diff --git a/0001-drm-i915-Pretend-cursor-is-always-on-for-ILK-style-W.patch b/0001-drm-i915-Pretend-cursor-is-always-on-for-ILK-style-W.patch
new file mode 100644
index 000000000..462f1132a
--- /dev/null
+++ b/0001-drm-i915-Pretend-cursor-is-always-on-for-ILK-style-W.patch
@@ -0,0 +1,67 @@
+From e2e407dc093f530b771ee8bf8fe1be41e3cea8b3 Mon Sep 17 00:00:00 2001
+From: Matt Roper <matthew.d.roper@intel.com>
+Date: Mon, 8 Feb 2016 11:05:28 -0800
+Subject: [PATCH] drm/i915: Pretend cursor is always on for ILK-style WM
+ calculations (v2)
+
+Due to our lack of two-step watermark programming, our driver has
+historically pretended that the cursor plane is always on for the
+purpose of watermark calculations; this helps avoid serious flickering
+when the cursor turns off/on (e.g., when the user moves the mouse
+pointer to a different screen).  That workaround was accidentally
+dropped as we started working toward atomic watermark updates.  Since we
+still aren't quite there yet with two-stage updates, we need to
+resurrect the workaround and treat the cursor as always active.
+
+v2: Tweak cursor width calculations slightly to more closely match the
+    logic we used before the atomic overhaul began.  (Ville)
+
+Cc: simdev11@outlook.com
+Cc: manfred.kitzbichler@gmail.com
+Cc: drm-intel-fixes@lists.freedesktop.org
+Reported-by: simdev11@outlook.com
+Reported-by: manfred.kitzbichler@gmail.com
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93892
+Fixes: 43d59eda1 ("drm/i915: Eliminate usage of plane_wm_parameters from ILK-style WM code (v2)")
+Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
+Link: http://patchwork.freedesktop.org/patch/msgid/1454479611-6804-1-git-send-email-matthew.d.roper@intel.com
+(cherry picked from commit b2435692dbb709d4c8ff3b2f2815c9b8423b72bb)
+Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+Link: http://patchwork.freedesktop.org/patch/msgid/1454958328-30129-1-git-send-email-matthew.d.roper@intel.com
+---
+ drivers/gpu/drm/i915/intel_pm.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
+index eb5fa05..a234687 100644
+--- a/drivers/gpu/drm/i915/intel_pm.c
++++ b/drivers/gpu/drm/i915/intel_pm.c
+@@ -1783,16 +1783,20 @@ static uint32_t ilk_compute_cur_wm(const struct intel_crtc_state *cstate,
+ 				   const struct intel_plane_state *pstate,
+ 				   uint32_t mem_value)
+ {
+-	int bpp = pstate->base.fb ? pstate->base.fb->bits_per_pixel / 8 : 0;
++	/*
++	 * We treat the cursor plane as always-on for the purposes of watermark
++	 * calculation.  Until we have two-stage watermark programming merged,
++	 * this is necessary to avoid flickering.
++	 */
++	int cpp = 4;
++	int width = pstate->visible ? pstate->base.crtc_w : 64;
+ 
+-	if (!cstate->base.active || !pstate->visible)
++	if (!cstate->base.active)
+ 		return 0;
+ 
+ 	return ilk_wm_method2(ilk_pipe_pixel_rate(cstate),
+ 			      cstate->base.adjusted_mode.crtc_htotal,
+-			      drm_rect_width(&pstate->dst),
+-			      bpp,
+-			      mem_value);
++			      width, cpp, mem_value);
+ }
+ 
+ /* Only for WM_LP. */
+-- 
+2.5.0
+
diff --git a/0001-usb-hub-fix-panic-in-usb_reset_and_verify_device.patch b/0001-usb-hub-fix-panic-in-usb_reset_and_verify_device.patch
new file mode 100644
index 000000000..1fa0e0fce
--- /dev/null
+++ b/0001-usb-hub-fix-panic-in-usb_reset_and_verify_device.patch
@@ -0,0 +1,30 @@
+From 07197eb61cfabc153846b1ae9d080a5d6c449d12 Mon Sep 17 00:00:00 2001
+From: "Du, Changbin" <changbin.du@intel.com>
+Date: Mon, 22 Feb 2016 10:08:36 +0800
+Subject: [PATCH] usb: hub: fix panic in usb_reset_and_verify_device
+
+Signed-off-by: Du, Changbin <changbin.du@intel.com>
+---
+ drivers/usb/core/hub.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
+index 350dcd9..045f951 100644
+--- a/drivers/usb/core/hub.c
++++ b/drivers/usb/core/hub.c
+@@ -5501,8 +5501,10 @@ done:
+ 	return 0;
+ 
+ re_enumerate:
+-	usb_release_bos_descriptor(udev);
+-	udev->bos = bos;
++	if (udev->bos != bos) {
++		usb_release_bos_descriptor(udev);
++		udev->bos = bos;
++	}
+ re_enumerate_no_bos:
+ 	/* LPM state doesn't matter when we're about to destroy the device. */
+ 	hub_port_logical_disconnect(parent_hub, port1);
+-- 
+2.5.0
+
diff --git a/ACPI-Limit-access-to-custom_method.patch b/ACPI-Limit-access-to-custom_method.patch
index 21257b8ce..38236753e 100644
--- a/ACPI-Limit-access-to-custom_method.patch
+++ b/ACPI-Limit-access-to-custom_method.patch
@@ -1,6 +1,7 @@
+From 4b85149b764cd024e3dd2aff9eb22a9e1aadd1fa Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Fri, 9 Mar 2012 08:39:37 -0500
-Subject: [PATCH] ACPI: Limit access to custom_method
+Subject: [PATCH 04/20] ACPI: Limit access to custom_method
 
 custom_method effectively allows arbitrary access to system memory, making
 it possible for an attacker to circumvent restrictions on module loading.
@@ -26,5 +27,5 @@ index c68e72414a67..4277938af700 100644
  		/* parse the table header to get the table length */
  		if (count <= sizeof(struct acpi_table_header))
 -- 
-2.1.0
+2.4.3
 
diff --git a/ALSA-timer-Fix-leak-in-SNDRV_TIMER_IOCTL_PARAMS.patch b/ALSA-timer-Fix-leak-in-SNDRV_TIMER_IOCTL_PARAMS.patch
new file mode 100644
index 000000000..3eb8bf183
--- /dev/null
+++ b/ALSA-timer-Fix-leak-in-SNDRV_TIMER_IOCTL_PARAMS.patch
@@ -0,0 +1,33 @@
+From 527a5767c165abd2b4dba99da992c51ca7547562 Mon Sep 17 00:00:00 2001
+From: Kangjie Lu <kangjielu@gmail.com>
+Date: Tue, 3 May 2016 16:44:07 -0400
+Subject: [PATCH 1/3] ALSA: timer: Fix leak in SNDRV_TIMER_IOCTL_PARAMS
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The stack object “tread” has a total size of 32 bytes. Its field
+“event” and “val” both contain 4 bytes padding. These 8 bytes
+padding bytes are sent to user without being initialized.
+
+Signed-off-by: Kangjie Lu <kjlu@gatech.edu>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ sound/core/timer.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sound/core/timer.c b/sound/core/timer.c
+index 6469bedda2f3..964f5ebf495e 100644
+--- a/sound/core/timer.c
++++ b/sound/core/timer.c
+@@ -1739,6 +1739,7 @@ static int snd_timer_user_params(struct file *file,
+ 	if (tu->timeri->flags & SNDRV_TIMER_IFLG_EARLY_EVENT) {
+ 		if (tu->tread) {
+ 			struct snd_timer_tread tread;
++			memset(&tread, 0, sizeof(tread));
+ 			tread.event = SNDRV_TIMER_EVENT_EARLY;
+ 			tread.tstamp.tv_sec = 0;
+ 			tread.tstamp.tv_nsec = 0;
+-- 
+2.5.5
+
diff --git a/ALSA-timer-Fix-leak-in-events-via-snd_timer_user_cca.patch b/ALSA-timer-Fix-leak-in-events-via-snd_timer_user_cca.patch
new file mode 100644
index 000000000..e6f46f8a8
--- /dev/null
+++ b/ALSA-timer-Fix-leak-in-events-via-snd_timer_user_cca.patch
@@ -0,0 +1,34 @@
+From addd6e9f0e25efb00d813d54528607c75b77c416 Mon Sep 17 00:00:00 2001
+From: Kangjie Lu <kangjielu@gmail.com>
+Date: Tue, 3 May 2016 16:44:20 -0400
+Subject: [PATCH 2/3] ALSA: timer: Fix leak in events via
+ snd_timer_user_ccallback
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The stack object “r1” has a total size of 32 bytes. Its field
+“event” and “val” both contain 4 bytes padding. These 8 bytes
+padding bytes are sent to user without being initialized.
+
+Signed-off-by: Kangjie Lu <kjlu@gatech.edu>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ sound/core/timer.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sound/core/timer.c b/sound/core/timer.c
+index 964f5ebf495e..e98fa5feb731 100644
+--- a/sound/core/timer.c
++++ b/sound/core/timer.c
+@@ -1225,6 +1225,7 @@ static void snd_timer_user_ccallback(struct snd_timer_instance *timeri,
+ 		tu->tstamp = *tstamp;
+ 	if ((tu->filter & (1 << event)) == 0 || !tu->tread)
+ 		return;
++	memset(&r1, 0, sizeof(r1));
+ 	r1.event = event;
+ 	r1.tstamp = *tstamp;
+ 	r1.val = resolution;
+-- 
+2.5.5
+
diff --git a/ALSA-timer-Fix-leak-in-events-via-snd_timer_user_tin.patch b/ALSA-timer-Fix-leak-in-events-via-snd_timer_user_tin.patch
new file mode 100644
index 000000000..7851c55a2
--- /dev/null
+++ b/ALSA-timer-Fix-leak-in-events-via-snd_timer_user_tin.patch
@@ -0,0 +1,34 @@
+From b06a443b5679e9a0298e2f206ddb60845569f62f Mon Sep 17 00:00:00 2001
+From: Kangjie Lu <kangjielu@gmail.com>
+Date: Tue, 3 May 2016 16:44:32 -0400
+Subject: [PATCH 3/3] ALSA: timer: Fix leak in events via
+ snd_timer_user_tinterrupt
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The stack object “r1” has a total size of 32 bytes. Its field
+“event” and “val” both contain 4 bytes padding. These 8 bytes
+padding bytes are sent to user without being initialized.
+
+Signed-off-by: Kangjie Lu <kjlu@gatech.edu>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ sound/core/timer.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sound/core/timer.c b/sound/core/timer.c
+index e98fa5feb731..c69a27155433 100644
+--- a/sound/core/timer.c
++++ b/sound/core/timer.c
+@@ -1268,6 +1268,7 @@ static void snd_timer_user_tinterrupt(struct snd_timer_instance *timeri,
+ 	}
+ 	if ((tu->filter & (1 << SNDRV_TIMER_EVENT_RESOLUTION)) &&
+ 	    tu->last_resolution != resolution) {
++		memset(&r1, 0, sizeof(r1));
+ 		r1.event = SNDRV_TIMER_EVENT_RESOLUTION;
+ 		r1.tstamp = tstamp;
+ 		r1.val = resolution;
+-- 
+2.5.5
+
diff --git a/ARM-tegra-usb-no-reset.patch b/ARM-tegra-usb-no-reset.patch
index 7c6357876..8ea4f5174 100644
--- a/ARM-tegra-usb-no-reset.patch
+++ b/ARM-tegra-usb-no-reset.patch
@@ -9,10 +9,10 @@ Patch for disconnect issues with storage attached to a
  1 file changed, 7 insertions(+)
 
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index d7c3d5a35946..a1121fc01e8c 100644
+index 43cb2f2e3b43..7f838ec11c81 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
-@@ -5006,6 +5006,13 @@ static void hub_event(struct work_struct *work)
+@@ -4996,6 +4996,13 @@ static void hub_event(struct work_struct *work)
  			(u16) hub->change_bits[0],
  			(u16) hub->event_bits[0]);
  
@@ -26,6 +26,3 @@ index d7c3d5a35946..a1121fc01e8c 100644
  	/* Lock the device, then check to see if we were
  	 * disconnected while waiting for the lock to succeed. */
  	usb_lock_device(hdev);
--- 
-2.1.0
-
diff --git a/Add-EFI-signature-data-types.patch b/Add-EFI-signature-data-types.patch
index eb05d8b8c..637f83bd1 100644
--- a/Add-EFI-signature-data-types.patch
+++ b/Add-EFI-signature-data-types.patch
@@ -1,3 +1,4 @@
+From 47f6b5c281137394d627e275cb80980492d00d84 Mon Sep 17 00:00:00 2001
 From: Dave Howells <dhowells@redhat.com>
 Date: Tue, 23 Oct 2012 09:30:54 -0400
 Subject: [PATCH] Add EFI signature data types
@@ -14,12 +15,12 @@ Signed-off-by: David Howells <dhowells@redhat.com>
  1 file changed, 20 insertions(+)
 
 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index c74cbd892032..1293d0e0bf90 100644
+index 4dc970e..82d6218 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
-@@ -589,6 +589,12 @@ void efi_native_runtime_setup(void);
- #define DEVICE_TREE_GUID \
-     EFI_GUID(  0xb1b621d5, 0xf19c, 0x41a5, 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 )
+@@ -599,6 +599,12 @@ void efi_native_runtime_setup(void);
+ #define EFI_PROPERTIES_TABLE_GUID \
+     EFI_GUID(  0x880aaca3, 0x4adc, 0x4a04, 0x90, 0x79, 0xb7, 0x47, 0x34, 0x08, 0x25, 0xe5 )
  
 +#define EFI_CERT_SHA256_GUID \
 +    EFI_GUID(  0xc1c41626, 0x504c, 0x4092, 0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28 )
@@ -30,7 +31,7 @@ index c74cbd892032..1293d0e0bf90 100644
  typedef struct {
  	efi_guid_t guid;
  	u64 table;
-@@ -804,6 +810,20 @@ typedef struct _efi_file_io_interface {
+@@ -823,6 +829,20 @@ typedef struct {
  
  #define EFI_INVALID_TABLE_ADDR		(~0UL)
  
@@ -52,5 +53,5 @@ index c74cbd892032..1293d0e0bf90 100644
   * All runtime access to EFI goes through this structure:
   */
 -- 
-2.1.0
+2.5.0
 
diff --git a/Add-an-EFI-signature-blob-parser-and-key-loader.patch b/Add-an-EFI-signature-blob-parser-and-key-loader.patch
index ecec5f3db..06ddd1596 100644
--- a/Add-an-EFI-signature-blob-parser-and-key-loader.patch
+++ b/Add-an-EFI-signature-blob-parser-and-key-loader.patch
@@ -1,6 +1,7 @@
+From c279ba86f93cf6a75d078e2d0e3f59d4ba8a2dd0 Mon Sep 17 00:00:00 2001
 From: Dave Howells <dhowells@redhat.com>
 Date: Tue, 23 Oct 2012 09:36:28 -0400
-Subject: [PATCH] Add an EFI signature blob parser and key loader.
+Subject: [PATCH 16/20] Add an EFI signature blob parser and key loader.
 
 X.509 certificates are loaded into the specified keyring as asymmetric type
 keys.
@@ -32,7 +33,7 @@ index 4870f28403f5..4a1b50d73b80 100644
 +
  endif # ASYMMETRIC_KEY_TYPE
 diff --git a/crypto/asymmetric_keys/Makefile b/crypto/asymmetric_keys/Makefile
-index e47fcd9ac5e8..6512f6596785 100644
+index cd1406f9b14a..d9db380bbe53 100644
 --- a/crypto/asymmetric_keys/Makefile
 +++ b/crypto/asymmetric_keys/Makefile
 @@ -8,6 +8,7 @@ asymmetric_keys-y := asymmetric_type.o signature.o
@@ -159,10 +160,10 @@ index 000000000000..424896a0b169
 +	return 0;
 +}
 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 1293d0e0bf90..706b16fa6de8 100644
+index fac43c611614..414c3c3d988d 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
-@@ -925,6 +925,10 @@ extern bool efi_poweroff_required(void);
+@@ -941,6 +941,10 @@ extern bool efi_poweroff_required(void);
  char * __init efi_md_typeattr_format(char *buf, size_t size,
  				     const efi_memory_desc_t *md);
  
@@ -174,5 +175,5 @@ index 1293d0e0bf90..706b16fa6de8 100644
   * efi_range_is_wc - check the WC bit on an address range
   * @start: starting kvirt address
 -- 
-2.1.0
+2.4.3
 
diff --git a/Add-option-to-automatically-enforce-module-signature.patch b/Add-option-to-automatically-enforce-module-signature.patch
index 537565bcd..015371b8b 100644
--- a/Add-option-to-automatically-enforce-module-signature.patch
+++ b/Add-option-to-automatically-enforce-module-signature.patch
@@ -1,7 +1,8 @@
+From 37431394b3eeb1ef6d38d0e6b2693210606c2c2c Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Fri, 9 Aug 2013 18:36:30 -0400
-Subject: [PATCH] Add option to automatically enforce module signatures when in
- Secure Boot mode
+Subject: [PATCH 10/20] Add option to automatically enforce module signatures
+ when in Secure Boot mode
 
 UEFI Secure Boot provides a mechanism for ensuring that the firmware will
 only load signed bootloaders and kernels. Certain use cases may also
@@ -20,10 +21,10 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
  7 files changed, 69 insertions(+), 1 deletion(-)
 
 diff --git a/Documentation/x86/zero-page.txt b/Documentation/x86/zero-page.txt
-index 82fbdbc1e0b0..a811210ad486 100644
+index 95a4d34af3fd..b8527c6b7646 100644
 --- a/Documentation/x86/zero-page.txt
 +++ b/Documentation/x86/zero-page.txt
-@@ -30,6 +30,8 @@ Offset	Proto	Name		Meaning
+@@ -31,6 +31,8 @@ Offset	Proto	Name		Meaning
  1E9/001	ALL	eddbuf_entries	Number of entries in eddbuf (below)
  1EA/001	ALL	edd_mbr_sig_buf_entries	Number of entries in edd_mbr_sig_buffer
  				(below)
@@ -33,10 +34,10 @@ index 82fbdbc1e0b0..a811210ad486 100644
  290/040	ALL	edd_mbr_sig_buffer EDD MBR signatures
  2D0/A00	ALL	e820_map	E820 memory map table
 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index b7d31ca55187..ab403a636357 100644
+index cc0d73eac047..14db458f4774 100644
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -1695,6 +1695,16 @@ config EFI_MIXED
+@@ -1734,6 +1734,16 @@ config EFI_MIXED
  
  	   If unsure, say N.
  
@@ -54,7 +55,7 @@ index b7d31ca55187..ab403a636357 100644
  	def_bool y
  	prompt "Enable seccomp to safely compute untrusted bytecode"
 diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
-index ef17683484e9..105e7360d747 100644
+index ee1b6d346b98..b4de3faa3f29 100644
 --- a/arch/x86/boot/compressed/eboot.c
 +++ b/arch/x86/boot/compressed/eboot.c
 @@ -12,6 +12,7 @@
@@ -103,7 +104,7 @@ index ef17683484e9..105e7360d747 100644
  /*
   * See if we have Graphics Output Protocol
   */
-@@ -1406,6 +1438,10 @@ struct boot_params *efi_main(struct efi_config *c,
+@@ -1412,6 +1444,10 @@ struct boot_params *efi_main(struct efi_config *c,
  	else
  		setup_boot_services32(efi_early);
  
@@ -115,7 +116,7 @@ index ef17683484e9..105e7360d747 100644
  
  	setup_efi_pci(boot_params);
 diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h
-index 44e6dd7e36a2..3ddf4150bd9e 100644
+index 329254373479..b61f8533c0fd 100644
 --- a/arch/x86/include/uapi/asm/bootparam.h
 +++ b/arch/x86/include/uapi/asm/bootparam.h
 @@ -134,7 +134,8 @@ struct boot_params {
@@ -129,10 +130,10 @@ index 44e6dd7e36a2..3ddf4150bd9e 100644
  	 * 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
-index 98dc9317286e..26741d24797e 100644
+index baadbf90a7c5..1ac118146e90 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
-@@ -1165,6 +1165,12 @@ void __init setup_arch(char **cmdline_p)
+@@ -1135,6 +1135,12 @@ void __init setup_arch(char **cmdline_p)
  
  	io_delay_init();
  
@@ -146,10 +147,10 @@ index 98dc9317286e..26741d24797e 100644
  	 * Parse the ACPI tables for possible boot-time SMP configuration.
  	 */
 diff --git a/include/linux/module.h b/include/linux/module.h
-index 0c86ec9e10ed..b02dfaacc76c 100644
+index db386349cd01..4b8df91f03cd 100644
 --- a/include/linux/module.h
 +++ b/include/linux/module.h
-@@ -188,6 +188,12 @@ const struct exception_table_entry *search_exception_tables(unsigned long add);
+@@ -273,6 +273,12 @@ const struct exception_table_entry *search_exception_tables(unsigned long add);
  
  struct notifier_block;
  
@@ -163,10 +164,10 @@ index 0c86ec9e10ed..b02dfaacc76c 100644
  
  extern int modules_disabled; /* for sysctl */
 diff --git a/kernel/module.c b/kernel/module.c
-index e6ff2181b2a5..95931292f3c4 100644
+index 7f045246e123..2b403ab0ef29 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -3892,6 +3892,13 @@ void module_layout(struct module *mod,
+@@ -4088,6 +4088,13 @@ void module_layout(struct module *mod,
  EXPORT_SYMBOL(module_layout);
  #endif
  
@@ -181,5 +182,5 @@ index e6ff2181b2a5..95931292f3c4 100644
  {
  #ifdef CONFIG_MODULE_SIG
 -- 
-2.1.0
+2.4.3
 
diff --git a/Add-secure_modules-call.patch b/Add-secure_modules-call.patch
index 51d3894c4..b6e039ff0 100644
--- a/Add-secure_modules-call.patch
+++ b/Add-secure_modules-call.patch
@@ -1,6 +1,7 @@
+From a1aaf20cffb1a949c5d6b1198690c7c30cfda4d5 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Fri, 9 Aug 2013 17:58:15 -0400
-Subject: [PATCH] Add secure_modules() call
+Subject: [PATCH 01/20] Add secure_modules() call
 
 Provide a single call to allow kernel code to determine whether the system
 has been configured to either disable module loading entirely or to load
@@ -11,28 +12,27 @@ Upstream-status: Fedora mustard.  Replaced by securelevels, but that was nak'd
 
 Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
 ---
- include/linux/module.h |  7 +++++++
+ include/linux/module.h |  6 ++++++
  kernel/module.c        | 10 ++++++++++
- 2 files changed, 17 insertions(+)
+ 2 files changed, 16 insertions(+)
 
 diff --git a/include/linux/module.h b/include/linux/module.h
-index 42999fe2dbd0..0c86ec9e10ed 100644
+index 3a19c79918e0..db386349cd01 100644
 --- a/include/linux/module.h
 +++ b/include/linux/module.h
-@@ -502,6 +502,8 @@ int unregister_module_notifier(struct notifier_block *nb);
- 
- extern void print_modules(void);
+@@ -635,6 +635,8 @@ static inline bool module_requested_async_probing(struct module *module)
+ 	return module && module->async_probe_requested;
+ }
  
 +extern bool secure_modules(void);
 +
  #else /* !CONFIG_MODULES... */
  
  /* Given an address, look for it in the exception tables. */
-@@ -612,6 +614,11 @@ static inline int unregister_module_notifier(struct notifier_block *nb)
- static inline void print_modules(void)
- {
+@@ -751,6 +753,10 @@ static inline bool module_requested_async_probing(struct module *module)
+ 	return false;
  }
-+
+ 
 +static inline bool secure_modules(void)
 +{
 +	return false;
@@ -41,10 +41,10 @@ index 42999fe2dbd0..0c86ec9e10ed 100644
  
  #ifdef CONFIG_SYSFS
 diff --git a/kernel/module.c b/kernel/module.c
-index b3d634ed06c9..e6ff2181b2a5 100644
+index b86b7bf1be38..7f045246e123 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -3891,3 +3891,13 @@ void module_layout(struct module *mod,
+@@ -4087,3 +4087,13 @@ void module_layout(struct module *mod,
  }
  EXPORT_SYMBOL(module_layout);
  #endif
@@ -59,5 +59,5 @@ index b3d634ed06c9..e6ff2181b2a5 100644
 +}
 +EXPORT_SYMBOL(secure_modules);
 -- 
-2.1.0
+2.4.3
 
diff --git a/Add-sysrq-option-to-disable-secure-boot-mode.patch b/Add-sysrq-option-to-disable-secure-boot-mode.patch
index efb66ffa9..4600848cf 100644
--- a/Add-sysrq-option-to-disable-secure-boot-mode.patch
+++ b/Add-sysrq-option-to-disable-secure-boot-mode.patch
@@ -1,6 +1,7 @@
+From 16d2ba5d5bc46e67e6aa7a3d113fbcc18c217388 Mon Sep 17 00:00:00 2001
 From: Kyle McMartin <kyle@redhat.com>
 Date: Fri, 30 Aug 2013 09:28:51 -0400
-Subject: [PATCH] Add sysrq option to disable secure boot mode
+Subject: [PATCH 20/20] Add sysrq option to disable secure boot mode
 
 Bugzilla: N/A
 Upstream-status: Fedora mustard
@@ -11,11 +12,11 @@ Upstream-status: Fedora mustard
  include/linux/input.h       |  5 +++++
  include/linux/sysrq.h       |  8 +++++++-
  kernel/debug/kdb/kdb_main.c |  2 +-
- kernel/module.c             |  4 ++--
- 7 files changed, 65 insertions(+), 10 deletions(-)
+ kernel/module.c             |  2 +-
+ 7 files changed, 64 insertions(+), 9 deletions(-)
 
 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 64a123acb97f..2964c69e7c8e 100644
+index f93826b8522c..41679b1aca83 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
 @@ -70,6 +70,11 @@
@@ -30,7 +31,7 @@ index 64a123acb97f..2964c69e7c8e 100644
  #include <video/edid.h>
  
  #include <asm/mtrr.h>
-@@ -1292,6 +1297,37 @@ void __init i386_reserve_resources(void)
+@@ -1261,6 +1266,37 @@ void __init i386_reserve_resources(void)
  
  #endif /* CONFIG_X86_32 */
  
@@ -69,10 +70,10 @@ index 64a123acb97f..2964c69e7c8e 100644
  	.notifier_call = dump_kernel_offset
  };
 diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
-index 421e29e4cd81..61c1eb97806c 100644
+index 345df9b03aed..dea6a6c4a39b 100644
 --- a/drivers/input/misc/uinput.c
 +++ b/drivers/input/misc/uinput.c
-@@ -366,6 +366,7 @@ static int uinput_allocate_device(struct uinput_device *udev)
+@@ -364,6 +364,7 @@ static int uinput_allocate_device(struct uinput_device *udev)
  	if (!udev->dev)
  		return -ENOMEM;
  
@@ -81,18 +82,18 @@ index 421e29e4cd81..61c1eb97806c 100644
  	input_set_drvdata(udev->dev, udev);
  
 diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
-index 259a4d5a4e8f..512c21dcb86f 100644
+index 95b330a9ea98..dfa3e154a719 100644
 --- a/drivers/tty/sysrq.c
 +++ b/drivers/tty/sysrq.c
-@@ -464,6 +464,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = {
- 	&sysrq_showstate_blocked_op,	/* w */
+@@ -472,6 +472,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = {
+ 	/* x: May be registered on mips for TLB dump */
  	/* x: May be registered on ppc/powerpc for xmon */
  	/* x: May be registered on sparc64 for global PMU dump */
 +	/* x: May be registered on x86_64 for disabling secure boot */
  	NULL,				/* x */
  	/* y: May be registered on sparc64 for global register dump */
  	NULL,				/* y */
-@@ -507,7 +508,7 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p)
+@@ -515,7 +516,7 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p)
                  sysrq_key_table[i] = op_p;
  }
  
@@ -101,7 +102,7 @@ index 259a4d5a4e8f..512c21dcb86f 100644
  {
  	struct sysrq_key_op *op_p;
  	int orig_log_level;
-@@ -527,11 +528,15 @@ void __handle_sysrq(int key, bool check_mask)
+@@ -535,11 +536,15 @@ void __handle_sysrq(int key, bool check_mask)
  
          op_p = __sysrq_get_key_op(key);
          if (op_p) {
@@ -118,7 +119,7 @@ index 259a4d5a4e8f..512c21dcb86f 100644
  			pr_cont("%s\n", op_p->action_msg);
  			console_loglevel = orig_log_level;
  			op_p->handler(key);
-@@ -563,7 +568,7 @@ void __handle_sysrq(int key, bool check_mask)
+@@ -571,7 +576,7 @@ void __handle_sysrq(int key, bool check_mask)
  void handle_sysrq(int key)
  {
  	if (sysrq_on())
@@ -127,7 +128,7 @@ index 259a4d5a4e8f..512c21dcb86f 100644
  }
  EXPORT_SYMBOL(handle_sysrq);
  
-@@ -643,7 +648,7 @@ static void sysrq_do_reset(unsigned long _state)
+@@ -652,7 +657,7 @@ static void sysrq_do_reset(unsigned long _state)
  static void sysrq_handle_reset_request(struct sysrq_state *state)
  {
  	if (state->reset_requested)
@@ -136,7 +137,7 @@ index 259a4d5a4e8f..512c21dcb86f 100644
  
  	if (sysrq_reset_downtime_ms)
  		mod_timer(&state->keyreset_timer,
-@@ -794,8 +799,10 @@ static bool sysrq_handle_keypress(struct sysrq_state *sysrq,
+@@ -803,8 +808,10 @@ static bool sysrq_handle_keypress(struct sysrq_state *sysrq,
  
  	default:
  		if (sysrq->active && value && value != 2) {
@@ -148,7 +149,7 @@ index 259a4d5a4e8f..512c21dcb86f 100644
  		}
  		break;
  	}
-@@ -1090,7 +1097,7 @@ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
+@@ -1084,7 +1091,7 @@ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
  
  		if (get_user(c, buf))
  			return -EFAULT;
@@ -228,21 +229,18 @@ index 4121345498e0..0ff3cef5df96 100644
  
  	return 0;
 diff --git a/kernel/module.c b/kernel/module.c
-index 95931292f3c4..974381763108 100644
+index 2b403ab0ef29..7818c110e95c 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -107,9 +107,9 @@ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */
+@@ -292,7 +292,7 @@ static void module_assert_mutex_or_preempt(void)
+ #endif
+ }
  
- #ifdef CONFIG_MODULE_SIG
- #ifdef CONFIG_MODULE_SIG_FORCE
--static bool sig_enforce = true;
-+bool sig_enforce = true;
- #else
--static bool sig_enforce = false;
-+bool sig_enforce = false;
- 
- static int param_set_bool_enable_only(const char *val,
- 				      const struct kernel_param *kp)
+-static bool sig_enforce = IS_ENABLED(CONFIG_MODULE_SIG_FORCE);
++bool sig_enforce = IS_ENABLED(CONFIG_MODULE_SIG_FORCE);
+ #ifndef CONFIG_MODULE_SIG_FORCE
+ module_param(sig_enforce, bool_enable_only, 0644);
+ #endif /* !CONFIG_MODULE_SIG_FORCE */
 -- 
-2.1.0
+2.4.3
 
diff --git a/Bluetooth-ath3k-Add-support-Atheros-AR5B195-combo-Mi.patch b/Bluetooth-ath3k-Add-support-Atheros-AR5B195-combo-Mi.patch
deleted file mode 100644
index eadbd8e2e..000000000
--- a/Bluetooth-ath3k-Add-support-Atheros-AR5B195-combo-Mi.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Alexander Ploumistos <alex.ploumistos@gmail.com>
-Date: Fri, 13 Feb 2015 21:05:11 +0200
-Subject: [PATCH] Bluetooth: ath3k: Add support Atheros AR5B195 combo Mini PCIe
- card
-
-Add 04f2:aff1 to ath3k.c supported devices list and btusb.c blacklist, so
-that the device can load the ath3k firmware and re-enumerate itself as an
-AR3011 device.
-
-T:  Bus=05 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#=  2 Spd=12   MxCh= 0
-D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
-P:  Vendor=04f2 ProdID=aff1 Rev= 0.01
-C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
-I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
-E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=1ms
-E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
-E:  Ad=02(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
-I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
-E:  Ad=83(I) Atr=01(Isoc) MxPS=   0 Ivl=1ms
-E:  Ad=03(O) Atr=01(Isoc) MxPS=   0 Ivl=1ms
-I:  If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
-E:  Ad=83(I) Atr=01(Isoc) MxPS=   9 Ivl=1ms
-E:  Ad=03(O) Atr=01(Isoc) MxPS=   9 Ivl=1ms
-I:  If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
-E:  Ad=83(I) Atr=01(Isoc) MxPS=  17 Ivl=1ms
-E:  Ad=03(O) Atr=01(Isoc) MxPS=  17 Ivl=1ms
-I:  If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
-E:  Ad=83(I) Atr=01(Isoc) MxPS=  25 Ivl=1ms
-E:  Ad=03(O) Atr=01(Isoc) MxPS=  25 Ivl=1ms
-I:  If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
-E:  Ad=83(I) Atr=01(Isoc) MxPS=  33 Ivl=1ms
-E:  Ad=03(O) Atr=01(Isoc) MxPS=  33 Ivl=1ms
-I:  If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
-E:  Ad=83(I) Atr=01(Isoc) MxPS=  49 Ivl=1ms
-E:  Ad=03(O) Atr=01(Isoc) MxPS=  49 Ivl=1ms
-
-Signed-off-by: Alexander Ploumistos <alexpl@fedoraproject.org>
-Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-Cc: stable@vger.kernel.org
----
- drivers/bluetooth/ath3k.c | 1 +
- drivers/bluetooth/btusb.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
-index de4c8499cbac..288547a3c566 100644
---- a/drivers/bluetooth/ath3k.c
-+++ b/drivers/bluetooth/ath3k.c
-@@ -65,6 +65,7 @@ static const struct usb_device_id ath3k_table[] = {
- 	/* Atheros AR3011 with sflash firmware*/
- 	{ USB_DEVICE(0x0489, 0xE027) },
- 	{ USB_DEVICE(0x0489, 0xE03D) },
-+	{ USB_DEVICE(0x04F2, 0xAFF1) },
- 	{ USB_DEVICE(0x0930, 0x0215) },
- 	{ USB_DEVICE(0x0CF3, 0x3002) },
- 	{ USB_DEVICE(0x0CF3, 0xE019) },
-diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index 8bfc4c2bba87..2c527da668ae 100644
---- a/drivers/bluetooth/btusb.c
-+++ b/drivers/bluetooth/btusb.c
-@@ -159,6 +159,7 @@ static const struct usb_device_id blacklist_table[] = {
- 	/* Atheros 3011 with sflash firmware */
- 	{ USB_DEVICE(0x0489, 0xe027), .driver_info = BTUSB_IGNORE },
- 	{ USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },
-+	{ USB_DEVICE(0x04f2, 0xaff1), .driver_info = BTUSB_IGNORE },
- 	{ USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },
- 	{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },
- 	{ USB_DEVICE(0x0cf3, 0xe019), .driver_info = BTUSB_IGNORE },
--- 
-2.1.0
-
diff --git a/HID-chicony-Add-support-for-Acer-Aspire-Switch-12.patch b/HID-chicony-Add-support-for-Acer-Aspire-Switch-12.patch
new file mode 100644
index 000000000..2baf72e4c
--- /dev/null
+++ b/HID-chicony-Add-support-for-Acer-Aspire-Switch-12.patch
@@ -0,0 +1,103 @@
+From 98f07385212073536f303c07ece455acdd4d267f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9=20=D0=9A=D1=83?=
+ =?UTF-8?q?=D0=B4=D1=80=D1=8F=D0=B2=D1=86=D0=B5=D0=B2?=
+ <nkudriavtsev@gmail.com>
+Date: Tue, 21 Jul 2015 13:31:52 +0300
+Subject: [PATCH] HID: chicony: Add support for Acer Aspire Switch 12
+
+Acer Aspire Switch 12 keyboard Chicony's controller reports too big usage
+index on the 1st interface. The patch fixes the report. The work based on
+solution from drivers/hid/hid-holtek-mouse.c
+
+Bug report: https://bugzilla.kernel.org/show_bug.cgi?id=101721
+
+Signed-off-by: Nicholas Kudriavtsev <nkudriavtsev@gmail.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.com>
+---
+ drivers/hid/hid-chicony.c | 26 ++++++++++++++++++++++++++
+ drivers/hid/hid-core.c    |  1 +
+ drivers/hid/hid-ids.h     |  1 +
+ 3 files changed, 28 insertions(+)
+
+diff --git a/drivers/hid/hid-chicony.c b/drivers/hid/hid-chicony.c
+index b613d5a79684..bc3cec199fee 100644
+--- a/drivers/hid/hid-chicony.c
++++ b/drivers/hid/hid-chicony.c
+@@ -20,6 +20,7 @@
+ #include <linux/input.h>
+ #include <linux/hid.h>
+ #include <linux/module.h>
++#include <linux/usb.h>
+ 
+ #include "hid-ids.h"
+ 
+@@ -57,10 +58,34 @@ static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+ 	return 1;
+ }
+ 
++static __u8 *ch_switch12_report_fixup(struct hid_device *hdev, __u8 *rdesc,
++		unsigned int *rsize)
++{
++	struct usb_interface *intf = to_usb_interface(hdev->dev.parent);
++	
++	if (intf->cur_altsetting->desc.bInterfaceNumber == 1) {
++		/* Change usage maximum and logical maximum from 0x7fff to
++		 * 0x2fff, so they don't exceed HID_MAX_USAGES */
++		switch (hdev->product) {
++		case USB_DEVICE_ID_CHICONY_ACER_SWITCH12:
++			if (*rsize >= 128 && rdesc[64] == 0xff && rdesc[65] == 0x7f
++					&& rdesc[69] == 0xff && rdesc[70] == 0x7f) {
++				hid_info(hdev, "Fixing up report descriptor\n");
++				rdesc[65] = rdesc[70] = 0x2f;
++			}
++			break;
++		}
++
++	}
++	return rdesc;
++}
++
++
+ static const struct hid_device_id ch_devices[] = {
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_AK1D) },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_ACER_SWITCH12) },
+ 	{ }
+ };
+ MODULE_DEVICE_TABLE(hid, ch_devices);
+@@ -68,6 +93,7 @@ MODULE_DEVICE_TABLE(hid, ch_devices);
+ static struct hid_driver ch_driver = {
+ 	.name = "chicony",
+ 	.id_table = ch_devices,
++	.report_fixup = ch_switch12_report_fixup,
+ 	.input_mapping = ch_input_mapping,
+ };
+ module_hid_driver(ch_driver);
+diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
+index e6fce23b121a..f90ca6574221 100644
+--- a/drivers/hid/hid-core.c
++++ b/drivers/hid/hid-core.c
+@@ -1807,6 +1807,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_AK1D) },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_ACER_SWITCH12) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_CP2112) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index b3b225b75d0a..79210ca8eff1 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -233,6 +233,7 @@
+ #define USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE	0x1053
+ #define USB_DEVICE_ID_CHICONY_WIRELESS2	0x1123
+ #define USB_DEVICE_ID_CHICONY_AK1D	0x1125
++#define USB_DEVICE_ID_CHICONY_ACER_SWITCH12	0x1421
+ 
+ #define USB_VENDOR_ID_CHUNGHWAT		0x2247
+ #define USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH	0x0001
+-- 
+2.4.3
+
diff --git a/HID-hid-input-Fix-accessing-freed-memory-during-devi.patch b/HID-hid-input-Fix-accessing-freed-memory-during-devi.patch
new file mode 100644
index 000000000..6a64910b5
--- /dev/null
+++ b/HID-hid-input-Fix-accessing-freed-memory-during-devi.patch
@@ -0,0 +1,53 @@
+From 0621809e37936e7c2b3eac9165cf2aad7f9189eb Mon Sep 17 00:00:00 2001
+From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
+Date: Mon, 3 Aug 2015 14:57:30 +0900
+Subject: [PATCH] HID: hid-input: Fix accessing freed memory during device
+ disconnect
+
+During unbinding the driver was dereferencing a pointer to memory
+already freed by power_supply_unregister().
+
+Driver was freeing its internal description of battery through pointers
+stored in power_supply structure. However, because the core owns the
+power supply instance, after calling power_supply_unregister() this
+memory is freed and the driver cannot access these members.
+
+Fix this by storing the pointer to internal description of battery in a
+local variable before calling power_supply_unregister(), so the pointer
+remains valid.
+
+Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
+Reported-by: H.J. Lu <hjl.tools@gmail.com>
+Fixes: 297d716f6260 ("power_supply: Change ownership from driver to core")
+Cc: <stable@vger.kernel.org>
+Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.com>
+---
+ drivers/hid/hid-input.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
+index 3511bbab..e3c6364 100644
+--- a/drivers/hid/hid-input.c
++++ b/drivers/hid/hid-input.c
+@@ -462,12 +462,15 @@ out:
+ 
+ static void hidinput_cleanup_battery(struct hid_device *dev)
+ {
++	const struct power_supply_desc *psy_desc;
++
+ 	if (!dev->battery)
+ 		return;
+ 
++	psy_desc = dev->battery->desc;
+ 	power_supply_unregister(dev->battery);
+-	kfree(dev->battery->desc->name);
+-	kfree(dev->battery->desc);
++	kfree(psy_desc->name);
++	kfree(psy_desc);
+ 	dev->battery = NULL;
+ }
+ #else  /* !CONFIG_HID_BATTERY_STRENGTH */
+-- 
+2.4.3
+
diff --git a/HID-hiddev-validate-num_values-for-HIDIOCGUSAGES-HID.patch b/HID-hiddev-validate-num_values-for-HIDIOCGUSAGES-HID.patch
new file mode 100644
index 000000000..e84272ee7
--- /dev/null
+++ b/HID-hiddev-validate-num_values-for-HIDIOCGUSAGES-HID.patch
@@ -0,0 +1,44 @@
+From 93a2001bdfd5376c3dc2158653034c20392d15c5 Mon Sep 17 00:00:00 2001
+From: Scott Bauer <sbauer@plzdonthack.me>
+Date: Thu, 23 Jun 2016 08:59:47 -0600
+Subject: [PATCH] HID: hiddev: validate num_values for HIDIOCGUSAGES,
+ HIDIOCSUSAGES commands
+
+This patch validates the num_values parameter from userland during the
+HIDIOCGUSAGES and HIDIOCSUSAGES commands. Previously, if the report id was set
+to HID_REPORT_ID_UNKNOWN, we would fail to validate the num_values parameter
+leading to a heap overflow.
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Scott Bauer <sbauer@plzdonthack.me>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+---
+ drivers/hid/usbhid/hiddev.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
+index 2f1ddca6f2e0..700145b15088 100644
+--- a/drivers/hid/usbhid/hiddev.c
++++ b/drivers/hid/usbhid/hiddev.c
+@@ -516,13 +516,13 @@ static noinline int hiddev_ioctl_usage(struct hiddev *hiddev, unsigned int cmd,
+ 					goto inval;
+ 			} else if (uref->usage_index >= field->report_count)
+ 				goto inval;
+-
+-			else if ((cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) &&
+-				 (uref_multi->num_values > HID_MAX_MULTI_USAGES ||
+-				  uref->usage_index + uref_multi->num_values > field->report_count))
+-				goto inval;
+ 		}
+ 
++		if ((cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) &&
++		    (uref_multi->num_values > HID_MAX_MULTI_USAGES ||
++		     uref->usage_index + uref_multi->num_values > field->report_count))
++			goto inval;
++
+ 		switch (cmd) {
+ 		case HIDIOCGUSAGE:
+ 			uref->value = field->value[uref->usage_index];
+-- 
+2.5.5
+
diff --git a/HID-multitouch-add-support-of-clickpads.patch b/HID-multitouch-add-support-of-clickpads.patch
deleted file mode 100644
index 97edb7dd6..000000000
--- a/HID-multitouch-add-support-of-clickpads.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Date: Fri, 6 Mar 2015 11:14:42 -0500
-Subject: [PATCH] HID: multitouch: add support of clickpads
-
-Touchpads that have only one button are called clickpads and should
-be advertised as such by the kernel.
-
-Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Tested-by: Jason Ekstrand <jason@jlekstrand.net>
----
- drivers/hid/hid-multitouch.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index f65e78b46999..ef06dc30b9b1 100644
---- a/drivers/hid/hid-multitouch.c
-+++ b/drivers/hid/hid-multitouch.c
-@@ -116,6 +116,7 @@ struct mt_device {
- 	__u8 touches_by_report;	/* how many touches are present in one report:
- 				* 1 means we should use a serial protocol
- 				* > 1 means hybrid (multitouch) protocol */
-+	__u8 buttons_count;	/* number of physical buttons per touchpad */
- 	bool serial_maybe;	/* need to check for serial protocol */
- 	bool curvalid;		/* is the current contact valid? */
- 	unsigned mt_flags;	/* flags to pass to input-mt */
-@@ -379,6 +380,10 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
- 		td->inputmode_value = MT_INPUTMODE_TOUCHPAD;
- 	}
- 
-+	/* count the buttons on touchpads */
-+	if ((usage->hid & HID_USAGE_PAGE) == HID_UP_BUTTON)
-+		td->buttons_count++;
-+
- 	if (usage->usage_index)
- 		prev_usage = &field->usage[usage->usage_index - 1];
- 
-@@ -728,6 +733,10 @@ static void mt_touch_input_configured(struct hid_device *hdev,
- 	if (cls->quirks & MT_QUIRK_NOT_SEEN_MEANS_UP)
- 		td->mt_flags |= INPUT_MT_DROP_UNUSED;
- 
-+	/* check for clickpads */
-+	if ((td->mt_flags & INPUT_MT_POINTER) && (td->buttons_count == 1))
-+		__set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
-+
- 	input_mt_init_slots(input, td->maxcontacts, td->mt_flags);
- 
- 	td->mt_flags = 0;
--- 
-2.1.0
-
diff --git a/HID-multitouch-enable-palm-rejection-if-device-imple.patch b/HID-multitouch-enable-palm-rejection-if-device-imple.patch
new file mode 100644
index 000000000..b9753fce7
--- /dev/null
+++ b/HID-multitouch-enable-palm-rejection-if-device-imple.patch
@@ -0,0 +1,41 @@
+From 37e81f1a82ba4f214c05c4cc3807378753c7a867 Mon Sep 17 00:00:00 2001
+From: Allen Hung <allen_hung@dell.com>
+Date: Fri, 20 Nov 2015 18:21:06 +0800
+Subject: [PATCH] HID: multitouch: enable palm rejection if device implements
+ confidence usage
+
+The usage Confidence is mandary to Windows Precision Touchpad devices. The
+appearance of this usage is checked in hidinput_connect but the quirk
+MT_QUIRK_VALID_IS_CONFIDENCE is not applied to device accordingly.
+Apply this quirk and also remove quirk MT_QUIRK_ALWAYS_VALID to enable palm
+rejection for the WIN 8 touchpad devices which have implemented usage
+Confidence in its input reports.
+
+Tested on Dell XPS 13 laptop.
+
+Signed-off-by: Allen Hung <allen_hung@dell.com>
+Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+---
+ drivers/hid/hid-multitouch.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
+index 7c811252c1ce..0c94348a168d 100644
+--- a/drivers/hid/hid-multitouch.c
++++ b/drivers/hid/hid-multitouch.c
+@@ -448,6 +448,11 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+ 			mt_store_field(usage, td, hi);
+ 			return 1;
+ 		case HID_DG_CONFIDENCE:
++			if (cls->name == MT_CLS_WIN_8 &&
++				field->application == HID_DG_TOUCHPAD) {
++				cls->quirks &= ~MT_QUIRK_ALWAYS_VALID;
++				cls->quirks |= MT_QUIRK_VALID_IS_CONFIDENCE;
++			}
+ 			mt_store_field(usage, td, hi);
+ 			return 1;
+ 		case HID_DG_TIPSWITCH:
+-- 
+2.5.0
+
diff --git a/HID-sony-do-not-bail-out-when-the-sixaxis-refuses-th.patch b/HID-sony-do-not-bail-out-when-the-sixaxis-refuses-th.patch
new file mode 100644
index 000000000..b1a789e84
--- /dev/null
+++ b/HID-sony-do-not-bail-out-when-the-sixaxis-refuses-th.patch
@@ -0,0 +1,49 @@
+From 954d6154959c8c196fa4b89fc98a4fb377c6a38d Mon Sep 17 00:00:00 2001
+From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Date: Fri, 8 Jan 2016 17:58:49 +0100
+Subject: [PATCH] HID: sony: do not bail out when the sixaxis refuses the
+ output report
+
+When setting the operational mode, some third party (Speedlink Strike-FX)
+gamepads refuse the output report. Failing here means we refuse to
+initialize the gamepad while this should be harmless.
+
+The weird part is that the initial commit that added this: a7de9b8
+("HID: sony: Enable Gasia third-party PS3 controllers") mentions this
+very same controller as one requiring this output report.
+Anyway, it's broken for one user at least, so let's change it.
+We will report an error, but at least the controller should work.
+
+And no, these devices present themselves as legacy Sony controllers
+(VID:PID of 054C:0268, as in the official ones) so there are no ways
+of discriminating them from the official ones.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1255325
+
+Reported-and-tested-by: Max Fedotov <thesourcehim@gmail.com>
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+---
+ drivers/hid/hid-sony.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
+index 661f94f8ab8b..11f91c0c2458 100644
+--- a/drivers/hid/hid-sony.c
++++ b/drivers/hid/hid-sony.c
+@@ -1411,8 +1411,10 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev)
+ 	}
+ 
+ 	ret = hid_hw_output_report(hdev, buf, 1);
+-	if (ret < 0)
+-		hid_err(hdev, "can't set operational mode: step 3\n");
++	if (ret < 0) {
++		hid_info(hdev, "can't set operational mode: step 3, ignoring\n");
++		ret = 0;
++	}
+ 
+ out:
+ 	kfree(buf);
+-- 
+2.5.0
+
diff --git a/HID-wacom-fix-Bamboo-ONE-oops.patch b/HID-wacom-fix-Bamboo-ONE-oops.patch
new file mode 100644
index 000000000..09e83179a
--- /dev/null
+++ b/HID-wacom-fix-Bamboo-ONE-oops.patch
@@ -0,0 +1,46 @@
+From 580549ef6b3e3fb3b958de490ca99f43a089a2cf Mon Sep 17 00:00:00 2001
+From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Date: Fri, 25 Mar 2016 15:26:55 +0100
+Subject: [PATCH] HID: wacom: fix Bamboo ONE oops
+
+Looks like recent changes in the Wacom driver made the Bamboo ONE crashes.
+The tablet behaves as if it was a regular Bamboo device with pen, touch
+and pad, but there is no physical pad connected to it.
+The weird part is that the pad is still sending events and given that
+there is no input node connected to it, we get  anull pointer exception.
+
+Link: https://bugzilla.redhat.com/show_bug.cgi?id=1317116
+
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Acked-by: Ping Cheng <pingc@wacom.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+---
+ drivers/hid/wacom_wac.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
+index bd198bbd4df0..02c4efea241c 100644
+--- a/drivers/hid/wacom_wac.c
++++ b/drivers/hid/wacom_wac.c
+@@ -2426,6 +2426,17 @@ void wacom_setup_device_quirks(struct wacom *wacom)
+ 	}
+ 
+ 	/*
++	 * Hack for the Bamboo One:
++	 * the device presents a PAD/Touch interface as most Bamboos and even
++	 * sends ghosts PAD data on it. However, later, we must disable this
++	 * ghost interface, and we can not detect it unless we set it here
++	 * to WACOM_DEVICETYPE_PAD or WACOM_DEVICETYPE_TOUCH.
++	 */
++	if (features->type == BAMBOO_PEN &&
++	    features->pktlen == WACOM_PKGLEN_BBTOUCH3)
++		features->device_type |= WACOM_DEVICETYPE_PAD;
++
++	/*
+ 	 * Raw Wacom-mode pen and touch events both come from interface
+ 	 * 0, whose HID descriptor has an application usage of 0xFF0D
+ 	 * (i.e., WACOM_VENDORDEFINED_PEN). We route pen packets back
+-- 
+2.5.5
+
diff --git a/IB-core-Prevent-integer-overflow-in-ib_umem_get-addr.patch b/IB-core-Prevent-integer-overflow-in-ib_umem_get-addr.patch
deleted file mode 100644
index 8f51675ea..000000000
--- a/IB-core-Prevent-integer-overflow-in-ib_umem_get-addr.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Shachar Raindel <raindel@mellanox.com>
-Date: Sun, 4 Jan 2015 18:30:32 +0200
-Subject: [PATCH] IB/core: Prevent integer overflow in ib_umem_get address
- arithmetic
-
-Properly verify that the resulting page aligned end address is larger
-than both the start address and the length of the memory area
-requested.
-
-Both the start and length arguments for ib_umem_get are controlled by
-the user. A misbehaving user can provide values which will cause an
-integer overflow when calculating the page aligned end address.
-
-This overflow can cause also miscalculation of the number of pages
-mapped, and additional logic issues.
-
-Issue: 470602
-Change-Id: Iee88441db454af291fc5a376009d840603398d23
-Signed-off-by: Shachar Raindel <raindel@mellanox.com>
-Signed-off-by: Jack Morgenstein <jackm@mellanox.com>
-Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
----
- drivers/infiniband/core/umem.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
-index aec7a6aa2951..8c014b5dab4c 100644
---- a/drivers/infiniband/core/umem.c
-+++ b/drivers/infiniband/core/umem.c
-@@ -99,6 +99,14 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
- 	if (dmasync)
- 		dma_set_attr(DMA_ATTR_WRITE_BARRIER, &attrs);
- 
-+	/*
-+	 * If the combination of the addr and size requested for this memory
-+	 * region causes an integer overflow, return error.
-+	 */
-+	if ((PAGE_ALIGN(addr + size) <= size) ||
-+	    (PAGE_ALIGN(addr + size) <= addr))
-+		return ERR_PTR(-EINVAL);
-+
- 	if (!can_do_mlock())
- 		return ERR_PTR(-EPERM);
- 
--- 
-2.1.0
-
diff --git a/Input-synaptics-do-not-retrieve-the-board-id-on-old-.patch b/Input-synaptics-do-not-retrieve-the-board-id-on-old-.patch
deleted file mode 100644
index 7006be4ad..000000000
--- a/Input-synaptics-do-not-retrieve-the-board-id-on-old-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Date: Sun, 8 Mar 2015 22:33:36 -0700
-Subject: [PATCH] Input: synaptics - do not retrieve the board id on old
- firmwares
-
-The board id capability has been added in firmware 7.5.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Acked-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
----
- drivers/input/mouse/synaptics.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
-index bd399a72e610..ff352ecca394 100644
---- a/drivers/input/mouse/synaptics.c
-+++ b/drivers/input/mouse/synaptics.c
-@@ -253,6 +253,10 @@ static int synaptics_board_id(struct psmouse *psmouse)
- 	struct synaptics_data *priv = psmouse->private;
- 	unsigned char bid[3];
- 
-+	/* firmwares prior 7.5 have no board_id encoded */
-+	if (SYN_ID_FULL(priv->identity) < 0x705)
-+		return 0;
-+
- 	if (synaptics_send_cmd(psmouse, SYN_QUE_MODES, bid))
- 		return -1;
- 	priv->board_id = ((bid[0] & 0xfc) << 6) | bid[1];
--- 
-2.1.0
-
diff --git a/Input-synaptics-fix-middle-button-on-Lenovo-2015-pro.patch b/Input-synaptics-fix-middle-button-on-Lenovo-2015-pro.patch
deleted file mode 100644
index 09943ffc6..000000000
--- a/Input-synaptics-fix-middle-button-on-Lenovo-2015-pro.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Date: Sun, 8 Mar 2015 22:30:43 -0700
-Subject: [PATCH] Input: synaptics - fix middle button on Lenovo 2015 products
-
-On the X1 Carbon 3rd gen (with a 2015 broadwell cpu), the physical middle
-button of the trackstick (attached to the touchpad serio device, of course)
-seems to get lost.
-
-Actually, the touchpads reports 3 extra buttons, which falls in the switch
-below to the '2' case. Let's handle the case of odd numbers also, so that
-the middle button finds its way back.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Acked-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
----
- drivers/input/mouse/synaptics.c | 44 ++++++++++++++++++++---------------------
- 1 file changed, 21 insertions(+), 23 deletions(-)
-
-diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
-index 134676303117..f8df5a518bf3 100644
---- a/drivers/input/mouse/synaptics.c
-+++ b/drivers/input/mouse/synaptics.c
-@@ -650,6 +650,18 @@ static void synaptics_parse_agm(const unsigned char buf[],
- 	}
- }
- 
-+static void synaptics_parse_ext_buttons(const unsigned char buf[],
-+					struct synaptics_data *priv,
-+					struct synaptics_hw_state *hw)
-+{
-+	unsigned int ext_bits =
-+		(SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap) + 1) >> 1;
-+	unsigned int ext_mask = GENMASK(ext_bits - 1, 0);
-+
-+	hw->ext_buttons = buf[4] & ext_mask;
-+	hw->ext_buttons |= (buf[5] & ext_mask) << ext_bits;
-+}
-+
- static bool is_forcepad;
- 
- static int synaptics_parse_hw_state(const unsigned char buf[],
-@@ -736,28 +748,9 @@ static int synaptics_parse_hw_state(const unsigned char buf[],
- 			hw->down = ((buf[0] ^ buf[3]) & 0x02) ? 1 : 0;
- 		}
- 
--		if (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap) &&
-+		if (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap) > 0 &&
- 		    ((buf[0] ^ buf[3]) & 0x02)) {
--			switch (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap) & ~0x01) {
--			default:
--				/*
--				 * if nExtBtn is greater than 8 it should be
--				 * considered invalid and treated as 0
--				 */
--				break;
--			case 8:
--				hw->ext_buttons |= ((buf[5] & 0x08)) ? 0x80 : 0;
--				hw->ext_buttons |= ((buf[4] & 0x08)) ? 0x40 : 0;
--			case 6:
--				hw->ext_buttons |= ((buf[5] & 0x04)) ? 0x20 : 0;
--				hw->ext_buttons |= ((buf[4] & 0x04)) ? 0x10 : 0;
--			case 4:
--				hw->ext_buttons |= ((buf[5] & 0x02)) ? 0x08 : 0;
--				hw->ext_buttons |= ((buf[4] & 0x02)) ? 0x04 : 0;
--			case 2:
--				hw->ext_buttons |= ((buf[5] & 0x01)) ? 0x02 : 0;
--				hw->ext_buttons |= ((buf[4] & 0x01)) ? 0x01 : 0;
--			}
-+			synaptics_parse_ext_buttons(buf, priv, hw);
- 		}
- 	} else {
- 		hw->x = (((buf[1] & 0x1f) << 8) | buf[2]);
-@@ -824,6 +817,7 @@ static void synaptics_report_buttons(struct psmouse *psmouse,
- {
- 	struct input_dev *dev = psmouse->dev;
- 	struct synaptics_data *priv = psmouse->private;
-+	int ext_bits = (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap) + 1) >> 1;
- 	int i;
- 
- 	input_report_key(dev, BTN_LEFT, hw->left);
-@@ -837,8 +831,12 @@ static void synaptics_report_buttons(struct psmouse *psmouse,
- 		input_report_key(dev, BTN_BACK, hw->down);
- 	}
- 
--	for (i = 0; i < SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap); i++)
--		input_report_key(dev, BTN_0 + i, hw->ext_buttons & (1 << i));
-+	for (i = 0; i < ext_bits; i++) {
-+		input_report_key(dev, BTN_0 + 2 * i,
-+				 hw->ext_buttons & (1 << i));
-+		input_report_key(dev, BTN_1 + 2 * i,
-+				 hw->ext_buttons & (1 << (i + ext_bits)));
-+	}
- }
- 
- static void synaptics_report_mt_data(struct psmouse *psmouse,
--- 
-2.1.0
-
diff --git a/Input-synaptics-handle-spurious-release-of-trackstic.patch b/Input-synaptics-handle-spurious-release-of-trackstic.patch
deleted file mode 100644
index 952d44c2e..000000000
--- a/Input-synaptics-handle-spurious-release-of-trackstic.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Date: Sun, 8 Mar 2015 22:32:43 -0700
-Subject: [PATCH] Input: synaptics - handle spurious release of trackstick
- buttons
-
-The Fimware 8.1 has a bug in which the extra buttons are only sent when the
-ExtBit is 1.  This should be fixed in a future FW update which should have
-a bump of the minor version.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Acked-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
----
- drivers/input/mouse/synaptics.c | 33 +++++++++++++++++++++++++--------
- 1 file changed, 25 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
-index f8df5a518bf3..bd399a72e610 100644
---- a/drivers/input/mouse/synaptics.c
-+++ b/drivers/input/mouse/synaptics.c
-@@ -812,14 +812,36 @@ static void synaptics_report_semi_mt_data(struct input_dev *dev,
- 	}
- }
- 
--static void synaptics_report_buttons(struct psmouse *psmouse,
--				     const struct synaptics_hw_state *hw)
-+static void synaptics_report_ext_buttons(struct psmouse *psmouse,
-+					 const struct synaptics_hw_state *hw)
- {
- 	struct input_dev *dev = psmouse->dev;
- 	struct synaptics_data *priv = psmouse->private;
- 	int ext_bits = (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap) + 1) >> 1;
- 	int i;
- 
-+	if (!SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap))
-+		return;
-+
-+	/* Bug in FW 8.1, buttons are reported only when ExtBit is 1 */
-+	if (SYN_ID_FULL(priv->identity) == 0x801 &&
-+	    !((psmouse->packet[0] ^ psmouse->packet[3]) & 0x02))
-+		return;
-+
-+	for (i = 0; i < ext_bits; i++) {
-+		input_report_key(dev, BTN_0 + 2 * i,
-+			hw->ext_buttons & (1 << i));
-+		input_report_key(dev, BTN_1 + 2 * i,
-+			hw->ext_buttons & (1 << (i + ext_bits)));
-+	}
-+}
-+
-+static void synaptics_report_buttons(struct psmouse *psmouse,
-+				     const struct synaptics_hw_state *hw)
-+{
-+	struct input_dev *dev = psmouse->dev;
-+	struct synaptics_data *priv = psmouse->private;
-+
- 	input_report_key(dev, BTN_LEFT, hw->left);
- 	input_report_key(dev, BTN_RIGHT, hw->right);
- 
-@@ -831,12 +853,7 @@ static void synaptics_report_buttons(struct psmouse *psmouse,
- 		input_report_key(dev, BTN_BACK, hw->down);
- 	}
- 
--	for (i = 0; i < ext_bits; i++) {
--		input_report_key(dev, BTN_0 + 2 * i,
--				 hw->ext_buttons & (1 << i));
--		input_report_key(dev, BTN_1 + 2 * i,
--				 hw->ext_buttons & (1 << (i + ext_bits)));
--	}
-+	synaptics_report_ext_buttons(psmouse, hw);
- }
- 
- static void synaptics_report_mt_data(struct psmouse *psmouse,
--- 
-2.1.0
-
diff --git a/Input-synaptics-log-queried-and-quirked-dimension-va.patch b/Input-synaptics-log-queried-and-quirked-dimension-va.patch
deleted file mode 100644
index a75c9f73f..000000000
--- a/Input-synaptics-log-queried-and-quirked-dimension-va.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Daniel Martin <consume.noise@gmail.com>
-Date: Sun, 8 Mar 2015 22:28:29 -0700
-Subject: [PATCH] Input: synaptics - log queried and quirked dimension values
-
-Logging the dimension values we queried and the values we use from a quirk
-to overwrite can be helpful for debugging.
-
-This partly relates to bug:
-    https://bugzilla.kernel.org/show_bug.cgi?id=91541
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Daniel Martin <consume.noise@gmail.com>
-Acked-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
----
- drivers/input/mouse/synaptics.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
-index fc7e1db7530e..cc7909ecf38e 100644
---- a/drivers/input/mouse/synaptics.c
-+++ b/drivers/input/mouse/synaptics.c
-@@ -365,6 +365,9 @@ static int synaptics_resolution(struct psmouse *psmouse)
- 		} else {
- 			priv->x_max = (resp[0] << 5) | ((resp[1] & 0x0f) << 1);
- 			priv->y_max = (resp[2] << 5) | ((resp[1] & 0xf0) >> 3);
-+			psmouse_info(psmouse,
-+				     "queried max coordinates: x [..%d], y [..%d]\n",
-+				     priv->x_max, priv->y_max);
- 		}
- 	}
- 
-@@ -376,6 +379,9 @@ static int synaptics_resolution(struct psmouse *psmouse)
- 		} else {
- 			priv->x_min = (resp[0] << 5) | ((resp[1] & 0x0f) << 1);
- 			priv->y_min = (resp[2] << 5) | ((resp[1] & 0xf0) >> 3);
-+			psmouse_info(psmouse,
-+				     "queried min coordinates: x [%d..], y [%d..]\n",
-+				     priv->x_min, priv->y_min);
- 		}
- 	}
- 
-@@ -398,6 +404,10 @@ static void synaptics_apply_quirks(struct psmouse *psmouse)
- 			priv->x_max = min_max_pnpid_table[i].x_max;
- 			priv->y_min = min_max_pnpid_table[i].y_min;
- 			priv->y_max = min_max_pnpid_table[i].y_max;
-+			psmouse_info(psmouse,
-+				     "quirked min/max coordinates: x [%d..%d], y [%d..%d]\n",
-+				     priv->x_min, priv->x_max,
-+				     priv->y_min, priv->y_max);
- 			break;
- 		}
- 	}
--- 
-2.1.0
-
diff --git a/Input-synaptics-pin-3-touches-when-the-firmware-repo.patch b/Input-synaptics-pin-3-touches-when-the-firmware-repo.patch
new file mode 100644
index 000000000..e697968c7
--- /dev/null
+++ b/Input-synaptics-pin-3-touches-when-the-firmware-repo.patch
@@ -0,0 +1,47 @@
+From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Date: Thu, 16 Apr 2015 13:01:46 -0400
+Subject: [PATCH] Input - synaptics: pin 3 touches when the firmware reports 3
+ fingers
+
+Synaptics PS/2 touchpad can send only 2 touches in a report. They can
+detect 4 or 5 and this information is valuable.
+
+In commit 63c4fda (Input: synaptics - allocate 3 slots to keep stability
+in image sensors), we allocate 3 slots, but we still continue to report
+the 2 available fingers. That means that the client sees 2 used slots while
+there is a total of 3 fingers advertised by BTN_TOOL_TRIPLETAP.
+
+For old kernels this is not a problem because max_slots was 2 and libinput/
+xorg-synaptics knew how to deal with that. Now that max_slot is 3, the
+clients ignore BTN_TOOL_TRIPLETAP and count the actual used slots (so 2).
+It then gets confused when receiving the BTN_TOOL_TRIPLETAP and DOUBLETAP
+information, and goes wild.
+
+We can pin the 3 slots until we get a total number of fingers below 2.
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1212230
+
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+---
+ drivers/input/mouse/synaptics.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
+index 3a32caf06bf1..58102970f94f 100644
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -940,6 +940,14 @@ static void synaptics_report_mt_data(struct psmouse *psmouse,
+ 		input_report_abs(dev, ABS_MT_PRESSURE, hw[i]->z);
+ 	}
+ 
++	/* keep (slot count <= num_fingers) by pinning all slots */
++	if (num_fingers >= 3) {
++		for (i = 0; i < 3; i++) {
++			input_mt_slot(dev, i);
++			input_mt_report_slot_state(dev, MT_TOOL_FINGER, true);
++		}
++	}
++
+ 	input_mt_drop_unused(dev);
+ 
+ 	/* Don't use active slot count to generate BTN_TOOL events. */
diff --git a/Input-synaptics-query-min-dimensions-for-fw-v8.1.patch b/Input-synaptics-query-min-dimensions-for-fw-v8.1.patch
deleted file mode 100644
index e62562ff4..000000000
--- a/Input-synaptics-query-min-dimensions-for-fw-v8.1.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Daniel Martin <consume.noise@gmail.com>
-Date: Sun, 8 Mar 2015 22:28:40 -0700
-Subject: [PATCH] Input: synaptics - query min dimensions for fw v8.1
-
-Query the min dimensions even if the check
-SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 7 fails, but we know that the
-firmware version 8.1 is safe.
-
-With that we don't need quirks for post-2013 models anymore as they expose
-correct min and max dimensions.
-
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=91541
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Daniel Martin <consume.noise@gmail.com>
-  re-order the tests to check SYN_CAP_MIN_DIMENSIONS even on FW 8.1
-Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Acked-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
----
- drivers/input/mouse/synaptics.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
-index cc7909ecf38e..7c80bd18613e 100644
---- a/drivers/input/mouse/synaptics.c
-+++ b/drivers/input/mouse/synaptics.c
-@@ -371,8 +371,14 @@ static int synaptics_resolution(struct psmouse *psmouse)
- 		}
- 	}
- 
--	if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 7 &&
--	    SYN_CAP_MIN_DIMENSIONS(priv->ext_cap_0c)) {
-+	if (SYN_CAP_MIN_DIMENSIONS(priv->ext_cap_0c) &&
-+	    (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 7 ||
-+	     /*
-+	      * Firmware v8.1 does not report proper number of extended
-+	      * capabilities, but has been proven to report correct min
-+	      * coordinates.
-+	      */
-+	     SYN_ID_FULL(priv->identity) == 0x801)) {
- 		if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_MIN_COORDS, resp)) {
- 			psmouse_warn(psmouse,
- 				     "device claims to have min coordinates query, but I'm not able to read it.\n");
--- 
-2.1.0
-
diff --git a/Input-synaptics-re-route-tracksticks-buttons-on-the-.patch b/Input-synaptics-re-route-tracksticks-buttons-on-the-.patch
deleted file mode 100644
index dca2732cb..000000000
--- a/Input-synaptics-re-route-tracksticks-buttons-on-the-.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Date: Sun, 8 Mar 2015 22:35:41 -0700
-Subject: [PATCH] Input: synaptics - re-route tracksticks buttons on the Lenovo
- 2015 series
-
-The 2015 series of the Lenovo thinkpads added back the hardware buttons on
-top of the touchpad for the trackstick.
-
-Unfortunately, they are wired to the touchpad, and not the trackstick.
-Thus, they are seen as extra buttons from the kernel point of view.
-
-This leads to a problem in user space because extra buttons on synaptics
-devices used to be used as scroll up/down buttons. So in the end, the
-experience for the user is scroll events for buttons left and right when
-using the trackstick. Yay!
-
-Fortunately, the firmware advertises such behavior in the extended
-capability $10, and so we can re-route the buttons through the pass-through
-interface.
-
-Hallelujah-expressed-by: Peter Hutterer <peter.hutterer@who-t.net>
-Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Acked-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
----
- drivers/input/mouse/synaptics.c | 47 +++++++++++++++++++++++++++++++----------
- drivers/input/mouse/synaptics.h |  5 +++++
- 2 files changed, 41 insertions(+), 11 deletions(-)
-
-diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
-index eec73e8f1f06..3b9717a46140 100644
---- a/drivers/input/mouse/synaptics.c
-+++ b/drivers/input/mouse/synaptics.c
-@@ -582,18 +582,22 @@ static int synaptics_is_pt_packet(unsigned char *buf)
- 	return (buf[0] & 0xFC) == 0x84 && (buf[3] & 0xCC) == 0xC4;
- }
- 
--static void synaptics_pass_pt_packet(struct serio *ptport, unsigned char *packet)
-+static void synaptics_pass_pt_packet(struct psmouse *psmouse,
-+				     struct serio *ptport,
-+				     unsigned char *packet)
- {
-+	struct synaptics_data *priv = psmouse->private;
- 	struct psmouse *child = serio_get_drvdata(ptport);
- 
- 	if (child && child->state == PSMOUSE_ACTIVATED) {
--		serio_interrupt(ptport, packet[1], 0);
-+		serio_interrupt(ptport, packet[1] | priv->pt_buttons, 0);
- 		serio_interrupt(ptport, packet[4], 0);
- 		serio_interrupt(ptport, packet[5], 0);
- 		if (child->pktsize == 4)
- 			serio_interrupt(ptport, packet[2], 0);
--	} else
-+	} else {
- 		serio_interrupt(ptport, packet[1], 0);
-+	}
- }
- 
- static void synaptics_pt_activate(struct psmouse *psmouse)
-@@ -839,6 +843,7 @@ static void synaptics_report_ext_buttons(struct psmouse *psmouse,
- 	struct input_dev *dev = psmouse->dev;
- 	struct synaptics_data *priv = psmouse->private;
- 	int ext_bits = (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap) + 1) >> 1;
-+	char buf[6] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
- 	int i;
- 
- 	if (!SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap))
-@@ -849,12 +854,30 @@ static void synaptics_report_ext_buttons(struct psmouse *psmouse,
- 	    !((psmouse->packet[0] ^ psmouse->packet[3]) & 0x02))
- 		return;
- 
--	for (i = 0; i < ext_bits; i++) {
--		input_report_key(dev, BTN_0 + 2 * i,
--			hw->ext_buttons & (1 << i));
--		input_report_key(dev, BTN_1 + 2 * i,
--			hw->ext_buttons & (1 << (i + ext_bits)));
-+	if (!SYN_CAP_EXT_BUTTONS_STICK(priv->ext_cap_10)) {
-+		for (i = 0; i < ext_bits; i++) {
-+			input_report_key(dev, BTN_0 + 2 * i,
-+				hw->ext_buttons & (1 << i));
-+			input_report_key(dev, BTN_1 + 2 * i,
-+				hw->ext_buttons & (1 << (i + ext_bits)));
-+		}
-+		return;
- 	}
-+
-+	/*
-+	 * This generation of touchpads has the trackstick buttons
-+	 * physically wired to the touchpad. Re-route them through
-+	 * the pass-through interface.
-+	 */
-+	if (!priv->pt_port)
-+		return;
-+
-+	/* The trackstick expects at most 3 buttons */
-+	priv->pt_buttons = SYN_CAP_EXT_BUTTON_STICK_L(hw->ext_buttons)      |
-+			   SYN_CAP_EXT_BUTTON_STICK_R(hw->ext_buttons) << 1 |
-+			   SYN_CAP_EXT_BUTTON_STICK_M(hw->ext_buttons) << 2;
-+
-+	synaptics_pass_pt_packet(psmouse, priv->pt_port, buf);
- }
- 
- static void synaptics_report_buttons(struct psmouse *psmouse,
-@@ -1095,7 +1118,8 @@ static psmouse_ret_t synaptics_process_byte(struct psmouse *psmouse)
- 		if (SYN_CAP_PASS_THROUGH(priv->capabilities) &&
- 		    synaptics_is_pt_packet(psmouse->packet)) {
- 			if (priv->pt_port)
--				synaptics_pass_pt_packet(priv->pt_port, psmouse->packet);
-+				synaptics_pass_pt_packet(psmouse, priv->pt_port,
-+							 psmouse->packet);
- 		} else
- 			synaptics_process_packet(psmouse);
- 
-@@ -1197,8 +1221,9 @@ static void set_input_params(struct psmouse *psmouse,
- 		__set_bit(BTN_BACK, dev->keybit);
- 	}
- 
--	for (i = 0; i < SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap); i++)
--		__set_bit(BTN_0 + i, dev->keybit);
-+	if (!SYN_CAP_EXT_BUTTONS_STICK(priv->ext_cap_10))
-+		for (i = 0; i < SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap); i++)
-+			__set_bit(BTN_0 + i, dev->keybit);
- 
- 	__clear_bit(EV_REL, dev->evbit);
- 	__clear_bit(REL_X, dev->relbit);
-diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h
-index 85180140509e..ee4bd0d12b26 100644
---- a/drivers/input/mouse/synaptics.h
-+++ b/drivers/input/mouse/synaptics.h
-@@ -111,6 +111,10 @@
- #define SYN_CAP_EXT_BUTTONS_STICK(ex10)	((ex10) & 0x010000)
- #define SYN_CAP_SECUREPAD(ex10)		((ex10) & 0x020000)
- 
-+#define SYN_CAP_EXT_BUTTON_STICK_L(eb)	(!!((eb) & 0x01))
-+#define SYN_CAP_EXT_BUTTON_STICK_M(eb)	(!!((eb) & 0x02))
-+#define SYN_CAP_EXT_BUTTON_STICK_R(eb)	(!!((eb) & 0x04))
-+
- /* synaptics modes query bits */
- #define SYN_MODE_ABSOLUTE(m)		((m) & (1 << 7))
- #define SYN_MODE_RATE(m)		((m) & (1 << 6))
-@@ -179,6 +183,7 @@ struct synaptics_data {
- 	bool disable_gesture;			/* disable gestures */
- 
- 	struct serio *pt_port;			/* Pass-through serio port */
-+	unsigned char pt_buttons;		/* Pass-through buttons */
- 
- 	/*
- 	 * Last received Advanced Gesture Mode (AGM) packet. An AGM packet
--- 
-2.1.0
-
diff --git a/Input-synaptics-remove-TOPBUTTONPAD-property-for-Len.patch b/Input-synaptics-remove-TOPBUTTONPAD-property-for-Len.patch
deleted file mode 100644
index bfc5ae68a..000000000
--- a/Input-synaptics-remove-TOPBUTTONPAD-property-for-Len.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Date: Sun, 8 Mar 2015 22:34:50 -0700
-Subject: [PATCH] Input: synaptics - remove TOPBUTTONPAD property for Lenovos
- 2015
-
-The 2015 series of the Lenovo thinkpads added back the hardware buttons on
-top of the touchpad for the trackstick.
-
-Unfortunately, Lenovo used the PNPIDs that are supposed to be "5 buttons"
-touchpads, so the new laptops also have the INPUT_PROP_TOPBUTTONPAD. Yay!
-
-Instead of manually removing each of the new ones, or hoping that we know
-all the current ones, we can consider that the PNPIDs list that were given
-contains touchpads that have the trackstick buttons, either physically
-wired to them, or emulated with the top software button property.
-
-Thanks to the extra buttons capability in query $10, we can reliably detect
-the physical buttons from the software ones, and so we can remove the
-TOPBUTTONPAD property even if it was declared as such.
-
-Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Acked-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
----
- drivers/input/mouse/synaptics.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
-index 83099eb8cf86..eec73e8f1f06 100644
---- a/drivers/input/mouse/synaptics.c
-+++ b/drivers/input/mouse/synaptics.c
-@@ -1206,7 +1206,8 @@ static void set_input_params(struct psmouse *psmouse,
- 
- 	if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) {
- 		__set_bit(INPUT_PROP_BUTTONPAD, dev->propbit);
--		if (psmouse_matches_pnp_id(psmouse, topbuttonpad_pnp_ids))
-+		if (psmouse_matches_pnp_id(psmouse, topbuttonpad_pnp_ids) &&
-+		    !SYN_CAP_EXT_BUTTONS_STICK(priv->ext_cap_10))
- 			__set_bit(INPUT_PROP_TOPBUTTONPAD, dev->propbit);
- 		/* Clickpads report only left button */
- 		__clear_bit(BTN_RIGHT, dev->keybit);
--- 
-2.1.0
-
diff --git a/Input-synaptics-remove-X1-Carbon-3rd-gen-from-the-to.patch b/Input-synaptics-remove-X1-Carbon-3rd-gen-from-the-to.patch
deleted file mode 100644
index af6f6d622..000000000
--- a/Input-synaptics-remove-X1-Carbon-3rd-gen-from-the-to.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Date: Sun, 8 Mar 2015 22:38:55 -0700
-Subject: [PATCH] Input: synaptics - remove X1 Carbon 3rd gen from the
- topbuttonpad list
-
-Lenovo decided to switch back to physical buttons for the trackstick on
-their latest series. The PNPId list was provided before they reverted back
-to physical buttons, so it contains the new models too.  We can know from
-the touchpad capabilities that the touchpad has physical buttons, so
-removing the ids from the list is not mandatory. It is still nicer to
-remove the wrong ids, so start by removing the X1 Carbon 3rd gen, with the
-PNPId of LEN0048.
-
-Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Acked-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
----
- drivers/input/mouse/synaptics.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
-index 3b9717a46140..c2167194a538 100644
---- a/drivers/input/mouse/synaptics.c
-+++ b/drivers/input/mouse/synaptics.c
-@@ -186,7 +186,6 @@ static const char * const topbuttonpad_pnp_ids[] = {
- 	"LEN0045",
- 	"LEN0046",
- 	"LEN0047",
--	"LEN0048",
- 	"LEN0049",
- 	"LEN2000",
- 	"LEN2001", /* Edge E431 */
--- 
-2.1.0
-
diff --git a/Input-synaptics-remove-X250-from-the-topbuttonpad-li.patch b/Input-synaptics-remove-X250-from-the-topbuttonpad-li.patch
deleted file mode 100644
index a4d6498d3..000000000
--- a/Input-synaptics-remove-X250-from-the-topbuttonpad-li.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Date: Sun, 8 Mar 2015 22:39:17 -0700
-Subject: [PATCH] Input: synaptics - remove X250 from the topbuttonpad list
-
-Lenovo X250 has a PnpID of LEN0046, but it does not have the top software
-button requirement.
-
-For the record, Lenovo T450s and W541 have a PnpID of LEN200f and LEN004a,
-so they are not on the top software button list.
-
-Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Reviewed-by: Daniel Martin <consume.noise@gmail.com>
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
----
- drivers/input/mouse/synaptics.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
-index c2167194a538..c74bfa1c05e3 100644
---- a/drivers/input/mouse/synaptics.c
-+++ b/drivers/input/mouse/synaptics.c
-@@ -184,7 +184,6 @@ static const char * const topbuttonpad_pnp_ids[] = {
- 	"LEN0041",
- 	"LEN0042", /* Yoga */
- 	"LEN0045",
--	"LEN0046",
- 	"LEN0047",
- 	"LEN0049",
- 	"LEN2000",
--- 
-2.1.0
-
diff --git a/Input-synaptics-remove-obsolete-min-max-quirk-for-X2.patch b/Input-synaptics-remove-obsolete-min-max-quirk-for-X2.patch
deleted file mode 100644
index 1bf8e05ab..000000000
--- a/Input-synaptics-remove-obsolete-min-max-quirk-for-X2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Daniel Martin <consume.noise@gmail.com>
-Date: Sun, 8 Mar 2015 22:29:07 -0700
-Subject: [PATCH] Input: synaptics - remove obsolete min/max quirk for X240
-
-The firmware of the X240 (LEN0035, 2013/12) exposes the same values
-    x [1232..5710], y [1156..4696]
-as the quirk applies.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Daniel Martin <consume.noise@gmail.com>
-Acked-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
----
- drivers/input/mouse/synaptics.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
-index 7c80bd18613e..382678ae3363 100644
---- a/drivers/input/mouse/synaptics.c
-+++ b/drivers/input/mouse/synaptics.c
-@@ -134,7 +134,7 @@ static const struct min_max_quirk min_max_pnpid_table[] = {
- 		1024, 5052, 2258, 4832
- 	},
- 	{
--		(const char * const []){"LEN0035", "LEN0042", NULL},
-+		(const char * const []){"LEN0042", NULL},
- 		1232, 5710, 1156, 4696
- 	},
- 	{
--- 
-2.1.0
-
diff --git a/Input-synaptics-retrieve-the-extended-capabilities-i.patch b/Input-synaptics-retrieve-the-extended-capabilities-i.patch
deleted file mode 100644
index 9be855143..000000000
--- a/Input-synaptics-retrieve-the-extended-capabilities-i.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Date: Sun, 8 Mar 2015 22:34:03 -0700
-Subject: [PATCH] Input: synaptics - retrieve the extended capabilities in
- query $10
-
-Newer Synaptics touchpads need to get information from the query $10.
-Retrieve it if available.
-
-Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Acked-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
----
- drivers/input/mouse/synaptics.c | 23 ++++++++++++++++++++---
- drivers/input/mouse/synaptics.h | 23 +++++++++++++++++++++++
- 2 files changed, 43 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
-index ff352ecca394..83099eb8cf86 100644
---- a/drivers/input/mouse/synaptics.c
-+++ b/drivers/input/mouse/synaptics.c
-@@ -244,11 +244,24 @@ static int synaptics_model_id(struct psmouse *psmouse)
- 	return 0;
- }
- 
-+static int synaptics_more_extended_queries(struct psmouse *psmouse)
-+{
-+	struct synaptics_data *priv = psmouse->private;
-+	unsigned char buf[3];
-+
-+	if (synaptics_send_cmd(psmouse, SYN_QUE_MEXT_CAPAB_10, buf))
-+		return -1;
-+
-+	priv->ext_cap_10 = (buf[0]<<16) | (buf[1]<<8) | buf[2];
-+
-+	return 0;
-+}
-+
- /*
-- * Read the board id from the touchpad
-+ * Read the board id and the "More Extended Queries" from the touchpad
-  * The board id is encoded in the "QUERY MODES" response
-  */
--static int synaptics_board_id(struct psmouse *psmouse)
-+static int synaptics_query_modes(struct psmouse *psmouse)
- {
- 	struct synaptics_data *priv = psmouse->private;
- 	unsigned char bid[3];
-@@ -260,6 +273,10 @@ static int synaptics_board_id(struct psmouse *psmouse)
- 	if (synaptics_send_cmd(psmouse, SYN_QUE_MODES, bid))
- 		return -1;
- 	priv->board_id = ((bid[0] & 0xfc) << 6) | bid[1];
-+
-+	if (SYN_MEXT_CAP_BIT(bid[0]))
-+		return synaptics_more_extended_queries(psmouse);
-+
- 	return 0;
- }
- 
-@@ -449,7 +466,7 @@ static int synaptics_query_hardware(struct psmouse *psmouse)
- 		return -1;
- 	if (synaptics_firmware_id(psmouse))
- 		return -1;
--	if (synaptics_board_id(psmouse))
-+	if (synaptics_query_modes(psmouse))
- 		return -1;
- 	if (synaptics_capability(psmouse))
- 		return -1;
-diff --git a/drivers/input/mouse/synaptics.h b/drivers/input/mouse/synaptics.h
-index aedc3299b14e..85180140509e 100644
---- a/drivers/input/mouse/synaptics.h
-+++ b/drivers/input/mouse/synaptics.h
-@@ -22,6 +22,7 @@
- #define SYN_QUE_EXT_CAPAB_0C		0x0c
- #define SYN_QUE_EXT_MAX_COORDS		0x0d
- #define SYN_QUE_EXT_MIN_COORDS		0x0f
-+#define SYN_QUE_MEXT_CAPAB_10		0x10
- 
- /* synatics modes */
- #define SYN_BIT_ABSOLUTE_MODE		(1 << 7)
-@@ -53,6 +54,7 @@
- #define SYN_EXT_CAP_REQUESTS(c)		(((c) & 0x700000) >> 20)
- #define SYN_CAP_MULTI_BUTTON_NO(ec)	(((ec) & 0x00f000) >> 12)
- #define SYN_CAP_PRODUCT_ID(ec)		(((ec) & 0xff0000) >> 16)
-+#define SYN_MEXT_CAP_BIT(m)		((m) & (1 << 1))
- 
- /*
-  * The following describes response for the 0x0c query.
-@@ -89,6 +91,26 @@
- #define SYN_CAP_REDUCED_FILTERING(ex0c)	((ex0c) & 0x000400)
- #define SYN_CAP_IMAGE_SENSOR(ex0c)	((ex0c) & 0x000800)
- 
-+/*
-+ * The following descibes response for the 0x10 query.
-+ *
-+ * byte	mask	name			meaning
-+ * ----	----	-------			------------
-+ * 1	0x01	ext buttons are stick	buttons exported in the extended
-+ *					capability are actually meant to be used
-+ *					by the tracktick (pass-through).
-+ * 1	0x02	SecurePad		the touchpad is a SecurePad, so it
-+ *					contains a built-in fingerprint reader.
-+ * 1	0xe0	more ext count		how many more extented queries are
-+ *					available after this one.
-+ * 2	0xff	SecurePad width		the width of the SecurePad fingerprint
-+ *					reader.
-+ * 3	0xff	SecurePad height	the height of the SecurePad fingerprint
-+ *					reader.
-+ */
-+#define SYN_CAP_EXT_BUTTONS_STICK(ex10)	((ex10) & 0x010000)
-+#define SYN_CAP_SECUREPAD(ex10)		((ex10) & 0x020000)
-+
- /* synaptics modes query bits */
- #define SYN_MODE_ABSOLUTE(m)		((m) & (1 << 7))
- #define SYN_MODE_RATE(m)		((m) & (1 << 6))
-@@ -143,6 +165,7 @@ struct synaptics_data {
- 	unsigned long int capabilities;		/* Capabilities */
- 	unsigned long int ext_cap;		/* Extended Capabilities */
- 	unsigned long int ext_cap_0c;		/* Ext Caps from 0x0c query */
-+	unsigned long int ext_cap_10;		/* Ext Caps from 0x10 query */
- 	unsigned long int identity;		/* Identification */
- 	unsigned int x_res, y_res;		/* X/Y resolution in units/mm */
- 	unsigned int x_max, y_max;		/* Max coordinates (from FW) */
--- 
-2.1.0
-
diff --git a/Input-synaptics-skip-quirks-when-post-2013-dimension.patch b/Input-synaptics-skip-quirks-when-post-2013-dimension.patch
deleted file mode 100644
index de96ed85c..000000000
--- a/Input-synaptics-skip-quirks-when-post-2013-dimension.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Date: Sun, 8 Mar 2015 22:29:25 -0700
-Subject: [PATCH] Input: synaptics - skip quirks when post-2013 dimensions
-
-Post-2013 Lenovo laptops provide correct min/max dimensions, which are
-different with the ones currently quirked.  According to
-https://bugzilla.kernel.org/show_bug.cgi?id=91541 the following board ids
-are assigned in the post-2013 touchpads:
-
-t440p/t440s: LEN0036 -> 2964/2962
-t540p:       LEN0034 -> 2964
-
-Using 2961 as the common minimum makes these 3 laptops OK. We may need
-to update those values later if other pnp_ids has a lower board_id.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Acked-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
----
- drivers/input/mouse/synaptics.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
-index aeccd562a2e3..134676303117 100644
---- a/drivers/input/mouse/synaptics.c
-+++ b/drivers/input/mouse/synaptics.c
-@@ -147,7 +147,7 @@ static const struct min_max_quirk min_max_pnpid_table[] = {
- 		(const char * const []){"LEN0034", "LEN0036", "LEN0037",
- 					"LEN0039", "LEN2002", "LEN2004",
- 					NULL},
--		{ANY_BOARD_ID, ANY_BOARD_ID},
-+		{ANY_BOARD_ID, 2961},
- 		1024, 5112, 2024, 4832
- 	},
- 	{
--- 
-2.1.0
-
diff --git a/Input-synaptics-split-synaptics_resolution-query-fir.patch b/Input-synaptics-split-synaptics_resolution-query-fir.patch
deleted file mode 100644
index bede0ce0e..000000000
--- a/Input-synaptics-split-synaptics_resolution-query-fir.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From: Daniel Martin <consume.noise@gmail.com>
-Date: Sun, 8 Mar 2015 22:27:37 -0700
-Subject: [PATCH] Input: synaptics - split synaptics_resolution(), query first
-
-Split the function synaptics_resolution() into synaptics_resolution() and
-synaptics_quirks().  synaptics_resolution() will be called before
-synaptics_quirks() to query dimensions and resolutions before overwriting
-them with quirks.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Daniel Martin <consume.noise@gmail.com>
-Acked-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
----
- drivers/input/mouse/synaptics.c | 35 +++++++++++++++++++++++------------
- 1 file changed, 23 insertions(+), 12 deletions(-)
-
-diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
-index f2cceb6493a0..fc7e1db7530e 100644
---- a/drivers/input/mouse/synaptics.c
-+++ b/drivers/input/mouse/synaptics.c
-@@ -346,7 +346,6 @@ static int synaptics_resolution(struct psmouse *psmouse)
- {
- 	struct synaptics_data *priv = psmouse->private;
- 	unsigned char resp[3];
--	int i;
- 
- 	if (SYN_ID_MAJOR(priv->identity) < 4)
- 		return 0;
-@@ -358,17 +357,6 @@ static int synaptics_resolution(struct psmouse *psmouse)
- 		}
- 	}
- 
--	for (i = 0; min_max_pnpid_table[i].pnp_ids; i++) {
--		if (psmouse_matches_pnp_id(psmouse,
--					   min_max_pnpid_table[i].pnp_ids)) {
--			priv->x_min = min_max_pnpid_table[i].x_min;
--			priv->x_max = min_max_pnpid_table[i].x_max;
--			priv->y_min = min_max_pnpid_table[i].y_min;
--			priv->y_max = min_max_pnpid_table[i].y_max;
--			return 0;
--		}
--	}
--
- 	if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 5 &&
- 	    SYN_CAP_MAX_DIMENSIONS(priv->ext_cap_0c)) {
- 		if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_MAX_COORDS, resp)) {
-@@ -394,6 +382,27 @@ static int synaptics_resolution(struct psmouse *psmouse)
- 	return 0;
- }
- 
-+/*
-+ * Apply quirk(s) if the hardware matches
-+ */
-+
-+static void synaptics_apply_quirks(struct psmouse *psmouse)
-+{
-+	struct synaptics_data *priv = psmouse->private;
-+	int i;
-+
-+	for (i = 0; min_max_pnpid_table[i].pnp_ids; i++) {
-+		if (psmouse_matches_pnp_id(psmouse,
-+					   min_max_pnpid_table[i].pnp_ids)) {
-+			priv->x_min = min_max_pnpid_table[i].x_min;
-+			priv->x_max = min_max_pnpid_table[i].x_max;
-+			priv->y_min = min_max_pnpid_table[i].y_min;
-+			priv->y_max = min_max_pnpid_table[i].y_max;
-+			break;
-+		}
-+	}
-+}
-+
- static int synaptics_query_hardware(struct psmouse *psmouse)
- {
- 	if (synaptics_identify(psmouse))
-@@ -409,6 +418,8 @@ static int synaptics_query_hardware(struct psmouse *psmouse)
- 	if (synaptics_resolution(psmouse))
- 		return -1;
- 
-+	synaptics_apply_quirks(psmouse);
-+
- 	return 0;
- }
- 
--- 
-2.1.0
-
diff --git a/Input-synaptics-support-min-max-board-id-in-min_max_.patch b/Input-synaptics-support-min-max-board-id-in-min_max_.patch
deleted file mode 100644
index e2e266a40..000000000
--- a/Input-synaptics-support-min-max-board-id-in-min_max_.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From: Daniel Martin <daniel.martin@secunet.com>
-Date: Sun, 8 Mar 2015 22:29:15 -0700
-Subject: [PATCH] Input: synaptics - support min/max board id in
- min_max_pnpid_table
-
-Add a min/max range for board ids to the min/max coordinates quirk. This
-makes it possible to restrict quirks to specific models based upon their
-board id. The define ANY_BOARD_ID (0) serves as a wild card.
-
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=91541
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Daniel Martin <daniel.martin@secunet.com>
-Acked-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
----
- drivers/input/mouse/synaptics.c | 42 +++++++++++++++++++++++++++++------------
- 1 file changed, 30 insertions(+), 12 deletions(-)
-
-diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
-index 382678ae3363..aeccd562a2e3 100644
---- a/drivers/input/mouse/synaptics.c
-+++ b/drivers/input/mouse/synaptics.c
-@@ -123,32 +123,41 @@ void synaptics_reset(struct psmouse *psmouse)
- 
- static bool cr48_profile_sensor;
- 
-+#define ANY_BOARD_ID 0
- struct min_max_quirk {
- 	const char * const *pnp_ids;
-+	struct {
-+		unsigned long int min, max;
-+	} board_id;
- 	int x_min, x_max, y_min, y_max;
- };
- 
- static const struct min_max_quirk min_max_pnpid_table[] = {
- 	{
- 		(const char * const []){"LEN0033", NULL},
-+		{ANY_BOARD_ID, ANY_BOARD_ID},
- 		1024, 5052, 2258, 4832
- 	},
- 	{
- 		(const char * const []){"LEN0042", NULL},
-+		{ANY_BOARD_ID, ANY_BOARD_ID},
- 		1232, 5710, 1156, 4696
- 	},
- 	{
- 		(const char * const []){"LEN0034", "LEN0036", "LEN0037",
- 					"LEN0039", "LEN2002", "LEN2004",
- 					NULL},
-+		{ANY_BOARD_ID, ANY_BOARD_ID},
- 		1024, 5112, 2024, 4832
- 	},
- 	{
- 		(const char * const []){"LEN2001", NULL},
-+		{ANY_BOARD_ID, ANY_BOARD_ID},
- 		1024, 5022, 2508, 4832
- 	},
- 	{
- 		(const char * const []){"LEN2006", NULL},
-+		{ANY_BOARD_ID, ANY_BOARD_ID},
- 		1264, 5675, 1171, 4688
- 	},
- 	{ }
-@@ -404,18 +413,27 @@ static void synaptics_apply_quirks(struct psmouse *psmouse)
- 	int i;
- 
- 	for (i = 0; min_max_pnpid_table[i].pnp_ids; i++) {
--		if (psmouse_matches_pnp_id(psmouse,
--					   min_max_pnpid_table[i].pnp_ids)) {
--			priv->x_min = min_max_pnpid_table[i].x_min;
--			priv->x_max = min_max_pnpid_table[i].x_max;
--			priv->y_min = min_max_pnpid_table[i].y_min;
--			priv->y_max = min_max_pnpid_table[i].y_max;
--			psmouse_info(psmouse,
--				     "quirked min/max coordinates: x [%d..%d], y [%d..%d]\n",
--				     priv->x_min, priv->x_max,
--				     priv->y_min, priv->y_max);
--			break;
--		}
-+		if (!psmouse_matches_pnp_id(psmouse,
-+					    min_max_pnpid_table[i].pnp_ids))
-+			continue;
-+
-+		if (min_max_pnpid_table[i].board_id.min != ANY_BOARD_ID &&
-+		    priv->board_id < min_max_pnpid_table[i].board_id.min)
-+			continue;
-+
-+		if (min_max_pnpid_table[i].board_id.max != ANY_BOARD_ID &&
-+		    priv->board_id > min_max_pnpid_table[i].board_id.max)
-+			continue;
-+
-+		priv->x_min = min_max_pnpid_table[i].x_min;
-+		priv->x_max = min_max_pnpid_table[i].x_max;
-+		priv->y_min = min_max_pnpid_table[i].y_min;
-+		priv->y_max = min_max_pnpid_table[i].y_max;
-+		psmouse_info(psmouse,
-+			     "quirked min/max coordinates: x [%d..%d], y [%d..%d]\n",
-+			     priv->x_min, priv->x_max,
-+			     priv->y_min, priv->y_max);
-+		break;
- 	}
- }
- 
--- 
-2.1.0
-
diff --git a/KEYS-Add-a-system-blacklist-keyring.patch b/KEYS-Add-a-system-blacklist-keyring.patch
index 9feb8e9b4..be35564a6 100644
--- a/KEYS-Add-a-system-blacklist-keyring.patch
+++ b/KEYS-Add-a-system-blacklist-keyring.patch
@@ -1,6 +1,7 @@
+From f630ce576114bfede02d8a0bafa97e4d6f978a74 Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Fri, 26 Oct 2012 12:36:24 -0400
-Subject: [PATCH] KEYS: Add a system blacklist keyring
+Subject: [PATCH 17/20] KEYS: Add a system blacklist keyring
 
 This adds an additional keyring that is used to store certificates that
 are blacklisted.  This keyring is searched first when loading signed modules
@@ -9,72 +10,15 @@ useful in cases where third party certificates are used for module signing.
 
 Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
 ---
+ certs/system_keyring.c        | 27 +++++++++++++++++++++++++++
  include/keys/system_keyring.h |  4 ++++
  init/Kconfig                  |  9 +++++++++
- kernel/module_signing.c       | 12 ++++++++++++
- kernel/system_keyring.c       | 17 +++++++++++++++++
- 4 files changed, 42 insertions(+)
+ 3 files changed, 40 insertions(+)
 
-diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h
-index 72665eb80692..2c7b80d31366 100644
---- a/include/keys/system_keyring.h
-+++ b/include/keys/system_keyring.h
-@@ -28,4 +28,8 @@ static inline struct key *get_system_trusted_keyring(void)
- }
- #endif
- 
-+#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
-+extern struct key *system_blacklist_keyring;
-+#endif
-+
- #endif /* _KEYS_SYSTEM_KEYRING_H */
-diff --git a/init/Kconfig b/init/Kconfig
-index f5dbc6d4261b..eca8ab59ae7f 100644
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -1734,6 +1734,15 @@ config SYSTEM_TRUSTED_KEYRING
- 
- 	  Keys in this keyring are used by module signature checking.
- 
-+config SYSTEM_BLACKLIST_KEYRING
-+	bool "Provide system-wide ring of blacklisted keys"
-+	depends on KEYS
-+	help
-+	  Provide a system keyring to which blacklisted keys can be added.
-+	  Keys in the keyring are considered entirely untrusted.  Keys in this
-+	  keyring are used by the module signature checking to reject loading
-+	  of modules signed with a blacklisted key.
-+
- config PROFILING
- 	bool "Profiling support"
- 	help
-diff --git a/kernel/module_signing.c b/kernel/module_signing.c
-index be5b8fac4bd0..fed815fcdaf2 100644
---- a/kernel/module_signing.c
-+++ b/kernel/module_signing.c
-@@ -158,6 +158,18 @@ static struct key *request_asymmetric_key(const char *signer, size_t signer_len,
- 
- 	pr_debug("Look up: \"%s\"\n", id);
- 
-+#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
-+	key = keyring_search(make_key_ref(system_blacklist_keyring, 1),
-+				   &key_type_asymmetric, id);
-+	if (!IS_ERR(key)) {
-+		/* module is signed with a cert in the blacklist.  reject */
-+		pr_err("Module key '%s' is in blacklist\n", id);
-+		key_ref_put(key);
-+		kfree(id);
-+		return ERR_PTR(-EKEYREJECTED);
-+	}
-+#endif
-+
- 	key = keyring_search(make_key_ref(system_trusted_keyring, 1),
- 			     &key_type_asymmetric, id);
- 	if (IS_ERR(key))
-diff --git a/kernel/system_keyring.c b/kernel/system_keyring.c
-index 875f64e8935b..c15e93f5a418 100644
---- a/kernel/system_keyring.c
-+++ b/kernel/system_keyring.c
+diff --git a/certs/system_keyring.c b/certs/system_keyring.c
+index 2570598b784d..53733822993f 100644
+--- a/certs/system_keyring.c
++++ b/certs/system_keyring.c
 @@ -20,6 +20,9 @@
  
  struct key *system_trusted_keyring;
@@ -90,7 +34,7 @@ index 875f64e8935b..c15e93f5a418 100644
  
  	set_bit(KEY_FLAG_TRUSTED_ONLY, &system_trusted_keyring->flags);
 +
-+#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
++	#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
 +	system_blacklist_keyring = keyring_alloc(".system_blacklist_keyring",
 +				    KUIDT_INIT(0), KGIDT_INIT(0),
 +				    current_cred(),
@@ -106,6 +50,56 @@ index 875f64e8935b..c15e93f5a418 100644
  	return 0;
  }
  
+@@ -138,6 +155,16 @@ int system_verify_data(const void *data, unsigned long len,
+ 	if (ret < 0)
+ 		goto error;
+ 
++#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
++	ret = pkcs7_validate_trust(pkcs7, system_blacklist_keyring, &trusted);
++	if (!ret) {
++		/* module is signed with a cert in the blacklist.  reject */
++		pr_err("Module key is in the blacklist\n");
++		ret = -EKEYREJECTED;
++		goto error;
++	}
++#endif
++
+ 	ret = pkcs7_validate_trust(pkcs7, system_trusted_keyring, &trusted);
+ 	if (ret < 0)
+ 		goto error;
+diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h
+index b20cd885c1fd..51d8ddc60e0f 100644
+--- a/include/keys/system_keyring.h
++++ b/include/keys/system_keyring.h
+@@ -35,4 +35,8 @@ extern int system_verify_data(const void *data, unsigned long len,
+ 			      enum key_being_used_for usage);
+ #endif
+ 
++#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
++extern struct key *system_blacklist_keyring;
++#endif
++
+ #endif /* _KEYS_SYSTEM_KEYRING_H */
+diff --git a/init/Kconfig b/init/Kconfig
+index 02da9f1fd9df..782d26f02885 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1783,6 +1783,15 @@ config SYSTEM_DATA_VERIFICATION
+ 	  module verification, kexec image verification and firmware blob
+ 	  verification.
+ 
++config SYSTEM_BLACKLIST_KEYRING
++	bool "Provide system-wide ring of blacklisted keys"
++	depends on KEYS
++	help
++	  Provide a system keyring to which blacklisted keys can be added.
++	  Keys in the keyring are considered entirely untrusted.  Keys in this
++	  keyring are used by the module signature checking to reject loading
++	  of modules signed with a blacklisted key.
++
+ config PROFILING
+ 	bool "Profiling support"
+ 	help
 -- 
-2.1.0
+2.4.3
 
diff --git a/KEYS-Fix-ASN.1-indefinite-length-object-parsing.patch b/KEYS-Fix-ASN.1-indefinite-length-object-parsing.patch
new file mode 100644
index 000000000..957de0977
--- /dev/null
+++ b/KEYS-Fix-ASN.1-indefinite-length-object-parsing.patch
@@ -0,0 +1,91 @@
+From 23c8a812dc3c621009e4f0e5342aa4e2ede1ceaa Mon Sep 17 00:00:00 2001
+From: David Howells <dhowells@redhat.com>
+Date: Tue, 23 Feb 2016 11:03:12 +0000
+Subject: [PATCH] KEYS: Fix ASN.1 indefinite length object parsing
+
+This fixes CVE-2016-0758.
+
+In the ASN.1 decoder, when the length field of an ASN.1 value is extracted,
+it isn't validated against the remaining amount of data before being added
+to the cursor.  With a sufficiently large size indicated, the check:
+
+	datalen - dp < 2
+
+may then fail due to integer overflow.
+
+Fix this by checking the length indicated against the amount of remaining
+data in both places a definite length is determined.
+
+Whilst we're at it, make the following changes:
+
+ (1) Check the maximum size of extended length does not exceed the capacity
+     of the variable it's being stored in (len) rather than the type that
+     variable is assumed to be (size_t).
+
+ (2) Compare the EOC tag to the symbolic constant ASN1_EOC rather than the
+     integer 0.
+
+ (3) To reduce confusion, move the initialisation of len outside of:
+
+	for (len = 0; n > 0; n--) {
+
+     since it doesn't have anything to do with the loop counter n.
+
+Signed-off-by: David Howells <dhowells@redhat.com>
+Reviewed-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
+Acked-by: David Woodhouse <David.Woodhouse@intel.com>
+Acked-by: Peter Jones <pjones@redhat.com>
+---
+ lib/asn1_decoder.c | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/lib/asn1_decoder.c b/lib/asn1_decoder.c
+index 2b3f46c049d4..554522934c44 100644
+--- a/lib/asn1_decoder.c
++++ b/lib/asn1_decoder.c
+@@ -74,7 +74,7 @@ next_tag:
+ 
+ 	/* Extract a tag from the data */
+ 	tag = data[dp++];
+-	if (tag == 0) {
++	if (tag == ASN1_EOC) {
+ 		/* It appears to be an EOC. */
+ 		if (data[dp++] != 0)
+ 			goto invalid_eoc;
+@@ -96,10 +96,8 @@ next_tag:
+ 
+ 	/* Extract the length */
+ 	len = data[dp++];
+-	if (len <= 0x7f) {
+-		dp += len;
+-		goto next_tag;
+-	}
++	if (len <= 0x7f)
++		goto check_length;
+ 
+ 	if (unlikely(len == ASN1_INDEFINITE_LENGTH)) {
+ 		/* Indefinite length */
+@@ -110,14 +108,18 @@ next_tag:
+ 	}
+ 
+ 	n = len - 0x80;
+-	if (unlikely(n > sizeof(size_t) - 1))
++	if (unlikely(n > sizeof(len) - 1))
+ 		goto length_too_long;
+ 	if (unlikely(n > datalen - dp))
+ 		goto data_overrun_error;
+-	for (len = 0; n > 0; n--) {
++	len = 0;
++	for (; n > 0; n--) {
+ 		len <<= 8;
+ 		len |= data[dp++];
+ 	}
++check_length:
++	if (len > datalen - dp)
++		goto data_overrun_error;
+ 	dp += len;
+ 	goto next_tag;
+ 
+-- 
+2.5.5
+
diff --git a/KEYS-potential-uninitialized-variable.patch b/KEYS-potential-uninitialized-variable.patch
new file mode 100644
index 000000000..23cabbb2e
--- /dev/null
+++ b/KEYS-potential-uninitialized-variable.patch
@@ -0,0 +1,30 @@
+From 82a50018782f84e733e718d4b24e1653d19333be Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Wed, 15 Jun 2016 09:31:45 -0400
+Subject: [PATCH] KEYS: potential uninitialized variable
+
+If __key_link_begin() failed then "edit" would be uninitialized.  I've
+added a check to fix that.
+
+Fixes: f70e2e06196a ('KEYS: Do preallocation for __key_link()')
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+---
+ security/keys/key.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/security/keys/key.c b/security/keys/key.c
+index bd5a272f28a6..346fbf201c22 100644
+--- a/security/keys/key.c
++++ b/security/keys/key.c
+@@ -597,7 +597,7 @@ int key_reject_and_link(struct key *key,
+ 
+ 	mutex_unlock(&key_construction_mutex);
+ 
+-	if (keyring)
++	if (keyring && link_ret == 0)
+ 		__key_link_end(keyring, &key->index_key, edit);
+ 
+ 	/* wake up anyone waiting for a key to be constructed */
+-- 
+2.5.5
+
diff --git a/Kbuild-Add-an-option-to-enable-GCC-VTA.patch b/Kbuild-Add-an-option-to-enable-GCC-VTA.patch
index c48145e6e..39ec531ea 100644
--- a/Kbuild-Add-an-option-to-enable-GCC-VTA.patch
+++ b/Kbuild-Add-an-option-to-enable-GCC-VTA.patch
@@ -43,10 +43,10 @@ Signed-off-by: Josh Stone <jistone@redhat.com>
  2 files changed, 21 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index e734965b1604..c724e72b238d 100644
+index 257ef5892ab7..3cc6f4477e78 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -706,7 +706,11 @@ KBUILD_CFLAGS	+= -fomit-frame-pointer
+@@ -701,7 +701,11 @@ KBUILD_CFLAGS	+= -fomit-frame-pointer
  endif
  endif
  
@@ -59,7 +59,7 @@ index e734965b1604..c724e72b238d 100644
  ifdef CONFIG_DEBUG_INFO
  ifdef CONFIG_DEBUG_INFO_SPLIT
 diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index c5cefb3c009c..b663e8e211b0 100644
+index e2894b23efb6..d98afe18f704 100644
 --- a/lib/Kconfig.debug
 +++ b/lib/Kconfig.debug
 @@ -165,7 +165,23 @@ config DEBUG_INFO_DWARF4
@@ -87,6 +87,3 @@ index c5cefb3c009c..b663e8e211b0 100644
  
  config GDB_SCRIPTS
  	bool "Provide GDB scripts for kernel debugging"
--- 
-2.1.0
-
diff --git a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
index e5bc47083..8a484b6d8 100644
--- a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
+++ b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
@@ -1,3 +1,4 @@
+From 2246a781c8dbb1207a0b0abbfae201f998c3954b Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Fri, 26 Oct 2012 12:42:16 -0400
 Subject: [PATCH] MODSIGN: Import certificates from UEFI Secure Boot
@@ -25,12 +26,12 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
  create mode 100644 kernel/modsign_uefi.c
 
 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 706b16fa6de8..470e8dfcb517 100644
+index 85ef051ac6fb..a042b2ece788 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
-@@ -595,6 +595,12 @@ void efi_native_runtime_setup(void);
- #define EFI_CERT_X509_GUID \
-     EFI_GUID(  0xa5c059a1, 0x94e4, 0x4aa7, 0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72 )
+@@ -600,6 +600,12 @@ typedef struct {
+ 	u64 table;
+ } efi_config_table_64_t;
  
 +#define EFI_IMAGE_SECURITY_DATABASE_GUID \
 +    EFI_GUID(  0xd719b2cb, 0x3d3a, 0x4596, 0xa3, 0xbc, 0xda, 0xd0, 0x0e, 0x67, 0x65, 0x6f )
@@ -40,12 +41,12 @@ index 706b16fa6de8..470e8dfcb517 100644
 +
  typedef struct {
  	efi_guid_t guid;
- 	u64 table;
+ 	u32 table;
 diff --git a/init/Kconfig b/init/Kconfig
-index eca8ab59ae7f..9a782b02e4d5 100644
+index 02da9f1fd9df..90c73a0564b1 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1888,6 +1888,15 @@ config MODULE_SIG_ALL
+@@ -1924,6 +1924,15 @@ config MODULE_SIG_ALL
  comment "Do not forget to sign required modules with scripts/sign-file"
  	depends on MODULE_SIG_FORCE && !MODULE_SIG_ALL
  
@@ -62,26 +63,26 @@ index eca8ab59ae7f..9a782b02e4d5 100644
  	prompt "Which hash algorithm should modules be signed with?"
  	depends on MODULE_SIG
 diff --git a/kernel/Makefile b/kernel/Makefile
-index 1408b3353a3c..8a3be67a3a15 100644
+index d4988410b410..55e886239e7e 100644
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
-@@ -46,6 +46,7 @@ obj-$(CONFIG_UID16) += uid16.o
- obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o
+@@ -47,6 +47,7 @@ endif
+ obj-$(CONFIG_UID16) += uid16.o
  obj-$(CONFIG_MODULES) += module.o
  obj-$(CONFIG_MODULE_SIG) += module_signing.o
 +obj-$(CONFIG_MODULE_SIG_UEFI) += modsign_uefi.o
  obj-$(CONFIG_KALLSYMS) += kallsyms.o
  obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
- obj-$(CONFIG_KEXEC) += kexec.o
-@@ -99,6 +100,8 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o
+ obj-$(CONFIG_KEXEC_CORE) += kexec_core.o
+@@ -103,6 +104,8 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o
  
- $(obj)/configs.o: $(obj)/config_data.h
+ obj-$(CONFIG_HAS_IOMEM) += memremap.o
  
 +$(obj)/modsign_uefi.o: KBUILD_CFLAGS += -fshort-wchar
 +
+ $(obj)/configs.o: $(obj)/config_data.h
+ 
  # config_data.h contains the same information as ikconfig.h but gzipped.
- # Info from config_data can be extracted from /proc/config*
- targets += config_data.gz
 diff --git a/kernel/modsign_uefi.c b/kernel/modsign_uefi.c
 new file mode 100644
 index 000000000000..94b0eb38a284
@@ -181,5 +182,5 @@ index 000000000000..94b0eb38a284
 +}
 +late_initcall(load_uefi_certs);
 -- 
-2.1.0
+2.4.3
 
diff --git a/MODSIGN-Support-not-importing-certs-from-db.patch b/MODSIGN-Support-not-importing-certs-from-db.patch
index 60c090b2b..bb5ae2a2c 100644
--- a/MODSIGN-Support-not-importing-certs-from-db.patch
+++ b/MODSIGN-Support-not-importing-certs-from-db.patch
@@ -1,6 +1,7 @@
+From d7c9efa4ab647d6ccb617f2504e79a398d56f7d4 Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Thu, 3 Oct 2013 10:14:23 -0400
-Subject: [PATCH] MODSIGN: Support not importing certs from db
+Subject: [PATCH 19/20] MODSIGN: Support not importing certs from db
 
 If a user tells shim to not use the certs/hashes in the UEFI db variable
 for verification purposes, shim will set a UEFI variable called MokIgnoreDB.
@@ -79,5 +80,5 @@ index 94b0eb38a284..ae28b974d49a 100644
  
  	mok = get_cert_list(L"MokListRT", &mok_var, &moksize);
 -- 
-2.1.0
+2.4.3
 
diff --git a/Makefile.config b/Makefile.config
index 63549f642..148e21fef 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -12,9 +12,9 @@ CONFIGFILES	= \
 	$(CFG)-armv7hl.config $(CFG)-armv7hl-lpae.config \
 	$(CFG)-aarch64.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64p7.config $(CFG)-ppc64-debug.config \
-	$(CFG)-ppc64le.config
+	$(CFG)-ppc64le.config $(CFG)-ppc64le-debug.config
 
-PLATFORMS	= x86 x86_64 powerpc powerpc64 s390x arm arm64
+PLATFORMS	= x86 x86_64 powerpc s390x arm arm64
 TEMPFILES	= $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
 
 configs: $(CONFIGFILES)
@@ -74,18 +74,12 @@ temp-x86_64-generic: temp-x86-64 temp-generic
 temp-x86_64-debug-generic: temp-x86-64 temp-debug-generic
 	perl merge.pl $^  > $@
 
-temp-powerpc-generic: config-powerpc-generic temp-generic
+temp-powerpc64-generic: config-powerpc64-generic temp-generic
 	perl merge.pl $^  > $@
 
-temp-powerpc-debug-generic: config-powerpc-generic temp-debug-generic
+temp-powerpc64-debug-generic: config-powerpc64-generic temp-debug-generic
 	perl merge.pl $^  > $@
 
-temp-powerpc64-generic: config-powerpc64 temp-powerpc-generic
-	perl merge.pl $^ > $@
-
-temp-powerpc64le-generic: config-powerpc64le temp-powerpc64-generic
-	perl merge.pl $^ > $@
-
 temp-s390-generic: config-s390x temp-generic
 	perl merge.pl $^ > $@
 
@@ -107,16 +101,19 @@ $(CFG)-x86_64.config: /dev/null temp-x86_64-generic
 $(CFG)-x86_64-debug.config: /dev/null temp-x86_64-debug-generic
 	perl merge.pl $^ x86_64 > $@
 
-$(CFG)-ppc64.config: /dev/null temp-powerpc64-generic
+$(CFG)-ppc64.config: config-powerpc64 temp-powerpc64-generic
 	perl merge.pl $^ powerpc > $@
 
-$(CFG)-ppc64-debug.config: temp-powerpc64-generic temp-powerpc-debug-generic
+$(CFG)-ppc64-debug.config: config-powerpc64 temp-powerpc64-debug-generic
 	perl merge.pl $^ powerpc > $@
 
 $(CFG)-ppc64p7.config: config-powerpc64p7 temp-powerpc64-generic
 	perl merge.pl $^ powerpc > $@
 
-$(CFG)-ppc64le.config: /dev/null temp-powerpc64le-generic
+$(CFG)-ppc64le.config: config-powerpc64le temp-powerpc64-generic
+	perl merge.pl $^ powerpc > $@
+
+$(CFG)-ppc64le-debug.config: config-powerpc64le temp-powerpc64-debug-generic
 	perl merge.pl $^ powerpc > $@
 
 $(CFG)-s390x.config: config-s390x temp-s390-generic
diff --git a/Makefile.release b/Makefile.release
index f7b704237..fcd90814f 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -82,7 +82,3 @@ config-release:
 
 	@# Change defaults back to sane things.
 	@perl -pi -e 's/CONFIG_MAXSMP=y/# CONFIG_MAXSMP is not set/' config-x86-generic
-
-	@perl -pi -e 's/CONFIG_SCHEDSTATS=y/# CONFIG_SCHEDSTATS is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_LATENCYTOP=y/# CONFIG_LATENCYTOP is not set/' config-nodebug
-
diff --git a/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch b/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
index 916ba60eb..23a514f3b 100644
--- a/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
+++ b/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
@@ -1,6 +1,8 @@
+From 655fbf360e1481db4f06001f893d388c15ac307f Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Thu, 8 Mar 2012 10:10:38 -0500
-Subject: [PATCH] PCI: Lock down BAR access when module security is enabled
+Subject: [PATCH 02/20] PCI: Lock down BAR access when module security is
+ enabled
 
 Any hardware that can potentially generate DMA has to be locked down from
 userspace in order to avoid it being possible for an attacker to modify
@@ -112,5 +114,5 @@ index b91c4da68365..98f5637304d1 100644
  
  	dev = pci_get_bus_and_slot(bus, dfn);
 -- 
-2.1.0
+2.4.3
 
diff --git a/PNP-Add-Broadwell-to-Intel-MCH-size-workaround.patch b/PNP-Add-Broadwell-to-Intel-MCH-size-workaround.patch
new file mode 100644
index 000000000..3a877105d
--- /dev/null
+++ b/PNP-Add-Broadwell-to-Intel-MCH-size-workaround.patch
@@ -0,0 +1,101 @@
+From 61feb31b0dfecfd7949e672a54ac7256f4dd2c3d Mon Sep 17 00:00:00 2001
+From: Christophe Le Roy <christophe.fish@gmail.com>
+Date: Fri, 11 Dec 2015 09:13:42 +0100
+Subject: [PATCH] PNP: Add Broadwell to Intel MCH size workaround
+
+Add device ID 0x1604 for Broadwell to commit cb171f7abb9a ("PNP:
+Work around BIOS defects in Intel MCH area reporting").
+
+>From a Lenovo ThinkPad T550:
+
+  system 00:01: [io  0x1800-0x189f] could not be reserved
+  system 00:01: [io  0x0800-0x087f] has been reserved
+  system 00:01: [io  0x0880-0x08ff] has been reserved
+  system 00:01: [io  0x0900-0x097f] has been reserved
+  system 00:01: [io  0x0980-0x09ff] has been reserved
+  system 00:01: [io  0x0a00-0x0a7f] has been reserved
+  system 00:01: [io  0x0a80-0x0aff] has been reserved
+  system 00:01: [io  0x0b00-0x0b7f] has been reserved
+  system 00:01: [io  0x0b80-0x0bff] has been reserved
+  system 00:01: [io  0x15e0-0x15ef] has been reserved
+  system 00:01: [io  0x1600-0x167f] has been reserved
+  system 00:01: [io  0x1640-0x165f] has been reserved
+  system 00:01: [mem 0xf8000000-0xfbffffff] could not be reserved
+  system 00:01: [mem 0xfed1c000-0xfed1ffff] has been reserved
+  system 00:01: [mem 0xfed10000-0xfed13fff] has been reserved
+  system 00:01: [mem 0xfed18000-0xfed18fff] has been reserved
+  system 00:01: [mem 0xfed19000-0xfed19fff] has been reserved
+  system 00:01: [mem 0xfed45000-0xfed4bfff] has been reserved
+  system 00:01: Plug and Play ACPI device, IDs PNP0c02 (active)
+  [...]
+  resource sanity check: requesting [mem 0xfed10000-0xfed15fff], which spans more than pnp 00:01 [mem 0xfed10000-0xfed13fff]
+  ------------[ cut here ]------------
+  WARNING: CPU: 2 PID: 1 at /build/linux-CrHvZ_/linux-4.2.6/arch/x86/mm/ioremap.c:198 __ioremap_caller+0x2ee/0x360()
+  Info: mapping multiple BARs. Your kernel is fine.
+  Modules linked in:
+  CPU: 2 PID: 1 Comm: swapper/0 Not tainted 4.2.0-1-amd64 #1 Debian 4.2.6-1
+  Hardware name: LENOVO 20CKCTO1WW/20CKCTO1WW, BIOS N11ET34W (1.10 ) 08/20/2015
+   0000000000000000 ffffffff817e6868 ffffffff8154e2f6 ffff8802241efbf8
+   ffffffff8106e5b1 ffffc90000e98000 0000000000006000 ffffc90000e98000
+   0000000000006000 0000000000000000 ffffffff8106e62a ffffffff817e68c8
+  Call Trace:
+   [<ffffffff8154e2f6>] ? dump_stack+0x40/0x50
+   [<ffffffff8106e5b1>] ? warn_slowpath_common+0x81/0xb0
+   [<ffffffff8106e62a>] ? warn_slowpath_fmt+0x4a/0x50
+   [<ffffffff810742a3>] ? iomem_map_sanity_check+0xb3/0xc0
+   [<ffffffff8105dade>] ? __ioremap_caller+0x2ee/0x360
+   [<ffffffff81036ae6>] ? snb_uncore_imc_init_box+0x66/0x90
+   [<ffffffff810351a8>] ? uncore_pci_probe+0xc8/0x1a0
+   [<ffffffff81302d7f>] ? local_pci_probe+0x3f/0xa0
+   [<ffffffff81303ea4>] ? pci_device_probe+0xc4/0x110
+   [<ffffffff813d9b1e>] ? driver_probe_device+0x1ee/0x450
+   [<ffffffff813d9dfb>] ? __driver_attach+0x7b/0x80
+   [<ffffffff813d9d80>] ? driver_probe_device+0x450/0x450
+   [<ffffffff813d796a>] ? bus_for_each_dev+0x5a/0x90
+   [<ffffffff813d9091>] ? bus_add_driver+0x1f1/0x290
+   [<ffffffff81b37fa8>] ? uncore_cpu_setup+0xc/0xc
+   [<ffffffff813da73f>] ? driver_register+0x5f/0xe0
+   [<ffffffff81b38074>] ? intel_uncore_init+0xcc/0x2b0
+   [<ffffffff81b37fa8>] ? uncore_cpu_setup+0xc/0xc
+   [<ffffffff8100213e>] ? do_one_initcall+0xce/0x200
+   [<ffffffff8108a100>] ? parse_args+0x140/0x4e0
+   [<ffffffff81b2b0cb>] ? kernel_init_freeable+0x162/0x1e8
+   [<ffffffff815443f0>] ? rest_init+0x80/0x80
+   [<ffffffff815443fe>] ? kernel_init+0xe/0xf0
+   [<ffffffff81553e5f>] ? ret_from_fork+0x3f/0x70
+   [<ffffffff815443f0>] ? rest_init+0x80/0x80
+  ---[ end trace 472e7959536abf12 ]---
+
+  00:00.0 Host bridge: Intel Corporation Broadwell-U Host Bridge -OPI (rev 09)
+          Subsystem: Lenovo Device 2223
+          Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx-
+          Status: Cap+ 66MHz- UDF- FastB2B+ ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort+ >SERR- <PERR- INTx-
+          Latency: 0
+          Capabilities: [e0] Vendor Specific Information: Len=0c <?>
+          Kernel driver in use: bdw_uncore
+  00: 86 80 04 16 06 00 90 20 09 00 00 06 00 00 00 00
+  10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+  20: 00 00 00 00 00 00 00 00 00 00 00 00 aa 17 23 22
+  30: 00 00 00 00 e0 00 00 00 00 00 00 00 00 00 00 00
+
+Signed-off-by: Christophe Le Roy <christophe.fish@gmail.com>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+---
+ drivers/pnp/quirks.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
+index 943c1cb9566c..f700723ca5d6 100644
+--- a/drivers/pnp/quirks.c
++++ b/drivers/pnp/quirks.c
+@@ -343,6 +343,7 @@ static void quirk_amd_mmconfig_area(struct pnp_dev *dev)
+ static const unsigned int mch_quirk_devices[] = {
+ 	0x0154,	/* Ivy Bridge */
+ 	0x0c00,	/* Haswell */
++	0x1604, /* Broadwell */
+ };
+ 
+ static struct pci_dev *get_intel_host(void)
+-- 
+2.5.0
+
diff --git a/PNP-Add-Haswell-ULT-to-Intel-MCH-size-workaround.patch b/PNP-Add-Haswell-ULT-to-Intel-MCH-size-workaround.patch
new file mode 100644
index 000000000..c2082a3b4
--- /dev/null
+++ b/PNP-Add-Haswell-ULT-to-Intel-MCH-size-workaround.patch
@@ -0,0 +1,119 @@
+From afa5b65015ff2a7f0b4ec8cab6f58fa47025259a Mon Sep 17 00:00:00 2001
+From: Josh Boyer <jwboyer@fedoraproject.org>
+Date: Fri, 22 Jan 2016 08:11:46 -0500
+Subject: [PATCH] PNP: Add Haswell-ULT to Intel MCH size workaround
+
+Add device ID 0x0a04 for Haswell-ULT to the list of devices with MCH
+problems.
+
+From a Lenovo ThinkPad T440S:
+[    0.188604] pnp: PnP ACPI init
+[    0.189044] system 00:00: [mem 0x00000000-0x0009ffff] could not be reserved
+[    0.189048] system 00:00: [mem 0x000c0000-0x000c3fff] could not be reserved
+[    0.189050] system 00:00: [mem 0x000c4000-0x000c7fff] could not be reserved
+[    0.189052] system 00:00: [mem 0x000c8000-0x000cbfff] could not be reserved
+[    0.189054] system 00:00: [mem 0x000cc000-0x000cffff] could not be reserved
+[    0.189056] system 00:00: [mem 0x000d0000-0x000d3fff] has been reserved
+[    0.189058] system 00:00: [mem 0x000d4000-0x000d7fff] has been reserved
+[    0.189060] system 00:00: [mem 0x000d8000-0x000dbfff] has been reserved
+[    0.189061] system 00:00: [mem 0x000dc000-0x000dffff] has been reserved
+[    0.189063] system 00:00: [mem 0x000e0000-0x000e3fff] could not be reserved
+[    0.189065] system 00:00: [mem 0x000e4000-0x000e7fff] could not be reserved
+[    0.189067] system 00:00: [mem 0x000e8000-0x000ebfff] could not be reserved
+[    0.189069] system 00:00: [mem 0x000ec000-0x000effff] could not be reserved
+[    0.189071] system 00:00: [mem 0x000f0000-0x000fffff] could not be reserved
+[    0.189073] system 00:00: [mem 0x00100000-0xdf9fffff] could not be reserved
+[    0.189075] system 00:00: [mem 0xfec00000-0xfed3ffff] could not be reserved
+[    0.189078] system 00:00: [mem 0xfed4c000-0xffffffff] could not be reserved
+[    0.189082] system 00:00: Plug and Play ACPI device, IDs PNP0c01 (active)
+[    0.189216] system 00:01: [io  0x1800-0x189f] could not be reserved
+[    0.189220] system 00:01: [io  0x0800-0x087f] has been reserved
+[    0.189222] system 00:01: [io  0x0880-0x08ff] has been reserved
+[    0.189224] system 00:01: [io  0x0900-0x097f] has been reserved
+[    0.189226] system 00:01: [io  0x0980-0x09ff] has been reserved
+[    0.189229] system 00:01: [io  0x0a00-0x0a7f] has been reserved
+[    0.189231] system 00:01: [io  0x0a80-0x0aff] has been reserved
+[    0.189233] system 00:01: [io  0x0b00-0x0b7f] has been reserved
+[    0.189235] system 00:01: [io  0x0b80-0x0bff] has been reserved
+[    0.189238] system 00:01: [io  0x15e0-0x15ef] has been reserved
+[    0.189240] system 00:01: [io  0x1600-0x167f] has been reserved
+[    0.189242] system 00:01: [io  0x1640-0x165f] has been reserved
+[    0.189246] system 00:01: [mem 0xf8000000-0xfbffffff] could not be reserved
+[    0.189249] system 00:01: [mem 0x00000000-0x00000fff] could not be reserved
+[    0.189251] system 00:01: [mem 0xfed1c000-0xfed1ffff] has been reserved
+[    0.189254] system 00:01: [mem 0xfed10000-0xfed13fff] has been reserved
+[    0.189256] system 00:01: [mem 0xfed18000-0xfed18fff] has been reserved
+[    0.189258] system 00:01: [mem 0xfed19000-0xfed19fff] has been reserved
+[    0.189261] system 00:01: [mem 0xfed45000-0xfed4bfff] has been reserved
+[    0.189264] system 00:01: Plug and Play ACPI device, IDs PNP0c02 (active)
+[....]
+[    0.583653] resource sanity check: requesting [mem 0xfed10000-0xfed15fff], which spans more than pnp 00:01 [mem 0xfed10000-0xfed13fff]
+[    0.583654] ------------[ cut here ]------------
+[    0.583660] WARNING: CPU: 0 PID: 1 at arch/x86/mm/ioremap.c:198 __ioremap_caller+0x2c5/0x380()
+[    0.583661] Info: mapping multiple BARs. Your kernel is fine.
+[    0.583662] Modules linked in:
+
+[    0.583666] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.3.3-303.fc23.x86_64 #1
+[    0.583668] Hardware name: LENOVO 20AR001GXS/20AR001GXS, BIOS GJET86WW (2.36 ) 12/04/2015
+[    0.583670]  0000000000000000 0000000014cf7e59 ffff880214a1baf8 ffffffff813a625f
+[    0.583673]  ffff880214a1bb40 ffff880214a1bb30 ffffffff810a07c2 00000000fed10000
+[    0.583675]  ffffc90000cb8000 0000000000006000 0000000000000000 ffff8800d6381040
+[    0.583678] Call Trace:
+[    0.583683]  [<ffffffff813a625f>] dump_stack+0x44/0x55
+[    0.583686]  [<ffffffff810a07c2>] warn_slowpath_common+0x82/0xc0
+[    0.583688]  [<ffffffff810a085c>] warn_slowpath_fmt+0x5c/0x80
+[    0.583692]  [<ffffffff810a6fba>] ? iomem_map_sanity_check+0xba/0xd0
+[    0.583695]  [<ffffffff81065835>] __ioremap_caller+0x2c5/0x380
+[    0.583698]  [<ffffffff81065907>] ioremap_nocache+0x17/0x20
+[    0.583701]  [<ffffffff8103a119>] snb_uncore_imc_init_box+0x79/0xb0
+[    0.583705]  [<ffffffff81038900>] uncore_pci_probe+0xd0/0x1b0
+[    0.583707]  [<ffffffff813efda5>] local_pci_probe+0x45/0xa0
+[    0.583710]  [<ffffffff813f118d>] pci_device_probe+0xfd/0x140
+[    0.583713]  [<ffffffff814d9b52>] driver_probe_device+0x222/0x480
+[    0.583715]  [<ffffffff814d9e34>] __driver_attach+0x84/0x90
+[    0.583717]  [<ffffffff814d9db0>] ? driver_probe_device+0x480/0x480
+[    0.583720]  [<ffffffff814d762c>] bus_for_each_dev+0x6c/0xc0
+[    0.583722]  [<ffffffff814d930e>] driver_attach+0x1e/0x20
+[    0.583724]  [<ffffffff814d8e4b>] bus_add_driver+0x1eb/0x280
+[    0.583727]  [<ffffffff81d6af1a>] ? uncore_cpu_setup+0x12/0x12
+[    0.583729]  [<ffffffff814da680>] driver_register+0x60/0xe0
+[    0.583733]  [<ffffffff813ef78c>] __pci_register_driver+0x4c/0x50
+[    0.583736]  [<ffffffff81d6affc>] intel_uncore_init+0xe2/0x2e6
+[    0.583738]  [<ffffffff81d6af1a>] ? uncore_cpu_setup+0x12/0x12
+[    0.583741]  [<ffffffff81002123>] do_one_initcall+0xb3/0x200
+[    0.583745]  [<ffffffff810be500>] ? parse_args+0x1a0/0x4a0
+[    0.583749]  [<ffffffff81d5c1c8>] kernel_init_freeable+0x189/0x223
+[    0.583752]  [<ffffffff81775c40>] ? rest_init+0x80/0x80
+[    0.583754]  [<ffffffff81775c4e>] kernel_init+0xe/0xe0
+[    0.583758]  [<ffffffff81781adf>] ret_from_fork+0x3f/0x70
+[    0.583760]  [<ffffffff81775c40>] ? rest_init+0x80/0x80
+[    0.583765] ---[ end trace 077c426a39e018aa ]---
+
+00:00.0 Host bridge [0600]: Intel Corporation Haswell-ULT DRAM Controller [8086:0a04] (rev 0b)
+	Subsystem: Lenovo Device [17aa:220c]
+	Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx-
+	Status: Cap+ 66MHz- UDF- FastB2B+ ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort+ >SERR- <PERR- INTx-
+	Latency: 0
+	Capabilities: <access denied>
+	Kernel driver in use: hsw_uncore
+
+Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
+---
+ drivers/pnp/quirks.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
+index f700723ca5d6..d28e3ab9479c 100644
+--- a/drivers/pnp/quirks.c
++++ b/drivers/pnp/quirks.c
+@@ -342,6 +342,7 @@ static void quirk_amd_mmconfig_area(struct pnp_dev *dev)
+ /* Device IDs of parts that have 32KB MCH space */
+ static const unsigned int mch_quirk_devices[] = {
+ 	0x0154,	/* Ivy Bridge */
++	0x0a04, /* Haswell-ULT */
+ 	0x0c00,	/* Haswell */
+ 	0x1604, /* Broadwell */
+ };
+-- 
+2.5.0
+
diff --git a/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch b/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
index 0727adee8..acf28cf88 100644
--- a/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
+++ b/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
@@ -1,6 +1,7 @@
+From d4ae417828427de74e9f857f9caa49580aecf1fe Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Fri, 9 Mar 2012 09:28:15 -0500
-Subject: [PATCH] Restrict /dev/mem and /dev/kmem when module loading is
+Subject: [PATCH 06/20] Restrict /dev/mem and /dev/kmem when module loading is
  restricted
 
 Allowing users to write to address space makes it possible for the kernel
@@ -13,7 +14,7 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
-index efe38c1bc234..16b8af1188e1 100644
+index 53fe675f9bd7..b52c88860532 100644
 --- a/drivers/char/mem.c
 +++ b/drivers/char/mem.c
 @@ -167,6 +167,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf,
@@ -37,5 +38,5 @@ index efe38c1bc234..16b8af1188e1 100644
  		unsigned long to_write = min_t(unsigned long, count,
  					       (unsigned long)high_memory - p);
 -- 
-2.1.0
+2.4.3
 
diff --git a/Revert-Btrfs-race-free-update-of-commit-root-for-ro-.patch b/Revert-Btrfs-race-free-update-of-commit-root-for-ro-.patch
deleted file mode 100644
index bc78069b5..000000000
--- a/Revert-Btrfs-race-free-update-of-commit-root-for-ro-.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From: Josh Boyer <jwboyer@fedoraproject.org>
-Date: Wed, 15 Oct 2014 10:09:50 -0400
-Subject: [PATCH] Revert "Btrfs: race free update of commit root for ro
- snapshots"
-
-This reverts commit 9c3b306e1c9e6be4be09e99a8fe2227d1005effc.
----
- fs/btrfs/inode.c | 36 ------------------------------------
- fs/btrfs/ioctl.c | 33 +++++++++++++++++++++++++++++++++
- 2 files changed, 33 insertions(+), 36 deletions(-)
-
-diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
-index fc9c0439caa3..d23362f4464e 100644
---- a/fs/btrfs/inode.c
-+++ b/fs/btrfs/inode.c
-@@ -5261,42 +5261,6 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry)
- 			iput(inode);
- 			inode = ERR_PTR(ret);
- 		}
--		/*
--		 * If orphan cleanup did remove any orphans, it means the tree
--		 * was modified and therefore the commit root is not the same as
--		 * the current root anymore. This is a problem, because send
--		 * uses the commit root and therefore can see inode items that
--		 * don't exist in the current root anymore, and for example make
--		 * calls to btrfs_iget, which will do tree lookups based on the
--		 * current root and not on the commit root. Those lookups will
--		 * fail, returning a -ESTALE error, and making send fail with
--		 * that error. So make sure a send does not see any orphans we
--		 * have just removed, and that it will see the same inodes
--		 * regardless of whether a transaction commit happened before
--		 * it started (meaning that the commit root will be the same as
--		 * the current root) or not.
--		 */
--		if (sub_root->node != sub_root->commit_root) {
--			u64 sub_flags = btrfs_root_flags(&sub_root->root_item);
--
--			if (sub_flags & BTRFS_ROOT_SUBVOL_RDONLY) {
--				struct extent_buffer *eb;
--
--				/*
--				 * Assert we can't have races between dentry
--				 * lookup called through the snapshot creation
--				 * ioctl and the VFS.
--				 */
--				ASSERT(mutex_is_locked(&dir->i_mutex));
--
--				down_write(&root->fs_info->commit_root_sem);
--				eb = sub_root->commit_root;
--				sub_root->commit_root =
--					btrfs_root_node(sub_root);
--				up_write(&root->fs_info->commit_root_sem);
--				free_extent_buffer(eb);
--			}
--		}
- 	}
- 
- 	return inode;
-diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
-index 0fe1aa047f15..8d2b76e29d3b 100644
---- a/fs/btrfs/ioctl.c
-+++ b/fs/btrfs/ioctl.c
-@@ -713,6 +713,39 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,
- 	if (ret)
- 		goto fail;
- 
-+	ret = btrfs_orphan_cleanup(pending_snapshot->snap);
-+	if (ret)
-+		goto fail;
-+
-+	/*
-+	 * If orphan cleanup did remove any orphans, it means the tree was
-+	 * modified and therefore the commit root is not the same as the
-+	 * current root anymore. This is a problem, because send uses the
-+	 * commit root and therefore can see inode items that don't exist
-+	 * in the current root anymore, and for example make calls to
-+	 * btrfs_iget, which will do tree lookups based on the current root
-+	 * and not on the commit root. Those lookups will fail, returning a
-+	 * -ESTALE error, and making send fail with that error. So make sure
-+	 * a send does not see any orphans we have just removed, and that it
-+	 * will see the same inodes regardless of whether a transaction
-+	 * commit happened before it started (meaning that the commit root
-+	 * will be the same as the current root) or not.
-+	 */
-+	if (readonly && pending_snapshot->snap->node !=
-+	    pending_snapshot->snap->commit_root) {
-+		trans = btrfs_join_transaction(pending_snapshot->snap);
-+		if (IS_ERR(trans) && PTR_ERR(trans) != -ENOENT) {
-+			ret = PTR_ERR(trans);
-+			goto fail;
-+		}
-+		if (!IS_ERR(trans)) {
-+			ret = btrfs_commit_transaction(trans,
-+						       pending_snapshot->snap);
-+			if (ret)
-+				goto fail;
-+		}
-+	}
-+
- 	inode = btrfs_lookup_dentry(dentry->d_parent->d_inode, dentry);
- 	if (IS_ERR(inode)) {
- 		ret = PTR_ERR(inode);
--- 
-1.9.3
-
diff --git a/Revert-Input-synaptics-use-dmax-in-input_mt_assign_s.patch b/Revert-Input-synaptics-use-dmax-in-input_mt_assign_s.patch
deleted file mode 100644
index a49f79957..000000000
--- a/Revert-Input-synaptics-use-dmax-in-input_mt_assign_s.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Josh Boyer <jwboyer@fedoraproject.org>
-Date: Wed, 11 Mar 2015 09:14:03 -0400
-Subject: [PATCH] Revert "Input: synaptics - use dmax in input_mt_assign_slots"
-
-This reverts commit 6ab17a8484f03c188a93713369912f1545eb26e9.
----
- drivers/input/mouse/synaptics.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
-index c74bfa1c05e3..dda605836546 100644
---- a/drivers/input/mouse/synaptics.c
-+++ b/drivers/input/mouse/synaptics.c
-@@ -67,9 +67,6 @@
- #define X_MAX_POSITIVE 8176
- #define Y_MAX_POSITIVE 8176
- 
--/* maximum ABS_MT_POSITION displacement (in mm) */
--#define DMAX 10
--
- /*****************************************************************************
-  *	Stuff we need even when we do not want native Synaptics support
-  ****************************************************************************/
-@@ -915,7 +912,7 @@ static void synaptics_report_mt_data(struct psmouse *psmouse,
- 		pos[i].y = synaptics_invert_y(hw[i]->y);
- 	}
- 
--	input_mt_assign_slots(dev, slot, pos, nsemi, DMAX * priv->x_res);
-+	input_mt_assign_slots(dev, slot, pos, nsemi, 0);
- 
- 	for (i = 0; i < nsemi; i++) {
- 		input_mt_slot(dev, slot[i]);
--- 
-2.1.0
-
diff --git a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
deleted file mode 100644
index 0c751c0b4..000000000
--- a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Josh Boyer <jwboyer@fedoraproject.org>
-Date: Mon, 28 Jul 2014 12:59:48 -0400
-Subject: [PATCH] Revert "Revert "ACPI / video: change acpi-video
- brightness_switch_enabled default to 0""
-
-This reverts commit 2843768b701971ab10e62c77d5c75ad7c306f1bd.
-
-Bugzilla: N/A
-Upstream-status: Sigh.  We almost got to drop this.
-
-Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
----
- Documentation/kernel-parameters.txt | 2 +-
- drivers/acpi/video.c                | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index bfcb1a62a7b4..a1d62e9ed29b 100644
---- a/Documentation/kernel-parameters.txt
-+++ b/Documentation/kernel-parameters.txt
-@@ -3822,7 +3822,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
- 			the allocated input device; If set to 0, video driver
- 			will only send out the event without touching backlight
- 			brightness level.
--			default: 1
-+			default: 0
- 
- 	virtio_mmio.device=
- 			[VMMIO] Memory mapped virtio (platform) device.
-diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
-index 26eb70c8f518..db70d550f526 100644
---- a/drivers/acpi/video.c
-+++ b/drivers/acpi/video.c
-@@ -68,7 +68,7 @@ MODULE_AUTHOR("Bruno Ducrot");
- MODULE_DESCRIPTION("ACPI Video Driver");
- MODULE_LICENSE("GPL");
- 
--static bool brightness_switch_enabled = 1;
-+static bool brightness_switch_enabled;
- module_param(brightness_switch_enabled, bool, 0644);
- 
- /*
--- 
-2.1.0
-
diff --git a/USB-usbfs-fix-potential-infoleak-in-devio.patch b/USB-usbfs-fix-potential-infoleak-in-devio.patch
new file mode 100644
index 000000000..48360c930
--- /dev/null
+++ b/USB-usbfs-fix-potential-infoleak-in-devio.patch
@@ -0,0 +1,41 @@
+From 7adc5cbc25dcc47dc3856108d9823d08da75da9d Mon Sep 17 00:00:00 2001
+From: Kangjie Lu <kangjielu@gmail.com>
+Date: Tue, 3 May 2016 16:32:16 -0400
+Subject: [PATCH] USB: usbfs: fix potential infoleak in devio
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The stack object “ci” has a total size of 8 bytes. Its last 3 bytes
+are padding bytes which are not initialized and leaked to userland
+via “copy_to_user”.
+
+Signed-off-by: Kangjie Lu <kjlu@gatech.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/core/devio.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
+index 52c4461dfccd..9b7f1f75e887 100644
+--- a/drivers/usb/core/devio.c
++++ b/drivers/usb/core/devio.c
+@@ -1316,10 +1316,11 @@ static int proc_getdriver(struct usb_dev_state *ps, void __user *arg)
+ 
+ static int proc_connectinfo(struct usb_dev_state *ps, void __user *arg)
+ {
+-	struct usbdevfs_connectinfo ci = {
+-		.devnum = ps->dev->devnum,
+-		.slow = ps->dev->speed == USB_SPEED_LOW
+-	};
++	struct usbdevfs_connectinfo ci;
++
++	memset(&ci, 0, sizeof(ci));
++	ci.devnum = ps->dev->devnum;
++	ci.slow = ps->dev->speed == USB_SPEED_LOW;
+ 
+ 	if (copy_to_user(arg, &ci, sizeof(ci)))
+ 		return -EFAULT;
+-- 
+2.5.5
+
diff --git a/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch b/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
index 7afe23d42..2794b155f 100644
--- a/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
+++ b/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
@@ -1,7 +1,8 @@
+From 32d3dc2147823a32c8a7771d8fe0f2d1ef057c6a Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@redhat.com>
 Date: Mon, 25 Jun 2012 19:57:30 -0400
-Subject: [PATCH] acpi: Ignore acpi_rsdp kernel parameter when module loading
- is restricted
+Subject: [PATCH 07/20] acpi: Ignore acpi_rsdp kernel parameter when module
+ loading is restricted
 
 This option allows userspace to pass the RSDP address to the kernel, which
 makes it possible for a user to circumvent any restrictions imposed on
@@ -13,10 +14,10 @@ Signed-off-by: Josh Boyer <jwboyer@redhat.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
-index f9eeae871593..aa1dcf3d0216 100644
+index 739a4a6b3b9b..9ef2a020a7a9 100644
 --- a/drivers/acpi/osl.c
 +++ b/drivers/acpi/osl.c
-@@ -44,6 +44,7 @@
+@@ -40,6 +40,7 @@
  #include <linux/list.h>
  #include <linux/jiffies.h>
  #include <linux/semaphore.h>
@@ -24,7 +25,7 @@ index f9eeae871593..aa1dcf3d0216 100644
  
  #include <asm/io.h>
  #include <asm/uaccess.h>
-@@ -255,7 +256,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
+@@ -253,7 +254,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
  acpi_physical_address __init acpi_os_get_root_pointer(void)
  {
  #ifdef CONFIG_KEXEC
@@ -34,5 +35,5 @@ index f9eeae871593..aa1dcf3d0216 100644
  #endif
  
 -- 
-2.1.0
+2.4.3
 
diff --git a/acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch b/acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch
deleted file mode 100644
index daba28bfa..000000000
--- a/acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Fri, 9 Jan 2015 15:28:29 +0100
-Subject: [PATCH] acpi-video: Add disable_native_backlight quirk for Samsung
- 730U3E/740U3E
-
-The Samsung 730U3E/740U3E has integrated ATI Radeon graphics, and backlight
-control does not work properly when using the native interfaces.
-
-BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1094948
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- drivers/acpi/video.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
-index 5b9c0bae4503..998c47f6d42b 100644
---- a/drivers/acpi/video.c
-+++ b/drivers/acpi/video.c
-@@ -522,6 +522,15 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
- 		DMI_MATCH(DMI_PRODUCT_NAME, "370R4E/370R4V/370R5E/3570RE/370R5V"),
- 		},
- 	},
-+	{
-+	 /* https://bugzilla.redhat.com/show_bug.cgi?id=1094948 */
-+	 .callback = video_disable_native_backlight,
-+	 .ident = "SAMSUNG 730U3E/740U3E",
-+	 .matches = {
-+		DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
-+		DMI_MATCH(DMI_PRODUCT_NAME, "730U3E/740U3E"),
-+		},
-+	},
- 
- 	{
- 	 /* https://bugzilla.redhat.com/show_bug.cgi?id=1163574 */
--- 
-2.1.0
-
diff --git a/acpi-video-Add-force-native-backlight-quirk-for-Leno.patch b/acpi-video-Add-force-native-backlight-quirk-for-Leno.patch
new file mode 100644
index 000000000..706fc540d
--- /dev/null
+++ b/acpi-video-Add-force-native-backlight-quirk-for-Leno.patch
@@ -0,0 +1,81 @@
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Tue, 3 Mar 2015 08:31:24 +0100
+Subject: [PATCH] acpi: video: Add force native backlight quirk for Lenovo
+ Ideapad Z570
+
+The Lenovo Ideapad Z570 (which is an Acer in disguise like some other Ideapads)
+has a broken acpi_video interface, this was fixed in commmit a11d342fb8
+("ACPI / video: force vendor backlight on Lenovo Ideapad Z570").
+
+Which stops acpi_video from registering a backlight interface, but this is
+only a partial fix, because for people who have the ideapad-laptop module
+installed that module will now register a backlight interface, which also
+does not work, so we need to use the native intel_backlight interface.
+
+The Lenovo Ideapad 570 is a pre-win8 laptop / too old for the acpi-video code
+to automatically prefer the native backlight interface, so add a quirk for it.
+
+This commit also removes the previous incomplete fix.
+
+BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1187004
+Cc: Stepan Bujnak <stepanbujnak@fastmail.fm>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/acpi/video.c        | 17 +++++++++++++++++
+ drivers/acpi/video_detect.c |  8 --------
+ 2 files changed, 17 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
+index 70ea37bea84f..d9bf8ba7d848 100644
+--- a/drivers/acpi/video.c
++++ b/drivers/acpi/video.c
+@@ -425,6 +425,12 @@ static int __init video_disable_native_backlight(const struct dmi_system_id *d)
+ 	return 0;
+ }
+ 
++static int __init video_enable_native_backlight(const struct dmi_system_id *d)
++{
++	use_native_backlight_dmi = NATIVE_BACKLIGHT_ON;
++	return 0;
++}
++
+ static struct dmi_system_id video_dmi_table[] __initdata = {
+ 	/*
+ 	 * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
+@@ -566,6 +572,17 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
+ 		DMI_MATCH(DMI_PRODUCT_NAME, "XPS L521X"),
+ 		},
+ 	},
++
++	/* Non win8 machines which need native backlight nevertheless */
++	{
++	 /* https://bugzilla.redhat.com/show_bug.cgi?id=1187004 */
++	 .callback = video_enable_native_backlight,
++	 .ident = "Lenovo Ideapad Z570",
++	 .matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
++		DMI_MATCH(DMI_PRODUCT_NAME, "102434U"),
++		},
++	},
+ 	{}
+ };
+ 
+diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
+index 27c43499977a..c42feb2bacd0 100644
+--- a/drivers/acpi/video_detect.c
++++ b/drivers/acpi/video_detect.c
+@@ -174,14 +174,6 @@ static struct dmi_system_id video_detect_dmi_table[] = {
+ 		DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 5737"),
+ 		},
+ 	},
+-	{
+-	.callback = video_detect_force_vendor,
+-	.ident = "Lenovo IdeaPad Z570",
+-	.matches = {
+-		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+-		DMI_MATCH(DMI_PRODUCT_VERSION, "Ideapad Z570"),
+-		},
+-	},
+ 	{ },
+ };
+ 
diff --git a/acpi-video-Allow-forcing-native-backlight-on-non-win.patch b/acpi-video-Allow-forcing-native-backlight-on-non-win.patch
new file mode 100644
index 000000000..2e6627be3
--- /dev/null
+++ b/acpi-video-Allow-forcing-native-backlight-on-non-win.patch
@@ -0,0 +1,73 @@
+From: Aaron Lu <aaron.lu@intel.com>
+Date: Wed, 11 Mar 2015 14:14:56 +0800
+Subject: [PATCH] acpi: video: Allow forcing native backlight on non win8
+ machines
+
+The native backlight behavior (so not registering both the acpi-video
+and the vendor backlight driver) can be useful on some non win8 machines
+too, so change the behavior of the video.use_native_backlight=1 or 0
+kernel cmdline option to be: if user has set video.use_native_backlight=1
+or 0, use that no matter if it is a win8 system or not. Also, we will
+put some known systems into the DMI table to make them either use native
+backlight interface or not, and the use_native_backlight_dmi is used to
+reflect that.
+
+Original-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Aaron Lu <aaron.lu@intel.com>
+Acked-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/acpi/video.c | 19 +++++++++++++------
+ 1 file changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
+index db70d550f526..70ea37bea84f 100644
+--- a/drivers/acpi/video.c
++++ b/drivers/acpi/video.c
+@@ -82,9 +82,15 @@ module_param(allow_duplicates, bool, 0644);
+  * For Windows 8 systems: used to decide if video module
+  * should skip registering backlight interface of its own.
+  */
+-static int use_native_backlight_param = -1;
++enum {
++	NATIVE_BACKLIGHT_NOT_SET = -1,
++	NATIVE_BACKLIGHT_OFF,
++	NATIVE_BACKLIGHT_ON,
++};
++
++static int use_native_backlight_param = NATIVE_BACKLIGHT_NOT_SET;
+ module_param_named(use_native_backlight, use_native_backlight_param, int, 0444);
+-static bool use_native_backlight_dmi = true;
++static int use_native_backlight_dmi = NATIVE_BACKLIGHT_NOT_SET;
+ 
+ static int register_count;
+ static struct mutex video_list_lock;
+@@ -237,15 +243,16 @@ static void acpi_video_switch_brightness(struct work_struct *work);
+ 
+ static bool acpi_video_use_native_backlight(void)
+ {
+-	if (use_native_backlight_param != -1)
++	if (use_native_backlight_param != NATIVE_BACKLIGHT_NOT_SET)
+ 		return use_native_backlight_param;
+-	else
++	else if (use_native_backlight_dmi != NATIVE_BACKLIGHT_NOT_SET)
+ 		return use_native_backlight_dmi;
++	return acpi_osi_is_win8();
+ }
+ 
+ bool acpi_video_verify_backlight_support(void)
+ {
+-	if (acpi_osi_is_win8() && acpi_video_use_native_backlight() &&
++	if (acpi_video_use_native_backlight() &&
+ 	    backlight_device_registered(BACKLIGHT_RAW))
+ 		return false;
+ 	return acpi_video_backlight_support();
+@@ -414,7 +421,7 @@ static int __init video_set_bqc_offset(const struct dmi_system_id *d)
+ 
+ static int __init video_disable_native_backlight(const struct dmi_system_id *d)
+ {
+-	use_native_backlight_dmi = false;
++	use_native_backlight_dmi = NATIVE_BACKLIGHT_OFF;
+ 	return 0;
+ }
+ 
diff --git a/alua_fix.patch b/alua_fix.patch
new file mode 100644
index 000000000..eb278fabb
--- /dev/null
+++ b/alua_fix.patch
@@ -0,0 +1,41 @@
+From 221255aee67ec1c752001080aafec0c4e9390d95 Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke <hare@suse.de>
+Date: Tue, 1 Dec 2015 10:16:42 +0100
+Subject: scsi: ignore errors from scsi_dh_add_device()
+
+device handler initialisation might fail due to a number of
+reasons. But as device_handlers are optional this shouldn't
+cause us to disable the device entirely.
+So just ignore errors from scsi_dh_add_device().
+
+Reviewed-by: Johannes Thumshirn <jthumshirn@suse.com>
+Reviewed-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Hannes Reinecke <hare@suse.de>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+---
+ drivers/scsi/scsi_sysfs.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
+index fc3cd26..d015374 100644
+--- a/drivers/scsi/scsi_sysfs.c
++++ b/drivers/scsi/scsi_sysfs.c
+@@ -1120,11 +1120,12 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
+ 	}
+ 
+ 	error = scsi_dh_add_device(sdev);
+-	if (error) {
++	if (error)
++		/*
++		 * device_handler is optional, so any error can be ignored
++		 */
+ 		sdev_printk(KERN_INFO, sdev,
+ 				"failed to add device handler: %d\n", error);
+-		return error;
+-	}
+ 
+ 	device_enable_async_suspend(&sdev->sdev_dev);
+ 	error = device_add(&sdev->sdev_dev);
+-- 
+cgit v0.11.2
+
diff --git a/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch b/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
index ba6949b88..2a161bb77 100644
--- a/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
+++ b/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
@@ -9,7 +9,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  1 file changed, 21 insertions(+)
 
 diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index 9688dda39e7a..8e3e77f3121f 100644
+index 853079eb0080..645302a6ada4 100644
 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
 +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
 @@ -109,6 +109,27 @@
@@ -40,6 +40,3 @@ index 9688dda39e7a..8e3e77f3121f 100644
  	clkout2_pin: pinmux_clkout2_pin {
  		pinctrl-single,pins = <
  			0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
--- 
-2.1.0
-
diff --git a/arm-dts-am335x-bone-common-enable-and-use-i2c2.patch b/arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
deleted file mode 100644
index 75f350912..000000000
--- a/arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 31 Dec 2013 11:17:45 -0600
-Subject: [PATCH] arm: dts: am335x-bone-common: enable and use i2c2
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- arch/arm/boot/dts/am335x-bone-common.dtsi | 39 +++++++++++++++++++++++++++++++
- 1 file changed, 39 insertions(+)
-
-diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index c3255e0c90aa..1fd496fe1a68 100644
---- a/arch/arm/boot/dts/am335x-bone-common.dtsi
-+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -81,6 +81,13 @@
- 		>;
- 	};
- 
-+	i2c2_pins: pinmux_i2c2_pins {
-+		pinctrl-single,pins = <
-+			0x178 0x73 /* (SLEWCTRL_SLOW | PIN_INPUT_PULLUP | MUX_MODE3) uart1_ctsn.i2c2_sda */
-+			0x17c 0x73 /* (SLEWCTRL_SLOW | PIN_INPUT_PULLUP | MUX_MODE3) uart1_rtsn.i2c2_scl */
-+		>;
-+	};
-+
- 	uart0_pins: pinmux_uart0_pins {
- 		pinctrl-single,pins = <
- 			0x170 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */
-@@ -218,6 +225,38 @@
- 		reg = <0x24>;
- 	};
- 
-+	baseboard_eeprom: baseboard_eeprom@50 {
-+		compatible = "at,24c256";
-+		reg = <0x50>;
-+	};
-+};
-+
-+&i2c2 {
-+	status = "okay";
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c2_pins>;
-+
-+	clock-frequency = <100000>;
-+
-+	cape_eeprom0: cape_eeprom0@54 {
-+		compatible = "at,24c256";
-+		reg = <0x54>;
-+	};
-+
-+	cape_eeprom1: cape_eeprom1@55 {
-+		compatible = "at,24c256";
-+		reg = <0x55>;
-+	};
-+
-+	cape_eeprom2: cape_eeprom2@56 {
-+		compatible = "at,24c256";
-+		reg = <0x56>;
-+	};
-+
-+	cape_eeprom3: cape_eeprom3@57 {
-+		compatible = "at,24c256";
-+		reg = <0x57>;
-+	};
- };
- 
- /include/ "tps65217.dtsi"
--- 
-2.1.0
-
diff --git a/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch b/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
deleted file mode 100644
index 9696f5386..000000000
--- a/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
+++ /dev/null
@@ -1,272 +0,0 @@
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 31 Dec 2013 14:18:00 -0600
-Subject: [PATCH] arm: dts: am335x-bone-common: setup default pinmux
- http://elinux.org/Basic_Proto_Cape
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- arch/arm/boot/dts/am335x-bone-common.dtsi | 222 ++++++++++++++++++++++++++++++
- 1 file changed, 222 insertions(+)
-
-diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index 1fd496fe1a68..9688dda39e7a 100644
---- a/arch/arm/boot/dts/am335x-bone-common.dtsi
-+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -95,6 +95,20 @@
- 		>;
- 	};
- 
-+	uart1_pins: pinmux_uart1_pins {
-+		pinctrl-single,pins = <
-+			0x180 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart1_rxd.uart1_rxd */
-+			0x184 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart1_txd.uart1_txd */
-+		>;
-+	};
-+
-+	uart1_pins: pinmux_uart1_pins {
-+		pinctrl-single,pins = <
-+			0x180 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart1_rxd.uart1_rxd */
-+			0x184 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart1_txd.uart1_txd */
-+		>;
-+	};
-+
- 	clkout2_pin: pinmux_clkout2_pin {
- 		pinctrl-single,pins = <
- 			0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
-@@ -175,6 +189,60 @@
- 			0x1c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad7.mmc1_dat7 */
- 		>;
- 	};
-+
-+	spi0_pins: pinmux_spi0_pins {
-+		pinctrl-single,pins = <
-+			0x150 (PIN_INPUT_PULLUP | MUX_MODE0)	/* spi0_sclk.spi0_sclk */
-+			0x154 (PIN_INPUT_PULLUP | MUX_MODE0)	/* spi0_d0.spi0_d0 */
-+			0x158 (PIN_OUTPUT_PULLUP | MUX_MODE0)	/* spi0_d1.spi0_d1 */
-+			0x15c (PIN_OUTPUT_PULLUP | MUX_MODE0)	/* spi0_cs0.spi0_cs0 */
-+		>;
-+	};
-+
-+	ehrpwm1_pin_p9_14: pinmux_ehrpwm1_pin_p9_14 {
-+		pinctrl-single,pins = <
-+			0x048 0x6	/* P9_14 (ZCZ ball U14) | MODE 6 */
-+		>;
-+	};
-+
-+	ehrpwm1_pin_p9_16: pinmux_ehrpwm1_pin_p9_16 {
-+		pinctrl-single,pins = <
-+			0x04c 0x6	/* P9_16 (ZCZ ball T14) | MODE 6 */
-+		>;
-+	};
-+
-+	ecap0_pin_p9_42: pinmux_ecap0_pin_p9_42 {
-+		pinctrl-single,pins = <
-+			0x164 0x0	/* P9_42 (ZCZ ball C18) | MODE 0 */
-+		>;
-+	};
-+
-+	spi0_pins: pinmux_spi0_pins {
-+		pinctrl-single,pins = <
-+			0x150 (PIN_INPUT_PULLUP | MUX_MODE0)	/* spi0_sclk.spi0_sclk */
-+			0x154 (PIN_INPUT_PULLUP | MUX_MODE0)	/* spi0_d0.spi0_d0 */
-+			0x158 (PIN_OUTPUT_PULLUP | MUX_MODE0)	/* spi0_d1.spi0_d1 */
-+			0x15c (PIN_OUTPUT_PULLUP | MUX_MODE0)	/* spi0_cs0.spi0_cs0 */
-+		>;
-+	};
-+
-+	ehrpwm1_pin_p9_14: pinmux_ehrpwm1_pin_p9_14 {
-+		pinctrl-single,pins = <
-+			0x048 0x6	/* P9_14 (ZCZ ball U14) | MODE 6 */
-+		>;
-+	};
-+
-+	ehrpwm1_pin_p9_16: pinmux_ehrpwm1_pin_p9_16 {
-+		pinctrl-single,pins = <
-+			0x04c 0x6	/* P9_16 (ZCZ ball T14) | MODE 6 */
-+		>;
-+	};
-+
-+	ecap0_pin_p9_42: pinmux_ecap0_pin_p9_42 {
-+		pinctrl-single,pins = <
-+			0x164 0x0	/* P9_42 (ZCZ ball C18) | MODE 0 */
-+		>;
-+	};
- };
- 
- &uart0 {
-@@ -184,6 +252,20 @@
- 	status = "okay";
- };
- 
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart1_pins>;
-+
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart1_pins>;
-+
-+	status = "okay";
-+};
-+
- &usb {
- 	status = "okay";
- };
-@@ -259,6 +341,106 @@
- 	};
- };
- 
-+&epwmss0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&ecap0_pin_p9_42>;
-+	status = "okay";
-+
-+	ecap@48300100 {
-+		status = "okay";
-+	};
-+};
-+
-+&epwmss1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <
-+		&ehrpwm1_pin_p9_14
-+		&ehrpwm1_pin_p9_16
-+	>;
-+
-+	status = "okay";
-+
-+	ehrpwm@48302200 {
-+		status = "okay";
-+	};
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins>;
-+	status = "okay";
-+
-+	spidev0: spi@0 {
-+		compatible = "spidev";
-+		reg = <0>;
-+		spi-max-frequency = <16000000>;
-+		spi-cpha;
-+	};
-+
-+	spidev1: spi@1 {
-+		compatible = "spidev";
-+		reg = <1>;
-+		spi-max-frequency = <16000000>;
-+	};
-+};
-+
-+&tscadc {
-+	status = "okay";
-+	adc {
-+		ti,adc-channels = <4 5 6>;
-+	};
-+};
-+
-+&epwmss0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&ecap0_pin_p9_42>;
-+	status = "okay";
-+
-+	ecap@48300100 {
-+		status = "okay";
-+	};
-+};
-+
-+&epwmss1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <
-+		&ehrpwm1_pin_p9_14
-+		&ehrpwm1_pin_p9_16
-+	>;
-+
-+	status = "okay";
-+
-+	ehrpwm@48302200 {
-+		status = "okay";
-+	};
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins>;
-+	status = "okay";
-+
-+	spidev0: spi@0 {
-+		compatible = "spidev";
-+		reg = <0>;
-+		spi-max-frequency = <16000000>;
-+		spi-cpha;
-+	};
-+
-+	spidev1: spi@1 {
-+		compatible = "spidev";
-+		reg = <1>;
-+		spi-max-frequency = <16000000>;
-+	};
-+};
-+
-+&tscadc {
-+	status = "okay";
-+	adc {
-+		ti,adc-channels = <4 5 6>;
-+	};
-+};
-+
- /include/ "tps65217.dtsi"
- 
- &tps {
-@@ -347,4 +529,44 @@
- 
- &sham {
- 	status = "okay";
-+
-+};
-+
-+/ {
-+	ocp {
-+		//FIXME: these pwm's still need work, this guild isn't working..
-+		//http://elinux.org/EBC_Exercise_13_Pulse_Width_Modulation
-+		pwm_test_P9_14@0 {
-+			compatible = "pwm_test";
-+			pwms = <&ehrpwm1 0 500000 1>;
-+			pwm-names = "PWM_P9_14";
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&ehrpwm1_pin_p9_14>;
-+			enabled = <1>;
-+			duty = <0>;
-+			status = "okay";
-+		};
-+
-+		pwm_test_P9_16@0 {
-+			compatible = "pwm_test";
-+			pwms = <&ehrpwm1 0 500000 1>;
-+			pwm-names = "PWM_P9_16";
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&ehrpwm1_pin_p9_16>;
-+			enabled = <1>;
-+			duty = <0>;
-+			status = "okay";
-+		};
-+
-+		pwm_test_P9_42 {
-+			compatible = "pwm_test";
-+			pwms = <&ecap0 0 500000 1>;
-+			pwm-names = "PWM_P9_42";
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&ecap0_pin_p9_42>;
-+			enabled = <1>;
-+			duty = <0>;
-+			status = "okay";
-+		};
-+	};
- };
--- 
-2.1.0
-
diff --git a/arm-dts-am335x-boneblack-add-cpu0-opp-points.patch b/arm-dts-am335x-boneblack-add-cpu0-opp-points.patch
index f212c3efb..edd9a3c9b 100644
--- a/arm-dts-am335x-boneblack-add-cpu0-opp-points.patch
+++ b/arm-dts-am335x-boneblack-add-cpu0-opp-points.patch
@@ -36,6 +36,3 @@ index 0fd89c38cf02..20660917a06f 100644
  	hdmi {
  		compatible = "ti,tilcdc,slave";
  		i2c = <&i2c0>;
--- 
-2.1.0
-
diff --git a/arm-dts-am335x-boneblack-lcdc-add-panel-info.patch b/arm-dts-am335x-boneblack-lcdc-add-panel-info.patch
index 46a151a9f..97f31f604 100644
--- a/arm-dts-am335x-boneblack-lcdc-add-panel-info.patch
+++ b/arm-dts-am335x-boneblack-lcdc-add-panel-info.patch
@@ -34,6 +34,3 @@ index 5c42d259fa68..0fd89c38cf02 100644
  	};
  };
  
--- 
-2.1.0
-
diff --git a/arm-highbank-l2-reverts.patch b/arm-highbank-l2-reverts.patch
deleted file mode 100644
index 9b886d00d..000000000
--- a/arm-highbank-l2-reverts.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Kyle McMartin <kmcmartin@redhat.com>
-Date: Tue, 30 Sep 2014 16:19:47 -0400
-Subject: [PATCH] arm: highbank l2 reverts
-
-Revert some v3.16 changes to mach-highbank which broke L2 cache enablement.
-Will debug upstream separately, but we need F22/21 running there. (#1139762)
----
- arch/arm/mach-highbank/highbank.c | 21 ++++++++++++---------
- 1 file changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c
-index 231fba0d03e5..0de5a6ddd5eb 100644
---- a/arch/arm/mach-highbank/highbank.c
-+++ b/arch/arm/mach-highbank/highbank.c
-@@ -51,13 +51,11 @@ static void __init highbank_scu_map_io(void)
- }
- 
- 
--static void highbank_l2c310_write_sec(unsigned long val, unsigned reg)
-+static void highbank_l2x0_disable(void)
- {
--	if (reg == L2X0_CTRL)
--		highbank_smc1(0x102, val);
--	else
--		WARN_ONCE(1, "Highbank L2C310: ignoring write to reg 0x%x\n",
--			  reg);
-+	outer_flush_all();
-+	/* Disable PL310 L2 Cache controller */
-+	highbank_smc1(0x102, 0x0);
- }
- 
- static void __init highbank_init_irq(void)
-@@ -66,6 +64,14 @@ static void __init highbank_init_irq(void)
- 
- 	if (of_find_compatible_node(NULL, NULL, "arm,cortex-a9"))
- 		highbank_scu_map_io();
-+
-+	/* Enable PL310 L2 Cache controller */
-+	if (IS_ENABLED(CONFIG_CACHE_L2X0) &&
-+	    of_find_compatible_node(NULL, NULL, "arm,pl310-cache")) {
-+		highbank_smc1(0x102, 0x1);
-+		l2x0_of_init(0, ~0);
-+		outer_cache.disable = highbank_l2x0_disable;
-+	}
- }
- 
- static void highbank_power_off(void)
-@@ -179,9 +185,6 @@ DT_MACHINE_START(HIGHBANK, "Highbank")
- #if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
- 	.dma_zone_size	= (4ULL * SZ_1G),
- #endif
--	.l2c_aux_val	= 0,
--	.l2c_aux_mask	= ~0,
--	.l2c_write_sec	= highbank_l2c310_write_sec,
- 	.init_irq	= highbank_init_irq,
- 	.init_machine	= highbank_init,
- 	.dt_compat	= highbank_match,
--- 
-2.1.0
-
diff --git a/arm-i.MX6-Utilite-device-dtb.patch b/arm-i.MX6-Utilite-device-dtb.patch
index 826967fca..86f9e763d 100644
--- a/arm-i.MX6-Utilite-device-dtb.patch
+++ b/arm-i.MX6-Utilite-device-dtb.patch
@@ -60,6 +60,3 @@ index 99b46f8030ad..8b6ddd16dcc5 100644
 +	pinctrl-0 = <&pinctrl_usdhc3>;
 +	status = "okay";
 +};
--- 
-2.1.0
-
diff --git a/arm64-acpi-drop-expert-patch.patch b/arm64-acpi-drop-expert-patch.patch
new file mode 100644
index 000000000..6122732d6
--- /dev/null
+++ b/arm64-acpi-drop-expert-patch.patch
@@ -0,0 +1,21 @@
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Sun, 3 May 2015 18:35:23 +0100
+Subject: [PATCH] arm64: acpi drop expert patch
+
+---
+ drivers/acpi/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
+index 114cf48085ab..70ba3ef9a37b 100644
+--- a/drivers/acpi/Kconfig
++++ b/drivers/acpi/Kconfig
+@@ -5,7 +5,7 @@
+ menuconfig ACPI
+ 	bool "ACPI (Advanced Configuration and Power Interface) Support"
+ 	depends on !IA64_HP_SIM
+-	depends on IA64 || X86 || (ARM64 && EXPERT)
++	depends on IA64 || X86 || ARM64
+ 	depends on PCI
+ 	select PNP
+ 	default y
diff --git a/arm64-avoid-needing-console-to-enable-serial-console.patch b/arm64-avoid-needing-console-to-enable-serial-console.patch
new file mode 100644
index 000000000..e8cc7bbe0
--- /dev/null
+++ b/arm64-avoid-needing-console-to-enable-serial-console.patch
@@ -0,0 +1,46 @@
+From ede02df9a481ba07348e6fd4393ba2e273ef16d8 Mon Sep 17 00:00:00 2001
+From: Mark Salter <msalter@redhat.com>
+Date: Wed, 25 Mar 2015 14:17:50 -0400
+Subject: [PATCH] arm64: avoid needing console= to enable serial console
+
+Tell kernel to prefer one of the serial ports for console on
+platforms currently supported (pl011 or 8250). console= on
+command line will override these assumed preferences. This is
+just a hack to get the behavior we want from DT provided by
+firmware.
+
+Signed-off-by: Mark Salter <msalter@redhat.com>
+---
+ arch/arm64/kernel/setup.c | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
+index 8119479..ea9ff80 100644
+--- a/arch/arm64/kernel/setup.c
++++ b/arch/arm64/kernel/setup.c
+@@ -381,3 +381,22 @@ static int __init topology_init(void)
+ 	return 0;
+ }
+ subsys_initcall(topology_init);
++
++/*
++ * Temporary hack to avoid need for console= on command line
++ */
++static int __init arm64_console_setup(void)
++{
++	/* Allow cmdline to override our assumed preferences */
++	if (console_set_on_cmdline)
++		return 0;
++
++	if (IS_ENABLED(CONFIG_SERIAL_AMBA_PL011))
++		add_preferred_console("ttyAMA", 0, "115200");
++
++	if (IS_ENABLED(CONFIG_SERIAL_8250))
++		add_preferred_console("ttyS", 0, "115200");
++
++	return 0;
++}
++early_initcall(arm64_console_setup);
+-- 
+2.5.0
+
diff --git a/asus-wmi-Restrict-debugfs-interface-when-module-load.patch b/asus-wmi-Restrict-debugfs-interface-when-module-load.patch
index 6dd8b8342..3ab7b85ea 100644
--- a/asus-wmi-Restrict-debugfs-interface-when-module-load.patch
+++ b/asus-wmi-Restrict-debugfs-interface-when-module-load.patch
@@ -1,7 +1,8 @@
+From 32f701d40657cc3c982b8cba4bf73452ccdd6697 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Fri, 9 Mar 2012 08:46:50 -0500
-Subject: [PATCH] asus-wmi: Restrict debugfs interface when module loading is
- restricted
+Subject: [PATCH 05/20] asus-wmi: Restrict debugfs interface when module
+ loading is restricted
 
 We have no way of validating what all of the Asus WMI methods do on a
 given machine, and there's a risk that some will allow hardware state to
@@ -15,10 +16,10 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
  1 file changed, 9 insertions(+)
 
 diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
-index 7543a56e0f45..93b5a6998371 100644
+index efbc3f0c592b..071171be4b7f 100644
 --- a/drivers/platform/x86/asus-wmi.c
 +++ b/drivers/platform/x86/asus-wmi.c
-@@ -1589,6 +1589,9 @@ static int show_dsts(struct seq_file *m, void *data)
+@@ -1868,6 +1868,9 @@ static int show_dsts(struct seq_file *m, void *data)
  	int err;
  	u32 retval = -1;
  
@@ -28,7 +29,7 @@ index 7543a56e0f45..93b5a6998371 100644
  	err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
  
  	if (err < 0)
-@@ -1605,6 +1608,9 @@ static int show_devs(struct seq_file *m, void *data)
+@@ -1884,6 +1887,9 @@ static int show_devs(struct seq_file *m, void *data)
  	int err;
  	u32 retval = -1;
  
@@ -38,7 +39,7 @@ index 7543a56e0f45..93b5a6998371 100644
  	err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
  				    &retval);
  
-@@ -1629,6 +1635,9 @@ static int show_call(struct seq_file *m, void *data)
+@@ -1908,6 +1914,9 @@ static int show_call(struct seq_file *m, void *data)
  	union acpi_object *obj;
  	acpi_status status;
  
@@ -49,5 +50,5 @@ index 7543a56e0f45..93b5a6998371 100644
  				     1, asus->debug.method_id,
  				     &input, &output);
 -- 
-2.1.0
+2.4.3
 
diff --git a/ath9k-rx-dma-stop-check.patch b/ath9k-rx-dma-stop-check.patch
index d63e2c4c8..40cbafc7b 100644
--- a/ath9k-rx-dma-stop-check.patch
+++ b/ath9k-rx-dma-stop-check.patch
@@ -36,6 +36,3 @@ index bba85d1a6cd1..ebbee8f17130 100644
  		ath_err(common,
  			"DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x DMADBG_7=0x%08x\n",
  			AH_RX_STOP_DMA_TIMEOUT / 1000,
--- 
-2.1.0
-
diff --git a/bluetooth-Validate-socket-address-length-in-sco_sock.patch b/bluetooth-Validate-socket-address-length-in-sco_sock.patch
new file mode 100644
index 000000000..1ee23fcf4
--- /dev/null
+++ b/bluetooth-Validate-socket-address-length-in-sco_sock.patch
@@ -0,0 +1,27 @@
+From 5233252fce714053f0151680933571a2da9cbfb4 Mon Sep 17 00:00:00 2001
+From: "David S. Miller" <davem@davemloft.net>
+Date: Tue, 15 Dec 2015 15:39:08 -0500
+Subject: [PATCH] bluetooth: Validate socket address length in sco_sock_bind().
+
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ net/bluetooth/sco.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
+index fe129663bd3f..f52bcbf2e58c 100644
+--- a/net/bluetooth/sco.c
++++ b/net/bluetooth/sco.c
+@@ -526,6 +526,9 @@ static int sco_sock_bind(struct socket *sock, struct sockaddr *addr,
+ 	if (!addr || addr->sa_family != AF_BLUETOOTH)
+ 		return -EINVAL;
+ 
++	if (addr_len < sizeof(struct sockaddr_sco))
++		return -EINVAL;
++
+ 	lock_sock(sk);
+ 
+ 	if (sk->sk_state != BT_OPEN) {
+-- 
+2.5.0
+
diff --git a/cdc_ncm-do-not-call-usbnet_link_change-from-cdc_ncm_.patch b/cdc_ncm-do-not-call-usbnet_link_change-from-cdc_ncm_.patch
new file mode 100644
index 000000000..479914dc2
--- /dev/null
+++ b/cdc_ncm-do-not-call-usbnet_link_change-from-cdc_ncm_.patch
@@ -0,0 +1,87 @@
+From 4d06dd537f95683aba3651098ae288b7cbff8274 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
+Date: Mon, 7 Mar 2016 21:15:36 +0100
+Subject: [PATCH] cdc_ncm: do not call usbnet_link_change from cdc_ncm_bind
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+usbnet_link_change will call schedule_work and should be
+avoided if bind is failing. Otherwise we will end up with
+scheduled work referring to a netdev which has gone away.
+
+Instead of making the call conditional, we can just defer
+it to usbnet_probe, using the driver_info flag made for
+this purpose.
+
+Fixes: 8a34b0ae8778 ("usbnet: cdc_ncm: apply usbnet_link_change")
+Reported-by: Andrey Konovalov <andreyknvl@gmail.com>
+Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Bjørn Mork <bjorn@mork.no>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/usb/cdc_ncm.c | 20 +++++---------------
+ 1 file changed, 5 insertions(+), 15 deletions(-)
+
+diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
+index be927964375b..86ba30ba35e8 100644
+--- a/drivers/net/usb/cdc_ncm.c
++++ b/drivers/net/usb/cdc_ncm.c
+@@ -988,8 +988,6 @@ EXPORT_SYMBOL_GPL(cdc_ncm_select_altsetting);
+ 
+ static int cdc_ncm_bind(struct usbnet *dev, struct usb_interface *intf)
+ {
+-	int ret;
+-
+ 	/* MBIM backwards compatible function? */
+ 	if (cdc_ncm_select_altsetting(intf) != CDC_NCM_COMM_ALTSETTING_NCM)
+ 		return -ENODEV;
+@@ -998,16 +996,7 @@ static int cdc_ncm_bind(struct usbnet *dev, struct usb_interface *intf)
+ 	 * Additionally, generic NCM devices are assumed to accept arbitrarily
+ 	 * placed NDP.
+ 	 */
+-	ret = cdc_ncm_bind_common(dev, intf, CDC_NCM_DATA_ALTSETTING_NCM, 0);
+-
+-	/*
+-	 * We should get an event when network connection is "connected" or
+-	 * "disconnected". Set network connection in "disconnected" state
+-	 * (carrier is OFF) during attach, so the IP network stack does not
+-	 * start IPv6 negotiation and more.
+-	 */
+-	usbnet_link_change(dev, 0, 0);
+-	return ret;
++	return cdc_ncm_bind_common(dev, intf, CDC_NCM_DATA_ALTSETTING_NCM, 0);
+ }
+ 
+ static void cdc_ncm_align_tail(struct sk_buff *skb, size_t modulus, size_t remainder, size_t max)
+@@ -1590,7 +1579,8 @@ static void cdc_ncm_status(struct usbnet *dev, struct urb *urb)
+ 
+ static const struct driver_info cdc_ncm_info = {
+ 	.description = "CDC NCM",
+-	.flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT | FLAG_MULTI_PACKET,
++	.flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT | FLAG_MULTI_PACKET
++			| FLAG_LINK_INTR,
+ 	.bind = cdc_ncm_bind,
+ 	.unbind = cdc_ncm_unbind,
+ 	.manage_power = usbnet_manage_power,
+@@ -1603,7 +1593,7 @@ static const struct driver_info cdc_ncm_info = {
+ static const struct driver_info wwan_info = {
+ 	.description = "Mobile Broadband Network Device",
+ 	.flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT | FLAG_MULTI_PACKET
+-			| FLAG_WWAN,
++			| FLAG_LINK_INTR | FLAG_WWAN,
+ 	.bind = cdc_ncm_bind,
+ 	.unbind = cdc_ncm_unbind,
+ 	.manage_power = usbnet_manage_power,
+@@ -1616,7 +1606,7 @@ static const struct driver_info wwan_info = {
+ static const struct driver_info wwan_noarp_info = {
+ 	.description = "Mobile Broadband Network Device (NO ARP)",
+ 	.flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT | FLAG_MULTI_PACKET
+-			| FLAG_WWAN | FLAG_NOARP,
++			| FLAG_LINK_INTR | FLAG_WWAN | FLAG_NOARP,
+ 	.bind = cdc_ncm_bind,
+ 	.unbind = cdc_ncm_unbind,
+ 	.manage_power = usbnet_manage_power,
+-- 
+2.5.5
+
diff --git a/compile-fixes.patch b/compile-fixes.patch
deleted file mode 100644
index 34c08ce47..000000000
--- a/compile-fixes.patch
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Small compile fixes (For more involved fixes, please use a separate patch).
-#
-# Please add the errors from gcc before the diffs to save others having
-# to do a compile to figure out what your diff is fixing. Thanks.
-#
diff --git a/config-arm-generic b/config-arm-generic
index b87b5d928..0831ea38e 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -1,4 +1,5 @@
 CONFIG_KUSER_HELPERS=y
+# CONFIG_VDSO is not set
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
 CONFIG_COMMON_CLK=y
 CONFIG_EARLY_PRINTK=y
@@ -6,8 +7,8 @@ CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y
 CONFIG_FB_SSD1307=m
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_NFS_FS=y
+CONFIG_FORCE_MAX_ZONEORDER=11
 
-CONFIG_CRASH=m
 CONFIG_CC_STACKPROTECTOR=y
 
 # CONFIG_PID_IN_CONTEXTIDR is not set
@@ -39,32 +40,50 @@ CONFIG_FB_SIMPLE=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 
+CONFIG_ARM_PMU=y
+
 # ARM AMBA generic HW
 CONFIG_ARM_AMBA=y
-# CONFIG_TEGRA_AHB is not set
+CONFIG_KERNEL_MODE_NEON=y
 CONFIG_ARM_CCI=y
 CONFIG_ARM_CCN=y
+CONFIG_ARM_CCI400_PMU=y
+CONFIG_ARM_CCI500_PMU=y
 CONFIG_ARM_DMA_USE_IOMMU=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
-CONFIG_KVM_ARM_VGIC=y
 CONFIG_ARM_GLOBAL_TIMER=y
 CONFIG_ARM_SMMU=y
 CONFIG_MMC_ARMMMCI=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIO_AMBAKMI=y
 CONFIG_FB_ARMCLCD=y
+CONFIG_RTC_DRV_PL031=y
+CONFIG_PL330_DMA=m
+CONFIG_GPIO_PL061=y
+CONFIG_USB_ISP1760=m
+CONFIG_ARM_PL172_MPMC=m
+
+# HW crypto and rng
+CONFIG_ARM_CRYPTO=y
+CONFIG_CRYPTO_AES_ARM=y
+CONFIG_CRYPTO_AES_ARM_BS=y
+CONFIG_CRYPTO_SHA1_ARM=y
+CONFIG_CRYPTO_SHA256_ARM=y
+CONFIG_CRYPTO_SHA1_ARM_NEON=y
+CONFIG_CRYPTO_SHA512_ARM_NEON=y
+CONFIG_CRYPTO_SHA512_ARM=y
 
 # ARM VExpress
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_MFD_VEXPRESS_SYSREG=y
 CONFIG_VEXPRESS_SYSCFG=y
 CONFIG_COMMON_CLK_VERSATILE=y
+CONFIG_ARM_TIMER_SP804=y
 CONFIG_CLK_SP810=y
 CONFIG_CLK_VEXPRESS_OSC=y
 CONFIG_I2C_VERSATILE=m
@@ -75,7 +94,41 @@ CONFIG_CLKSRC_VERSATILE=y
 CONFIG_POWER_RESET_VERSATILE=y
 # CONFIG_ARM_CHARLCD is not set
 
-# Power/Thermal/Cpufreq
+# Rockchips
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_I2C_RK3X=m
+CONFIG_SPI_ROCKCHIP=m
+CONFIG_PWM_ROCKCHIP=m
+CONFIG_ROCKCHIP_SARADC=m
+CONFIG_ROCKCHIP_IODOMAIN=m
+CONFIG_MMC_DW_ROCKCHIP=m
+CONFIG_EMAC_ROCKCHIP=m
+CONFIG_MFD_RK808=m
+CONFIG_COMMON_CLK_RK808=m
+CONFIG_REGULATOR_RK808=m
+CONFIG_RTC_DRV_RK808=m
+CONFIG_RTC_DRV_HYM8563=m
+CONFIG_ROCKCHIP_SARADC=m
+CONFIG_ROCKCHIP_IOMMU=y
+CONFIG_ROCKCHIP_THERMAL=m
+CONFIG_DRM_ROCKCHIP=m
+CONFIG_ROCKCHIP_DW_HDMI=m
+CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_DWMAC_ROCKCHIP=m
+CONFIG_SND_SOC_ROCKCHIP=m
+CONFIG_SND_SOC_ROCKCHIP_I2S=m
+CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
+CONFIG_SND_SOC_ROCKCHIP_RT5645=m
+CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
+CONFIG_REGULATOR_ACT8865=m
+CONFIG_ROCKCHIP_PM_DOMAINS=y
+CONFIG_ROCKCHIP_EFUSE=m
+
+# Tegra
+# CONFIG_TEGRA_AHB is not set
+
+# Power management / thermal / cpu scaling
+# CONFIG_ARM_CPUIDLE is not set
 # CONFIG_ARM_DT_BL_CPUFREQ is not set
 # CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
 
@@ -96,6 +149,8 @@ CONFIG_OF_NET=y
 CONFIG_OF_OVERLAY=y
 CONFIG_OF_PCI_IRQ=m
 CONFIG_OF_PCI=m
+# CONFIG_PCI_HOST_GENERIC is not set
+# CONFIG_PCIE_IPROC is not set
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_PM_GENERIC_DOMAINS_OF=y
@@ -107,6 +162,15 @@ CONFIG_THERMAL_OF=y
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 
+# Mailbox
+CONFIG_MAILBOX=y
+CONFIG_ARM_MHU=m
+# CONFIG_PL320_MBOX is not set
+CONFIG_ARM_SCPI_PROTOCOL=m
+
+# NVMem
+CONFIG_NVMEM=m
+
 # USB
 CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
@@ -114,15 +178,18 @@ CONFIG_USB_XHCI_PLATFORM=m
 
 # MMC/SD
 CONFIG_MMC_SPI=m
+CONFIG_MMC_SDHCI_OF_ARASAN=m
 
 # Designware (used by numerous devices)
 CONFIG_MMC_DW=m
 CONFIG_MMC_DW_PLTFM=m
+CONFIG_MMC_DW_IDMAC=y
+CONFIG_MMC_DW_K3=m
 CONFIG_MMC_DW_PCI=m
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
+# CONFIG_SPI_DW_MID_DMA is not set
 # CONFIG_MMC_DW_IDMAC is not set
-# CONFIG_MMC_DW_K3 is not set
 # CONFIG_MMC_QCOM_DML is not set
 CONFIG_USB_DWC2=m
 CONFIG_USB_DWC2_DUAL_ROLE=y
@@ -134,15 +201,19 @@ CONFIG_USB_DWC3=m
 CONFIG_USB_DWC3_DUAL_ROLE=y
 CONFIG_USB_DWC3_PCI=m
 # CONFIG_USB_DWC3_DEBUG is not set
-# CONFIG_DWC3_HOST_USB3_LPM_ENABLE is not set
+CONFIG_USB_DWC3_ULPI=y
 CONFIG_DW_WATCHDOG=m
 CONFIG_PCIE_DW=y
 # CONFIG_MMC_DW_EXYNOS is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
+CONFIG_GPIO_DWAPB=m
 
 # External Connectors
 CONFIG_EXTCON=m
 CONFIG_EXTCON_GPIO=m
 CONFIG_EXTCON_ADC_JACK=m
+CONFIG_EXTCON_USB_GPIO=m
 # CONFIG_EXTCON_SM5502 is not set
 # CONFIG_EXTCON_RT8973A is not set
 
@@ -169,11 +240,21 @@ CONFIG_GPIOLIB=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_BACKLIGHT_GPIO=m
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_POWER_RESET_RESTART=y
 # CONFIG_GPIO_74XX_MMIO is not set
 
+# Pin stuff
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_PINCTRL=y
+CONFIG_GENERIC_PINCONF=y
+CONFIG_PINCTRL_SINGLE=y
+
 #i2c
 CONFIG_I2C_ARB_GPIO_CHALLENGE=m
 CONFIG_I2C_BOARDINFO=y
@@ -183,6 +264,7 @@ CONFIG_I2C_MUX_GPIO=m
 CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_REG=m
 
 # spi
 CONFIG_SPI_PL022=m
@@ -190,6 +272,7 @@ CONFIG_SPI_PL022=m
 # Sensors
 CONFIG_SENSORS_IIO_HWMON=m
 CONFIG_IIO_SYSFS_TRIGGER=m
+CONFIG_SENSORS_ARM_SCPI=m
 
 # PHY framework
 CONFIG_GENERIC_PHY=y
@@ -204,6 +287,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_CMA=y
 CONFIG_DMA_CMA=y
 # CONFIG_CMA_DEBUG is not set
+CONFIG_CMA_DEBUGFS=y
 CONFIG_CMA_SIZE_MBYTES=16
 CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
@@ -212,6 +296,16 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y
 CONFIG_CMA_ALIGNMENT=8
 CONFIG_CMA_AREAS=7
 
+# EDAC
+CONFIG_EDAC=y
+CONFIG_EDAC_MM_EDAC=m
+CONFIG_EDAC_LEGACY_SYSFS=y
+
+# VFIO
+CONFIG_VFIO_PLATFORM=m
+CONFIG_VFIO_AMBA=m
+# CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET is not set
+
 # CONFIG_CRYPTO_TEST is not set
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
 # CONFIG_XEN is not set
@@ -231,13 +325,16 @@ CONFIG_CMA_AREAS=7
 
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_QCOM is not set
+CONFIG_COMMON_CLK_SCPI=m
 
 # CONFIG_ARM_PTDUMP is not set
 
 # CONFIG_PATA_PLATFORM is not set
 # CONFIG_USB_ULPI is not set
 # CONFIG_KEYBOARD_OMAP4 is not set
+# CONFIG_KEYBOARD_BCM is not set
 # CONFIG_PHY_SAMSUNG_USB2 is not set
+# CONFIG_OMAP_GPMC_DEBUG is not set
 
 ### turn off things which make no sense on embedded SoC
 
@@ -255,6 +352,7 @@ CONFIG_CMA_AREAS=7
 
 # netdrv
 
+CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NET_VENDOR_ADAPTEC is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
@@ -264,15 +362,16 @@ CONFIG_CMA_AREAS=7
 # CONFIG_NET_VENDOR_DEC is not set
 # CONFIG_NET_VENDOR_EMULEX is not set
 # CONFIG_NET_VENDOR_EXAR is not set
-# CONFIG_NET_VENDOR_MELLANOX is not set
 # CONFIG_NET_VENDOR_QLOGIC is not set
 # CONFIG_NET_VENDOR_SUN is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_NET_VENDOR_XIRCOM is not set
+# CONFIG_TLAN is not set
 
 # scsi
 
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_SCSI_3W_SAS is not set
 # CONFIG_SCSI_PM8001 is not set
 # CONFIG_SCSI_IPS is not set
@@ -295,12 +394,20 @@ CONFIG_CMA_AREAS=7
 
 # drm
 # CONFIG_DRM_VMWGFX is not set
+# CONFIG_DRM_MSM_DSI is not set
 # CONFIG_IMX_IPUV3_CORE is not set
 
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
 # CONFIG_CORESIGHT is not set
-
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 # CONFIG_BMP085_SPI is not set
 # CONFIG_TI_DAC7512 is not set
-# CONFIG_SPI_ROCKCHIP is not set
+
+# https://fedoraproject.org/wiki/Features/Checkpoint_Restore
+CONFIG_CHECKPOINT_RESTORE=y
+
+# Bad Intel shit we don't care about
+# CONFIG_PINCTRL_BAYTRAIL is not set
+# CONFIG_PINCTRL_CHERRYVIEW is not set
+# CONFIG_PINCTRL_BROXTON is not set
+# CONFIG_PINCTRL_SUNRISEPOINT is not set
diff --git a/config-arm64 b/config-arm64
index 5ad900f8c..d2a723230 100644
--- a/config-arm64
+++ b/config-arm64
@@ -7,13 +7,21 @@ CONFIG_SCHED_SMT=y
 # CONFIG_CPU_BIG_ENDIAN is not set
 
 # arm64 only SoCs
-CONFIG_ARCH_XGENE=y
+CONFIG_ARCH_HISI=y
 CONFIG_ARCH_SEATTLE=y
-# CONFIG_ARCH_THUNDER is not set
+CONFIG_ARCH_XGENE=y
+# CONFIG_ARCH_BCM_IPROC is not set
+# CONFIG_ARCH_BERLIN is not set
 # CONFIG_ARCH_EXYNOS7 is not set
 # CONFIG_ARCH_FSL_LS2085A is not set
+# CONFIG_ARCH_LAYERSCAPE is not set
 # CONFIG_ARCH_MEDIATEK is not set
+# CONFIG_ARCH_QCOM is not set
+# CONFIG_ARCH_SPRD is not set
+# CONFIG_ARCH_STRATIX10 is not set
 # CONFIG_ARCH_TEGRA is not set
+# CONFIG_ARCH_THUNDER is not set
+# CONFIG_ARCH_ZYNQMP is not set
 
 # Erratum
 CONFIG_ARM64_ERRATUM_826319=y
@@ -21,12 +29,24 @@ CONFIG_ARM64_ERRATUM_827319=y
 CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_832075=y
+CONFIG_ARM64_ERRATUM_843419=y
+CONFIG_ARM64_ERRATUM_834220=y
+CONFIG_CAVIUM_ERRATUM_22375=y
+CONFIG_CAVIUM_ERRATUM_23154=y
 
+# AMBA / VExpress
+# CONFIG_RTC_DRV_PL030 is not set
+# CONFIG_SERIAL_AMBA_PL010 is not set
 # CONFIG_AMBA_PL08X is not set
+CONFIG_ARM_SMMU_V3=y
+
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_ARM64_64K_PAGES=y
-# CONFIG_COMPAT is not set
+
+CONFIG_ARM64_HW_AFDBM=y
+CONFIG_ARM64_PAN=y
+CONFIG_ARM64_LSE_ATOMICS=y
 
 CONFIG_BCMA_POSSIBLE=y
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
@@ -37,43 +57,19 @@ CONFIG_CMDLINE="console=ttyAMA0"
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_CONSOLE_TRANSLATIONS=y
 
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CSUM=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_IO=y
-CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_HAVE_NET_DSA=y
-# CONFIG_HUGETLB_PAGE is not set
 CONFIG_HVC_DRIVER=y
+# CONFIG_HVC_DCC is not set
 CONFIG_HZ=100
 
 CONFIG_KVM=y
-CONFIG_KVM_ARM_MAX_VCPUS=8
+CONFIG_KVM_ARM_MAX_VCPUS=16
 
-CONFIG_NFS_ACL_SUPPORT=y
-CONFIG_NFS_COMMON=y
-CONFIG_NFS_DEBUG=y
-# CONFIG_NFSD_FAULT_INJECTION is not set
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFS_USE_KERNEL_DNS=y
-# CONFIG_PL330_DMA is not set
 CONFIG_RCU_FANOUT=64
-# CONFIG_RTC_DRV_PL030 is not set
-CONFIG_RTC_DRV_PL031=y
-CONFIG_SERIAL_8250_DMA=y
-# CONFIG_SERIAL_AMBA_PL010 is not set
 CONFIG_SPARSE_IRQ=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 
 # CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_THERMAL is not set
-CONFIG_VIRTUALIZATION=y
-CONFIG_VM_EVENT_COUNTERS=y
 
 CONFIG_EFI=y
 CONFIG_EFI_VARS=y
@@ -82,54 +78,6 @@ CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
 CONFIG_RTC_DRV_EFI=y
 
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=m
-CONFIG_CRYPTO_SHA2_ARM64_CE=m
-CONFIG_CRYPTO_GHASH_ARM64_CE=m
-CONFIG_CRYPTO_AES_ARM64_CE=m
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
-CONFIG_CRYPTO_CRC32_ARM64=m
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-
-CONFIG_ARM64_CPUIDLE=y
-
-# APM Xgene
-CONFIG_POWER_RESET_XGENE=y
-CONFIG_COMMON_CLK_XGENE=y
-
-CONFIG_AHCI_XGENE=y
-CONFIG_PHY_XGENE=y
-CONFIG_NET_XGENE=y
-CONFIG_RTC_DRV_XGENE=m
-CONFIG_HW_RANDOM_XGENE=m
-CONFIG_GPIO_XGENE=y
-CONFIG_GPIO_XGENE_SB=m
-
-# busted build for various reasons
-#  uses pci_* for some reason to allocate DMA buffers
-# CONFIG_DVB_B2C2_FLEXCOP_USB is not set
-#  weird include chain resulting in missing u64 type
-# CONFIG_USB_SPEEDTOUCH is not set
-#  dma issues in headers
-# CONFIG_PARPORT_PC is not set
-# CONFIG_VGA_CONSOLE is not set
-
-CONFIG_PCI_XGENE=y
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-# CONFIG_HOTPLUG_PCI_SHPC is not set
-
-# CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
-
-# CONFIG_PNP_DEBUG_MESSAGES is not set
-CONFIG_SBSAUART_TTY=y
-CONFIG_I2C_SCMI=m
-CONFIG_SENSORS_ACPI_POWER=m
-
 CONFIG_ACPI=y
 CONFIG_ACPI_PROCFS_POWER=y
 CONFIG_ACPI_EC_DEBUGFS=y
@@ -140,15 +88,75 @@ CONFIG_ACPI_IPMI=y
 CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_HED=m
 CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_ACPI_NFIT=m
+# CONFIG_ACPI_NFIT_DEBUG is not set
+CONFIG_PCC=y
+CONFIG_ACPI_CPPC_CPUFREQ=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_THERMAL=y
+CONFIG_I2C_SCMI=m
+CONFIG_SENSORS_ACPI_POWER=m
 
+CONFIG_ARM64_CRYPTO=y
+CONFIG_CRYPTO_SHA1_ARM64_CE=y
+CONFIG_CRYPTO_SHA2_ARM64_CE=y
+CONFIG_CRYPTO_GHASH_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64_CE=y
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
+CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+CONFIG_CRYPTO_CRC32_ARM64=m
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_CCP_DD=m
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+
+# APM Xgene
+CONFIG_POWER_RESET_XGENE=y
+CONFIG_COMMON_CLK_XGENE=y
+CONFIG_AHCI_XGENE=y
+CONFIG_PHY_XGENE=y
+CONFIG_NET_XGENE=y
+CONFIG_RTC_DRV_XGENE=m
+CONFIG_HW_RANDOM_XGENE=m
+CONFIG_GPIO_XGENE=y
+CONFIG_GPIO_XGENE_SB=m
+CONFIG_XGENE_DMA=m
+CONFIG_EDAC_XGENE=m
+CONFIG_PCI_XGENE=y
+CONFIG_PCI_XGENE_MSI=y
+CONFIG_I2C_XGENE_SLIMPRO=m
+
+# busted build for various reasons
+#  uses pci_* for some reason to allocate DMA buffers
+# CONFIG_DVB_B2C2_FLEXCOP_USB is not set
+#  weird include chain resulting in missing u64 type
+# CONFIG_USB_SPEEDTOUCH is not set
+#  dma issues in headers
+# CONFIG_PARPORT_PC is not set
+# CONFIG_VGA_CONSOLE is not set
+
+# CONFIG_HOTPLUG_PCI_SHPC is not set
+
+# CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
+
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+# AMD Seattle
 CONFIG_NET_SB1000=y
 CONFIG_AMD_XGBE=m
 CONFIG_AMD_XGBE_PHY=m
 # CONFIG_AMD_XGBE_DCB is not set
+# CONFIG_VFIO_PLATFORM_AMDXGBE_RESET is not set
+CONFIG_PINCTRL_AMD=y
 
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_DCB=y
+# HiSilicon
+CONFIG_POWER_RESET_HISI=y
+CONFIG_HISI_THERMAL=m
+CONFIG_STUB_CLK_HI6220=y
+CONFIG_PCI_HISI=y
+
+# ThunderX
+# CONFIG_MDIO_OCTEON is not set
 
 # CONFIG_IMX_THERMAL is not set
 
@@ -158,9 +166,17 @@ CONFIG_DMI_SYSFS=y
 
 CONFIG_SATA_AHCI_PLATFORM=y
 
+CONFIG_LIBNVDIMM=m
+CONFIG_BTT=y
+CONFIG_ND_BTT=m
+CONFIG_ND_BLK=m
+
 # CONFIG_SND_SOC is not set
 
 # CONFIG_PMIC_OPREGION is not set
 # CONFIG_DEBUG_RODATA is not set
 
 CONFIG_DEBUG_SECTION_MISMATCH=y
+
+# CONFIG_FSL_MC_BUS is not set
+# CONFIG_FUJITSU_ES is not set
diff --git a/config-armv7 b/config-armv7
index f27049dca..50c4cc594 100644
--- a/config-armv7
+++ b/config-armv7
@@ -2,11 +2,9 @@
 
 # CONFIG_ARCH_BERLIN is not set
 # CONFIG_ARCH_KEYSTONE is not set
-CONFIG_ARCH_MVEBU=y
 CONFIG_ARCH_MXC=y
 CONFIG_ARCH_OMAP3=y
 CONFIG_ARCH_OMAP4=y
-CONFIG_ARCH_PICOXCELL=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_U8500=y
@@ -18,74 +16,16 @@ CONFIG_ARCH_ZYNQ=y
 # CONFIG_ARM_VIRT_EXT is not set
 # CONFIG_VIRTUALIZATION is not set
 
-# mvebu
-CONFIG_MACH_ARMADA_370=y
-CONFIG_MACH_ARMADA_375=y
-CONFIG_MACH_ARMADA_38X=y
-CONFIG_MACH_ARMADA_XP=y
-CONFIG_MACH_DOVE=y
-
-CONFIG_MVEBU_DEVBUS=y
-CONFIG_PCI_MVEBU=y
-CONFIG_CACHE_TAUROS2=y
-CONFIG_MV_XOR=y
-CONFIG_CRYPTO_DEV_MV_CESA=m
-CONFIG_MV643XX_ETH=m
-CONFIG_PINCTRL_MVEBU=y
-CONFIG_PINCTRL_ARMADA_370=y
-CONFIG_PINCTRL_ARMADA_XP=y
-# CONFIG_ARM_MVEBU_V7_CPUIDLE is not set
-CONFIG_PINCTRL_DOVE=y
-CONFIG_EDAC_MV64X60=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_88PM80X=m
-CONFIG_RTC_DRV_ISL12057=m
-CONFIG_RTC_DRV_MV=m
-CONFIG_RTC_DRV_ARMADA38X=m
-CONFIG_MVNETA=m
-CONFIG_GPIO_MVEBU=y
-CONFIG_MVEBU_CLK_CORE=y
-CONFIG_MVEBU_CLK_COREDIV=y
-CONFIG_MMC_MVSDIO=m
-CONFIG_MMC_SDHCI_DOVE=m
-CONFIG_SPI_ORION=m
-CONFIG_USB_MV_UDC=m
-CONFIG_MVEBU_MBUS=y
-CONFIG_USB_XHCI_MVEBU=m
-CONFIG_PHY_MVEBU_SATA=y
-CONFIG_AHCI_MVEBU=m
-CONFIG_ARMADA_THERMAL=m
-CONFIG_DOVE_THERMAL=m
-CONFIG_DRM_ARMADA=m
-CONFIG_ORION_WATCHDOG=m
-CONFIG_SND_KIRKWOOD_SOC=m
-CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
-CONFIG_USB_EHCI_HCD_ORION=m
-CONFIG_MMC_SDHCI_PXAV3=m
-CONFIG_MVPP2=m
-CONFIG_COMMON_CLK_SI5351=m
-CONFIG_RTC_DRV_ARMADA38X=m
-# CONFIG_CACHE_FEROCEON_L2 is not set
-# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
-
 # omap 
 CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
 CONFIG_SOC_OMAP5=y
 # CONFIG_SOC_DRA7XX is not set
 CONFIG_SOC_OMAP3430=y
-CONFIG_SOC_TI81XX=y
-# CONFIG_MACH_CM_T35 is not set
-# CONFIG_MACH_DEVKIT8000 is not set
+# CONFIG_SOC_TI81XX is not set
 # CONFIG_MACH_NOKIA_RX51 is not set
 # CONFIG_MACH_OMAP_LDP is not set
-# CONFIG_MACH_OMAP3_BEAGLE is not set
 # CONFIG_MACH_OMAP3517EVM is not set
-# CONFIG_MACH_OMAP3530_LV_SOM is not set
 # CONFIG_MACH_OMAP3_PANDORA is not set
-# CONFIG_MACH_OMAP3_TORPEDO is not set
-# CONFIG_MACH_OVERO is not set
-# CONFIG_MACH_SBC3530 is not set
-# CONFIG_MACH_TOUCHBOOK is not set
 
 CONFIG_SOC_HAS_REALTIME_COUNTER=y
 CONFIG_OMAP_RESET_CLOCKS=y
@@ -102,14 +42,16 @@ CONFIG_DMA_OMAP=m
 CONFIG_OMAP_IOMMU=y
 CONFIG_HWSPINLOCK_OMAP=m
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
+# CONFIG_PHY_DM816X_USB is not set
 
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
 CONFIG_SERIAL_8250_OMAP=m
 
+# Needed by omap_hsmmc for card detect on at least the am33xx (BBone) platforms (changed in 4.2)
+CONFIG_GPIO_OMAP=y
 CONFIG_GPIO_TWL4030=m
 CONFIG_GPIO_TWL6040=m
-CONFIG_GPIO_PCF857X=m
 CONFIG_I2C_OMAP=m
 CONFIG_CHARGER_TWL4030=m
 CONFIG_CHARGER_ISP1704=m
@@ -120,6 +62,9 @@ CONFIG_TWL4030_MADC=m
 CONFIG_TWL4030_POWER=y
 CONFIG_TWL4030_WATCHDOG=m
 CONFIG_BATTERY_TWL4030_MADC=m
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=y
+CONFIG_BATTERY_BQ27XXX_PLATFORM=y
 CONFIG_OMAP_USB2=m
 CONFIG_OMAP_CONTROL_PHY=m
 CONFIG_TI_PIPE3=m
@@ -138,9 +83,9 @@ CONFIG_USB_EHCI_HCD_OMAP=m
 CONFIG_USB_OHCI_HCD_OMAP3=m
 CONFIG_USB_MUSB_AM35X=m
 CONFIG_USB_MUSB_OMAP2PLUS=m
+CONFIG_USB_INVENTRA_DMA=y
 CONFIG_USB_DWC3_OMAP=m
 CONFIG_MMC_OMAP=m
-CONFIG_MMC_OMAP_HS=y
 CONFIG_RTC_DRV_MAX8907=m
 # CONFIG_RTC_DRV_TWL92330 is not set
 CONFIG_RTC_DRV_TWL4030=y
@@ -259,7 +204,10 @@ CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
 CONFIG_SND_OMAP_SOC_RX51=m
 CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+CONFIG_SND_SOC_TLV320AIC23_SPI=m
 CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TLV320AIC31XX=m
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SOC_TWL4030=m
 CONFIG_SND_SOC_TWL6040=m
@@ -291,10 +239,10 @@ CONFIG_TI_CPSW=m
 CONFIG_TI_CPSW_PHY_SEL=y
 CONFIG_TI_CPSW_ALE=m
 CONFIG_TI_CPTS=y
-# Builtin needed for BBone White
-CONFIG_REGULATOR_TPS65217=y
 CONFIG_TI_EMIF=m
 CONFIG_DRM_TILCDC=m
+# We only need this until the BBB dts is actually updated
+CONFIG_DRM_TILCDC_SLAVE_COMPAT=y
 CONFIG_SPI_DAVINCI=m
 CONFIG_SND_DAVINCI_SOC=m
 CONFIG_SND_DAVINCI_SOC_I2S=m
@@ -309,7 +257,20 @@ CONFIG_TI_AM335X_ADC=m
 CONFIG_PWM_TIPWMSS=y
 CONFIG_MFD_TPS65218=m
 CONFIG_REGULATOR_TPS65218=m
+CONFIG_INPUT_TPS65218_PWRBUTTON=m
 CONFIG_VIDEO_AM437X_VPFE=m
+CONFIG_UIO_PRUSS=m
+CONFIG_WKUP_M3_RPROC=m
+
+# Builtin needed for BBone White
+CONFIG_MFD_TPS65217=y
+CONFIG_REGULATOR_TPS65217=y
+CONFOG_CHARGER_TPS65217=m
+CONFIG_BACKLIGHT_TPS65217=m
+CONFIG_REGULATOR_TPS65217=m
+
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
 
 # QCom
 CONFIG_ARCH_MSM8X60=y
@@ -317,20 +278,23 @@ CONFIG_ARCH_MSM8960=y
 CONFIG_ARCH_MSM8974=y
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
-CONFIG_SERIAL_MSM_HS=m
 CONFIG_PINCTRL_APQ8064=m
 CONFIG_PINCTRL_APQ8084=m
 CONFIG_PINCTRL_IPQ8064=m
+CONFIG_PINCTRL_MSM8660=m
 CONFIG_PINCTRL_MSM8960=m
 CONFIG_PINCTRL_MSM8X74=m
 CONFIG_PINCTRL_MSM8916=m
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
+CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
 CONFIG_COMMON_CLK_QCOM=m
+# CONFIG_MSM_GCC_8916 is not set
 # CONFIG_IPQ_LCC_806X is not set
 # CONFIG_MSM_LCC_8960 is not set
 CONFIG_MFD_QCOM_RPM=m
 CONFIG_MFD_PM8921_CORE=m
 CONFIG_REGULATOR_QCOM_RPM=m
+CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_APQ_GCC_8084=m
 CONFIG_APQ_MMCC_8084=m
 CONFIG_IPQ_GCC_806X=m
@@ -349,11 +313,12 @@ CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MMC_QCOM_DML=m
 CONFIG_QCOM_BAM_DMA=m
 CONFIG_QCOM_GSBI=m
+CONFIG_QCOM_PM=y
 CONFIG_PHY_QCOM_APQ8064_SATA=m
 CONFIG_PHY_QCOM_IPQ806X_SATA=m
 CONFIG_USB_DWC3_QCOM=m
+CONFIG_DWMAC_IPQ806X=m
 CONFIG_CRYPTO_DEV_QCE=m
-# CONFIG_MSM_IOMMU is not set
 CONFIG_DRM_MSM=m
 CONFIG_DRM_MSM_FBDEV=y
 CONFIG_USB_EHCI_MSM=m
@@ -361,6 +326,7 @@ CONFIG_MFD_PM8XXX=m
 CONFIG_KEYBOARD_PMIC8XXX=m
 CONFIG_INPUT_PM8XXX_VIBRATOR=m
 CONFIG_INPUT_PMIC8XXX_PWRKEY=m
+CONFIG_INPUT_PM8941_PWRKEY=m
 CONFIG_RTC_DRV_PM8XXX=m
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set 
 CONFIG_QCOM_WDT=m
@@ -369,15 +335,34 @@ CONFIG_SPMI=m
 CONFIG_SPMI_MSM_PMIC_ARB=m
 CONFIG_QCOM_SPMI_IADC=m
 CONFIG_QCOM_SPMI_VADC=m
+CONFIG_LEDS_PM8941_WLED=m
+CONFIG_SND_SOC_QCOM=m
+CONFIG_SND_SOC_LPASS_CPU=m
+CONFIG_SND_SOC_LPASS_PLATFORM=m
+CONFIG_SND_SOC_STORM=m
+CONFIG_PHY_QCOM_UFS=m
+CONFIG_HWSPINLOCK_QCOM=m
+CONFIG_QCOM_COINCELL=m
+CONFIG_USB_QCOM_8X16_PHY=m
+CONFIG_QCOM_SMD=m
+CONFIG_QCOM_SMD_RPM=m
+CONFIG_QCOM_SMEM=m
+CONFIG_REGULATOR_QCOM_SMD_RPM=m
+# CONFIG_QCOM_SMEM is not set
+CONFIG_QCOM_SMEM=m
+CONFIG_QCOM_QFPROM=m
 
 # i.MX
 # CONFIG_MXC_DEBUG_BOARD is not set
 CONFIG_SOC_IMX50=y
 CONFIG_SOC_IMX51=y
 CONFIG_SOC_IMX53=y
+CONFIG_SOC_IMX6=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
 CONFIG_SOC_IMX6SX=y
+CONFIG_SOC_IMX6UL=y
+CONFIG_SOC_IMX7D=y
 # CONFIG_SOC_LS1021A is not set
 # CONFIG_SOC_VF610 is not set
 CONFIG_ARM_IMX6Q_CPUFREQ=m
@@ -396,7 +381,11 @@ CONFIG_USB_CHIPIDEA_HOST=y
 # CONFIG_USB_CHIPIDEA_DEBUG is not set
 CONFIG_USB_FSL_USB2=m
 CONFIG_NET_VENDOR_FREESCALE=y
+# CONFIG_GIANFAR is not set
 CONFIG_FEC=m
+# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_XGMAC_MDIO is not set
+CONFIG_KEYBOARD_SNVS_PWRKEY=m
 CONFIG_KEYBOARD_IMX=m
 CONFIG_KEYBOARD_STMPE=m
 CONFIG_TOUCHSCREEN_STMPE=m
@@ -416,10 +405,23 @@ CONFIG_IMX_WEIM=y
 CONFIG_IMX2_WDT=m
 CONFIG_HW_RANDOM_MXC_RNGA=m
 CONFIG_CRYPTO_DEV_SAHARA=m
+CONFIG_CRYPTO_DEV_FSL_CAAM=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=8
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=8192
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
+# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
+# CONFIG_CRYPTO_DEV_MXS_DCP is not set
 CONFIG_RTC_DRV_SNVS=m
+CONFIG_FB_MXS=m
 # CONFIG_FB_MX3 is not set
 # CONFIG_FB_IMX is not set
-# CONFIG_FB_MXS is not set
+CONFIG_TOUCHSCREEN_IMX6UL_TSC=m
+CONFIG_NVMEM_IMX_OCOTP=m
 
 CONFIG_SND_IMX_SOC=m
 CONFIG_SND_SOC_FSL_ASOC_CARD=m
@@ -509,8 +511,6 @@ CONFIG_ARCH_EXYNOS4=y
 CONFIG_SOC_EXYNOS4212=y
 CONFIG_SOC_EXYNOS4412=y
 CONFIG_SOC_EXYNOS4415=y
-CONFIG_ARM_EXYNOS4210_CPUFREQ=y
-CONFIG_ARM_EXYNOS4X12_CPUFREQ=y
 CONFIG_AK8975=m
 CONFIG_CM36651=m
 CONFIG_KEYBOARD_SAMSUNG=m
@@ -555,17 +555,6 @@ CONFIG_SENSORS_AB8500=m
 CONFIG_STE_MODEM_RPROC=m
 CONFIG_STIH415_RESET=y
 
-CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
-CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
-CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
-CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
-CONFIG_IIO_ST_PRESS=m
-CONFIG_IIO_ST_PRESS_I2C=m
-CONFIG_IIO_ST_PRESS_SPI=m
-CONFIG_IIO_ST_SENSORS_I2C=m
-CONFIG_IIO_ST_SENSORS_SPI=m
-CONFIG_IIO_ST_SENSORS_CORE=m
-
 # Allwinner
 CONFIG_MACH_SUN4I=y
 CONFIG_MACH_SUN5I=y
@@ -609,7 +598,7 @@ CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 CONFIG_COMMON_CLK_AXI_CLKGEN=m
 CONFIG_COMMON_CLK_SI570=m
 CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
-CONFIG_ARM_ZYNQ_CPUIDLE=y
+# CONFIG_ARM_ZYNQ_CPUIDLE is not set
 CONFIG_LATTICE_ECP3_CONFIG=m
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=m
@@ -618,7 +607,6 @@ CONFIG_GPIO_ZYNQ=m
 CONFIG_I2C_XILINX=m
 CONFIG_SPI_XILINX=m
 CONFIG_SPI_CADENCE=m
-CONFIG_MMC_SDHCI_OF_ARASAN=m
 CONFIG_I2C_CADENCE=m
 CONFIG_XILINX_WATCHDOG=m
 CONFIG_XILINX_XADC=m
@@ -636,6 +624,7 @@ CONFIG_CADENCE_WATCHDOG=m
 CONFIG_REGULATOR_ISL9305=m
 CONFIG_EDAC_SYNOPSYS=m
 CONFIG_PINCTRL_ZYNQ=y
+CONFIG_AXI_DMAC=m
 
 # Multi function devices
 CONFIG_MFD_88PM800=m
@@ -660,4 +649,3 @@ CONFIG_REGULATOR_MAX8649=m
 CONFIG_REGULATOR_MAX8660=m
 CONFIG_REGULATOR_MAX8907=m
 CONFIG_REGULATOR_MAX8952=m
-CONFIG_REGULATOR_MAX8973=m
diff --git a/config-armv7-generic b/config-armv7-generic
index bf9e95eb0..717c23320 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -14,7 +14,6 @@ CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_NEON=y
 CONFIG_IWMMXT=y
-CONFIG_KERNEL_MODE_NEON=y
 
 CONFIG_ARM_UNWIND=y
 CONFIG_ARM_THUMB=y
@@ -34,6 +33,7 @@ CONFIG_XZ_DEC_ARMTHUMB=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
 CONFIG_IRQ_CROSSBAR=y
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
+CONFIG_CPU_SW_DOMAIN_PAN=y
 
 # CONFIG_MCPM is not set
 # CONFIG_OABI_COMPAT is not set
@@ -50,7 +50,6 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # Platforms enabled/disabled globally on ARMv7
 CONFIG_ARCH_EXYNOS=y
 CONFIG_ARCH_HIGHBANK=y
-CONFIG_ARCH_ROCKCHIP=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
@@ -72,6 +71,11 @@ CONFIG_ARCH_VIRT=y
 # CONFIG_ARCH_VEXPRESS_SPC is not set
 # CONFIG_ARCH_WM8850 is not set
 # CONFIG_ARCH_DIGICOLOR is not set
+# CONFIG_ARCH_ALPINE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_UNIPHIER is not set
+# CONFIG_ARCH_ZX is not set
+# CONFIG_SOC_BRCMSTB is not set
 
 # errata
 # v5/v6
@@ -107,6 +111,7 @@ CONFIG_PJ4B_ERRATA_4742=y
 CONFIG_SMP_ON_UP=y
 CONFIG_HIGHMEM=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ARM_MODULE_PLTS is not set
 
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
@@ -116,19 +121,16 @@ CONFIG_RCU_FANOUT=32
 CONFIG_CHECKPOINT_RESTORE=y
 
 # Power management / thermal / cpu scaling
-CONFIG_CPU_IDLE=y
-# CONFIG_CPU_IDLE_GOV_LADDER is not set
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
-
 CONFIG_PM_OPP=y
 CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_ARM_PSCI=y
 CONFIG_THERMAL=y
 CONFIG_CLOCK_THERMAL=y
-CONFIG_CPUFREQ_DT=y
+# CONFIG_DEVFREQ_THERMAL is not set
+CONFIG_CPUFREQ_DT=m
 # CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
 CONFIG_PM_DEVFREQ=y
+CONFIG_PM_DEVFREQ_EVENT=y
 CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
 CONFIG_DEVFREQ_GOV_PERFORMANCE=y
 CONFIG_DEVFREQ_GOV_POWERSAVE=y
@@ -139,10 +141,10 @@ CONFIG_LSM_MMAP_MIN_ADDR=32768
 
 CONFIG_XZ_DEC_ARM=y
 
-CONFIG_UACCESS_WITH_MEMCPY=y
-
 CONFIG_PCI_HOST_GENERIC=y
 # CONFIG_PCI_LAYERSCAPE is not set
+# Do NOT enable this, it breaks stuff and makes things go slow
+# CONFIG_UACCESS_WITH_MEMCPY is not set
 
 CONFIG_LBDAF=y
 
@@ -155,21 +157,15 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_APPENDED_DTB=y
 
 # General vexpress ARM drivers
-CONFIG_ARM_TIMER_SP804=y
-
 CONFIG_SERIO_AMBAKMI=m
 CONFIG_SERIAL_AMBA_PL010=y
 CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
 
 CONFIG_RTC_DRV_PL030=y
-CONFIG_RTC_DRV_PL031=y
-
-CONFIG_PL330_DMA=m
 CONFIG_AMBA_PL08X=y
-CONFIG_GPIO_PL061=y
-CONFIG_PL320_MBOX=y
 CONFIG_SND_ARMAACI=m
-CONFIG_USB_ISP1760=m
+
+CONFIG_EDAC=y
 
 # highbank
 CONFIG_EDAC_HIGHBANK_MC=m
@@ -177,6 +173,8 @@ CONFIG_EDAC_HIGHBANK_L2=m
 CONFIG_SATA_HIGHBANK=m
 CONFIG_ARM_HIGHBANK_CPUFREQ=m
 # CONFIG_ARM_HIGHBANK_CPUIDLE is not set
+CONFIG_PL320_MBOX=y
+CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET=m
 
 # AllWinner
 # CONFIG_MACH_SUN4I is not set
@@ -185,31 +183,46 @@ CONFIG_MACH_SUN6I=y
 CONFIG_MACH_SUN7I=y
 CONFIG_MACH_SUN8I=y
 # CONFIG_MACH_SUN9I is not set
+CONFIG_SUNXI_SRAM=y
+CONFIG_DMA_SUN4I=m
 CONFIG_DMA_SUN6I=m
 CONFIG_SUNXI_WATCHDOG=m
 CONFIG_NET_VENDOR_ALLWINNER=y
-CONFIG_STMMAC_PLATFORM=m
 CONFIG_EEPROM_SUNXI_SID=m
 CONFIG_RTC_DRV_SUNXI=m
 CONFIG_PHY_SUN4I_USB=m
+# CONFIG_PHY_SUN9I_USB is not set
 CONFIG_AHCI_SUNXI=m
 CONFIG_SPI_SUN4I=m
 CONFIG_SPI_SUN6I=m
 CONFIG_MMC_SUNXI=m
 CONFIG_I2C_SUN6I_P2WI=m
 CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
 CONFIG_TOUCHSCREEN_SUN4I=m
 CONFIG_MFD_AXP20X=y
+CONFIG_AXP20X_POWER=m
+CONFIG_INPUT_AXP20X_PEK=m
 CONFIG_REGULATOR_AXP20X=m
+CONFIG_AXP288_FUEL_GAUGE=m
+CONFIG_AXP288_ADC=m
+CONFIG_EXTCON_AXP288=m
+CONFIG_AXP288_CHARGER=m
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m
 CONFIG_IR_SUNXI=m
 CONFIG_MDIO_SUN4I=m
+CONFIG_DWMAC_SUNXI=m
 CONFIG_SUN4I_EMAC=m
 CONFIG_RTC_DRV_SUN6I=m
-CONFIG_AXP288_ADC=m
 CONFIG_MTD_NAND_SUNXI=m
 CONFIG_SERIO_SUN4I_PS2=m
 CONFIG_KEYBOARD_SUN4I_LRADC=m
 CONFIG_PWM_SUN4I=m
+CONFIG_USB_MUSB_SUNXI=m
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_SND_SUN4I_CODEC=m
+CONFIG_SUNXI_RSB=m
+CONFIG_NVMEM_SUNXI_SID=m
 
 # Exynos
 CONFIG_ARCH_EXYNOS3=y
@@ -224,13 +237,12 @@ CONFIG_SOC_EXYNOS5410=y
 CONFIG_SOC_EXYNOS5800=y
 CONFIG_SERIAL_SAMSUNG=y
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-CONFIG_ARM_EXYNOS5250_CPUFREQ=y
-CONFIG_ARM_EXYNOS5440_CPUFREQ=y
+CONFIG_ARM_EXYNOS5440_CPUFREQ=m
 CONFIG_ARM_EXYNOS_CPU_FREQ_BOOST_SW=y
-CONFIG_ARM_EXYNOS_CPUIDLE=y
+# CONFIG_ARM_EXYNOS_CPUIDLE is not set
 CONFIG_ARM_EXYNOS5_BUS_DEVFREQ=m
 # CONFIG_EXYNOS5420_MCPM not set
-CONFIG_ARM_EXYNOS_CPUFREQ=m
+CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
 
 CONFIG_I2C_EXYNOS5=m
 CONFIG_I2C_S3C2410=m
@@ -240,7 +252,7 @@ CONFIG_EXYNOS_ADC=m
 CONFIG_MMC_SDHCI_S3C=m
 CONFIG_MMC_SDHCI_S3C_DMA=y
 CONFIG_MMC_DW_EXYNOS=m
-CONFIG_EXYNOS_IOMMU=y
+# CONFIG_EXYNOS_IOMMU is not set
 CONFIG_PCI_EXYNOS=y
 CONFIG_PHY_EXYNOS5_USBDRD=m
 CONFIG_PHY_SAMSUNG_USB2=m
@@ -270,14 +282,17 @@ CONFIG_DRM_EXYNOS_DPI=y
 CONFIG_DRM_EXYNOS_DSI=y
 CONFIG_DRM_EXYNOS_FIMC=y
 CONFIG_DRM_EXYNOS_FIMD=y
+CONFIG_DRM_EXYNOS5433_DECON=y
+CONFIG_DRM_EXYNOS_MIC=y
 CONFIG_DRM_EXYNOS7_DECON=y
 CONFIG_DRM_EXYNOS_G2D=y
 CONFIG_DRM_EXYNOS_GSC=y
 CONFIG_DRM_EXYNOS_HDMI=y
-CONFIG_DRM_EXYNOS_IOMMU=y
+# CONFIG_DRM_EXYNOS_IOMMU is not set
 CONFIG_DRM_EXYNOS_IPP=y
 CONFIG_DRM_EXYNOS_ROTATOR=y
 CONFIG_DRM_EXYNOS_VIDI=y
+CONFIG_DRM_EXYNOS_MIXER=y
 CONFIG_PHY_EXYNOS_DP_VIDEO=m
 # CONFIG_FB_S3C is not set
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
@@ -320,30 +335,8 @@ CONFIG_LEDS_MAX8997=m
 CONFIG_RTC_DRV_MAX8997=m
 CONFIG_RTC_DRV_MAX77686=m
 CONFIG_RTC_DRV_MAX77802=m
-CONFIG_RTC_DRV_RK808=m
 CONFIG_EXTCON_MAX8997=m
 
-# Rockchips
-CONFIG_I2C_RK3X=m
-CONFIG_SPI_ROCKCHIP=m
-CONFIG_PWM_ROCKCHIP=m
-CONFIG_ROCKCHIP_SARADC=m
-CONFIG_ROCKCHIP_IODOMAIN=m
-CONFIG_MMC_DW_ROCKCHIP=m
-CONFIG_EMAC_ROCKCHIP=m
-CONFIG_MFD_RK808=m
-CONFIG_COMMON_CLK_RK808=m
-CONFIG_REGULATOR_RK808=m
-CONFIG_RTC_DRV_HYM8563=m
-CONFIG_ROCKCHIP_SARADC=m
-CONFIG_ROCKCHIP_IOMMU=y
-CONFIG_SND_SOC_ROCKCHIP=m
-CONFIG_SND_SOC_ROCKCHIP_I2S=m
-CONFIG_ROCKCHIP_THERMAL=m
-CONFIG_DRM_ROCKCHIP=m
-CONFIG_ROCKCHIP_DW_HDMI=m
-CONFIG_PHY_ROCKCHIP_USB=m
-
 # Tegra
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
@@ -382,7 +375,10 @@ CONFIG_AD525X_DPOT_I2C=m
 CONFIG_AD525X_DPOT_SPI=m
 CONFIG_TEGRA_SOCTHERM=m
 CONFIG_TEGRA_MC=y
+CONFIG_TEGRA124_EMC=y
 CONFIG_ARM_TEGRA_DEVFREQ=m
+# CONFIG_ARM_TEGRA20_CPUFREQ is not set
+CONFIG_ARM_TEGRA124_CPUFREQ=m
 
 # Jetson TK1
 CONFIG_PINCTRL_AS3722=y
@@ -394,6 +390,62 @@ CONFIG_RTC_DRV_AS3722=y
 # TI Generic
 CONFIG_TI_SOC_THERMAL=m
 CONFIG_TI_THERMAL=y
+# CONFIG_OMAP3_THERMAL is not set
+CONFIG_MMC_OMAP_HS=m
+
+# mvebu
+CONFIG_ARCH_MVEBU=y
+CONFIG_MACH_ARMADA_370=y
+CONFIG_MACH_ARMADA_375=y
+CONFIG_MACH_ARMADA_38X=y
+CONFIG_MACH_ARMADA_39X=y
+CONFIG_MACH_ARMADA_XP=y
+CONFIG_MACH_DOVE=y
+
+CONFIG_MVEBU_DEVBUS=y
+CONFIG_PCI_MVEBU=y
+CONFIG_CACHE_TAUROS2=y
+CONFIG_MV_XOR=y
+CONFIG_CRYPTO_DEV_MV_CESA=m
+CONFIG_CRYPTO_DEV_MARVELL_CESA=m
+CONFIG_MV643XX_ETH=m
+CONFIG_PINCTRL_MVEBU=y
+CONFIG_PINCTRL_ARMADA_370=y
+CONFIG_PINCTRL_ARMADA_XP=y
+# CONFIG_ARM_MVEBU_V7_CPUIDLE is not set
+CONFIG_PINCTRL_DOVE=y
+CONFIG_EDAC_MV64X60=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_88PM80X=m
+CONFIG_RTC_DRV_ISL12057=m
+CONFIG_RTC_DRV_MV=m
+CONFIG_RTC_DRV_ARMADA38X=m
+CONFIG_MVNETA=m
+CONFIG_GPIO_MVEBU=y
+CONFIG_MVEBU_CLK_CORE=y
+CONFIG_MVEBU_CLK_COREDIV=y
+CONFIG_MMC_MVSDIO=m
+CONFIG_MMC_SDHCI_DOVE=m
+CONFIG_SPI_ORION=m
+CONFIG_USB_MV_UDC=m
+CONFIG_MVEBU_MBUS=y
+CONFIG_USB_XHCI_MVEBU=m
+CONFIG_PHY_MVEBU_SATA=y
+CONFIG_AHCI_MVEBU=m
+CONFIG_ARMADA_THERMAL=m
+CONFIG_DOVE_THERMAL=m
+CONFIG_DRM_ARMADA=m
+CONFIG_ORION_WATCHDOG=m
+CONFIG_SND_KIRKWOOD_SOC=m
+CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
+CONFIG_USB_EHCI_HCD_ORION=m
+CONFIG_MMC_SDHCI_PXAV3=m
+CONFIG_MVPP2=m
+CONFIG_COMMON_CLK_SI5351=m
+CONFIG_RTC_DRV_ARMADA38X=m
+# CONFIG_CACHE_FEROCEON_L2 is not set
+# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
+CONFIG_LEDS_NS2=m
 
 # DRM panels
 CONFIG_DRM_PANEL=y
@@ -401,7 +453,11 @@ CONFIG_DRM_PANEL_SIMPLE=m
 CONFIG_DRM_PANEL_LD9040=m
 CONFIG_DRM_PANEL_S6E8AA0=m
 CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
+CONFIG_DRM_PANEL_LG_LG4573=m
+CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 CONFIG_DRM_DW_HDMI=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 
 # regmap
 CONFIG_REGMAP_SPI=m
@@ -423,8 +479,7 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_DUAL_ROLE=y
 CONFIG_USB_MUSB_DSPS=m
-# Use PIO on musb as upstream doesn't support multiple DMA engines yet :-/
-CONFIG_MUSB_PIO_ONLY=y
+# CONFIG_MUSB_PIO_ONLY is not set
 # CONFIG_USB_MUSB_TUSB6010 is not set
 # CONFIG_USB_MUSB_UX500 is not set
 CONFIG_USB_GPIO_VBUS=m
@@ -445,6 +500,7 @@ CONFIG_USB_CONFIGFS_SERIAL=y
 # CONFIG_USB_CONFIGFS_F_MIDI is not set
 # CONFIG_USB_CONFIGFS_F_HID is not set
 # CONFIG_USB_CONFIGFS_F_UVC is not set
+# CONFIG_USB_CONFIGFS_F_PRINTER is not set
 
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -467,7 +523,6 @@ CONFIG_USB_CONFIGFS_SERIAL=y
 
 # Multifunction Devices
 CONFIG_MFD_TPS65090=y
-CONFIG_MFD_TPS65217=y
 CONFIG_MFD_TPS65910=y
 CONFIG_MFD_TPS65912=y
 CONFIG_MFD_TPS65912_I2C=y
@@ -488,11 +543,7 @@ CONFIG_MFD_TPS65912_SPI=y
 # 
 
 # Pin stuff
-CONFIG_PINMUX=y
-CONFIG_PINCONF=y
-CONFIG_PINCTRL=y
-CONFIG_PINCTRL_SINGLE=y
-CONFIG_GENERIC_PINCONF=y
+# CONFIG_PINCTRL_AMD is not set
 # CONFIG_PINCTRL_SAMSUNG is not set
 # CONFIG_PINCTRL_MSM8X74 is not set
 # CONFIG_PINCTRL_BCM281XX is not set
@@ -500,6 +551,7 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_APQ8084 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
 # CONFIG_PINCTRL_MSM8960 is not set
+# CONFIG_PINCTRL_MSM8660 is not set
 
 # GPIO
 # CONFIG_GPIO_EM is not set
@@ -518,8 +570,6 @@ CONFIG_INPUT_GPIO=m
 CONFIG_INPUT_GPIO_BEEPER=m
 CONFIG_INPUT_GPIO_TILT_POLLED=m
 CONFIG_INPUT_MATRIXKMAP=m
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_GPIO_POLLED=m
 CONFIG_KEYBOARD_MATRIX=m
 # CONFIG_GPIO_RCAR is not set
 CONFIG_W1_MASTER_GPIO=m
@@ -540,35 +590,23 @@ CONFIG_SPI_TLE62X0=m
 CONFIG_SPI_XCOMM=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_CADENCE is not set
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
 
 CONFIG_NFC_NCI_SPI=y
 
 # i2c
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
 CONFIG_I2C_MV64XXX=m
 
 # HW crypto and rng
-CONFIG_CRYPTO_SHA1_ARM=m
-CONFIG_CRYPTO_AES_ARM=m
-# CONFIG_CRYPTO_AES_ARM_BS is not set
-CONFIG_CRYPTO_SHA1_ARM_NEON=m
-CONFIG_CRYPTO_SHA512_ARM_NEON=m
+# CONFIG_CRYPTO_SHA1_ARM_CE is not set
+# CONFIG_CRYPTO_SHA2_ARM_CE is not set
+# CONFIG_CRYPTO_AES_ARM_CE is not set
+# CONFIG_CRYPTO_GHASH_ARM_CE is not set
 
 # DMA
 CONFIG_TI_PRIV_EDMA=y
 CONFIG_TI_EDMA=y
 
-# EDAC
-CONFIG_EDAC=y
-CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_LEGACY_SYSFS=y
-
-# Watchdog
-
-# Mailbox
-CONFIG_MAILBOX=y
-
 # MTD
 # CONFIG_MG_DISK is not set
 CONFIG_MTD_DATAFLASH=m
@@ -589,6 +627,7 @@ CONFIG_MTD_NAND_PLATFORM=m
 CONFIG_MTD_NAND_PXA3xx=m
 CONFIG_MTD_NAND_RICOH=m
 CONFIG_MTD_NAND_TMIO=m
+# CONFIG_MTD_NAND_BRCMNAND is not set
 CONFIG_MTD_SPI_NOR=m
 # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
 CONFIG_MTD_SPINAND_MT29F=m
@@ -601,9 +640,7 @@ CONFIG_EEPROM_93XX46=m
 # Sound
 CONFIG_SND_ARM=y
 CONFIG_SND_SOC_AC97_BUS=y
-
-# Displays
-CONFIG_BACKLIGHT_TPS65217=m
+CONFIG_SND_SOC_AC97_CODEC=y
 
 # RTC
 CONFIG_RTC_DRV_DS1305=m
@@ -662,6 +699,7 @@ CONFIG_REGULATOR_DA9211=m
 CONFIG_REGULATOR_ISL9305=m
 CONFIG_REGULATOR_MAX77802=m
 CONFIG_REGULATOR_PWM=m
+# CONFIG_REGULATOR_MT6311 is not set
 CONFIG_SENSORS_LTC2978_REGULATOR=y
 
 CONFIG_POWER_AVS=y
@@ -680,9 +718,11 @@ CONFIG_TMP006=m
 CONFIG_BMP085=y
 CONFIG_BMP085_I2C=m
 CONFIG_BMP085_SPI=m
+CONFIG_BMP280=m
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_ADCXX=m
 CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_BH1780=m
 CONFIG_SENSORS_GPIO_FAN=m
 CONFIG_SENSORS_HTU21=m
 CONFIG_SENSORS_ISL29018=m
@@ -690,6 +730,11 @@ CONFIG_SENSORS_ISL29028=m
 CONFIG_SENSORS_LIS3_SPI=m
 CONFIG_SENSORS_LM70=m
 CONFIG_SENSORS_MAX1111=m
+CONFIG_MPL115=m
+CONFIG_MPL3115=m
+CONFIG_DHT11=m
+CONFIG_SI7005=m
+CONFIG_SI7020=m
 
 CONFIG_LCD_L4F00242T03=m
 CONFIG_LCD_LMS283GF05=m
@@ -708,7 +753,6 @@ CONFIG_LCD_HX8357=m
 CONFIG_INPUT_GP2A=m
 CONFIG_INPUT_ARIZONA_HAPTICS=m
 CONFIG_INPUT_MC13783_PWRBUTTON=m
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
 
 CONFIG_TOUCHSCREEN_ADS7846=m
 CONFIG_TOUCHSCREEN_AD7877=m
@@ -735,7 +779,6 @@ CONFIG_LIBERTAS_SPI=m
 CONFIG_P54_SPI=m
 CONFIG_P54_SPI_DEFAULT_EEPROM=n
 CONFIG_MICREL_KS8995MA=m
-CONFIG_IEEE802154_AT86RF230=m
 CONFIG_IEEE802154_MRF24J40=m
 
 CONFIG_ARM_KPROBES_TEST=m
@@ -760,9 +803,6 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
 
-# Sensors
-CONFIG_SENSORS_HTU21=m
-
 # Chromebook
 CONFIG_MFD_CROS_EC=m
 CONFIG_MFD_CROS_EC_I2C=m
@@ -770,6 +810,27 @@ CONFIG_MFD_CROS_EC_SPI=m
 CONFIG_KEYBOARD_CROS_EC=m
 CONFIG_I2C_CROS_EC_TUNNEL=m
 CONFIG_SND_SOC_TS3A227E=m
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_PROTO=y
+
+# This newly introduced mess needs to be fixed upstream :-(
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_DWMAC_GENERIC=m
+# CONFIG_DWMAC_IPQ806X is not set
+# CONFIG_DWMAC_LPC18XX is not set
+# CONFIG_DWMAC_MESON is not set
+# CONFIG_DWMAC_SOCFPGA is not set
+# CONFIG_DWMAC_STI is not set
+
+CONFIG_R8188EU=m
+
+# CONFIG_88EU_AP_MODE is not set
+
+# CAN drivers
+# CONFIG_CAN_TI_HECC is not set
+# CONFIG_CAN_FLEXCAN is not set
+# CONFIG_CAN_RCAR is not set
+# CONFIG_CAN_MCP251X is not set
 
 # Needs work/investigation
 # CONFIG_ARM_KPROBES_TEST is not set
@@ -778,6 +839,7 @@ CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_DRM_TILCDC is not set
 # CONFIG_DRM_IMX is not set
 # CONFIG_DRM_STI is not set
+# CONFIG_DRM_FSL_DCU is not set
 # CONFIG_AHCI_IMX is not set
 # CONFIG_IMX_THERMAL is not set
 # CONFIG_TI_DAC7512 is not set
@@ -800,6 +862,7 @@ CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SERIAL_MAX310X is not set
 # CONFIG_SERIAL_IFX6X60 is not set
 # CONFIG_SERIAL_BCM63XX is not set
+# CONFIG_SERIAL_STM32 is not set
 # CONFIG_FB_XILINX is not set
 # CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_BRCMSTB_GISB_ARB is not set
@@ -810,7 +873,6 @@ CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SCSI_ACARD is not set
 # CONFIG_SFC is not set
 # CONFIG_SND_ALI5451 is not set
-# CONFIG_MLX4_EN is not set
 # CONFIG_POWER_RESET_QNAP is not set
 # CONFIG_MMC_TMIO is not set
 # CONFIG_PINCTRL_IMX35 is not set
@@ -826,10 +888,13 @@ CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_INPUT_REGULATOR_HAPTIC is not set
-# CONFIG_INPUT_AXP20X_PEK is not set
 # CONFIG_POWER_RESET_BRCMSTB is not set
 # CONFIG_INPUT_TPS65218_PWRBUTTON is not set
 # CONFIG_CLK_QORIQ is not set
+# CONFIG_QORIQ_CPUFREQ is not set
+# CONFIG_QCOM_SPMI_TEMP_ALARM is not set
+# CONFIG_SND_SOC_APQ8016_SBC is not set
+# CONFIG_SND_SOC_TAS571X is not set
 
 # Debug options. We need to deal with them at some point like x86
 # CONFIG_DEBUG_USER is not set
@@ -841,3 +906,8 @@ CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_CRYPTO_DEV_UX500_DEBUG is not set
 # CONFIG_AB8500_DEBUG is not set
 # CONFIG_ARM_KERNMEM_PERMS is not set
+
+# CONFIG_VFIO_PLATFORM_AMDXGBE_RESET is not set
+
+# Altera?
+# CONFIG_PCIE_ALTERA is not set
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 87a209a2f..483c49960 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -1,7 +1,6 @@
 # ARM A15 lpae unified arch kernel
 CONFIG_ARCH_KEYSTONE=y
 
-# CONFIG_ARCH_MVEBU is not set
 # CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_OMAP3 is not set
 # CONFIG_ARCH_OMAP4 is not set
@@ -13,10 +12,10 @@ CONFIG_ARCH_KEYSTONE=y
 # CONFIG_ARCH_AXXIA is not set
 
 CONFIG_ARM_LPAE=y
+# CONFIG_CPU_SW_DOMAIN_PAN is not set
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_ARM_VIRT_EXT=y
-CONFIG_VIRTUALIZATION=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 
 CONFIG_CMA_SIZE_SEL_MBYTES=y
@@ -29,7 +28,6 @@ CONFIG_ARM_ERRATA_773022=y
 CONFIG_KVM=y
 CONFIG_KVM_ARM_HOST=y
 CONFIG_KVM_ARM_MAX_VCPUS=8
-CONFIG_KVM_ARM_TIMER=y
 
 # CONFIG_XEN is not set
 CONFIG_XEN_FBDEV_FRONTEND=y
@@ -54,7 +52,7 @@ CONFIG_XEN_WDT=m
 CONFIG_KEYSTONE_USB_PHY=m
 CONFIG_USB_DWC3_KEYSTONE=m
 CONFIG_GPIO_DAVINCI=y
-CONFIG_I2C_DAVINCI=m
+# CONFIG_I2C_DAVINCI is not set
 CONFIG_TI_AEMIF=m
 CONFIG_POWER_RESET_KEYSTONE=y
 CONFIG_DAVINCI_WATCHDOG=m
diff --git a/config-debug b/config-debug
index fcc5aac03..d733183a2 100644
--- a/config-debug
+++ b/config-debug
@@ -31,7 +31,7 @@ CONFIG_LOCK_STAT=y
 CONFIG_DEBUG_STACK_USAGE=y
 
 CONFIG_ACPI_DEBUG=y
-
+# CONFIG_ACPI_DEBUGGER is not set
 CONFIG_DEBUG_SG=y
 CONFIG_DEBUG_PI_LIST=y
 
@@ -90,7 +90,7 @@ CONFIG_RTLWIFI_DEBUG=y
 CONFIG_DEBUG_OBJECTS_WORK=y
 
 CONFIG_DMADEVICES_DEBUG=y
-CONFIG_DMADEVICES_VDEBUG=y
+# CONFIG_DMADEVICES_VDEBUG is not set
 
 CONFIG_PM_ADVANCED_DEBUG=y
 
@@ -126,5 +126,3 @@ CONFIG_EDAC_DEBUG=y
 CONFIG_SPI_DEBUG=y
 
 CONFIG_X86_DEBUG_STATIC_CPU_HAS=y
-CONFIG_LATENCYTOP=y
-CONFIG_SCHEDSTATS=y
diff --git a/config-generic b/config-generic
index c84ee3f58..f796b90f2 100644
--- a/config-generic
+++ b/config-generic
@@ -51,7 +51,10 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_FUTEX=y
+# CONFIG_FAIL_FUTEX is not set
 CONFIG_EPOLL=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_USERFAULTFD=y
 CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
@@ -66,6 +69,7 @@ CONFIG_NET_NS=y
 CONFIG_USER_NS=y
 
 CONFIG_POSIX_MQUEUE=y
+CONFIG_KDBUS=m
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
@@ -103,6 +107,8 @@ CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIE_ECRC=y
 CONFIG_PCIEAER_INJECT=m
+CONFIG_HOTPLUG_PCI=y
+# CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_PCIE=y
 
 # CONFIG_SGI_IOC4 is not set
@@ -140,6 +146,8 @@ CONFIG_MMC_TIFM_SD=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMC_VIA_SDMMC=m
 CONFIG_MMC_SDHCI_PLTFM=m
+# CONFIG_MMC_SDHCI_OF is not set
+# CONFIG_MMC_SDHCI_OF_AT91 is not set
 CONFIG_MMC_CB710=m
 CONFIG_MMC_RICOH_MMC=y
 CONFIG_MMC_USHC=m
@@ -147,11 +155,12 @@ CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_VUB300=m
 CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_MTK=m
 # CONFIG_MMC_SPI is not set
 # CONFIG_MMC_SDHCI_OF_ARASAN is not set
 # CONFIG_MMC_SDHCI_F_SDH30 is not set
 # CONFIG_MMC_USDHI6ROL0 is not set
-
+# CONFIG_MMC_SDHCI_OF_ESDHC is not set
 
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
@@ -168,24 +177,24 @@ CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-CONFIG_INFINIBAND_IPATH=m
+# Deprecated and moved to staging
+# CONFIG_INFINIBAND_IPATH is not set
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_ISERT=m
-CONFIG_INFINIBAND_AMSO1100=m
+# Deprecated and moved to staging
+# CONFIG_INFINIBAND_AMSO1100 is not set
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
 CONFIG_INFINIBAND_CXGB3=m
 CONFIG_INFINIBAND_CXGB4=m
 CONFIG_SCSI_CXGB3_ISCSI=m
 CONFIG_SCSI_CXGB4_ISCSI=m
 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_MLX5_INFINIBAND=m
 CONFIG_INFINIBAND_NES=m
 # CONFIG_INFINIBAND_NES_DEBUG is not set
 CONFIG_INFINIBAND_QIB=m
 CONFIG_INFINIBAND_QIB_DCA=y
-# CONFIG_INFINIBAND_OCRDMA is not set
-# CONFIG_INFINIBAND_USNIC is not set
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_USNIC=m
 
 #
 # Executable file formats
@@ -202,6 +211,10 @@ CONFIG_BINFMT_MISC=m
 
 # CONFIG_COMMON_CLK_SI5351 is not set
 # CONFIG_COMMON_CLK_CDCE706 is not set
+# CONFIG_COMMON_CLK_PWM is not set
+# CONFIG_COMMON_CLK_CDCE925 is not set
+# CONFIG_COMMON_CLK_HI6220 is not set
+# 
 
 #
 # Generic Driver Options
@@ -264,6 +277,7 @@ CONFIG_MTD=m
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
 # CONFIG_MTD_SWAP is not set
+# CONFIG_MTD_PARTITIONED_MASTER is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -311,6 +325,8 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_NAND_ECC_BCH is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_HISI504 is not set
+# CONFIG_MTD_NAND_DENALI_PCI is not set
+# CONFIG_MTD_NAND_DENALI_DT is not set
 # CONFIG_MTD_LPDDR is not set
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
@@ -335,6 +351,15 @@ CONFIG_ACPI_PCI_SLOT=y
 CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
+# CONFIG_ACPI_NFIT is not set
+# CONFIG_LIBNVDIMM is not set
+# CONFIG_ND_BLK is not set
+# CONFIG_BTT is not set
+
+# CONFIG_NVMEM is not set
+
+# CONFIG_FPGA is not set
+
 #
 # Block devices
 #
@@ -364,8 +389,10 @@ CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_BLK_DEV_PMEM=m
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_BLK_DEV_RAM_DAX=y
 
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
@@ -382,11 +409,13 @@ CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_RSXX is not set
 
+CONFIG_VIRTUALIZATION=y
 CONFIG_SCSI_VIRTIO=m
 CONFIG_VIRTIO_BLK=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_PCI_LEGACY=y
 CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
 CONFIG_VIRTIO_NET=m
@@ -394,6 +423,7 @@ CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VHOST_NET=m
 CONFIG_VHOST_SCSI=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
 
 #
 # SCSI device support
@@ -552,6 +582,10 @@ CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 CONFIG_FCOE=m
 CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+
+# CONFIG_NVM is not set
 
 CONFIG_ATA=y
 CONFIG_ATA_BMDMA=y
@@ -564,6 +598,7 @@ CONFIG_BLK_DEV_SX8=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=y
 CONFIG_SATA_AHCI_PLATFORM=m
+# CONFIG_AHCI_CEVA is not set
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
@@ -642,6 +677,7 @@ CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
 CONFIG_MD_AUTODETECT=y
 CONFIG_MD_FAULTY=m
+# CONFIG_MD_CLUSTER is not set
 CONFIG_MD_LINEAR=m
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_RAID0=m
@@ -655,6 +691,7 @@ CONFIG_BCACHE=m
 
 CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_MQ_DEFAULT is not set
 CONFIG_DM_CRYPT=m
 CONFIG_DM_DEBUG=y
 CONFIG_DM_DELAY=m
@@ -664,6 +701,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_MQ=m
+CONFIG_DM_CACHE_SMQ=m
 CONFIG_DM_CACHE_CLEANER=m
 # CONFIG_DM_ERA is not set
 # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
@@ -676,6 +714,7 @@ CONFIG_DM_RAID=m
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
 CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
 
 #
 # Fusion MPT device support
@@ -727,6 +766,7 @@ CONFIG_TCP_CONG_HSTCP=m
 CONFIG_TCP_CONG_HYBLA=m
 CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
 CONFIG_TCP_CONG_LP=m
 CONFIG_TCP_CONG_SCALABLE=m
 CONFIG_TCP_CONG_VEGAS=m
@@ -770,6 +810,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_NET_IPVTI=m
 CONFIG_NET_FOU=m
 CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_GENEVE_CORE=m
 CONFIG_GENEVE=m
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
@@ -790,6 +831,7 @@ CONFIG_IP_VS_PROTO_ESP=y
 CONFIG_IP_VS_PROTO_AH=y
 CONFIG_IP_VS_PROTO_SCTP=y
 CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
 CONFIG_IP_VS_IPV6=y
 CONFIG_IP_VS_RR=m
 CONFIG_IP_VS_WRR=m
@@ -818,6 +860,7 @@ CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_ILA=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
@@ -850,11 +893,13 @@ CONFIG_NETWORK_PHY_TIMESTAMPING=y
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_ADVANCED=y
 CONFIG_NF_CONNTRACK=m
+CONFIG_NETFILTER_INGRESS=y
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_ACCT=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
 CONFIG_NETFILTER_NETLINK_LOG=m
+# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
 CONFIG_NETFILTER_XTABLES=y
 CONFIG_NETFILTER_XT_SET=m
 CONFIG_NETFILTER_XT_MARK=m
@@ -1023,6 +1068,7 @@ CONFIG_IP6_NF_TARGET_MASQUERADE=m
 # nf_tables support
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_INET=m
+CONFIG_NF_TABLES_NETDEV=m
 CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_META=m
 CONFIG_NFT_CT=m
@@ -1043,8 +1089,12 @@ CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NF_TABLES_IPV4=m
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 CONFIG_NF_TABLES_ARP=m
@@ -1149,6 +1199,7 @@ CONFIG_IP_DCCP_CCID3=y
 #
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
+CONFIG_TIPC_MEDIA_UDP=y
 
 CONFIG_NETLABEL=y
 
@@ -1185,6 +1236,7 @@ CONFIG_NET_CLS_ACT=y
 CONFIG_NET_CLS_BASIC=m
 CONFIG_NET_CLS_CGROUP=y
 CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_IND=y
@@ -1203,6 +1255,7 @@ CONFIG_NET_EMATCH_NBYTE=m
 CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_TEXT=m
 CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_CANID=m
 CONFIG_NET_EMATCH_U32=m
 
 CONFIG_NET_ACT_CSUM=m
@@ -1229,6 +1282,7 @@ CONFIG_BATMAN_ADV_MCAST=y
 
 # CONFIG_BATMAN_ADV_DEBUG is not set
 CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_CONNTRACK=y
 CONFIG_OPENVSWITCH_GRE=y
 CONFIG_OPENVSWITCH_VXLAN=y
 CONFIG_OPENVSWITCH_GENEVE=y
@@ -1264,8 +1318,10 @@ CONFIG_IPVLAN=m
 CONFIG_VXLAN=m
 CONFIG_EQUALIZER=m
 CONFIG_TUN=m
+# CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=m
 CONFIG_NLMON=m
+CONFIG_NET_VRF=m
 
 #
 # ATM
@@ -1319,6 +1375,8 @@ CONFIG_L2TP_ETH=m
 
 # CONFIG_CAIF is not set
 
+CONFIG_LWTUNNEL=y
+
 CONFIG_RFKILL=m
 CONFIG_RFKILL_GPIO=m
 CONFIG_RFKILL_INPUT=y
@@ -1359,20 +1417,22 @@ CONFIG_ATL1=m
 CONFIG_ATL1C=m
 CONFIG_ATL1E=m
 CONFIG_NET_CADENCE=y
-CONFIG_ARM_AT91_ETHER=m
 CONFIG_MACB=m
 
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
 CONFIG_NET_CALXEDA_XGMAC=m
 
+# CONFIG_NET_VENDOR_CAVIUM is not set
+
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T3=m
 CONFIG_CHELSIO_T4=m
 CONFIG_CHELSIO_T4VF=m
-# CONFIG_CHELSIO_T4_DCB is not set
+CONFIG_CHELSIO_T4_DCB=y
+# CONFIG_CHELSIO_T4_FCOE is not set
 
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
@@ -1404,12 +1464,14 @@ CONFIG_SUNDANCE=m
 CONFIG_NET_VENDOR_EMULEX=y
 CONFIG_BE2NET=m
 CONFIG_BE2NET_VXLAN=y
+# CONFIG_BE2NET_HWMON is not set
 
 CONFIG_NET_VENDOR_EXAR=y
 CONFIG_S2IO=m
 CONFIG_VXGE=m
 # CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 
+# CONFIG_NET_VENDOR_EZCHIP is not set
 # CONFIG_NET_VENDOR_FARADAY is not set
 # CONFIG_NET_VENDOR_FUJITSU is not set
 # CONFIG_NET_VENDOR_HISILICON is not set
@@ -1486,6 +1548,8 @@ CONFIG_QLCNIC_VXLAN=y
 CONFIG_QLCNIC_HWMON=y
 CONFIG_QLGE=m
 CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QEDE=m
 
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 
@@ -1501,6 +1565,8 @@ CONFIG_R8169=m
 
 CONFIG_SH_ETH=m
 
+# CONFIG_NET_VENDOR_RENESAS is not set
+
 CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=m
 
@@ -1535,6 +1601,9 @@ CONFIG_SUNGEM=m
 CONFIG_CASSINI=m
 CONFIG_NIU=m
 
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
+# CONFIG_SYNOPSYS_DWC_ETH_QOS is not set
+
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 
@@ -1561,6 +1630,7 @@ CONFIG_BCM87XX_PHY=m
 CONFIG_CICADA_PHY=m
 CONFIG_DAVICOM_PHY=m
 CONFIG_DP83640_PHY=m
+CONFIG_MICROCHIP_PHY=m
 CONFIG_FIXED_PHY=y
 CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BCM_UNIMAC=m
@@ -1577,7 +1647,11 @@ CONFIG_SMSC_PHY=m
 CONFIG_STE10XP=m
 CONFIG_VITESSE_PHY=m
 CONFIG_MICREL_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_DP83848_PHY=m
 # CONFIG_MICREL_KS8995MA is not set
+CONFIG_AQUANTIA_PHY=m
+CONFIG_TERANETICS_PHY=m
 
 CONFIG_MII=m
 CONFIG_NET_CORE=y
@@ -1592,6 +1666,7 @@ CONFIG_BCMGENET=m
 CONFIG_BNX2=m
 CONFIG_BNX2X=m
 CONFIG_BNX2X_SRIOV=y
+CONFIG_BNX2X_VXLAN=y
 CONFIG_CNIC=m
 CONFIG_FEALNX=m
 CONFIG_ETHOC=m
@@ -1604,10 +1679,20 @@ CONFIG_JME=m
 
 #
 # Ethernet (10000 Mbit)
+# CONFIG_NET_VENDOR_AURORA is not set
+
 #
 # CONFIG_IP1000 is not set
-# CONFIG_MLX4_EN is not set
-# CONFIG_MLX4_EN_VXLAN is not set
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_EN_VXLAN=y
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_INFINIBAND=m
+# CONFIG_MLXSW_CORE is not set
+# CONFIG_MLX4_DEBUG is not set
 # CONFIG_SFC is not set
 
 # CONFIG_FDDI is not set
@@ -1761,6 +1846,8 @@ CONFIG_LIBERTAS_SDIO=m
 # CONFIG_LIBERTAS_THINFIRM is not set
 # CONFIG_LIBERTAS_SPI is not set
 CONFIG_LIBERTAS_MESH=y
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
 
 CONFIG_IWLWIFI=m
 CONFIG_IWLDVM=m
@@ -1793,6 +1880,8 @@ CONFIG_RSI_USB=m
 CONFIG_RT2X00=m
 CONFIG_RT2X00_LIB_DEBUGFS=y
 # CONFIG_RT2X00_DEBUG is not set
+CONFIG_WL_MEDIATEK=y
+CONFIG_MT7601U=m
 CONFIG_RT2400PCI=m
 CONFIG_RT2500PCI=m
 CONFIG_RT61PCI=m
@@ -1818,6 +1907,7 @@ CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_USB_NET_KALMIA=m
 CONFIG_USB_NET_QMI_WWAN=m
 CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_CH9200=m
 # CONFIG_WL_TI is not set
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
@@ -1839,6 +1929,9 @@ CONFIG_RTL8723AE=m
 CONFIG_RTL8723BE=m
 CONFIG_RTL8188EE=m
 CONFIG_RTL8821AE=m
+CONFIG_RTL8XXXU=m
+# Untested is intentionally disabled in stable branches
+# CONFIG_RTL8XXXU_UNTESTED is not set
 
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
@@ -1850,16 +1943,30 @@ CONFIG_IEEE802154_SOCKET=m
 CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_ATUSB=m
 CONFIG_IEEE802154_CC2520=m
-# CONFIG_IEEE802154_AT86RF230 is not set
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
 # CONFIG_IEEE802154_MRF24J40 is not set
+# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
 
 CONFIG_MAC802154=m
 CONFIG_NET_MPLS_GSO=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
 
 CONFIG_NET_SWITCHDEV=y
 
 CONFIG_6LOWPAN=m
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+
 
 #
 # Token Ring devices
@@ -1887,7 +1994,44 @@ CONFIG_HAMRADIO=y
 CONFIG_AX25=m
 CONFIG_AX25_DAMA_SLAVE=y
 
-# CONFIG_CAN is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_LEDS=y
+# CONFIG_CAN_GRCAN is not set
+# CONFIG_CAN_XILINXCAN is not set
+CONFIG_CAN_SJA1000=m
+# CONFIG_CAN_SJA1000_ISA is not set
+CONFIG_CAN_SJA1000_PLATFORM=m
+# CONFIG_CAN_EMS_PCMCIA is not set
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_EMS_USB=m
+# CONFIG_CAN_PEAK_PCMCIA is not set
+CONFIG_CAN_PEAK_PCI=m
+CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_KVASER_USB=m
+CONFIG_CAN_PLX_PCI=m
+# CONFIG_CAN_TSCAN1 is not set
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
+CONFIG_CAN_C_CAN_PCI=m
+CONFIG_CAN_M_CAN=m
+CONFIG_CAN_CC770=m
+# CONFIG_CAN_CC770_ISA is not set
+CONFIG_CAN_CC770_PLATFORM=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_SOFTING=m
+# CONFIG_CAN_SOFTING_CS is not set
+CONFIG_CAN_SUN4I=m
 
 CONFIG_NETROM=m
 CONFIG_ROSE=m
@@ -1923,8 +2067,14 @@ CONFIG_NFC_ST21NFCA=m
 CONFIG_NFC_ST21NFCA_I2C=m
 # CONFIG_NFC_ST21NFCB is not set
 # CONFIG_NFC_ST21NFCB_I2C is not set
+# CONFIG_NFC_NXP_NCI is not set
 # CONFIG_NFC_NCI_SPI is not set
-
+# CONFIG_NFC_NCI_UART is not set
+# CONFIG_NFC_ST_NCI is not set
+# CONFIG_NFC_S3FWRN5_I2C is not set
+# CONFIG_NFC_FDP is not set
+# CONFIG_NFC_MRVL_I2C is not set
+# CONFIG_NFC_MRVL_SPI is not set
 
 #
 # IrDA (infrared) support
@@ -1969,9 +2119,11 @@ CONFIG_WINBOND_FIR=m
 #
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
+CONFIG_BT_HS=y
 CONFIG_BT_LE=y
 CONFIG_BT_6LOWPAN=m
 # CONFIG_BT_SELFTEST is not set
+# CONFIG_BT_DEBUGFS is not set
 CONFIG_BT_SCO=y
 CONFIG_BT_CMTP=m
 CONFIG_BT_RFCOMM=m
@@ -1987,11 +2139,16 @@ CONFIG_BT_HIDP=m
 CONFIG_BT_HCIBTUSB=m
 # Disable the BT_HCIUSB driver.
 # It sucks more power than BT_HCIBTUSB which has the same functionality.
+CONFIG_BT_HCIBTUSB_BCM=y
+CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HCIUART_QCA=y
 CONFIG_BT_HCIDTL1=m
 CONFIG_BT_HCIBT3C=m
 CONFIG_BT_HCIBLUECARD=m
@@ -2005,6 +2162,7 @@ CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
+CONFIG_BT_QCA=m
 CONFIG_BT_WILINK=m
 
 #
@@ -2130,10 +2288,13 @@ CONFIG_GIGASET_M105=m
 #
 # CONFIG_PHONE is not set
 
+# CONFIG_NET_L3_MASTER_DEV is not set
+
 #
 # Input device support
 #
 CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=y
 CONFIG_INPUT_FF_MEMLESS=m
 
 #
@@ -2168,6 +2329,7 @@ CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
+# CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
 
 #
@@ -2192,6 +2354,7 @@ CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_PARKBD is not set
 # CONFIG_SERIO_PCIPS2 is not set
 # CONFIG_SERIO_LIBPS2 is not set
+# CONFIG_USERIO is not set
 
 #
 # Input Device Drivers
@@ -2225,6 +2388,8 @@ CONFIG_MOUSE_PS2=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_MOUSE_PS2_SENTELIC=y
+# Fedora 22 and 23 don't have a new enough xorg-x11-drv-vmmouse.  Revisit
+# CONFIG_MOUSE_PS2_VMMOUSE is not set
 CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_VSXXXAA=m
 CONFIG_MOUSE_APPLETOUCH=m
@@ -2315,6 +2480,13 @@ CONFIG_TOUCHSCREEN_ZFORCE=m
 # CONFIG_TOUCHSCREEN_AD7877 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
 # CONFIG_TOUCHSCREEN_AR1021_I2C is not set
+# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set
+# CONFIG_TOUCHSCREEN_SX8654 is not set
+# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
+# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
+# CONFIG_TOUCHSCREEN_FT6236 is not set
+# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
+# CONFIG_TOUCHSCREEN_TSC2004 is not set
 
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_E3X0_BUTTON=m
@@ -2366,7 +2538,7 @@ CONFIG_TCG_TIS=m
 CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 # CONFIG_TCG_INFINEON is not set
-# CONFIG_TCG_TIS_I2C_ST33 is not set
+# CONFIG_TCG_TIS_ST33ZP24 is not set
 # CONFIG_TCG_XEN is not set
 CONFIG_TELCLOCK=m
 
@@ -2378,13 +2550,16 @@ CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=32
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_RSA=y
-# CONFIG_SERIAL_8250_DW is not set
+CONFIG_SERIAL_8250_DW=y
+# CONFIG_SERIAL_8250_INGENIC is not set
+CONFIG_SERIAL_8250_RT288X=y
+CONFIG_SERIAL_8250_MID=y
 CONFIG_CYCLADES=m
 # CONFIG_CYZ_INTR is not set
 # CONFIG_MOXA_INTELLIO is not set
@@ -2394,10 +2569,10 @@ CONFIG_CYCLADES=m
 CONFIG_SERIAL_JSM=m
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
-# CONFIG_SERIAL_MFD_HSU is not set
 
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_UARTLITE is not set
 
 #
 # Non-8250 serial port support
@@ -2437,7 +2612,8 @@ CONFIG_I2C_CHARDEV=m
 # CONFIG_I2C_MUX_GPIO is not set
 # CONFIG_I2C_MUX_PCA9541 is not set
 # CONFIG_I2C_MUX_PINCTRL is not set
-#
+# CONFIG_I2C_MUX_REG is not set
+# CONFIG_I2C_CADENCE is not set
 
 #
 # I2C Algorithms
@@ -2465,6 +2641,7 @@ CONFIG_I2C_ALGOPCA=m
 # CONFIG_I2C_NFORCE2_S4985 is not set
 # CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_CBUS_GPIO is not set
+# CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_VIPERBOARD=m
 
 CONFIG_EEPROM_AT24=m
@@ -2573,6 +2750,7 @@ CONFIG_SENSORS_MCP3021=m
 CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_NCT6683=m
 CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
@@ -2584,6 +2762,7 @@ CONFIG_CHARGER_SMB347=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_TC74=m
 CONFIG_SENSORS_THMC50=m
 CONFIG_SENSORS_TMP401=m
 CONFIG_APDS9802ALS=m
@@ -2654,14 +2833,18 @@ CONFIG_SENSORS_AD7314=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX20751=m
 CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_LTC2978=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_MAX1668=m
 CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX31790=m
 CONFIG_SENSORS_TPS40422=m
 
+# CONFIG_NTB is not set
+
 # Industrial I/O subsystem configuration
 CONFIG_IIO=m
 CONFIG_IIO_BUFFER=y
@@ -2679,20 +2862,23 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m
 # CONFIG_AD5380 is not set
 # CONFIG_AD5064 is not set
 # CONFIG_BMA180 is not set
-# CONFIG_BMC150_ACCEL is not set
+CONFIG_BMC150_ACCEL=m
 # CONFIG_MAX1363 is not set
 # CONFIG_MAX517 is not set
 # CONFIG_MAX5821 is not set
 # CONFIG_MCP4725 is not set
 # CONFIG_ITG3200 is not set
 # CONFIG_APDS9300 is not set
+CONFIG_BH1750=m
 CONFIG_CM32181=m
 # CONFIG_CM3232 is not set
+# CONFIG_CM3323 is not set
 # CONFIG_CM36651 is not set
 # CONFIG_GP2AP020A00F is not set
 # CONFIG_TSL2583 is not set
 # CONFIG_TSL2x7x is not set
 # CONFIG_LTR501 is not set
+CONFIG_STK3310=m
 # CONFIG_TCS3472 is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_NAU7802 is not set
@@ -2704,9 +2890,11 @@ CONFIG_CM32181=m
 # CONFIG_INV_MPU6050_IIO is not set
 CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_MAGN_3AXIS=m
+# CONFIG_BMC150_MAGN is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+CONFIG_ACPI_ALS=m
 # CONFIG_ADJD_S311 is not set
 # CONFIG_AL3320A is not set
 # CONFIG_SENSORS_TSL2563 is not set
@@ -2723,6 +2911,8 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # CONFIG_MMA8452 is not set
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
+# CONFIG_STK8312 is not set
+# CONFIG_STK8BA50 is not set
 # CONFIG_AD7266 is not set
 # CONFIG_AD7298 is not set
 # CONFIG_AD7476 is not set
@@ -2743,6 +2933,7 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # CONFIG_AD5764 is not set
 # CONFIG_AD5791 is not set
 # CONFIG_AD7303 is not set
+# CONFIG_M62332 is not set
 # CONFIG_AD9523 is not set
 # CONFIG_ADF4350 is not set
 # CONFIG_ADIS16080 is not set
@@ -2756,6 +2947,7 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # CONFIG_ADIS16480 is not set
 # CONFIG_DHT11 is not set
 # CONFIG_MPL3115 is not set
+# CONFIG_MS5611 is not set
 # CONFIG_MPL115 is not set
 # CONFIG_SI7005 is not set
 # CONFIG_SI7020 is not set
@@ -2764,11 +2956,26 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 CONFIG_KXCJK1013=m
 # CONFIG_ISL29125 is not set
 # CONFIG_JSA1212 is not set
+CONFIG_RPR0521=m
+CONFIG_OPT3001=m
+CONFIG_PA12203001=m
 # CONFIG_TCS3414 is not set
 # CONFIG_AK09911 is not set
 # CONFIG_T5403 is not set
 # CONFIG_MCP4922 is not set
 # CONFIG_MAX1027 is not set
+# CONFIG_MXC4005 is not set
+# CONFIG_VZ89X is not set
+# CONFIG_HDC100X is not set
+# CONFIG_HTU21 is not set
+# CONFIG_APDS9960 is not set
+# CONFIG_US5182D is not set
+# CONFIG_MCP4531 is not set
+# CONFIG_MS5637 is not set
+# CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_TSYS01 is not set
+# CONFIG_TSYS02D is not set
+# CONFIG_HI8435 is not set
 
 # staging IIO drivers
 # CONFIG_AD7291 is not set
@@ -2902,6 +3109,8 @@ CONFIG_WM831X_WATCHDOG=m
 # CONFIG_MEN_A21_WDT is not set
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_CADENCE_WATCHDOG is not set
+# CONFIG_BCM7038_WDT is not set
 
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -2919,6 +3128,7 @@ CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_ABX80X=m
 CONFIG_RTC_DRV_DS1307=m
 CONFIG_RTC_DRV_DS1511=m
 CONFIG_RTC_DRV_DS1553=m
@@ -2986,6 +3196,8 @@ CONFIG_RTC_DRV_PCF85063=m
 # CONFIG_RTC_DRV_ISL12057 is not set
 # CONFIG_RTC_DRV_XGENE is not set
 # CONFIG_RTC_DRV_ABB5ZES3 is not set
+# CONFIG_RTC_DRV_ZYNQMP is not set
+# CONFIG_RTC_DRV_RV8803 is not set
 
 CONFIG_R3964=m
 # CONFIG_APPLICOM is not set
@@ -3011,13 +3223,18 @@ CONFIG_VGA_ARB_MAX_GPUS=16
 
 
 CONFIG_DRM=m
+CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_AST=m  # do not enable on f17 or older
 CONFIG_DRM_CIRRUS_QEMU=m  # do not enable on f17 or older
 # CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RADEON_UMS is not set
+CONFIG_DRM_AMDGPU=m
+# CONFIG_DRM_AMDGPU_CIK is not set
+CONFIG_DRM_AMDGPU_USERPTR=y
 # CONFIG_DRM_I810 is not set
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MGAG200=m  # do not enable on f17 or older
@@ -3035,16 +3252,22 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
+# CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_UDL=m
 CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_QXL=m
 CONFIG_DRM_BOCHS=m
+CONFIG_DRM_VIRTIO_GPU=m
 CONFIG_DRM_PTN3460=m
+CONFIG_DRM_PS8622=m
 # CONFIG_DRM_PANEL is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
 # CONFIG_DRM_PANEL_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+CONFIG_DRM_VGEM=m
 
 #
 # PCMCIA character devices
@@ -3071,12 +3294,15 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
+# CONFIG_MEDIA_CONTROLLER_DVB is not set
 # CONFIG_MEDIA_SDR_SUPPORT is not set
 CONFIG_VIDEO_DEV=m
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_V4L2=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
+# CONFIG_V4L2_FLASH_LED_CLASS is not set
 # CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_XILINX is not set
 # CONFIG_USB_SI4713 is not set
 # CONFIG_PLATFORM_SI4713 is not set
 # CONFIG_I2C_SI4713 is not set
@@ -3212,6 +3438,7 @@ CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_NGENE=m
 CONFIG_DVB_DDBRIDGE=m
 CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_NETUP_UNIDVB=m
 CONFIG_DVB_USB_TECHNISAT_USB2=m
 CONFIG_DVB_USB_V2=m
 
@@ -3313,6 +3540,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_SH_VEU is not set
 # CONFIG_VIDEO_RENESAS_VSP1 is not set
 # CONFIG_V4L_TEST_DRIVERS is not set
+# CONFIG_DVB_PLATFORM_DRIVERS is not set
 
 #
 # Broadcom Crystal HD video decoder driver
@@ -3395,6 +3623,8 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_GOLDFISH is not set
 # CONFIG_FB_OPENCORES is not set
+# CONFIG_FB_SM712 is not set
+# CONFIG_FB_IBM_GXT4500 is not set
 
 # CONFIG_FIRMWARE_EDID is not set
 
@@ -3584,7 +3814,9 @@ CONFIG_SND_SCS1X=m
 CONFIG_SND_DICE=m
 CONFIG_SND_OXFW=m
 CONFIG_SND_FIREWORKS=m
-# CONFIG_SND_BEBOB is not set
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
 
 #
 # Open Sound System
@@ -3621,7 +3853,6 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760 is not set
 CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_FUSBH200_HCD=m
 # CONFIG_USB_FOTG210_HCD is not set
 # CONFIG_USB_GR_UDC is not set
 CONFIG_USB_OHCI_HCD=y
@@ -3635,6 +3866,7 @@ CONFIG_USB_SL811_HCD_ISO=y
 # CONFIG_USB_SL811_CS is not set
 # CONFIG_USB_R8A66597_HCD is not set
 CONFIG_USB_XHCI_HCD=y
+# CONFIG_USB_XHCI_PLATFORM is not set
 # CONFIG_USB_MAX3421_HCD is not set
 
 #
@@ -3678,6 +3910,7 @@ CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
 CONFIG_UHID=m
 CONFIG_HID_PID=y
+CONFIG_HID_LOGITECH=m
 CONFIG_LOGITECH_FF=y
 CONFIG_HID_LOGITECH_DJ=m
 CONFIG_HID_LOGITECH_HIDPP=m
@@ -3688,22 +3921,28 @@ CONFIG_HID_WACOM=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
 CONFIG_USB_IDMOUSE=m
+CONFIG_HID_CYPRESS=m
 CONFIG_DRAGONRISE_FF=y
 CONFIG_GREENASIA_FF=y
 CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=y
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
 CONFIG_HID_NTRIG=y
 CONFIG_HID_PLANTRONICS=m
 CONFIG_HID_PRIMAX=m
 CONFIG_HID_BETOP_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_DRAGONRISE=m
 CONFIG_HID_GYRATION=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
 CONFIG_HID_ORTEK=m
 CONFIG_HID_PANTHERLORD=m
 CONFIG_HID_PENMOUNT=m
@@ -3727,12 +3966,16 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_GYRO_3D=m
 CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+# CONFIG_MMC35240 is not set
 CONFIG_HID_SENSOR_ALS=m
 # CONFIG_HID_SENSOR_PROX is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
+# CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_GEMBIRD=m
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_ACRUX=m
@@ -3741,7 +3984,6 @@ CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_LCPOWER=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
-CONFIG_HID_HUION=m
 CONFIG_HID_GT683R=m
 CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_WIIMOTE=m
@@ -3750,10 +3992,14 @@ CONFIG_HID_SAITEK=m
 CONFIG_HID_TIVO=m
 CONFIG_HID_GENERIC=y
 CONFIG_HID_AUREAL=m
+CONFIG_HID_A4TECH=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_BELKIN=m
 CONFIG_HID_APPLEIR=m
 # CONFIG_HID_CP2112 is not set
 CONFIG_HID_LENOVO=m
-
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_GFRM=m
 
 #
 # USB Imaging devices
@@ -3834,6 +4080,7 @@ CONFIG_USB_KAWETH=m
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_NET_AX8817X=m
@@ -3968,10 +4215,14 @@ CONFIG_USB_APPLEDISPLAY=m
 # Physical Layer USB driver
 CONFIG_USB_PHY=y
 # CONFIG_USB_OTG_FSM is not set
+CONFIG_USB_ULPI_BUS=m
 
 # CONFIG_GENERIC_PHY is not set
 # CONFIG_PHY_ST_SPEAR1310_MIPHY is not set
 # CONFIG_PHY_ST_SPEAR1340_MIPHY is not set
+# CONFIG_PHY_PXA_28NM_HSIC is not set
+# CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_TUSB1210 is not set
 # CONFIG_AM335X_PHY_USB is not set
 # CONFIG_SAMSUNG_USBPHY is not set
 # CONFIG_BCM_KONA_USB2_PHY is not set
@@ -3992,6 +4243,7 @@ CONFIG_USB_YUREX=m
 CONFIG_USB_EZUSB_FX2=m
 CONFIG_USB_HSIC_USB3503=m
 # CONFIG_USB_LINK_LAYER_TEST is not set
+CONFIG_USB_CHAOSKEY=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
 CONFIG_USB_LEGOTOWER=m
@@ -4037,6 +4289,7 @@ CONFIG_SSB_PCMCIAHOST=y
 # CONFIG_SSB_DEBUG is not set
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB_DRIVER_GPIO=y
+CONFIG_SSB_HOST_SOC=y
 
 # Multifunction USB devices
 # CONFIG_MFD_PCF50633 is not set
@@ -4081,6 +4334,7 @@ CONFIG_MFD_VIPERBOARD=m
 # CONFIG_MFD_CS5535 is not set
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_MT6397 is not set
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_WL1273_CORE is not set
@@ -4110,9 +4364,12 @@ CONFIG_MFD_VIPERBOARD=m
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_DA9150 is not set
 # CONFIG_MFD_RT5033 is not set
+# CONFIG_MFD_SKY81452 is not set
+# CONFIG_MFD_MAX77843 is not set
+# CONFIG_MFD_DA9062 is not set
 # CONFIG_EZX_PCAP is not set
 # CONFIG_INTEL_SOC_PMIC is not set
-
+# CONFIG_MFD_ATMEL_FLEXCOM is not set
 
 #
 # File systems
@@ -4123,9 +4380,10 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
 CONFIG_EXT4_FS=y
-CONFIG_EXT4_USE_FOR_EXT23=y
+CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_ENCRYPTION is not set
 CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 CONFIG_REISERFS_FS=m
@@ -4159,7 +4417,7 @@ CONFIG_AUTOFS4_FS=y
 # CONFIG_EXOFS_FS is not set
 # CONFIG_EXOFS_DEBUG is not set
 CONFIG_NILFS2_FS=m
-# CONFIG_FS_DAX is not set
+CONFIG_FS_DAX=y
 # CONFIG_LOGFS is not set
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
@@ -4202,6 +4460,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
 CONFIG_PROC_VMCORE=y
+CONFIG_PROC_CHILDREN=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
@@ -4257,6 +4516,7 @@ CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_F2FS_CHECK_FS is not set
 # CONFIG_F2FS_IO_TRACE is not set
+# CONFIG_F2FS_FS_ENCRYPTION is not set
 
 #
 # Network File Systems
@@ -4287,14 +4547,14 @@ CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_XPRT_RDMA_CLIENT=m
-# CONFIG_SUNRPC_XPRT_RDMA_SERVER is not set
+CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_SUNRPC_DEBUG=y
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_SMB2=y
+# CONFIG_CIFS_SMB311 is not set
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
@@ -4343,6 +4603,7 @@ CONFIG_GFS2_FS_LOCKING_DLM=y
 
 CONFIG_UBIFS_FS=m
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_ATIME_SUPPORT=y
 
 #
 # Partition Types
@@ -4456,6 +4717,7 @@ CONFIG_HEADERS_CHECK=y
 # CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
 # CONFIG_DEBUG_LOCKDEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_STATIC_KEYS_SELFTEST is not set
 
 # DEBUG options that don't get enabled/disabled with 'make debug/release'
 
@@ -4494,14 +4756,16 @@ CONFIG_MEMORY_FAILURE=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_CROSS_MEMORY_ATTACH=y
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_BACKTRACE_SELF_TEST is not set
+CONFIG_LATENCYTOP=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 CONFIG_EARLY_PRINTK_DBGP=y
 # CONFIG_PAGE_POISONING is not set
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_CRASH is not set
+CONFIG_CRASH=m
+CONFIG_CRASH_DUMP=y
 # CONFIG_GCOV_KERNEL is not set
 
 CONFIG_KGDB=y
@@ -4550,6 +4814,7 @@ CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_USER_API_RNG=y
+CONFIG_CRYPTO_USER_API_AEAD=y
 CONFIG_CRYPTO_MANAGER=y
 # Note, CONFIG_CRYPTO_MANAGER_DISABLE_TESTS needs to be unset, or FIPS will be disabled.
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
@@ -4618,6 +4883,15 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_RSA=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_DRBG_HASH=y
+CONFIG_CRYPTO_DRBG_CTR=y
+CONFIG_CRYPTO_KEYWRAP=m
 
 
 
@@ -4682,6 +4956,7 @@ CONFIG_BACKLIGHT_LP855X=m
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
+# CONFIG_BACKLIGHT_PM8941_WLED is not set
 
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_PLATFORM=m
@@ -4699,11 +4974,12 @@ CONFIG_LCD_PLATFORM=m
 # CONFIG_LCD_LTV350QV is not set
 
 
+CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_DEBUG=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_AUTOGROUP=y
 
 CONFIG_CPUSETS=y
@@ -4714,6 +4990,7 @@ CONFIG_CGROUPS=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
@@ -4748,6 +5025,8 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_BANG_BANG is not set
 # CONFIG_THERMAL_EMULATION is not set
 # CONFIG_THERMAL_OF is not set
+# CONFIG_THERMAL_WRITABLE_TRIPS is not set
+# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
 # CONFIG_CPU_THERMAL is not set
 
 CONFIG_INOTIFY=y
@@ -4833,6 +5112,7 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_AK4554 is not set
 # CONFIG_SND_SOC_AK4642 is not set
 # CONFIG_SND_SOC_AK5386 is not set
+# CONFIG_SND_SOC_AK4613 is not set
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@@ -4842,6 +5122,7 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_PCM1792A is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
 # CONFIG_SND_SOC_PCM512x_SPI is not set
+# CONFIG_SND_SOC_QCOM is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 # CONFIG_SND_SOC_TAS5086 is not set
@@ -4859,6 +5140,8 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_WM8770 is not set
 # CONFIG_SND_SOC_WM8776 is not set
 # CONFIG_SND_SOC_WM8804 is not set
+# CONFIG_SND_SOC_WM8804_I2C is not set
+# CONFIG_SND_SOC_WM8804_SPI is not set
 # CONFIG_SND_SOC_WM8903 is not set
 # CONFIG_SND_SOC_WM8962 is not set
 # CONFIG_SND_SOC_TPA6130A2 is not set
@@ -4895,6 +5178,10 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_TS3A227E is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
 # CONFIG_SND_SOC_STA32X is not set 
+# CONFIG_SND_SOC_CS4349 is not set
+# CONFIG_SND_SOC_GTM601 is not set
+# CONFIG_SND_SOC_STI_SAS is not set
+# 
 
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
@@ -4909,6 +5196,12 @@ CONFIG_LEDS_CLASS_FLASH=m
 # CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_S3C24XX is not set
+# CONFIG_LEDS_BCM6328 is not set
+# CONFIG_LEDS_BCM6358 is not set
+# CONFIG_LEDS_TLC591XX is not set
+# CONFIG_LEDS_KTD2692 is not set
+# CONFIG_LEDS_AAT1290 is not set
+# 
 CONFIG_LEDS_DELL_NETBOOKS=m
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_LM355x is not set
@@ -4917,6 +5210,7 @@ CONFIG_LEDS_DELL_NETBOOKS=m
 # CONFIG_LEDS_LP8501 is not set
 # CONFIG_LEDS_LP8860 is not set
 # CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PM8941_WLED is not set
 # CONFIG_LEDS_SYSCON is not set
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
@@ -4934,27 +5228,34 @@ CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM3642 is not set
 CONFIG_LEDS_BLINKM=m
 CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
 CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_WM8350=m
 CONFIG_LEDS_WM831X_STATUS=m
 # CONFIG_LEDS_DAC124S085 is not set
+# Do not enable the below.  They selects the fw user helper, which we don't want
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+# CONFIG_LEDS_LP5562 is not set
+# CONFIG_LEDS_LP55XX_COMMON is not set
 
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
+# CONFIG_IDMA64 is not set
 # CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
 # CONFIG_TIMB_DMA is not set
 # CONFIG_DMATEST is not set
 # CONFIG_FSL_EDMA is not set
 # CONFIG_NBPFAXI_DMA is not set
 CONFIG_ASYNC_TX_DMA=y
+# CONFIG_HSU_DMA is not set
+# CONFIG_HSU_DMA_PCI is not set
+# CONFIG_XGENE_DMA is not set
+# CONFIG_INTEL_IDMA64 is not set
 
 CONFIG_UNUSED_SYMBOLS=y
 
@@ -4975,6 +5276,8 @@ CONFIG_FUNCTION_PROFILER=y
 # CONFIG_TRACEPOINT_BENCHMARK is not set
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_TRACE_ENUM_MAP_FILE is not set
+# CONFIG_TRACING_EVENTS_GPIO is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 CONFIG_FUNCTION_TRACER=y
@@ -4991,6 +5294,7 @@ CONFIG_HZ_1000=y
 CONFIG_NO_HZ=y
 
 # CONFIG_SCHED_STACK_END_CHECK is not set
+# CONFIG_DEBUG_TIMEKEEPING is not set
 CONFIG_TIMER_STATS=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PERF_EVENTS=y
@@ -5017,7 +5321,7 @@ CONFIG_APM_POWER=m
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_BQ27XXX is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
@@ -5030,9 +5334,17 @@ CONFIG_APM_POWER=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
 # CONFIG_CHARGER_BQ24735 is not set
+# CONFIG_CHARGER_BQ24257 is not set
+# CONFIG_CHARGER_BQ25890 is not set
+# CONFIG_CHARGER_RT9455 is not set
+# CONFIG_CHARGER_QCOM_SMBB is not set
+# CONFIG_CHARGER_TPS65217 is not set
+# CONFIG_AXP20X_POWER is not set
+
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_LTC2952 is not set
 # CONFIG_POWER_RESET_SYSCON is not set
+# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_POWER_RESET_RESTART is not set
 
@@ -5050,11 +5362,12 @@ CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UIO_NETX is not set
 # CONFIG_UIO_MF624 is not set
+# CONFIG_UIO_PRUSS is not set
 
 CONFIG_VFIO=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_PCI=m
-
+# CONFIG_VFIO_NOIOMMU is not set
 
 # LIRC
 CONFIG_LIRC_STAGING=y
@@ -5152,6 +5465,7 @@ CONFIG_UWB_I1480U=m
 
 CONFIG_STAGING=y
 # CONFIG_ANDROID is not set
+# CONFIG_STAGING_BOARD is not set
 CONFIG_STAGING_MEDIA=y
 # CONFIG_DVB_AS102 is not set
 # CONFIG_SLICOSS is not set
@@ -5162,7 +5476,7 @@ CONFIG_STAGING_MEDIA=y
 # CONFIG_I2C_BCM2048 is not set
 # CONFIG_DT3155 is not set
 # CONFIG_PRISM2_USB is not set
-# CONFIG_ECHO is not set
+# CONFIG_MOST is not set
 CONFIG_USB_ATMEL=m
 # CONFIG_COMEDI is not set
 # CONFIG_PANEL is not set
@@ -5213,6 +5527,9 @@ CONFIG_USBIP_HOST=m
 # CONFIG_DVB_MN88473 is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_FB_TFT is not set
+# CONFIG_FB_SM750 is not set
+# CONFIG_STAGING_RDMA is not set
+# CONFIG_WILC1000_DRIVER is not set
 # END OF STAGING
 
 #
@@ -5242,12 +5559,18 @@ CONFIG_RCU_NOCB_CPU=y
 CONFIG_RCU_NOCB_CPU_ALL=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_RCU_TORTURE_TEST=m
+# CONFIG_RCU_TORTURE_TEST_SLOW_INIT is not set
+CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY=3
+# CONFIG_RCU_TORTURE_TEST_SLOW_PREINIT is not set
+# CONFIG_RCU_TORTURE_TEST_SLOW_CLEANUP is not set
 # CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
 # CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_TASKS_RCU is not set
 # CONFIG_RCU_USER_QS is not set
 CONFIG_RCU_KTHREAD_PRIO=0
 CONFIG_SPARSE_RCU_POINTER=y
+# CONFIG_RCU_EXPERT is not set
 
 # CONFIG_LIVEPATCH is not set
 
@@ -5284,6 +5607,8 @@ CONFIG_ZSMALLOC=y
 # CONFIG_ZSMALLOC_STAT is not set
 # CONFIG_PGTABLE_MAPPING is not set
 
+# CONFIG_IDLE_PAGE_TRACKING is not set
+
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_KEYBOARD_GPIO is not set
 # CONFIG_KEYBOARD_GPIO_POLLED is not set
@@ -5330,6 +5655,11 @@ CONFIG_GPIO_VIPERBOARD=m
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_GPIO_XILINX is not set
+# CONFIG_GPIO_ALTERA is not set
+# CONFIG_GPIO_ZX is not set
+# CONFIG_GPIO_AMDPT is not set
+# CONFIG_GPIO_104_IDIO_16 is not set
+# CONFIG_GPIO_IT87 is not set
 
 # FIXME: Why?
 
@@ -5353,7 +5683,7 @@ CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
 CONFIG_TCM_FC=m
-CONFIG_TCM_USER=m
+CONFIG_TCM_USER2=m
 
 CONFIG_HWSPINLOCK=m
 
@@ -5367,14 +5697,18 @@ CONFIG_PSTORE_RAM=m
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
 # CONFIG_TEST_UDELAY is not set
+# CONFIG_MEMTEST is not set
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_STATIC_KEYS is not set
+# CONFIG_TEST_PRINTF is not set
 
 # CONFIG_AVERAGE is not set
 # CONFIG_VMXNET3 is not set
 
 # CONFIG_SIGMA is not set
 
+CONFIG_CHROME_PLATFORMS=y
 
 CONFIG_BCMA=m
 CONFIG_BCMA_BLOCKIO=y
@@ -5393,6 +5727,7 @@ CONFIG_IOMMU_SUPPORT=y
 
 # CONFIG_MAILBOX is not set
 # CONFIG_ALTERA_MBOX is not set
+# CONFIG_MAILBOX_TEST is not set
 
 # CONFIG_RESET_CONTROLLER is not set
 
@@ -5403,6 +5738,7 @@ CONFIG_FMC_WRITE_EEPROM=m
 CONFIG_FMC_CHARDEV=m
 
 # CONFIG_GENWQE is not set
+CONFIG_ECHO=m
 
 CONFIG_POWERCAP=y
 # CONFIG_THUNDERBOLT is not set
@@ -5436,9 +5772,16 @@ CONFIG_POWERCAP=y
 
 # CONFIG_GLOB_SELFTEST is not set
 
-# CONFIG_SBSAUART_TTY is not set
-
 # CONFIG_SERIAL_8250_FINTEK is not set
 
 # set in x86-generic presently
 # CONFIG_TOUCHSCREEN_GOODIX is not set
+
+# CONFIG_INTEL_TH is not set
+# CONFIG_STM is not set
+# CONFIG_STM_DUMMY is not set
+# CONFIG_STM_SOURCE_CONSOLE is not set
+
+# CONFIG_AHCI_QORIQ is not set
+# CONFIG_COMMON_CLK_SI514 is not set
+# CONFIG_CLK_QORIQ is not set
diff --git a/config-nodebug b/config-nodebug
index 01008d646..65e8accd1 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -31,6 +31,7 @@ CONFIG_CPUMASK_OFFSTACK=y
 # CONFIG_DEBUG_STACK_USAGE is not set
 
 # CONFIG_ACPI_DEBUG is not set
+# CONFIG_ACPI_DEBUGGER is not set
 
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_PI_LIST is not set
@@ -126,7 +127,3 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 # CONFIG_SPI_DEBUG is not set
 
 # CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
-
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_LATENCYTOP is not set
-
diff --git a/config-powerpc64 b/config-powerpc64
index e0eebe270..0edf37b51 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -1,186 +1,109 @@
-CONFIG_WINDFARM_PM81=y
-CONFIG_WINDFARM_PM91=y
-CONFIG_WINDFARM_PM121=y
-CONFIG_WINDFARM_PM72=y
-CONFIG_WINDFARM_RM31=y
+# CONFIG_CPU_LITTLE_ENDIAN is not set
 
-CONFIG_PPC_PMAC64=y
 CONFIG_PPC_MAPLE=y
-# CONFIG_PPC_CELL is not set
-# CONFIG_PPC_IBM_CELL_BLADE is not set
-CONFIG_PPC_PSERIES=y
 CONFIG_PPC_PMAC=y
-CONFIG_PPC_POWERNV=y
-CONFIG_PPC_POWERNV_RTAS=y
-CONFIG_SENSORS_IBMPOWERNV=y
-CONFIG_HW_RANDOM_POWERNV=m
-CONFIG_POWERNV_CPUFREQ=m
-CONFIG_IPMI_POWERNV=m
-CONFIG_SCOM_DEBUGFS=y
-# CONFIG_PPC_PASEMI is not set
-# CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set
-# CONFIG_PPC_PS3 is not set
-# CONFIG_PPC_CELLEB is not set
-# CONFIG_PPC_CELL_QPACE is not set
-CONFIG_PMAC_RACKMETER=m
-CONFIG_IBMEBUS=y
-CONFIG_RTAS_FLASH=y
-# CONFIG_UDBG_RTAS_CONSOLE is not set
-CONFIG_PPC_SPLPAR=y
-CONFIG_SCANLOG=y
-CONFIG_LPARCFG=y
-CONFIG_SERIAL_ICOM=m
-CONFIG_HVCS=m
-CONFIG_HVC_CONSOLE=y
-# CONFIG_HVC_OLD_HVSI is not set
-CONFIG_HOTPLUG_PCI=y
-CONFIG_IBMVETH=m
-CONFIG_SCSI_IBMVSCSI=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_HOTPLUG_PCI_RPA=m
-CONFIG_HOTPLUG_PCI_RPA_DLPAR=y
+CONFIG_PPC_PMAC64=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+# CONFIG_BLK_DEV_IDE_SATA is not set
+# CONFIG_BLK_DEV_IDECS is not set
+CONFIG_BLK_DEV_IDECD=m
+# CONFIG_BLK_DEV_IDETAPE is not set
+CONFIG_BLK_DEV_IDEDMA=y
+CONFIG_BLK_DEV_GENERIC=y
+CONFIG_BLK_DEV_DELKIN=m
+CONFIG_IDE_TASK_IOCTL=y
+CONFIG_IDE_PROC_FS=y
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
+
+#
+# IDE chipset support/bugfixes
+#
+# CONFIG_IDE_GENERIC is not set
+# CONFIG_BLK_DEV_IDEPNP is not set
+# CONFIG_BLK_DEV_IDEPCI is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SL82C105 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_IDE_PMAC is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_OFFBOARD is not set
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+CONFIG_IDE_GD=y
+CONFIG_IDE_GD_ATA=y
+CONFIG_IDE_GD_ATAPI=y
+
+CONFIG_PATA_PLATFORM=m
+CONFIG_PATA_OF_PLATFORM=m
+
+# Power970 / G5
+CONFIG_EDAC_CPC925=m
+
+# Maple
+CONFIG_CPU_FREQ_MAPLE=y
+CONFIG_EDAC_AMD8111=m
+CONFIG_EDAC_AMD8131=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_MMIO_NVRAM=y
+
+# Apple G5
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_ADB=y
+CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
 CONFIG_ADB_PMU_LED_IDE=y
-CONFIG_PMAC_SMU=y
-CONFIG_CPU_FREQ_PMAC64=y
-CONFIG_CPU_FREQ_MAPLE=y
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-CONFIG_SCSI_IPR_DUMP=y
-CONFIG_HVC_RTAS=y
-CONFIG_HVC_OPAL=y
-
-# iSeries device drivers
-#
-
-CONFIG_PASEMI_MAC=m
-CONFIG_SERIAL_OF_PLATFORM=m
-
-CONFIG_SERIAL_TXX9=y
-CONFIG_SERIAL_TXX9_NR_UARTS=6
-CONFIG_SERIAL_TXX9_CONSOLE=y
-
-CONFIG_HVC_BEAT=y
-
-CONFIG_PPC_PMI=m
-
-CONFIG_PATA_SCC=m
-
+CONFIG_I2C_POWERMAC=y
+CONFIG_PMAC_RACKMETER=m
+CONFIG_PMAC_APM_EMU=m
 CONFIG_APM_EMULATION=m
+CONFIG_PMAC_SMU=y
+CONFIG_APPLE_AIRPORT=m
+CONFIG_SND_POWERMAC=m
+CONFIG_SND_POWERMAC_AUTO_DRC=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_PATA_MACIO=y
+CONFIG_WINDFARM=y
+CONFIG_WINDFARM_RM31=y
+CONFIG_WINDFARM_PM72=y
+CONFIG_WINDFARM_PM81=y
+CONFIG_WINDFARM_PM91=y
+CONFIG_WINDFARM_PM112=y
+CONFIG_WINDFARM_PM121=y
+CONFIG_CPU_FREQ_PMAC64=y
+CONFIG_SERIAL_PMACZILOG=m
+# CONFIG_SERIAL_PMACZILOG_TTYS is not set
+CONFIG_AGP_UNINORTH=y
+# CONFIG_PMAC_BACKLIGHT_LEGACY is not set
 
-CONFIG_PPC64=y
-CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_NR_CPUS=1024
-# CONFIG_FB_PLATINUM is not set
-# CONFIG_FB_VALKYRIE is not set
-# CONFIG_FB_CT65550 is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-
-
-CONFIG_RTAS_PROC=y
-CONFIG_NUMA=y
-CONFIG_NUMA_BALANCING=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-CONFIG_PPC_64K_PAGES=y
-CONFIG_PPC_SUBPAGE_PROT=y
-CONFIG_SCHED_SMT=y
-
-CONFIG_HZ=100
-CONFIG_HZ_100=y
-# CONFIG_HZ_1000 is not set
-
-CONFIG_MEMORY_HOTREMOVE=y
-
-CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y
-
-CONFIG_CGROUP_HUGETLB=y
-
-# CONFIG_MV643XX_ETH is not set
-CONFIG_IRQSTACKS=y
-CONFIG_DEBUG_STACKOVERFLOW=y
-# CONFIG_INPUT_PCSPKR is not set
-
-CONFIG_EHEA=m
-CONFIG_INFINIBAND_EHCA=m
-
-# CONFIG_HCALL_STATS is not set
-
-CONFIG_XMON_DISASSEMBLY=y
-
-
-# CONFIG_TUNE_CELL is not set
-# CONFIG_BLK_DEV_PLATFORM is not set
-
-
-CONFIG_EDAC_CPC925=m
-CONFIG_FRAME_WARN=2048
-
-CONFIG_FORCE_MAX_ZONEORDER=9
-CONFIG_VIRTUALIZATION=y
-
-CONFIG_VSX=y
-
-CONFIG_SCSI_IBMVFC=m
-# CONFIG_SCSI_IBMVFC_TRACE is not set
-CONFIG_IBM_BSR=m
-
-CONFIG_CRASH_DUMP=y
-CONFIG_FA_DUMP=y
-CONFIG_RELOCATABLE=y
-
-CONFIG_RCU_FANOUT=64
-
-CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-CONFIG_CMA_AREAS=7
-CONFIG_KVM_BOOK3S_64=m
-CONFIG_KVM_BOOK3S_64_HV=m
-CONFIG_KVM_BOOK3S_64_PR=m
-# CONFIG_KVM_EXIT_TIMING is not set
-CONFIG_KVM_XICS=y
-
-#-- bz#607175
-#-- active memory sharing
-CONFIG_PPC_SMLPAR=y
-CONFIG_CMM=y
-CONFIG_HV_PERF_CTRS=y
-#-- DLPAR memory remove
-CONFIG_SPARSEMEM_VMEMMAP=y
-
-# CONFIG_COMPACTION is not set
-
-CONFIG_PSERIES_ENERGY=m
-
-CONFIG_CPU_IDLE=y
-# CONFIG_CPU_IDLE_GOV_LADDER is not set
-CONFIG_PSERIES_CPUIDLE=y
-CONFIG_POWERNV_CPUIDLE=y
-
-CONFIG_PPC_ICSWX=y
-CONFIG_IO_EVENT_IRQ=y
-CONFIG_HW_RANDOM_AMD=m
-
-CONFIG_UIO_PDRV=m
-
-CONFIG_I2C_OPAL=m
-CONFIG_RTC_DRV_OPAL=m
-
-CONFIG_HW_RANDOM_PSERIES=m
-CONFIG_CRYPTO_DEV_NX=y
-CONFIG_CRYPTO_842=m
-CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS=m
-
-CONFIG_CXL=m
-
-# CONFIG_PPC_ICSWX_PID is not set
-# CONFIG_PPC_ICSWX_USE_SIGILL is not set
-# CONFIG_PCIEPORTBUS is not set
-# CONFIG_SND_HDA_INTEL is not set
-CONFIG_BLK_DEV_RSXX=m
-CONFIG_PPC_TRANSACTIONAL_MEM=y
-
-# CONFIG_CARL9170 is not set
+CONFIG_SND_AOA=m
+CONFIG_SND_AOA_SOUNDBUS=m
+CONFIG_SND_AOA_FABRIC_LAYOUT=m
+CONFIG_SND_AOA_ONYX=m
+CONFIG_SND_AOA_TAS=m
+CONFIG_SND_AOA_TOONIE=m
+CONFIG_SND_AOA_SOUNDBUS_I2S=m
diff --git a/config-powerpc-generic b/config-powerpc64-generic
similarity index 59%
rename from config-powerpc-generic
rename to config-powerpc64-generic
index 2d705f101..b543cfbb6 100644
--- a/config-powerpc-generic
+++ b/config-powerpc64-generic
@@ -1,14 +1,151 @@
-# Most PowerPC kernels we build are SMP
-CONFIG_IRQ_ALL_CPUS=y
 CONFIG_PPC=y
-CONFIG_WATCHDOG_RTAS=m
-CONFIG_DEBUGGER=y
-CONFIG_GENERIC_NVRAM=y
-CONFIG_ALTIVEC=y
+CONFIG_PPC64=y
 
-CONFIG_TAU=y
-# CONFIG_TAU_INT is not set
-CONFIG_TAU_AVERAGE=y
+CONFIG_PPC_POWERNV=y
+CONFIG_PPC_PSERIES=y
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_QPACE is not set
+# CONFIG_PPC_IBM_CELL_BLADE is not set
+# CONFIG_PPC_MAPLE is not set
+# CONFIG_PPC_PASEMI is not set
+# CONFIG_PPC_PMAC is not set
+# CONFIG_PPC_PMAC64 is not set
+# CONFIG_PPC_PS3 is not set
+CONFIG_HIBERNATION=n
+
+CONFIG_EXTRA_TARGETS=""
+
+CONFIG_NR_CPUS=1024
+
+CONFIG_NR_IRQS=512
+CONFIG_SPARSE_IRQ=y
+CONFIG_IRQ_ALL_CPUS=y
+CONFIG_IRQSTACKS=y
+
+CONFIG_DEBUG_STACKOVERFLOW=y
+CONFIG_DEBUGGER=y
+CONFIG_PPC_DENORMALISATION=y
+# CONFIG_PPC_EARLY_DEBUG is not set
+CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
+
+CONFIG_FRAME_WARN=2048
+
+CONFIG_FORCE_MAX_ZONEORDER=9
+
+CONFIG_XMON=y
+# CONFIG_XMON_DEFAULT is not set
+CONFIG_XMON_DISASSEMBLY=y
+
+CONFIG_BOOTX_TEXT=y
+
+CONFIG_ALTIVEC=y
+CONFIG_VSX=y
+
+CONFIG_HZ=100
+CONFIG_HZ_100=y
+# CONFIG_HZ_1000 is not set
+
+CONFIG_NUMA=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_PPC_64K_PAGES=y
+CONFIG_PPC_SUBPAGE_PROT=y
+CONFIG_SCHED_SMT=y
+# CONFIG_TUNE_CELL is not set
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y
+
+CONFIG_CGROUP_HUGETLB=y
+
+CONFIG_RCU_FANOUT=64
+CONFIG_RCU_FANOUT_LEAF=16
+
+CONFIG_FA_DUMP=y
+CONFIG_RELOCATABLE=y
+
+CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_GOV_LADDER is not set
+CONFIG_POWERNV_CPUIDLE=y
+CONFIG_PSERIES_CPUIDLE=y
+
+CONFIG_HW_RANDOM_PSERIES=m
+CONFIG_CRYPTO_DEV_NX=y
+CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
+CONFIG_CRYPTO_DEV_NX_COMPRESS=m
+CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
+CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
+CONFIG_CRYPTO_DEV_NX_COMPRESS_CRYPTO=m
+CONFIG_CRYPTO_DEV_VMX=y
+# CONFIG_CRYPTO_DEV_VMX_ENCRYPT is not set
+
+CONFIG_XZ_DEC_POWERPC=y
+
+# HW Virt
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_AREAS=7
+CONFIG_KVM_GUEST=y
+CONFIG_KVM_BOOK3S_64=m
+CONFIG_KVM_BOOK3S_64_HV=m
+CONFIG_KVM_BOOK3S_64_PR=m
+# CONFIG_KVM_BOOK3S_HV_EXIT_TIMING is not set
+# CONFIG_KVM_EXIT_TIMING is not set
+CONFIG_KVM_XICS=y
+# CONFIG_HCALL_STATS is not set
+CONFIG_PPC_SPLPAR=y
+CONFIG_LPARCFG=y
+#-- active memory sharing
+CONFIG_PPC_SMLPAR=y
+CONFIG_CMM=y
+CONFIG_HV_PERF_CTRS=y
+#-- DLPAR memory remove
+CONFIG_SPARSEMEM_VMEMMAP=y
+
+# Power NV
+CONFIG_HVC_CONSOLE=y
+CONFIG_HVCS=m
+CONFIG_HVC_RTAS=y
+CONFIG_HVC_OPAL=y
+CONFIG_I2C_OPAL=m
+CONFIG_RTC_DRV_OPAL=m
+CONFIG_SENSORS_IBMPOWERNV=y
+CONFIG_HW_RANDOM_POWERNV=m
+CONFIG_POWERNV_CPUFREQ=m
+CONFIG_IPMI_POWERNV=m
+CONFIG_RTAS_FLASH=y
+CONFIG_OPAL_PRD=m
+CONFIG_MTD_POWERNV_FLASH=m
+
+# Power 7 and later
+CONFIG_PPC_TRANSACTIONAL_MEM=y
+CONFIG_BLK_DEV_RSXX=m
+CONFIG_CXL=m
+CONFIG_CXLFLASH=m
+CONFIG_IBMEBUS=y
+CONFIG_EHEA=m
+CONFIG_INFINIBAND_EHCA=m
+CONFIG_PPC_ICSWX=y
+# CONFIG_PPC_ICSWX_PID is not set
+# CONFIG_PPC_ICSWX_USE_SIGILL is not set
+
+# pSeries
+# CONFIG_SCSI_IBMVFC_TRACE is not set
+CONFIG_IBM_BSR=m
+CONFIG_IBMVETH=m
+CONFIG_PSERIES_ENERGY=m
+# CONFIG_HVC_OLD_HVSI is not set
+CONFIG_SCOM_DEBUGFS=y
+CONFIG_SCANLOG=y
+CONFIG_RTAS_PROC=y
+CONFIG_WATCHDOG_RTAS=m
+# CONFIG_UDBG_RTAS_CONSOLE is not set
+CONFIG_IO_EVENT_IRQ=y
 
 # CONFIG_RTC is not set
 # CONFIG_GEN_RTC is not set
@@ -16,59 +153,51 @@ CONFIG_TAU_AVERAGE=y
 CONFIG_RTC_DRV_GENERIC=y
 # CONFIG_CMDLINE_BOOL is not set
 
-CONFIG_ADB=y
-CONFIG_ADB_PMU=y
-CONFIG_WINDFARM=y
-CONFIG_WINDFARM_PM112=y
-CONFIG_I2C_POWERMAC=y
-CONFIG_APPLE_AIRPORT=m
-CONFIG_SERIAL_PMACZILOG=m
-# CONFIG_SERIAL_PMACZILOG_TTYS is not set
-CONFIG_AGP_UNINORTH=y
+CONFIG_HOTPLUG_PCI_SHPC=m
+CONFIG_HOTPLUG_PCI_RPA=m
+CONFIG_HOTPLUG_PCI_RPA_DLPAR=y
+
+CONFIG_SCSI_IBMVFC=m
+CONFIG_SCSI_IBMVSCSI=m
+CONFIG_SCSI_IPR=m
+CONFIG_SCSI_IPR_TRACE=y
+CONFIG_SCSI_IPR_DUMP=y
+
+CONFIG_SERIAL_ICOM=m
+# CONFIG_SERIAL_8250 is not set
+
+# Things we might want to review for newer architectures
+# CONFIG_PCIEPORTBUS is not set
+
 CONFIG_FB_OF=y
 # CONFIG_FB_CONTROL is not set
+# CONFIG_FB_CT65550 is not set
 CONFIG_FB_IBM_GXT4500=y
 CONFIG_FB_MATROX=y
 CONFIG_FB_MATROX_G=y
-# CONFIG_FB_VGA16 is not set
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_RIVA_BACKLIGHT=y
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_MB862XX_PCI_GDC is not set
 # CONFIG_FB_MB862XX_LIME is not set
 # CONFIG_FB_MB862XX_I2C is not set
+# CONFIG_FB_PLATINUM is not set
+# CONFIG_FB_VALKYRIE is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
 
-
-CONFIG_SND_POWERMAC=m
-CONFIG_SND_POWERMAC_AUTO_DRC=y
-CONFIG_SND_AOA=m
-CONFIG_SND_AOA_SOUNDBUS=m
-CONFIG_SND_AOA_FABRIC_LAYOUT=m
-CONFIG_SND_AOA_ONYX=m
-CONFIG_SND_AOA_TAS=m
-CONFIG_SND_AOA_TOONIE=m
-CONFIG_SND_AOA_SOUNDBUS_I2S=m
 # CONFIG_SND_SOC is not set
+# CONFIG_INPUT_PCSPKR is not set
+# CONFIG_SND_HDA_INTEL is not set
 
-CONFIG_XMON=y
-# CONFIG_XMON_DEFAULT is not set
-CONFIG_XMON_DISASSEMBLY=y
-
-CONFIG_BOOTX_TEXT=y
-CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_CAPI_EICON=y
 
-CONFIG_NVRAM=y
-
 # CONFIG_SCSI_AHA1542 is not set
 # CONFIG_SCSI_IN2000 is not set
 # CONFIG_SCSI_IPS is not set
 # CONFIG_NI65 is not set
 # CONFIG_LANCE is not set
 # CONFIG_3C515 is not set
-
-CONFIG_MEMORY_HOTPLUG=y
+# CONFIG_BLK_DEV_PLATFORM is not set
 
 # Stuff which wants bus_to_virt() or virt_to_bus()
 # CONFIG_BLK_CPQ_DA is not set
@@ -78,106 +207,31 @@ CONFIG_MEMORY_HOTPLUG=y
 # CONFIG_ATM_AMBASSADOR is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 
-
-# CONFIG_PPC_EARLY_DEBUG is not set
-
-# CONFIG_PMAC_BACKLIGHT_LEGACY is not set
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_POWERNV=m
 
-CONFIG_PPC_EFIKA=y
-CONFIG_PPC_MEDIA5200=y
-
-# CONFIG_PPC_LITE5200 is not set
-CONFIG_PPC_BESTCOMM=y
-CONFIG_PMAC_RACKMETER=m
+CONFIG_USB_EHCI_HCD_PPC_OF=y
 CONFIG_USB_OHCI_HCD_PCI=y
 CONFIG_USB_OHCI_HCD_PPC_OF=y
 CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
 CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
 
-CONFIG_SERIAL_UARTLITE=m
-CONFIG_SERIAL_UARTLITE_CONSOLE=y
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+# CONFIG_EDAC_CPC925 is not set
 
-CONFIG_SENSORS_AMS=m
-CONFIG_SENSORS_AMS_PMU=y
-CONFIG_SENSORS_AMS_I2C=y
-
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_IDECS is not set
-CONFIG_BLK_DEV_IDECD=m
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_IDE_TASK_IOCTL=y
-#
-# IDE chipset support/bugfixes
-#
-# CONFIG_IDE_GENERIC is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-# CONFIG_BLK_DEV_IDEPCI is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_BLK_DEV_IDE_PMAC is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_DELKIN=m
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_TC86C001 is not set
-CONFIG_BLK_DEV_IDEDMA=y
-CONFIG_BLK_DEV_GENERIC=y
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-CONFIG_MTD_PHYSMAP_OF=m
-CONFIG_IDE_PROC_FS=y
-CONFIG_MACINTOSH_DRIVERS=y
-
-CONFIG_PPC_PASEMI_MDIO=m
 CONFIG_SPU_FS_64K_LS=y
-CONFIG_PPC_PASEMI_CPUFREQ=y
-CONFIG_PMAC_APM_EMU=m
-CONFIG_HW_RANDOM_PASEMI=m
 
 CONFIG_EDAC=y
 CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_PASEMI=m
-CONFIG_EDAC_AMD8131=m
-CONFIG_EDAC_AMD8111=m
 CONFIG_EDAC_LEGACY_SYSFS=y
 
 # CONFIG_AXON_RAM is not set
-# CONFIG_OPROFILE_CELL is not set
 
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_IDEPCI_PCIBUS_ORDER is not set
-CONFIG_PATA_PLATFORM=m
-CONFIG_PATA_OF_PLATFORM=m
-CONFIG_USB_EHCI_HCD_PPC_OF=y
 
 # CONFIG_MPC5121_ADS is not set
 CONFIG_MTD_OF_PARTS=y
@@ -191,10 +245,6 @@ CONFIG_DMADEVICES=y
 
 CONFIG_SND_PPC=y
 
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_83xx is not set
-# CONFIG_PPC_86xx is not set
-CONFIG_EXTRA_TARGETS=""
 # CONFIG_CODE_PATCHING_SELFTEST is not set
 # CONFIG_FTR_FIXUP_SELFTEST is not set
 
@@ -209,9 +259,6 @@ CONFIG_EXTRA_TARGETS=""
 
 CONFIG_NET_VENDOR_IBM=y
 
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_DCB=y
-
 # CONFIG_SERIO_XILINX_XPS_PS2 is not set
 
 # CONFIG_PPC_SMLPAR is not set
@@ -221,21 +268,10 @@ CONFIG_MLX4_EN_DCB=y
 # CONFIG_GEF_PPC9A is not set
 # CONFIG_GEF_SBC310 is not set
 
-# CONFIG_QUICC_ENGINE is not set
-# CONFIG_QE_GPIO is not set
-
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GD_ATAPI=y
-
 # CONFIG_MCU_MPC8349EMITX is not set
 
 # CONFIG_GPIO_XILINX is not set
 
-CONFIG_PMIC_DA903X=y
-CONFIG_BACKLIGHT_DA903X=m
-CONFIG_LEDS_DA903X=m
-
 CONFIG_MSI_BITMAP_SELFTEST=y
 
 CONFIG_RELOCATABLE=y
@@ -243,11 +279,10 @@ CONFIG_RELOCATABLE=y
 # CONFIG_HVC_UDBG is not set
 CONFIG_PRINT_STACK_DEPTH=64
 
-CONFIG_BATTERY_DA9030=m
+# CONFIG_PMIC_DA903X is not set
 # CONFIG_TWL4030_CORE is not set
 
 CONFIG_BLK_DEV_IT8172=m
-CONFIG_TOUCHSCREEN_DA9034=m
 
 CONFIG_SIMPLE_GPIO=y
 
@@ -255,6 +290,7 @@ CONFIG_SIMPLE_GPIO=y
 
 # CONFIG_PS3_VRAM is not set
 CONFIG_MDIO_GPIO=m
+CONFIG_SERIAL_OF_PLATFORM=m
 # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_PCA953X=m
@@ -265,22 +301,18 @@ CONFIG_GPIO_PCF857X=m
 
 # CONFIG_AMIGAONE is not set
 
-CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
-
 CONFIG_DTL=y
 
 CONFIG_MMC_SDHCI_OF=m
 
 # CONFIG_CONSISTENT_SIZE_BOOL is not set
 
-
 CONFIG_PPC_EMULATED_STATS=y
 
 CONFIG_SWIOTLB=y
 
-# CONFIG_RDS is not set
-
 CONFIG_PPC_DISABLE_WERROR=y
+# CONFIG_STRICT_MM_TYPECHECKS is not set
 
 # CONFIG_XILINX_LL_TEMAC is not set
 # CONFIG_XILINX_EMACLITE is not set
@@ -289,21 +321,15 @@ CONFIG_GPIO_WM831X=m
 # CONFIG_GPIO_UCB1400 is not set
 # CONFIG_EDAC_MPC85XX is not set
 
-CONFIG_NR_IRQS=512
-CONFIG_SPARSE_IRQ=y
-
 # CONFIG_PPC_MPC5200_LPBFIFO is not set
 # CONFIG_CAN_MSCAN is not set
 # CONFIG_CAN_MPC5XXX is not set
-CONFIG_PATA_MACIO=y
-CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_TPS65910 is not set
 # CONFIG_MFD_TPS65912_I2C is not set
 # CONFIG_MFD_WL1273_CORE is not set
 # CONFIG_XPS_USB_HCD_XILINX is not set
-# CONFIG_MMC_SDHCI_OF_ESDHC is not set
 # CONFIG_MMC_SDHCI_OF_HLWD is not set
 
 # CONFIG_MFD_AAT2870_CORE is not set
@@ -311,13 +337,6 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 # CONFIG_GPIO_SCH is not set
 # CONFIG_GPIO_74XX_MMIO is not set
 
-# CONFIG_PPC_MPC512x is not set
-# CONFIG_RTC_DRV_MPC5121 is not set
-
-# CONFIG_MPC512X_DMA is not set
-
-CONFIG_KVM_GUEST=y
-
 CONFIG_I2C_MPC=m
 
 # CONFIG_IMA is not set
@@ -325,6 +344,7 @@ CONFIG_I2C_MPC=m
 
 # CONFIG_CRYPTO_DEV_FSL_CAAM is not set
 # CONFIG_CRYPTO_SHA1_PPC is not set
+# CONFIG_CRYPTO_MD5_PPC is not set
 
 # CONFIG_CAN_FLEXCAN is not set
 # CONFIG_NET_VENDOR_XILINX is not set
@@ -333,15 +353,14 @@ CONFIG_I2C_MPC=m
 # CONFIG_NET_VENDOR_PASEMI is not set
 # CONFIG_NET_VENDOR_TOSHIBA is not set
 
-# CONFIG_CPU_IDLE is not set
+CONFIG_MDIO_OCTEON=m
+
 # CONFIG_OF_UNITTEST is not set
 # CONFIG_OF_OVERLAY is not set
 # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
 # CONFIG_INPUT_GP2A is not set
 # CONFIG_INPUT_GPIO_TILT_POLLED is not set
 
-CONFIG_RCU_FANOUT_LEAF=16
-
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
 # CONFIG_MPIC_MSGR is not set
 # CONFIG_FA_DUMP is not set
@@ -351,21 +370,14 @@ CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_SPAPR_TCE_IOMMU is not set
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
 
-CONFIG_PPC_DENORMALISATION=y
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
 
-
-# CONFIG_CPU_LITTLE_ENDIAN is not set
+# CONFIG_WINDFARM is not set
 
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_FB_SSD1307=m
 CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_BACKLIGHT_PWM=m
-CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=n
-
-CONFIG_XZ_DEC_POWERPC=y
-
-CONFIG_CRASH=m
diff --git a/config-powerpc64le b/config-powerpc64le
index ee43fdb3b..7d9f3fc3a 100644
--- a/config-powerpc64le
+++ b/config-powerpc64le
@@ -1 +1,6 @@
 CONFIG_CPU_LITTLE_ENDIAN=y
+
+CONFIG_POWER7_CPU=y
+
+# https://fedoraproject.org/wiki/Features/Checkpoint_Restore
+CONFIG_CHECKPOINT_RESTORE=y
diff --git a/config-powerpc64p7 b/config-powerpc64p7
index c3d97065a..5e85fbd12 100644
--- a/config-powerpc64p7
+++ b/config-powerpc64p7
@@ -1,174 +1,3 @@
+# CONFIG_CPU_LITTLE_ENDIAN is not set
+
 CONFIG_POWER7_CPU=y
-# CONFIG_PPC_PMAC64 is not set
-# CONFIG_PPC_MAPLE is not set
-# CONFIG_PPC_CELL is not set
-# CONFIG_PPC_IBM_CELL_BLADE is not set
-CONFIG_PPC_PSERIES=y
-# CONFIG_PPC_PMAC is not set
-CONFIG_PPC_POWERNV=y
-CONFIG_PPC_POWERNV_RTAS=y
-CONFIG_HW_RANDOM_POWERNV=m
-CONFIG_SENSORS_IBMPOWERNV=y
-CONFIG_POWERNV_CPUFREQ=m
-CONFIG_IPMI_POWERNV=m
-CONFIG_SCOM_DEBUGFS=y
-# CONFIG_PPC_PASEMI is not set
-# CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set
-# CONFIG_PPC_PS3 is not set
-# CONFIG_PPC_CELLEB is not set
-# CONFIG_PPC_CELL_QPACE is not set
-CONFIG_IBMEBUS=y
-CONFIG_RTAS_FLASH=y
-# CONFIG_UDBG_RTAS_CONSOLE is not set
-CONFIG_PPC_SPLPAR=y
-CONFIG_SCANLOG=y
-CONFIG_LPARCFG=y
-CONFIG_SERIAL_ICOM=m
-CONFIG_HVCS=m
-CONFIG_HVC_CONSOLE=y
-# CONFIG_HVC_OLD_HVSI is not set
-CONFIG_HOTPLUG_PCI=y
-CONFIG_IBMVETH=m
-CONFIG_SCSI_IBMVSCSI=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_HOTPLUG_PCI_RPA=m
-CONFIG_HOTPLUG_PCI_RPA_DLPAR=y
-CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_IDE=y
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-CONFIG_SCSI_IPR_DUMP=y
-CONFIG_HVC_RTAS=y
-CONFIG_HVC_OPAL=y
-
-# iSeries device drivers
-#
-
-CONFIG_SERIAL_OF_PLATFORM=m
-
-CONFIG_SERIAL_TXX9=y
-CONFIG_SERIAL_TXX9_NR_UARTS=6
-CONFIG_SERIAL_TXX9_CONSOLE=y
-
-CONFIG_HVC_BEAT=y
-
-CONFIG_PPC_PMI=m
-
-CONFIG_PATA_SCC=m
-
-CONFIG_APM_EMULATION=m
-
-CONFIG_PPC64=y
-CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_NR_CPUS=1024
-# CONFIG_FB_PLATINUM is not set
-# CONFIG_FB_VALKYRIE is not set
-# CONFIG_FB_CT65550 is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-
-
-CONFIG_RTAS_PROC=y
-CONFIG_NUMA=y
-CONFIG_NUMA_BALANCING=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-CONFIG_PPC_64K_PAGES=y
-CONFIG_PPC_SUBPAGE_PROT=y
-CONFIG_SCHED_SMT=y
-
-CONFIG_HZ=100
-CONFIG_HZ_100=y
-# CONFIG_HZ_1000 is not set
-
-CONFIG_MEMORY_HOTREMOVE=y
-
-CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y
-
-CONFIG_CGROUP_HUGETLB=y
-
-# CONFIG_MV643XX_ETH is not set
-CONFIG_IRQSTACKS=y
-CONFIG_DEBUG_STACKOVERFLOW=y
-# CONFIG_INPUT_PCSPKR is not set
-
-CONFIG_EHEA=m
-CONFIG_INFINIBAND_EHCA=m
-
-# CONFIG_HCALL_STATS is not set
-
-CONFIG_XMON_DISASSEMBLY=y
-
-
-# CONFIG_TUNE_CELL is not set
-# CONFIG_BLK_DEV_PLATFORM is not set
-
-
-CONFIG_EDAC_CPC925=m
-CONFIG_FRAME_WARN=2048
-
-CONFIG_FORCE_MAX_ZONEORDER=9
-CONFIG_VIRTUALIZATION=y
-
-CONFIG_VSX=y
-
-CONFIG_SCSI_IBMVFC=m
-# CONFIG_SCSI_IBMVFC_TRACE is not set
-CONFIG_IBM_BSR=m
-
-CONFIG_CRASH_DUMP=y
-CONFIG_FA_DUMP=y
-CONFIG_RELOCATABLE=y
-
-CONFIG_RCU_FANOUT=64
-
-CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-CONFIG_CMA_AREAS=7
-CONFIG_KVM_BOOK3S_64=m
-CONFIG_KVM_BOOK3S_64_HV=m
-CONFIG_KVM_BOOK3S_64_PR=m
-# CONFIG_KVM_EXIT_TIMING is not set
-CONFIG_KVM_XICS=y
-
-#-- bz#607175
-#-- active memory sharing
-CONFIG_PPC_SMLPAR=y
-CONFIG_CMM=y
-CONFIG_HV_PERF_CTRS=y
-#-- DLPAR memory remove
-CONFIG_SPARSEMEM_VMEMMAP=y
-
-# CONFIG_COMPACTION is not set
-
-CONFIG_PSERIES_ENERGY=m
-
-CONFIG_CPU_IDLE=y
-# CONFIG_CPU_IDLE_GOV_LADDER is not set
-CONFIG_PSERIES_CPUIDLE=y
-CONFIG_POWERNV_CPUIDLE=y
-
-CONFIG_PPC_ICSWX=y
-CONFIG_IO_EVENT_IRQ=y
-CONFIG_HW_RANDOM_AMD=m
-
-CONFIG_UIO_PDRV=m
-
-CONFIG_I2C_OPAL=m
-CONFIG_RTC_DRV_OPAL=m
-
-CONFIG_HW_RANDOM_PSERIES=m
-CONFIG_CRYPTO_DEV_NX=y
-CONFIG_CRYPTO_842=m
-CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS=m
-
-CONFIG_CXL=m
-
-# CONFIG_PPC_ICSWX_PID is not set
-# CONFIG_PPC_ICSWX_USE_SIGILL is not set
-# CONFIG_PCIEPORTBUS is not set
-# CONFIG_SND_HDA_INTEL is not set
-CONFIG_BLK_DEV_RSXX=m
-CONFIG_PPC_TRANSACTIONAL_MEM=y
diff --git a/config-s390x b/config-s390x
index 3e700b185..a41d95ac4 100644
--- a/config-s390x
+++ b/config-s390x
@@ -1,5 +1,4 @@
 CONFIG_64BIT=y
-# CONFIG_MARCH_G5 is not set
 # CONFIG_MARCH_Z900 is not set
 CONFIG_MARCH_Z9_109=y
 # CONFIG_MARCH_Z990 is not set
@@ -15,6 +14,8 @@ CONFIG_HZ_100=y
 
 CONFIG_LOG_BUF_SHIFT=16
 
+CONFIG_IRQ_DOMAIN_DEBUG=y
+
 #
 # I/O subsystem configuration
 #
@@ -128,10 +129,12 @@ CONFIG_MSDOS_PARTITION=y
 #
 # S390 crypto hw
 #
+CONFIG_CRYPTO_AES_S390=m
+CONFIG_CRYPTO_DES_S390=m
+CONFIG_CRYPTO_GHASH_S390=m
 CONFIG_CRYPTO_SHA1_S390=m
 CONFIG_CRYPTO_SHA256_S390=m
-CONFIG_CRYPTO_DES_S390=m
-CONFIG_CRYPTO_AES_S390=m
+CONFIG_CRYPTO_SHA512_S390=m
 
 #
 # Kernel hacking
@@ -147,10 +150,6 @@ CONFIG_DIAG288_WATCHDOG=m
 CONFIG_VMLOGRDR=m
 CONFIG_MONREADER=m
 
-CONFIG_VIRT_CPU_ACCOUNTING=y
-
-# CONFIG_CLAW is not set
-
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_MII is not set
@@ -175,8 +174,7 @@ CONFIG_S390_VMUR=m
 CONFIG_CTCM=m
 CONFIG_QETH_L2=m
 CONFIG_QETH_L3=m
-CONFIG_CRYPTO_SHA512_S390=m
-CONFIG_VIRTUALIZATION=y
+
 CONFIG_KVM=m
 # CONFIG_KVM_S390_UCONTROL is not set
 CONFIG_S390_GUEST=y
@@ -207,11 +205,10 @@ CONFIG_VMCP=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_BOOK=y
 CONFIG_SCHED_TOPOLOGY=y
+# CONFIG_NUMA is not set
 
 # CONFIG_WARN_DYNAMIC_STACK is not set
 
-CONFIG_CRYPTO_GHASH_S390=m
-
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
 CONFIG_SCM_BUS=y
 CONFIG_EADM_SCH=m
@@ -223,7 +220,6 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
 CONFIG_PCI=y
 CONFIG_PCI_NR_FUNCTIONS=64
 CONFIG_PCI_NR_MSI=256
-CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_SHPC=y
 CONFIG_HOTPLUG_PCI_S390=y
@@ -297,17 +293,6 @@ CONFIG_HOTPLUG_PCI_S390=y
 # CONFIG_SH_ETH is not set
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_IEEE802154_DRIVERS is not set
-
+# CONFIG_MDIO_OCTEON is not set
 # CONFIG_FMC is not set
-
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_DCB=y
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_RDS=m
-CONFIG_RDS_RDMA=m
-CONFIG_RDS_TCP=m
-CONFIG_IRQ_DOMAIN_DEBUG=y
-
-CONFIG_CRASH=m
+# CONFIG_OF is not set
diff --git a/config-x86-32-generic b/config-x86-32-generic
index c2b27269c..865fb9004 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -83,7 +83,6 @@ CONFIG_X86_LONGRUN=y
 
 CONFIG_X86_HT=y
 
-
 # CONFIG_4KSTACKS is not set
 
 CONFIG_PCI_DIRECT=y
@@ -198,6 +197,7 @@ CONFIG_BACKLIGHT_PWM=m
 
 # CONFIG_EDAC_SBRIDGE is not set
 
+CONFIG_OF=y
 # CONFIG_OF_UNITTEST is not set
 # CONFIG_OF_OVERLAY is not set
 # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
@@ -219,3 +219,4 @@ CONFIG_BACKLIGHT_PWM=m
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_QCOM is not set
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_KEYBOARD_BCM is not set
diff --git a/config-x86-generic b/config-x86-generic
index 71f68c759..646378bb7 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -4,6 +4,8 @@ CONFIG_X86_EXTENDED_PLATFORM=y
 
 CONFIG_X86_GENERIC=y
 
+# CONFIG_X86_LEGACY_VM86 is not set
+
 CONFIG_HPET=y
 CONFIG_HPET_TIMER=y
 # CONFIG_HPET_MMAP is not set
@@ -34,21 +36,19 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_X86_PM_TIMER=y
 
-# This requires changes to binutils and the compiler.  Plus you can't actually
-# buy hardware with MPX yet.  So... leave it off until all of that seems set.
-# CONFIG_X86_INTEL_MPX is not set
+CONFIG_X86_INTEL_MPX=y
 
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
-# CONFIG_EFI_MIXED is not set
-CONFIG_EFI_VARS=y
+# CONFIG_EFI_VARS is not set
 CONFIG_EFIVAR_FS=y
-CONFIG_EFI_VARS_PSTORE=y
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+# CONFIG_EFI_VARS_PSTORE is not set
+# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
 CONFIG_EFI_PCDP=y
 CONFIG_FB_EFI=y
 CONFIG_EARLY_PRINTK_EFI=y
 CONFIG_EFI_RUNTIME_MAP=y
+# CONFIG_EFI_FAKE_MEMMAP is not set
 # needs FB_SIMPLE to work correctly
 # CONFIG_X86_SYSFB is not set
 
@@ -58,6 +58,7 @@ CONFIG_EFI_RUNTIME_MAP=y
 CONFIG_INTEL_IOMMU=y
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_SVM=y
 CONFIG_SCSI_ADVANSYS=m
 
 CONFIG_CAPI_EICON=y
@@ -67,9 +68,12 @@ CONFIG_CAPI_EICON=y
 #
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
+CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_DEBUG_RODATA=y
+# Generating too many warnings while waiting for fixes
+# CONFIG_DEBUG_WX is not set
 CONFIG_DEBUG_STACKOVERFLOW=y
 
 CONFIG_ACPI=y
@@ -102,8 +106,17 @@ CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_CUSTOM_METHOD=m
 CONFIG_ACPI_BGRT=y
 # CONFIG_ACPI_EXTLOG is not set
+# CONFIG_ACPI_REV_OVERRIDE_POSSIBLE is not set
+
+CONFIG_INTEL_SOC_PMIC=y
+CONFIG_PMIC_OPREGION=y
+CONFIG_CRC_PMIC_OPREGION=y
+CONFIG_XPOWER_PMIC_OPREGION=y
+CONFIG_GPIO_CRYSTAL_COVE=y
+CONFIG_AXP288_ADC=y
+CONFIG_AXP288_FUEL_GAUGE=y
+# CONFIG_PWM_CRC is not set
 
-# CONFIG_PMIC_OPREGION is not set
 
 CONFIG_X86_INTEL_PSTATE=y
 CONFIG_X86_ACPI_CPUFREQ=m
@@ -125,17 +138,16 @@ CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
 
 CONFIG_GENERIC_ISA_DMA=y
 
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_BIOS=y
 
-CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
 
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
@@ -212,7 +224,7 @@ CONFIG_AMILO_RFKILL=m
 CONFIG_ASUS_LAPTOP=m
 CONFIG_COMPAL_LAPTOP=m
 CONFIG_DELL_LAPTOP=m
-CONFIG_CHROME_PLATFORMS=y
+CONFIG_DELL_RBTN=m
 CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
 CONFIG_EEEPC_LAPTOP=m
@@ -235,6 +247,7 @@ CONFIG_ASUS_NB_WMI=m
 CONFIG_HP_WIRELESS=m
 CONFIG_HP_WMI=m
 # CONFIG_INTEL_SCU_IPC is not set
+# CONFIG_INTEL_PMC_IPC is not set
 CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_DELL_SMO8800=m
@@ -254,11 +267,8 @@ CONFIG_TOUCHSCREEN_GOODIX=m
 CONFIG_VIA_WDT=m
 CONFIG_IE6XX_WDT=m
 
-CONFIG_CRASH_DUMP=y
 CONFIG_PROC_VMCORE=y
-CONFIG_CRASH=m
 
-CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
@@ -304,6 +314,16 @@ CONFIG_XEN_PCIDEV_BACKEND=m
 CONFIG_XEN_ACPI_PROCESSOR=m
 # CONFIG_XEN_SCSI_FRONTEND is not set
 # CONFIG_XEN_SCSI_BACKEND is not set
+CONFIG_XEN_SYMS=y
+
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_PXA2XX=m
+# CONFIG_CAN_MCP251X is not set
+# CONFIG_SPI_CADENCE is not set
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
+# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+# CONFIG_DRM_PANEL_LG_LG4573 is not set
 
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
@@ -331,11 +351,13 @@ CONFIG_ISCSI_IBFT=m
 
 CONFIG_DMADEVICES=y
 CONFIG_INTEL_IOATDMA=m
+CONFIG_INTEL_IDMA64=m
 
 CONFIG_SENSORS_I5K_AMB=m
 CONFIG_SENSORS_FAM15H_POWER=m
 CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_SENSORS_I5500=m
+CONFIG_SENSORS_DELL_SMM=m
 
 # CONFIG_CPA_DEBUG is not set
 
@@ -354,6 +376,7 @@ CONFIG_HP_ILO=m
 
 CONFIG_BACKLIGHT_APPLE=m
 
+CONFIG_X86_PMEM_LEGACY=y
 
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 
@@ -381,6 +404,7 @@ CONFIG_ACPI_CMPC=m
 CONFIG_MSI_WMI=m
 CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_TOSHIBA_HAPS=m
+CONFIG_TOSHIBA_WMI=m
 
 CONFIG_VGA_SWITCHEROO=y
 CONFIG_LPC_SCH=m
@@ -428,7 +452,6 @@ CONFIG_INTEL_IDLE=y
 CONFIG_F71808E_WDT=m
 CONFIG_HPWDT_NMI_DECODING=y
 # CONFIG_MFD_TPS6586X is not set
-# CONFIG_INTEL_MID_DMAC is not set
 # CONFIG_GPIO_INTEL_MID is not set
 CONFIG_PCH_DMA=m
 CONFIG_INTEL_IPS=m
@@ -450,6 +473,8 @@ CONFIG_CRYPTO_CRC32_PCLMUL=m
 
 CONFIG_HP_ACCEL=m
 
+CONFIG_SURFACE_PRO3_BUTTON=m
+
 # CONFIG_RAPIDIO is not set
 
 CONFIG_SCHED_SMT=y
@@ -485,13 +510,19 @@ CONFIG_NFC_PN544_MEI=m
 CONFIG_NFC_MICROREAD_MEI=m
 
 # Maybe enable in debug kernels?
+# CONFIG_DEBUG_ENTRY is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 
 # CONFIG_X86_GOLDFISH is not set
 
 CONFIG_X86_INTEL_LPSS=y
+CONFIG_IDMA64=m
 
 # CONFIG_X86_AMD_PLATFORM_DEVICE is not set
+# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
+
+CONFIG_MFD_INTEL_LPSS_ACPI=m
+CONFIG_MFD_INTEL_LPSS_PCI=m
 
 CONFIG_IOSF_MBI=m
 # CONFIG_IOSF_MBI_DEBUG is not set
@@ -500,7 +531,10 @@ CONFIG_PWM_LPSS_PCI=m
 CONFIG_PWM_LPSS_PLATFORM=m
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_BAYTRAIL=y
-CONFIG_PINCTRL_CHERRYVIEW=m
+CONFIG_PINCTRL_CHERRYVIEW=y
+# CONFIG_PINCTRL_AMD is not set
+CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_PINCTRL_BROXTON=m
 
 #baytrail/cherrytrail stuff
 CONFIG_KEYBOARD_GPIO=m
@@ -515,17 +549,22 @@ CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
-
-
+CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
+CONFIG_SND_SOC_AC97_CODEC=m
+# CONFIG_SND_SOC_TAS571X is not set
+# CONFIG_SND_SUN4I_CODEC is not set
 
 # CONFIG_INTEL_POWERCLAMP is not set
 CONFIG_X86_PKG_TEMP_THERMAL=m
 CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INT340X_THERMAL=m
 CONFIG_INTEL_RAPL=m
+CONFIG_INTEL_PCH_THERMAL=m
 
 CONFIG_VMWARE_VMCI=m
 CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_MOUSE_PS2_VMMOUSE=y
 
 CONFIG_XZ_DEC_X86=y
 
@@ -540,6 +579,8 @@ CONFIG_MODULE_SIG_ALL=y
 # CONFIG_MODULE_SIG_SHA1 is not set
 CONFIG_MODULE_SIG_SHA256=y
 # CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
+CONFIG_SYSTEM_TRUSTED_KEYS=""
 CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE=y
 CONFIG_EFI_SIGNATURE_LIST_PARSER=y
 
@@ -549,6 +590,11 @@ CONFIG_EFI_SIGNATURE_LIST_PARSER=y
 CONFIG_MODULE_SIG_UEFI=y
 
 CONFIG_VMXNET3=m
+CONFIG_FUJITSU_ES=m
 CONFIG_VFIO_PCI_VGA=y
 
-# CONFIG_NTB is not set
+CONFIG_PCH_CAN=m
+
+# CONFIG_X86_DEBUG_FPU is not set
+# CONFIG_PUNIT_ATOM_DEBUG is not set
+# CONFIG_AMD_MCE_INJ is not set
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 19364ed31..9d13391fc 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -11,8 +11,10 @@ CONFIG_UV_MMTIMER=m
 CONFIG_NUMA=y
 CONFIG_AMD_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
+CONFIG_ACPI_NFIT=m
+# CONFIG_ACPI_NFIT_DEBUG is not set
 # CONFIG_NUMA_EMU is not set
-# CONFIG_X86_NUMACHIP is not set
+CONFIG_X86_NUMACHIP=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 CONFIG_NUMA_BALANCING=y
 
@@ -24,6 +26,9 @@ CONFIG_PHYSICAL_ALIGN=0x1000000
 # https://lists.fedoraproject.org/pipermail/kernel/2013-December/004753.html
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 
+# enable the 32-bit entry point for Baytrail
+CONFIG_EFI_MIXED=y
+
 CONFIG_IA32_EMULATION=y
 # CONFIG_IA32_AOUT is not set
 
@@ -49,10 +54,14 @@ CONFIG_ACPI_HOTPLUG_MEMORY=y
 
 # CONFIG_INTEL_SCU_IPC is not set
 
+CONFIG_SCIF_BUS=m
+CONFIG_SCIF=m
+
 CONFIG_INTEL_MIC_HOST=m
 CONFIG_INTEL_MIC_CARD=m
 CONFIG_INTEL_MIC_BUS=m
 CONFIG_INTEL_MIC_X100_DMA=m
+CONFIG_MIC_COSM=m
 
 # SHPC has half-arsed PCI probing, which makes it load on too many systems
 CONFIG_HOTPLUG_PCI_SHPC=m
@@ -78,6 +87,8 @@ CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
 CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
 CONFIG_CRYPTO_DES3_EDE_X86_64=m
+CONFIG_CRYPTO_POLY1305_X86_64=m
+CONFIG_CRYPTO_CHACHA20_X86_64=m
 # staging crypto
 # CONFIG_CRYPTO_SKEIN is not set
 
@@ -103,6 +114,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_MEMORY_HOTPLUG=y
 # CONFIG_ARCH_MEMORY_PROBE is not set
 # CONFIG_MEMORY_HOTREMOVE is not set
+# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set 
 
 # CONFIG_BLK_DEV_CMD640 is not set
 # CONFIG_BLK_DEV_RZ1000 is not set
@@ -124,7 +136,8 @@ CONFIG_XEN_DEV_EVTCHN=m
 CONFIG_XEN_SYS_HYPERVISOR=y
 # CONFIG_XEN_MCE_LOG is not set
 # CONFIG_XEN_STUB is not set
-# CONFIG_XEN_PVH is not set
+CONFIG_XEN_PVH=y
+CONFIG_XEN_512GB=y
 
 CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
 
@@ -147,6 +160,7 @@ CONFIG_RCU_FANOUT=64
 
 CONFIG_INTEL_TXT=y
 
+# CONFIG_OF is not set
 
 CONFIG_FUNCTION_GRAPH_TRACER=y
 
@@ -162,24 +176,39 @@ CONFIG_THUNDERBOLT=m
 
 CONFIG_NTB=m
 CONFIG_NTB_NETDEV=m
+CONFIG_NTB_INTEL=m
+CONFIG_NTB_PINGPONG=m
+CONFIG_NTB_TOOL=m
+CONFIG_NTB_TRANSPORT=m
 
 # 10GigE
 #
 CONFIG_IP1000=m
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_DCB=y
-# CONFIG_MLX4_DEBUG is not set
 CONFIG_SFC=m
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MTD=y
+# CONFIG_SFC_MCDI_LOGGING is not set
 # Override MTD stuff because SFC_MTD needs it
 CONFIG_MTD_BLOCK=m
 
 CONFIG_HSA_AMD=m
 
+CONFIG_LIBNVDIMM=m
+CONFIG_BTT=y
+CONFIG_ND_BTT=m
+CONFIG_ND_BLK=m
+
+CONFIG_MDIO_OCTEON=m
+
 CONFIG_NO_HZ_FULL=y
 # CONFIG_NO_HZ_IDLE is not set
 # CONFIG_NO_HZ_FULL_ALL is not set
 # CONFIG_NO_HZ_FULL_SYSIDLE is not set
 # CONFIG_CONTEXT_TRACKING_FORCE is not set
+
+# Turn on CONFIG_CMA for THP
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_AREAS=7
diff --git a/crash-driver.patch b/crash-driver.patch
index 9c35b0169..d88138440 100644
--- a/crash-driver.patch
+++ b/crash-driver.patch
@@ -148,7 +148,7 @@ index 000000000000..404bcb93c112
 +
 +#endif /* _ASM_IA64_CRASH_H */
 diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
-index 5b7791dd3965..aee4b870c763 100644
+index 096731049538..e88887827906 100644
 --- a/arch/ia64/kernel/ia64_ksyms.c
 +++ b/arch/ia64/kernel/ia64_ksyms.c
 @@ -84,6 +84,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs);
@@ -240,10 +240,10 @@ index 000000000000..552be5e2c571
 +
 +#endif /* _S390_CRASH_H */
 diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c
-index 2eb34bdfc613..11ce5c98462c 100644
+index 8a993a53fcd6..8f511795b52e 100644
 --- a/arch/s390/mm/maccess.c
 +++ b/arch/s390/mm/maccess.c
-@@ -193,6 +193,7 @@ void *xlate_dev_mem_ptr(phys_addr_t addr)
+@@ -197,6 +197,7 @@ void *xlate_dev_mem_ptr(phys_addr_t addr)
  	put_online_cpus();
  	return bounce;
  }
@@ -251,7 +251,7 @@ index 2eb34bdfc613..11ce5c98462c 100644
  
  /*
   * Free converted buffer for /dev/mem access (if necessary)
-@@ -202,3 +203,4 @@ void unxlate_dev_mem_ptr(phys_addr_t addr, void *buf)
+@@ -206,3 +207,4 @@ void unxlate_dev_mem_ptr(phys_addr_t addr, void *buf)
  	if ((void *) addr != buf)
  		free_page((unsigned long) buf);
  }
@@ -269,7 +269,7 @@ index 000000000000..fd4736ec99f5
 +
 +#endif /* _X86_CRASH_H */
 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index a4af8221751e..193f1a7c2ce5 100644
+index a043107da2af..b272397f306a 100644
 --- a/drivers/char/Kconfig
 +++ b/drivers/char/Kconfig
 @@ -4,6 +4,9 @@
@@ -283,10 +283,10 @@ index a4af8221751e..193f1a7c2ce5 100644
  
  config DEVMEM
 diff --git a/drivers/char/Makefile b/drivers/char/Makefile
-index d06cde26031b..0832636fd9bc 100644
+index d8a7579300d2..31c83630f593 100644
 --- a/drivers/char/Makefile
 +++ b/drivers/char/Makefile
-@@ -62,3 +62,5 @@ js-rtc-y = rtc.o
+@@ -60,3 +60,5 @@ js-rtc-y = rtc.o
  
  obj-$(CONFIG_TILE_SROM)		+= tile-srom.o
  obj-$(CONFIG_XILLYBUS)		+= xillybus/
@@ -504,6 +504,3 @@ index 000000000000..25ab9869d566
 +#endif /* __KERNEL__ */
 +
 +#endif /* __CRASH_H__ */
--- 
-2.1.0
-
diff --git a/criu-no-expert.patch b/criu-no-expert.patch
index 6c488570d..f7e1ffff1 100644
--- a/criu-no-expert.patch
+++ b/criu-no-expert.patch
@@ -9,27 +9,24 @@ Upstream-status: Fedora mustard
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/init/Kconfig b/init/Kconfig
-index 9a782b02e4d5..d97b5032d4b0 100644
+index 648bb79d6b73..860ca236975f 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1135,7 +1135,7 @@ config DEBUG_BLK_CGROUP
+@@ -1137,7 +1137,7 @@ config CGROUP_WRITEBACK
  endif # CGROUPS
  
  config CHECKPOINT_RESTORE
 -	bool "Checkpoint/restore support" if EXPERT
 +	bool "Checkpoint/restore support"
+ 	select PROC_CHILDREN
  	default n
  	help
- 	  Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1146,7 +1146,7 @@ config CHECKPOINT_RESTORE
+@@ -1149,7 +1149,7 @@ config CHECKPOINT_RESTORE
  	  If unsure, say N here.
  
  menuconfig NAMESPACES
 -	bool "Namespaces support" if EXPERT
 +	bool "Namespaces support"
+ 	depends on MULTIUSER
  	default !EXPERT
  	help
- 	  Provides the way to make tasks work with different objects using
--- 
-2.1.0
-
diff --git a/die-floppy-die.patch b/die-floppy-die.patch
index 5a5e72843..caaa2dde5 100644
--- a/die-floppy-die.patch
+++ b/die-floppy-die.patch
@@ -27,6 +27,3 @@ index a08cda955285..e320e1e679cf 100644
  
  #else
  
--- 
-2.1.0
-
diff --git a/disable-i8042-check-on-apple-mac.patch b/disable-i8042-check-on-apple-mac.patch
index 793bada3d..e75028da2 100644
--- a/disable-i8042-check-on-apple-mac.patch
+++ b/disable-i8042-check-on-apple-mac.patch
@@ -1,3 +1,4 @@
+From 31e64826785b5bafef7a6361516c060be2bca253 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess@hadess.net>
 Date: Thu, 20 May 2010 10:30:31 -0400
 Subject: [PATCH] disable i8042 check on apple mac
@@ -17,11 +18,11 @@ Signed-off-by: Bastien Nocera <hadess@hadess.net>
  1 file changed, 22 insertions(+)
 
 diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
-index bfb0b2280df0..06b10fe7e65b 100644
+index c9c98f0ab284..5137185e14a9 100644
 --- a/drivers/input/serio/i8042.c
 +++ b/drivers/input/serio/i8042.c
-@@ -1484,6 +1484,22 @@ static struct platform_driver i8042_driver = {
- 	.shutdown	= i8042_shutdown,
+@@ -1540,6 +1540,22 @@ static struct notifier_block i8042_kbd_bind_notifier_block = {
+ 	.notifier_call = i8042_kbd_bind_notifier,
  };
  
 +#ifdef CONFIG_DMI
@@ -43,7 +44,7 @@ index bfb0b2280df0..06b10fe7e65b 100644
  static int __init i8042_init(void)
  {
  	struct platform_device *pdev;
-@@ -1491,6 +1507,12 @@ static int __init i8042_init(void)
+@@ -1547,6 +1563,12 @@ static int __init i8042_init(void)
  
  	dbg_init();
  
@@ -57,5 +58,5 @@ index bfb0b2280df0..06b10fe7e65b 100644
  	if (err)
  		return err;
 -- 
-2.1.0
+2.4.3
 
diff --git a/drm-i915-hush-check-crtc-state.patch b/drm-i915-hush-check-crtc-state.patch
index beea2dc2e..fa4baffbf 100644
--- a/drm-i915-hush-check-crtc-state.patch
+++ b/drm-i915-hush-check-crtc-state.patch
@@ -1,3 +1,4 @@
+From 02f47b49ab1cdbe62ceb71b658e2c469799ae368 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax@redhat.com>
 Date: Wed, 13 Nov 2013 10:17:24 -0500
 Subject: [PATCH] drm/i915: hush check crtc state
@@ -14,18 +15,18 @@ Upstream-status: http://lists.freedesktop.org/archives/intel-gfx/2013-November/0
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 9943c20a741d..bfac247e6d2c 100644
+index ca9278be49f7..308ac0539a87 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -10886,7 +10886,7 @@ check_crtc_state(struct drm_device *dev)
- 
- 		if (active &&
- 		    !intel_pipe_config_compare(dev, crtc->config, &pipe_config)) {
+@@ -12688,7 +12688,7 @@ check_crtc_state(struct drm_device *dev, struct drm_atomic_state *old_state)
+ 		sw_config = to_intel_crtc_state(crtc->state);
+ 		if (!intel_pipe_config_compare(dev, sw_config,
+ 					       pipe_config, false)) {
 -			I915_STATE_WARN(1, "pipe state doesn't match!\n");
 +			DRM_DEBUG_KMS("pipe state doesn't match!\n");
- 			intel_dump_pipe_config(crtc, &pipe_config,
+ 			intel_dump_pipe_config(intel_crtc, pipe_config,
  					       "[hw state]");
- 			intel_dump_pipe_config(crtc, crtc->config,
+ 			intel_dump_pipe_config(intel_crtc, sw_config,
 -- 
-2.1.0
+2.4.3
 
diff --git a/drm-i915-turn-off-wc-mmaps.patch b/drm-i915-turn-off-wc-mmaps.patch
new file mode 100644
index 000000000..c81b89226
--- /dev/null
+++ b/drm-i915-turn-off-wc-mmaps.patch
@@ -0,0 +1,21 @@
+From: Dave Airlie <airlied@redhat.com>
+Date: Thu, 4 Jun 2015 07:12:20 -0400
+Subject: [PATCH] drm: i915: turn off wc mmaps
+
+---
+ drivers/gpu/drm/i915/i915_dma.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
+index d2df321ba634..775a5b11a366 100644
+--- a/drivers/gpu/drm/i915/i915_dma.c
++++ b/drivers/gpu/drm/i915/i915_dma.c
+@@ -151,7 +151,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
+ 		value = 1;
+ 		break;
+ 	case I915_PARAM_MMAP_VERSION:
+-		value = 1;
++		value = 0;
+ 		break;
+ 	case I915_PARAM_SUBSLICE_TOTAL:
+ 		value = INTEL_INFO(dev)->subslice_total;
diff --git a/drm-vmwgfx-Allow-dropped-masters-render-node-like-ac.patch b/drm-vmwgfx-Allow-dropped-masters-render-node-like-ac.patch
new file mode 100644
index 000000000..70204e5e9
--- /dev/null
+++ b/drm-vmwgfx-Allow-dropped-masters-render-node-like-ac.patch
@@ -0,0 +1,60 @@
+From a19afebb883f2a02ecf4b8d5a114ce6957a59238 Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed, 26 Aug 2015 05:49:21 -0700
+Subject: [PATCH 2/2] drm/vmwgfx: Allow dropped masters render-node like access
+ on legacy nodes v2
+
+Applications like gnome-shell may try to render after dropping master
+privileges. Since the driver should now be safe against this scenario,
+allow those applications to use their legacy node like a render node.
+
+v2: Add missing return statement.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Sinclair Yeh <syeh@vmware.com>
+---
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c     | 7 ++++++-
+ drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 6 ++++++
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+index a4766acd0ea2..d022b509f1ac 100644
+--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+@@ -993,10 +993,15 @@ static struct vmw_master *vmw_master_check(struct drm_device *dev,
+ 	}
+ 
+ 	/*
+-	 * Check if we were previously master, but now dropped.
++	 * Check if we were previously master, but now dropped. In that
++	 * case, allow at least render node functionality.
+ 	 */
+ 	if (vmw_fp->locked_master) {
+ 		mutex_unlock(&dev->master_mutex);
++
++		if (flags & DRM_RENDER_ALLOW)
++			return NULL;
++
+ 		DRM_ERROR("Dropped master trying to access ioctl that "
+ 			  "requires authentication.\n");
+ 		return ERR_PTR(-EACCES);
+diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
+index 4d0c98edeb6a..7fc3e8abd0c4 100644
+--- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
+@@ -906,6 +906,12 @@ vmw_surface_handle_reference(struct vmw_private *dev_priv,
+ 				  "surface reference.\n");
+ 			return -EACCES;
+ 		}
++		if (ACCESS_ONCE(vmw_fpriv(file_priv)->locked_master)) {
++			DRM_ERROR("Locked master refused legacy "
++				  "surface reference.\n");
++			return -EACCES;
++		}
++
+ 		handle = u_handle;
+ 	}
+ 
+-- 
+2.4.3
+
diff --git a/efi-Add-EFI_SECURE_BOOT-bit.patch b/efi-Add-EFI_SECURE_BOOT-bit.patch
index f0110ea86..89b9664c7 100644
--- a/efi-Add-EFI_SECURE_BOOT-bit.patch
+++ b/efi-Add-EFI_SECURE_BOOT-bit.patch
@@ -1,6 +1,7 @@
+From c01ff700ea4192ae04b306fef725d62189550236 Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Tue, 27 Aug 2013 13:33:03 -0400
-Subject: [PATCH] efi: Add EFI_SECURE_BOOT bit
+Subject: [PATCH 13/20] efi: Add EFI_SECURE_BOOT bit
 
 UEFI machines can be booted in Secure Boot mode.  Add a EFI_SECURE_BOOT bit
 for use with efi_enabled.
@@ -12,10 +13,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
  2 files changed, 3 insertions(+)
 
 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 26741d24797e..64a123acb97f 100644
+index f3b804f..a401ff8 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
-@@ -1167,7 +1167,9 @@ void __init setup_arch(char **cmdline_p)
+@@ -1145,7 +1145,9 @@ void __init setup_arch(char **cmdline_p)
  
  #ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
  	if (boot_params.secure_boot) {
@@ -26,17 +27,17 @@ index 26741d24797e..64a123acb97f 100644
  #endif
  
 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index cf7e431cbc73..c74cbd892032 100644
+index 569b5a8..4dc970e 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
-@@ -942,6 +942,7 @@ extern int __init efi_setup_pcdp_console(char *);
- #define EFI_64BIT		5	/* Is the firmware 64-bit? */
- #define EFI_PARAVIRT		6	/* Access is via a paravirt interface */
+@@ -980,6 +980,7 @@ extern int __init efi_setup_pcdp_console(char *);
  #define EFI_ARCH_1		7	/* First arch-specific bit */
-+#define EFI_SECURE_BOOT		8	/* Are we in Secure Boot mode? */
+ #define EFI_DBG			8	/* Print additional debug info at runtime */
+ #define EFI_NX_PE_DATA		9	/* Can runtime data regions be mapped non-executable? */
++#define EFI_SECURE_BOOT		10	/* Are we in Secure Boot mode? */
  
  #ifdef CONFIG_EFI
  /*
 -- 
-2.1.0
+2.5.0
 
diff --git a/efi-Add-esrt-support.patch b/efi-Add-esrt-support.patch
deleted file mode 100644
index bd0c98e67..000000000
--- a/efi-Add-esrt-support.patch
+++ /dev/null
@@ -1,767 +0,0 @@
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 18 Nov 2014 10:18:22 -0500
-Subject: [PATCH] efi: Add esrt support.
-
-Add sysfs files for the EFI System Resource Table (ESRT) under
-/sys/firmware/efi/esrt and for each EFI System Resource Entry under
-entries/ as a subdir.
-
-The EFI System Resource Table (ESRT) provides a read-only catalog of
-system components for which the system accepts firmware upgrades via
-UEFI's "Capsule Update" feature.  This module allows userland utilities
-to evaluate what firmware updates can be applied to this system, and
-potentially arrange for those updates to occur.
-
-The ESRT is described as part of the UEFI specification, in version 2.5
-which should be available from http://uefi.org/specifications in early
-2015.  If you're a member of the UEFI Forum, information about its
-addition to the standard is available as UEFI Mantis 1090.
-
-For some hardware platforms, additional restrictions may be found at
-http://msdn.microsoft.com/en-us/library/windows/hardware/jj128256.aspx ,
-and additional documentation may be found at
-http://download.microsoft.com/download/5/F/5/5F5D16CD-2530-4289-8019-94C6A20BED3C/windows-uefi-firmware-update-platform.docx
-.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- Documentation/ABI/testing/sysfs-firmware-efi-esrt |  81 ++++
- arch/x86/platform/efi/efi.c                       |   2 +
- drivers/firmware/efi/Makefile                     |   2 +-
- drivers/firmware/efi/efi.c                        |  66 ++-
- drivers/firmware/efi/esrt.c                       | 464 ++++++++++++++++++++++
- include/linux/efi.h                               |   8 +
- 6 files changed, 621 insertions(+), 2 deletions(-)
- create mode 100644 Documentation/ABI/testing/sysfs-firmware-efi-esrt
- create mode 100644 drivers/firmware/efi/esrt.c
-
-diff --git a/Documentation/ABI/testing/sysfs-firmware-efi-esrt b/Documentation/ABI/testing/sysfs-firmware-efi-esrt
-new file mode 100644
-index 000000000000..6e431d1a4e79
---- /dev/null
-+++ b/Documentation/ABI/testing/sysfs-firmware-efi-esrt
-@@ -0,0 +1,81 @@
-+What:		/sys/firmware/efi/esrt/
-+Date:		February 2015
-+Contact:	Peter Jones <pjones@redhat.com>
-+Description:	Provides userland access to read the EFI System Resource Table
-+		(ESRT), a catalog of firmware for which can be updated with
-+		the UEFI UpdateCapsule mechanism described in section 7.5 of
-+		the UEFI Standard.
-+Users:		fwupdate - https://github.com/rhinstaller/fwupdate
-+
-+What:		/sys/firmware/efi/esrt/fw_resource_count
-+Date:		February 2015
-+Contact:	Peter Jones <pjones@redhat.com>
-+Description:	The number of entries in the ESRT
-+
-+What:		/sys/firmware/efi/esrt/fw_resource_count_max
-+Date:		February 2015
-+Contact:	Peter Jones <pjones@redhat.com>
-+Description:	The maximum number of entries that /could/ be registered
-+		in the allocation the table is currently in.  This is
-+		really only useful to the system firmware itself.
-+
-+What:		/sys/firmware/efi/esrt/fw_resource_version
-+Date:		February 2015
-+Contact:	Peter Jones <pjones@redhat.com>
-+Description:	The version of the ESRT structure provided by the firmware.
-+
-+What:		/sys/firmware/efi/esrt/entries/entry$N/
-+Date:		February 2015
-+Contact:	Peter Jones <pjones@redhat.com>
-+Description:	Each ESRT entry is identified by a GUID, and each gets a
-+		subdirectory under entries/ .
-+		example: /sys/firmware/efi/esrt/entries/entry0/
-+
-+What:		/sys/firmware/efi/esrt/entries/entry$N/fw_type
-+Date:		February 2015
-+Contact:	Peter Jones <pjones@redhat.com>
-+Description:	What kind of firmware entry this is:
-+		0 - Unknown
-+		1 - System Firmware
-+		2 - Device Firmware
-+		3 - UEFI Driver
-+
-+What:		/sys/firmware/efi/esrt/entries/entry$N/fw_class
-+Date:		February 2015
-+Contact:	Peter Jones <pjones@redhat.com>
-+Description:	This is the entry's guid, and will match the directory name.
-+
-+What:		/sys/firmware/efi/esrt/entries/entry$N/fw_version
-+Date:		February 2015
-+Contact:	Peter Jones <pjones@redhat.com>
-+Description:	The version of the firmware currently installed.  This is a
-+		32-bit unsigned integer.
-+
-+What:		/sys/firmware/efi/esrt/entries/entry$N/lowest_supported_fw_version
-+Date:		February 2015
-+Contact:	Peter Jones <pjones@redhat.com>
-+Description:	The lowest version of the firmware that can be installed.
-+
-+What:		/sys/firmware/efi/esrt/entries/entry$N/capsule_flags
-+Date:		February 2015
-+Contact:	Peter Jones <pjones@redhat.com>
-+Description:	Flags that must be passed to UpdateCapsule()
-+
-+What:		/sys/firmware/efi/esrt/entries/entry$N/last_attempt_version
-+Date:		February 2015
-+Contact:	Peter Jones <pjones@redhat.com>
-+Description:	The last firmware version for which an update was attempted.
-+
-+What:		/sys/firmware/efi/esrt/entries/entry$N/last_attempt_status
-+Date:		February 2015
-+Contact:	Peter Jones <pjones@redhat.com>
-+Description:	The result of the last firmware update attempt for the
-+		firmware resource entry.
-+		0 - Success
-+		1 - Insufficient resources
-+		2 - Incorrect version
-+		3 - Invalid format
-+		4 - Authentication error
-+		5 - AC power event
-+		6 - Battery power event
-+
-diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
-index dbc8627a5cdf..b4c9fbbc9270 100644
---- a/arch/x86/platform/efi/efi.c
-+++ b/arch/x86/platform/efi/efi.c
-@@ -492,6 +492,8 @@ void __init efi_init(void)
- 		return;
- 
- 	print_efi_memmap();
-+
-+	efi_esrt_init();
- }
- 
- void __init efi_late_init(void)
-diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile
-index d8be608a9f3b..26eabbc55341 100644
---- a/drivers/firmware/efi/Makefile
-+++ b/drivers/firmware/efi/Makefile
-@@ -1,7 +1,7 @@
- #
- # Makefile for linux kernel
- #
--obj-$(CONFIG_EFI)			+= efi.o vars.o reboot.o
-+obj-$(CONFIG_EFI)			+= efi.o esrt.o vars.o reboot.o
- obj-$(CONFIG_EFI_VARS)			+= efivars.o
- obj-$(CONFIG_EFI_VARS_PSTORE)		+= efi-pstore.o
- obj-$(CONFIG_UEFI_CPER)			+= cper.o
-diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
-index 3061bb8629dc..e54ea20dfb42 100644
---- a/drivers/firmware/efi/efi.c
-+++ b/drivers/firmware/efi/efi.c
-@@ -39,6 +39,7 @@ struct efi __read_mostly efi = {
- 	.fw_vendor  = EFI_INVALID_TABLE_ADDR,
- 	.runtime    = EFI_INVALID_TABLE_ADDR,
- 	.config_table  = EFI_INVALID_TABLE_ADDR,
-+	.esrt       = EFI_INVALID_TABLE_ADDR,
- };
- EXPORT_SYMBOL(efi);
- 
-@@ -64,7 +65,7 @@ static int __init parse_efi_cmdline(char *str)
- }
- early_param("efi", parse_efi_cmdline);
- 
--static struct kobject *efi_kobj;
-+struct kobject *efi_kobj;
- static struct kobject *efivars_kobj;
- 
- /*
-@@ -232,6 +233,68 @@ err_put:
- 
- subsys_initcall(efisubsys_init);
- 
-+/*
-+ * Find the efi memory descriptor for a given physical address.  Given a
-+ * physicall address, determine if it exists within an EFI Memory Map entry,
-+ * and if so, populate the supplied memory descriptor with the appropriate
-+ * data.
-+ */
-+int __init efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md)
-+{
-+	struct efi_memory_map *map = efi.memmap;
-+	void *p, *e;
-+
-+	if (!efi_enabled(EFI_MEMMAP)) {
-+		pr_err_once("EFI_MEMMAP is not enabled.\n");
-+		return -EINVAL;
-+	}
-+
-+	if (!map) {
-+		pr_err_once("efi.memmap is not set.\n");
-+		return -EINVAL;
-+	}
-+	if (!out_md) {
-+		pr_err_once("out_md is null.\n");
-+		return -EINVAL;
-+        }
-+	if (WARN_ON_ONCE(!map->phys_map))
-+		return -EINVAL;
-+	if (WARN_ON_ONCE(map->nr_map == 0) || WARN_ON_ONCE(map->desc_size == 0))
-+		return -EINVAL;
-+
-+	e = map->phys_map + map->nr_map * map->desc_size;
-+	for (p = map->phys_map; p < e; p += map->desc_size) {
-+		/*
-+		 * If a driver calls this after efi_free_boot_services,
-+		 * ->map will be NULL.
-+		 * So just always get our own virtual map on the CPU.
-+		 */
-+		efi_memory_desc_t *md = phys_to_virt((phys_addr_t)p);
-+		u64 size = md->num_pages << EFI_PAGE_SHIFT;
-+		u64 end = md->phys_addr + size;
-+
-+		if (!(md->attribute & EFI_MEMORY_RUNTIME) &&
-+		    md->type != EFI_BOOT_SERVICES_DATA &&
-+		    md->type != EFI_RUNTIME_SERVICES_DATA)
-+			continue;
-+		if (phys_addr >= md->phys_addr && phys_addr < end) {
-+			memcpy(out_md, md, sizeof(*out_md));
-+			return 0;
-+		}
-+	}
-+	pr_err_once("requested map not found.\n");
-+	return -ENOENT;
-+}
-+
-+/*
-+ * Calculate the highest address of an efi memory descriptor.
-+ */
-+u64 __init efi_mem_desc_end(efi_memory_desc_t *md)
-+{
-+	u64 size = md->num_pages << EFI_PAGE_SHIFT;
-+	u64 end = md->phys_addr + size;
-+	return end;
-+}
- 
- /*
-  * We can't ioremap data in EFI boot services RAM, because we've already mapped
-@@ -274,6 +337,7 @@ static __initdata efi_config_table_type_t common_tables[] = {
- 	{SMBIOS_TABLE_GUID, "SMBIOS", &efi.smbios},
- 	{SMBIOS3_TABLE_GUID, "SMBIOS 3.0", &efi.smbios3},
- 	{UGA_IO_PROTOCOL_GUID, "UGA", &efi.uga},
-+	{EFI_SYSTEM_RESOURCE_TABLE_GUID, "ESRT", &efi.esrt},
- 	{NULL_GUID, NULL, NULL},
- };
- 
-diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c
-new file mode 100644
-index 000000000000..20c0cbdb1c60
---- /dev/null
-+++ b/drivers/firmware/efi/esrt.c
-@@ -0,0 +1,464 @@
-+/*
-+ * esrt.c
-+ *
-+ * This module exports EFI System Resource Table (ESRT) entries into userspace
-+ * through the sysfs file system. The ESRT provides a read-only catalog of
-+ * system components for which the system accepts firmware upgrades via UEFI's
-+ * "Capsule Update" feature. This module allows userland utilities to evaluate
-+ * what firmware updates can be applied to this system, and potentially arrange
-+ * for those updates to occur.
-+ *
-+ * Data is currently found below /sys/firmware/efi/esrt/...
-+ */
-+#define pr_fmt(fmt) "esrt: " fmt
-+
-+#include <linux/capability.h>
-+#include <linux/device.h>
-+#include <linux/efi.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/kobject.h>
-+#include <linux/list.h>
-+#include <linux/memblock.h>
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+#include <linux/types.h>
-+
-+#include <asm/io.h>
-+#include <asm/early_ioremap.h>
-+
-+struct efi_system_resource_entry_v1 {
-+	efi_guid_t	fw_class;
-+	u32		fw_type;
-+	u32		fw_version;
-+	u32		lowest_supported_fw_version;
-+	u32		capsule_flags;
-+	u32		last_attempt_version;
-+	u32		last_attempt_status;
-+};
-+
-+/*
-+ * _count and _version are what they seem like.  _max is actually just
-+ * accounting info for the firmware when creating the table; it should never
-+ * have been exposed to us.  To wit, the spec says:
-+ * The maximum number of resource array entries that can be within the
-+ * table without reallocating the table, must not be zero.
-+ * Since there's no guidance about what that means in terms of memory layout,
-+ * it means nothing to us.
-+ */
-+struct efi_system_resource_table {
-+	u32	fw_resource_count;
-+	u32	fw_resource_count_max;
-+	u64	fw_resource_version;
-+	u8	entries[];
-+};
-+
-+static phys_addr_t esrt_data;
-+static size_t esrt_data_size;
-+
-+static struct efi_system_resource_table *esrt;
-+
-+struct esre_entry {
-+	union {
-+		struct efi_system_resource_entry_v1 *esre1;
-+	} esre;
-+
-+	struct kobject kobj;
-+	struct list_head list;
-+};
-+
-+/* global list of esre_entry. */
-+static LIST_HEAD(entry_list);
-+
-+/* entry attribute */
-+struct esre_attribute {
-+	struct attribute attr;
-+	ssize_t (*show)(struct esre_entry *entry, char *buf);
-+	ssize_t (*store)(struct esre_entry *entry,
-+			 const char *buf, size_t count);
-+};
-+
-+static struct esre_entry *to_entry(struct kobject *kobj)
-+{
-+	return container_of(kobj, struct esre_entry, kobj);
-+}
-+
-+static struct esre_attribute *to_attr(struct attribute *attr)
-+{
-+	return container_of(attr, struct esre_attribute, attr);
-+}
-+
-+static ssize_t esre_attr_show(struct kobject *kobj,
-+			      struct attribute *_attr, char *buf)
-+{
-+	struct esre_entry *entry = to_entry(kobj);
-+	struct esre_attribute *attr = to_attr(_attr);
-+
-+	/* Don't tell normal users what firmware versions we've got... */
-+	if (!capable(CAP_SYS_ADMIN))
-+		return -EACCES;
-+
-+	return attr->show(entry, buf);
-+}
-+
-+static const struct sysfs_ops esre_attr_ops = {
-+	.show = esre_attr_show,
-+};
-+
-+/* Generic ESRT Entry ("ESRE") support. */
-+static ssize_t esre_fw_class_show(struct esre_entry *entry, char *buf)
-+{
-+	char *str = buf;
-+
-+	efi_guid_to_str(&entry->esre.esre1->fw_class, str);
-+	str += strlen(str);
-+	str += sprintf(str, "\n");
-+
-+	return str - buf;
-+}
-+
-+static struct esre_attribute esre_fw_class = __ATTR(fw_class, 0400,
-+	esre_fw_class_show, NULL);
-+
-+#define esre_attr_decl(name, size, fmt) \
-+static ssize_t esre_##name##_show(struct esre_entry *entry, char *buf) \
-+{ \
-+	return sprintf(buf, fmt "\n", \
-+		       le##size##_to_cpu(entry->esre.esre1->name)); \
-+} \
-+\
-+static struct esre_attribute esre_##name = __ATTR(name, 0400, \
-+	esre_##name##_show, NULL)
-+
-+esre_attr_decl(fw_type, 32, "%u");
-+esre_attr_decl(fw_version, 32, "%u");
-+esre_attr_decl(lowest_supported_fw_version, 32, "%u");
-+esre_attr_decl(capsule_flags, 32, "0x%x");
-+esre_attr_decl(last_attempt_version, 32, "%u");
-+esre_attr_decl(last_attempt_status, 32, "%u");
-+
-+static struct attribute *esre1_attrs[] = {
-+	&esre_fw_class.attr,
-+	&esre_fw_type.attr,
-+	&esre_fw_version.attr,
-+	&esre_lowest_supported_fw_version.attr,
-+	&esre_capsule_flags.attr,
-+	&esre_last_attempt_version.attr,
-+	&esre_last_attempt_status.attr,
-+	NULL
-+};
-+static void esre_release(struct kobject *kobj)
-+{
-+	struct esre_entry *entry = to_entry(kobj);
-+
-+	list_del(&entry->list);
-+	kfree(entry);
-+}
-+
-+static struct kobj_type esre1_ktype = {
-+	.release = esre_release,
-+	.sysfs_ops = &esre_attr_ops,
-+	.default_attrs = esre1_attrs,
-+};
-+
-+
-+static struct kobject *esrt_kobj;
-+static struct kset *esrt_kset;
-+
-+static int esre_create_sysfs_entry(void *esre, int entry_num)
-+{
-+	int rc = 0;
-+	struct esre_entry *entry;
-+	char name[20];
-+
-+	entry = kzalloc(sizeof(*entry), GFP_KERNEL);
-+	if (!entry)
-+		return -ENOMEM;
-+
-+	sprintf(name, "entry%d", entry_num);
-+
-+	entry->kobj.kset = esrt_kset;
-+
-+	if (esrt->fw_resource_version == 1) {
-+		entry->esre.esre1 = esre;
-+		rc = kobject_init_and_add(&entry->kobj, &esre1_ktype, NULL,
-+					  "%s", name);
-+	}
-+	if (rc) {
-+		kfree(entry);
-+		return rc;
-+	}
-+
-+	list_add_tail(&entry->list, &entry_list);
-+	return 0;
-+}
-+
-+/* support for displaying ESRT fields at the top level */
-+#define esrt_attr_decl(name, size, fmt) \
-+static ssize_t esrt_##name##_show(struct kobject *kobj, \
-+				  struct kobj_attribute *attr, char *buf)\
-+{ \
-+	return sprintf(buf, fmt "\n", le##size##_to_cpu(esrt->name)); \
-+} \
-+\
-+static struct kobj_attribute esrt_##name = __ATTR(name, 0400, \
-+	esrt_##name##_show, NULL)
-+
-+esrt_attr_decl(fw_resource_count, 32, "%u");
-+esrt_attr_decl(fw_resource_count_max, 32, "%u");
-+esrt_attr_decl(fw_resource_version, 64, "%llu");
-+
-+static struct attribute *esrt_attrs[] = {
-+	&esrt_fw_resource_count.attr,
-+	&esrt_fw_resource_count_max.attr,
-+	&esrt_fw_resource_version.attr,
-+	NULL,
-+};
-+
-+static inline int esrt_table_exists(void)
-+{
-+	if (!efi_enabled(EFI_CONFIG_TABLES))
-+		return 0;
-+	if (efi.esrt == EFI_INVALID_TABLE_ADDR)
-+		return 0;
-+	return 1;
-+}
-+
-+static umode_t esrt_attr_is_visible(struct kobject *kobj,
-+				    struct attribute *attr, int n)
-+{
-+	if (!esrt_table_exists())
-+		return 0;
-+	return attr->mode;
-+}
-+
-+static struct attribute_group esrt_attr_group = {
-+	.attrs = esrt_attrs,
-+	.is_visible = esrt_attr_is_visible,
-+};
-+
-+/*
-+ * remap the table, copy it to kmalloced pages, and unmap it.
-+ */
-+void __init efi_esrt_init(void)
-+{
-+	void *va;
-+	struct efi_system_resource_table tmpesrt;
-+	struct efi_system_resource_entry_v1 *v1_entries;
-+	size_t size, max, entry_size, entries_size;
-+	efi_memory_desc_t md;
-+	int rc;
-+
-+	pr_debug("esrt-init: loading.\n");
-+	if (!esrt_table_exists())
-+		return;
-+
-+	rc = efi_mem_desc_lookup(efi.esrt, &md);
-+	if (rc < 0) {
-+		pr_err("ESRT header is not in the memory map.\n");
-+		return;
-+	}
-+
-+	max = efi_mem_desc_end(&md);
-+	if (max < efi.esrt) {
-+		pr_err("EFI memory descriptor is invalid. (esrt: %p max: %p)\n",
-+		       (void *)efi.esrt, (void *)max);
-+		return;
-+	}
-+
-+	size = sizeof(*esrt);
-+	max -= efi.esrt;
-+
-+	if (max < size) {
-+		pr_err("ESRT header doen't fit on single memory map entry. (size: %zu max: %zu)\n",
-+		       size, max);
-+		return;
-+	}
-+
-+	va = early_memremap(efi.esrt, size);
-+	if (!va) {
-+		pr_err("early_memremap(%p, %zu) failed.\n", (void *)efi.esrt,
-+		       size);
-+		return;
-+	}
-+
-+	memcpy(&tmpesrt, va, sizeof(tmpesrt));
-+
-+	if (tmpesrt.fw_resource_version == 1) {
-+		entry_size = sizeof (*v1_entries);
-+	} else {
-+		pr_err("Unsupported ESRT version %lld.\n",
-+		       tmpesrt.fw_resource_version);
-+		return;
-+	}
-+
-+	if (tmpesrt.fw_resource_count > 0 && max - size < entry_size) {
-+		pr_err("ESRT memory map entry can only hold the header. (max: %zu size: %zu)\n",
-+		       max - size, entry_size);
-+		goto err_memunmap;
-+	}
-+
-+	/*
-+	 * The format doesn't really give us any boundary to test here,
-+	 * so I'm making up 128 as the max number of individually updatable
-+	 * components we support.
-+	 * 128 should be pretty excessive, but there's still some chance
-+	 * somebody will do that someday and we'll need to raise this.
-+	 */
-+	if (tmpesrt.fw_resource_count > 128) {
-+		pr_err("ESRT says fw_resource_count has very large value %d.\n",
-+		       tmpesrt.fw_resource_count);
-+		goto err_memunmap;
-+	}
-+
-+	/*
-+	 * We know it can't be larger than N * sizeof() here, and N is limited
-+	 * by the previous test to a small number, so there's no overflow.
-+	 */
-+	entries_size = tmpesrt.fw_resource_count * entry_size;
-+	if (max < size + entries_size) {
-+		pr_err("ESRT does not fit on single memory map entry (size: %zu max: %zu)\n",
-+		       size, max);
-+		goto err_memunmap;
-+	}
-+
-+	/* remap it with our (plausible) new pages */
-+	early_memunmap(va, size);
-+	size += entries_size;
-+	va = early_memremap(efi.esrt, size);
-+	if (!va) {
-+		pr_err("early_memremap(%p, %zu) failed.\n", (void *)efi.esrt,
-+		       size);
-+		return;
-+	}
-+
-+	esrt_data = (phys_addr_t)efi.esrt;
-+	esrt_data_size = size;
-+
-+	pr_info("Reserving ESRT space from %p to %p.\n", (void *)esrt_data,
-+		(char *)esrt_data + size);
-+	memblock_reserve(esrt_data, esrt_data_size);
-+
-+	pr_debug("esrt-init: loaded.\n");
-+err_memunmap:
-+	early_memunmap(va, size);
-+}
-+
-+static int __init register_entries(void)
-+{
-+	struct efi_system_resource_entry_v1 *v1_entries = (void *)esrt->entries;
-+	int i, rc;
-+
-+	if (!esrt_table_exists())
-+		return 0;
-+
-+	for (i = 0; i < le32_to_cpu(esrt->fw_resource_count); i++) {
-+		void *entry;
-+		if (esrt->fw_resource_version == 1) {
-+			entry = &v1_entries[i];
-+		}
-+		rc = esre_create_sysfs_entry(entry, i);
-+		if (rc < 0) {
-+			pr_err("ESRT entry creation failed with error %d.\n",
-+			       rc);
-+			return rc;
-+		}
-+	}
-+	return 0;
-+}
-+
-+static void cleanup_entry_list(void)
-+{
-+	struct esre_entry *entry, *next;
-+
-+	list_for_each_entry_safe(entry, next, &entry_list, list) {
-+		kobject_put(&entry->kobj);
-+	}
-+}
-+
-+static int __init esrt_sysfs_init(void)
-+{
-+	int error;
-+	struct efi_system_resource_table __iomem *ioesrt;
-+
-+	pr_debug("esrt-sysfs: loading.\n");
-+	if (!esrt_data || !esrt_data_size)
-+		return -ENOSYS;
-+
-+	ioesrt = ioremap(esrt_data, esrt_data_size);
-+	if (!ioesrt) {
-+		pr_err("ioremap(%p, %zu) failed.\n", (void *)esrt_data,
-+		       esrt_data_size);
-+		return -ENOMEM;
-+	}
-+
-+	esrt = kmalloc(esrt_data_size, GFP_KERNEL);
-+	if (!esrt) {
-+		pr_err("kmalloc failed. (wanted %zu bytes)\n", esrt_data_size);
-+		iounmap(ioesrt);
-+		return -ENOMEM;
-+	}
-+
-+	memcpy_fromio(esrt, ioesrt, esrt_data_size);
-+
-+	esrt_kobj = kobject_create_and_add("esrt", efi_kobj);
-+	if (!esrt_kobj) {
-+		pr_err("Firmware table registration failed.\n");
-+		error = -ENOMEM;
-+		goto err;
-+	}
-+
-+	error = sysfs_create_group(esrt_kobj, &esrt_attr_group);
-+	if (error) {
-+		pr_err("Sysfs attribute export failed with error %d.\n",
-+		       error);
-+		goto err_remove_esrt;
-+	}
-+
-+	esrt_kset = kset_create_and_add("entries", NULL, esrt_kobj);
-+	if (!esrt_kset) {
-+		pr_err("kset creation failed.\n");
-+		error = -ENOMEM;
-+		goto err_remove_group;
-+	}
-+
-+	error = register_entries();
-+	if (error)
-+		goto err_cleanup_list;
-+
-+	memblock_remove(esrt_data, esrt_data_size);
-+
-+	pr_debug("esrt-sysfs: loaded.\n");
-+
-+	return 0;
-+err_cleanup_list:
-+	cleanup_entry_list();
-+	kset_unregister(esrt_kset);
-+err_remove_group:
-+	sysfs_remove_group(esrt_kobj, &esrt_attr_group);
-+err_remove_esrt:
-+	kobject_put(esrt_kobj);
-+err:
-+	kfree(esrt);
-+	esrt = NULL;
-+	return error;
-+}
-+
-+static void __exit esrt_sysfs_exit(void)
-+{
-+	pr_debug("esrt-sysfs: unloading.\n");
-+	cleanup_entry_list();
-+	kset_unregister(esrt_kset);
-+	sysfs_remove_group(esrt_kobj, &esrt_attr_group);
-+	kfree(esrt);
-+	esrt = NULL;
-+	kobject_del(esrt_kobj);
-+	kobject_put(esrt_kobj);
-+}
-+
-+module_init(esrt_sysfs_init);
-+module_exit(esrt_sysfs_exit);
-+
-+MODULE_AUTHOR("Peter Jones <pjones@redhat.com>");
-+MODULE_DESCRIPTION("EFI System Resource Table support");
-+MODULE_LICENSE("GPL");
-diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 470e8dfcb517..ed0d0c09d45c 100644
---- a/include/linux/efi.h
-+++ b/include/linux/efi.h
-@@ -589,6 +589,9 @@ void efi_native_runtime_setup(void);
- #define DEVICE_TREE_GUID \
-     EFI_GUID(  0xb1b621d5, 0xf19c, 0x41a5, 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 )
- 
-+#define EFI_SYSTEM_RESOURCE_TABLE_GUID \
-+    EFI_GUID(  0xb122a263, 0x3661, 0x4f68, 0x99, 0x29, 0x78, 0xf8, 0xb0, 0xd6, 0x21, 0x80 )
-+
- #define EFI_CERT_SHA256_GUID \
-     EFI_GUID(  0xc1c41626, 0x504c, 0x4092, 0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28 )
- 
-@@ -849,6 +852,7 @@ extern struct efi {
- 	unsigned long fw_vendor;	/* fw_vendor */
- 	unsigned long runtime;		/* runtime table */
- 	unsigned long config_table;	/* config tables */
-+	unsigned long esrt;		/* ESRT table */
- 	efi_get_time_t *get_time;
- 	efi_set_time_t *set_time;
- 	efi_get_wakeup_time_t *get_wakeup_time;
-@@ -901,6 +905,7 @@ static inline efi_status_t efi_query_variable_store(u32 attributes, unsigned lon
- #endif
- extern void __iomem *efi_lookup_mapped_addr(u64 phys_addr);
- extern int efi_config_init(efi_config_table_type_t *arch_tables);
-+extern void __init efi_esrt_init(void);
- extern int efi_config_parse_tables(void *config_tables, int count, int sz,
- 				   efi_config_table_type_t *arch_tables);
- extern u64 efi_get_iobase (void);
-@@ -908,12 +913,15 @@ extern u32 efi_mem_type (unsigned long phys_addr);
- extern u64 efi_mem_attributes (unsigned long phys_addr);
- extern u64 efi_mem_attribute (unsigned long phys_addr, unsigned long size);
- extern int __init efi_uart_console_only (void);
-+extern u64 efi_mem_desc_end(efi_memory_desc_t *md);
-+extern int efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md);
- extern void efi_initialize_iomem_resources(struct resource *code_resource,
- 		struct resource *data_resource, struct resource *bss_resource);
- extern void efi_get_time(struct timespec *now);
- extern void efi_reserve_boot_services(void);
- extern int efi_get_fdt_params(struct efi_fdt_params *params, int verbose);
- extern struct efi_memory_map memmap;
-+extern struct kobject *efi_kobj;
- 
- extern int efi_reboot_quirk_mode;
- extern bool efi_poweroff_required(void);
--- 
-2.1.0
-
diff --git a/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch b/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
index 3133d6658..ba2f3cefa 100644
--- a/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
+++ b/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
@@ -1,6 +1,7 @@
+From 9ef94251448aa463c5937ee8e8e27d6fd9529509 Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Tue, 5 Feb 2013 19:25:05 -0500
-Subject: [PATCH] efi: Disable secure boot if shim is in insecure mode
+Subject: [PATCH 11/20] efi: Disable secure boot if shim is in insecure mode
 
 A user can manually tell the shim boot loader to disable validation of
 images it loads.  When a user does this, it creates a UEFI variable called
@@ -14,7 +15,7 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
  1 file changed, 19 insertions(+), 1 deletion(-)
 
 diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
-index 105e7360d747..83fc4e9888ee 100644
+index b4de3faa3f29..5cc2ef570390 100644
 --- a/arch/x86/boot/compressed/eboot.c
 +++ b/arch/x86/boot/compressed/eboot.c
 @@ -830,8 +830,9 @@ out:
@@ -53,5 +54,5 @@ index 105e7360d747..83fc4e9888ee 100644
  }
  
 -- 
-2.1.0
+2.4.3
 
diff --git a/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch b/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
index e6cf81345..095bea782 100644
--- a/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
+++ b/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
@@ -1,6 +1,7 @@
+From 0081083434db41c15b72eced975da0bd9b80566b Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Tue, 27 Aug 2013 13:28:43 -0400
-Subject: [PATCH] efi: Make EFI_SECURE_BOOT_SIG_ENFORCE depend on EFI
+Subject: [PATCH 12/20] efi: Make EFI_SECURE_BOOT_SIG_ENFORCE depend on EFI
 
 The functionality of the config option is dependent upon the platform being
 UEFI based.  Reflect this in the config deps.
@@ -11,10 +12,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index ab403a636357..5dac78119fa7 100644
+index 14db458f4774..f6ff0a86d841 100644
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -1696,7 +1696,8 @@ config EFI_MIXED
+@@ -1735,7 +1735,8 @@ config EFI_MIXED
  	   If unsure, say N.
  
  config EFI_SECURE_BOOT_SIG_ENFORCE
@@ -25,5 +26,5 @@ index ab403a636357..5dac78119fa7 100644
  	---help---
  	  UEFI Secure Boot provides a mechanism for ensuring that the
 -- 
-2.1.0
+2.4.3
 
diff --git a/ext4-Allocate-entire-range-in-zero-range.patch b/ext4-Allocate-entire-range-in-zero-range.patch
deleted file mode 100644
index 3b35e1a1b..000000000
--- a/ext4-Allocate-entire-range-in-zero-range.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From: Lukas Czerner <lczerner@redhat.com>
-Date: Wed, 18 Feb 2015 17:49:28 +0100
-Subject: [PATCH] ext4: Allocate entire range in zero range
-
-Currently there is a bug in zero range code which causes zero range
-calls to only allocate block aligned portion of the range, while
-ignoring the rest in some cases.
-
-In some cases, namely if the end of the range is past isize, we do
-attempt to preallocate the last nonaligned block. However this might
-cause kernel to BUG() in some carefully designed zero range requests on
-setups where page size > block size.
-
-Fix this problem by first preallocating the entire range, including the
-nonaligned edges and converting the written extents to unwritten in the
-next step. This approach will also give us the advantage of having the
-range to be as linearly contiguous as possible.
-
-Signed-off-by: Lukas Czerner <lczerner@redhat.com>
----
- fs/ext4/extents.c | 31 +++++++++++++++++++------------
- 1 file changed, 19 insertions(+), 12 deletions(-)
-
-diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
-index bed43081720f..aa522429b751 100644
---- a/fs/ext4/extents.c
-+++ b/fs/ext4/extents.c
-@@ -4803,12 +4803,6 @@ static long ext4_zero_range(struct file *file, loff_t offset,
- 	else
- 		max_blocks -= lblk;
- 
--	flags = EXT4_GET_BLOCKS_CREATE_UNWRIT_EXT |
--		EXT4_GET_BLOCKS_CONVERT_UNWRITTEN |
--		EXT4_EX_NOCACHE;
--	if (mode & FALLOC_FL_KEEP_SIZE)
--		flags |= EXT4_GET_BLOCKS_KEEP_SIZE;
--
- 	mutex_lock(&inode->i_mutex);
- 
- 	/*
-@@ -4825,15 +4819,28 @@ static long ext4_zero_range(struct file *file, loff_t offset,
- 		ret = inode_newsize_ok(inode, new_size);
- 		if (ret)
- 			goto out_mutex;
--		/*
--		 * If we have a partial block after EOF we have to allocate
--		 * the entire block.
--		 */
--		if (partial_end)
--			max_blocks += 1;
- 	}
- 
-+	flags = EXT4_GET_BLOCKS_CREATE_UNWRIT_EXT;
-+	if (mode & FALLOC_FL_KEEP_SIZE)
-+		flags |= EXT4_GET_BLOCKS_KEEP_SIZE;
-+
-+	/* Preallocate the range including the unaligned edges */
-+	if (partial_begin || partial_end) {
-+		ret = ext4_alloc_file_blocks(file,
-+				round_down(offset, 1 << blkbits) >> blkbits,
-+				(round_up((offset + len), 1 << blkbits) -
-+				 round_down(offset, 1 << blkbits)) >> blkbits,
-+				new_size, flags, mode);
-+		if (ret)
-+			goto out_mutex;
-+
-+	}
-+
-+	/* Zero range excluding the unaligned edges */
- 	if (max_blocks > 0) {
-+		flags |= (EXT4_GET_BLOCKS_CONVERT_UNWRITTEN |
-+			  EXT4_EX_NOCACHE);
- 
- 		/* Now release the pages and zero block aligned part of pages*/
- 		truncate_pagecache_range(inode, start, end - 1);
--- 
-2.1.0
-
diff --git a/fifo-nv04-remove-the-loop-from-the-interrupt-handler.patch b/fifo-nv04-remove-the-loop-from-the-interrupt-handler.patch
deleted file mode 100644
index 480ff9344..000000000
--- a/fifo-nv04-remove-the-loop-from-the-interrupt-handler.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From: Ben Skeggs <bskeggs@redhat.com>
-Date: Tue, 27 Jan 2015 15:09:39 +1000
-Subject: [PATCH] fifo/nv04: remove the loop from the interrupt handler
-
-Complete bong hit (and not the last...), the hardware will reassert the
-interrupt to PMC if it's necessary.
-
-Also potentially harmful in the face of interrupts such as the non-stall
-interrupt, which remain active in NV_PFIFO_INTR even when we don't care
-about servicing it.
-
-It appears (hopefully, fdo#87244), that under certain loads, the methods
-may pass quickly enough to hit the "100 spins and kill PFIFO" thing that
-we had going on.  Not ideal ;)
-
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c | 85 ++++++++++---------------
- 1 file changed, 35 insertions(+), 50 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c
-index b038b6eb51db..043e4296084c 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c
-@@ -502,72 +502,57 @@ nv04_fifo_intr(struct nvkm_subdev *subdev)
- {
- 	struct nvkm_device *device = nv_device(subdev);
- 	struct nv04_fifo_priv *priv = (void *)subdev;
--	uint32_t status, reassign;
--	int cnt = 0;
-+	u32 mask = nv_rd32(priv, NV03_PFIFO_INTR_EN_0);
-+	u32 stat = nv_rd32(priv, NV03_PFIFO_INTR_0) & mask;
-+	u32 reassign, chid, get, sem;
- 
- 	reassign = nv_rd32(priv, NV03_PFIFO_CACHES) & 1;
--	while ((status = nv_rd32(priv, NV03_PFIFO_INTR_0)) && (cnt++ < 100)) {
--		uint32_t chid, get;
--
--		nv_wr32(priv, NV03_PFIFO_CACHES, 0);
--
--		chid = nv_rd32(priv, NV03_PFIFO_CACHE1_PUSH1) & priv->base.max;
--		get  = nv_rd32(priv, NV03_PFIFO_CACHE1_GET);
-+	nv_wr32(priv, NV03_PFIFO_CACHES, 0);
- 
--		if (status & NV_PFIFO_INTR_CACHE_ERROR) {
--			nv04_fifo_cache_error(device, priv, chid, get);
--			status &= ~NV_PFIFO_INTR_CACHE_ERROR;
--		}
-+	chid = nv_rd32(priv, NV03_PFIFO_CACHE1_PUSH1) & priv->base.max;
-+	get  = nv_rd32(priv, NV03_PFIFO_CACHE1_GET);
- 
--		if (status & NV_PFIFO_INTR_DMA_PUSHER) {
--			nv04_fifo_dma_pusher(device, priv, chid);
--			status &= ~NV_PFIFO_INTR_DMA_PUSHER;
--		}
-+	if (stat & NV_PFIFO_INTR_CACHE_ERROR) {
-+		nv04_fifo_cache_error(device, priv, chid, get);
-+		stat &= ~NV_PFIFO_INTR_CACHE_ERROR;
-+	}
- 
--		if (status & NV_PFIFO_INTR_SEMAPHORE) {
--			uint32_t sem;
-+	if (stat & NV_PFIFO_INTR_DMA_PUSHER) {
-+		nv04_fifo_dma_pusher(device, priv, chid);
-+		stat &= ~NV_PFIFO_INTR_DMA_PUSHER;
-+	}
- 
--			status &= ~NV_PFIFO_INTR_SEMAPHORE;
--			nv_wr32(priv, NV03_PFIFO_INTR_0,
--				NV_PFIFO_INTR_SEMAPHORE);
-+	if (stat & NV_PFIFO_INTR_SEMAPHORE) {
-+		stat &= ~NV_PFIFO_INTR_SEMAPHORE;
-+		nv_wr32(priv, NV03_PFIFO_INTR_0, NV_PFIFO_INTR_SEMAPHORE);
- 
--			sem = nv_rd32(priv, NV10_PFIFO_CACHE1_SEMAPHORE);
--			nv_wr32(priv, NV10_PFIFO_CACHE1_SEMAPHORE, sem | 0x1);
-+		sem = nv_rd32(priv, NV10_PFIFO_CACHE1_SEMAPHORE);
-+		nv_wr32(priv, NV10_PFIFO_CACHE1_SEMAPHORE, sem | 0x1);
- 
--			nv_wr32(priv, NV03_PFIFO_CACHE1_GET, get + 4);
--			nv_wr32(priv, NV04_PFIFO_CACHE1_PULL0, 1);
--		}
-+		nv_wr32(priv, NV03_PFIFO_CACHE1_GET, get + 4);
-+		nv_wr32(priv, NV04_PFIFO_CACHE1_PULL0, 1);
-+	}
- 
--		if (device->card_type == NV_50) {
--			if (status & 0x00000010) {
--				status &= ~0x00000010;
--				nv_wr32(priv, 0x002100, 0x00000010);
--			}
--
--			if (status & 0x40000000) {
--				nv_wr32(priv, 0x002100, 0x40000000);
--				nvkm_fifo_uevent(&priv->base);
--				status &= ~0x40000000;
--			}
-+	if (device->card_type == NV_50) {
-+		if (stat & 0x00000010) {
-+			stat &= ~0x00000010;
-+			nv_wr32(priv, 0x002100, 0x00000010);
- 		}
- 
--		if (status) {
--			nv_warn(priv, "unknown intr 0x%08x, ch %d\n",
--				status, chid);
--			nv_wr32(priv, NV03_PFIFO_INTR_0, status);
--			status = 0;
-+		if (stat & 0x40000000) {
-+			nv_wr32(priv, 0x002100, 0x40000000);
-+			nvkm_fifo_uevent(&priv->base);
-+			stat &= ~0x40000000;
- 		}
--
--		nv_wr32(priv, NV03_PFIFO_CACHES, reassign);
- 	}
- 
--	if (status) {
--		nv_error(priv, "still angry after %d spins, halt\n", cnt);
--		nv_wr32(priv, 0x002140, 0);
--		nv_wr32(priv, 0x000140, 0);
-+	if (stat) {
-+		nv_warn(priv, "unknown intr 0x%08x\n", stat);
-+		nv_mask(priv, NV03_PFIFO_INTR_EN_0, stat, 0x00000000);
-+		nv_wr32(priv, NV03_PFIFO_INTR_0, stat);
- 	}
- 
--	nv_wr32(priv, 0x000100, 0x00000100);
-+	nv_wr32(priv, NV03_PFIFO_CACHES, reassign);
- }
- 
- static int
--- 
-2.1.0
-
diff --git a/filter-aarch64.sh b/filter-aarch64.sh
old mode 100644
new mode 100755
index c4d6daa42..dae47aaa3
--- a/filter-aarch64.sh
+++ b/filter-aarch64.sh
@@ -11,4 +11,4 @@
 
 driverdirs="atm auxdisplay bcma bluetooth fmc infiniband isdn leds media memstick message mmc mtd nfc ntb pcmcia platform power ssb staging uio uwb"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs iscsi_tcp megaraid pmcraid qla1280 9pnet_rdma svcrdma xprtrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user"
diff --git a/filter-armv7hl.sh b/filter-armv7hl.sh
old mode 100644
new mode 100755
index 162df32b6..5803dd01f
--- a/filter-armv7hl.sh
+++ b/filter-armv7hl.sh
@@ -11,4 +11,4 @@
 
 driverdirs="atm auxdisplay bcma bluetooth fmc infiniband isdn media memstick message nfc ntb pcmcia platform ssb staging uio uwb"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs iscsi_tcp megaraid pmcraid qla1280 9pnet_rdma svcrdma xprtrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user"
diff --git a/filter-i686.sh b/filter-i686.sh
old mode 100644
new mode 100755
index 1f3f97270..784ab37e4
--- a/filter-i686.sh
+++ b/filter-i686.sh
@@ -11,4 +11,4 @@
 
 driverdirs="atm auxdisplay bcma bluetooth fmc infiniband isdn leds media memstick mfd mmc mtd nfc ntb pcmcia platform power ssb staging uio uwb"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs iscsi_tcp megaraid pmcraid qla1280 9pnet_rdma svcrdma xprtrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub hid-sensor-magn-3d hid-sensor-incl-3d hid-sensor-gyro-3d hid-sensor-iio-common hid-sensor-accel-3d hid-sensor-trigger hid-sensor-als hid-sensor-rotation target_core_user"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub hid-sensor-magn-3d hid-sensor-incl-3d hid-sensor-gyro-3d hid-sensor-iio-common hid-sensor-accel-3d hid-sensor-trigger hid-sensor-als hid-sensor-rotation target_core_user"
diff --git a/filter-modules.sh b/filter-modules.sh
index f02ec47be..31b78ce29 100755
--- a/filter-modules.sh
+++ b/filter-modules.sh
@@ -16,7 +16,7 @@
 # Set the default dirs/modules to filter out
 driverdirs="atm auxdisplay bcma bluetooth fmc iio infiniband isdn leds media memstick mfd mmc mtd nfc ntb pcmcia platform power ssb staging uio uwb"
 
-netdrvs="appletalk dsa hamradio ieee802154 irda ppp slip usb wireless"
+netdrvs="appletalk can dsa hamradio ieee802154 irda ppp slip usb wireless"
 
 ethdrvs="3com adaptec alteon amd atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell mellanox neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti wiznet xircom"
 
@@ -28,11 +28,11 @@ usbdrvs="atm wusbcore"
 
 fsdrvs="affs befs coda cramfs dlm ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs udf ufs"
 
-netprots="appletalk atm ax25 batman-adv bluetooth dccp dsa ieee802154 irda l2tp mac80211 mac802154 netrom nfc rds rfkill rose sctp wireless"
+netprots="appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee802154 irda l2tp mac80211 mac802154 netrom nfc rds rfkill rose sctp wireless"
 
 drmdrvs="ast gma500 mgag200 via nouveau"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs iscsi_tcp megaraid pmcraid qla1280 9pnet_rdma svcrdma xprtrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user"
 
 # Grab the arch-specific filter list overrides
 source ./filter-$2.sh
diff --git a/filter-ppc64.sh b/filter-ppc64.sh
old mode 100644
new mode 100755
index be4d9878d..8001e0944
--- a/filter-ppc64.sh
+++ b/filter-ppc64.sh
@@ -11,4 +11,4 @@
 
 driverdirs="atm auxdisplay bcma bluetooth fmc infiniband isdn leds media memstick message mmc mtd nfc ntb pcmcia platform power ssb staging uio uwb"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs iscsi_tcp megaraid pmcraid qla1280 9pnet_rdma svcrdma xprtrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user"
diff --git a/filter-ppc64le.sh b/filter-ppc64le.sh
old mode 100644
new mode 100755
index 664d59e44..c8948c94d
--- a/filter-ppc64le.sh
+++ b/filter-ppc64le.sh
@@ -11,4 +11,4 @@
 
 driverdirs="atm auxdisplay bcma bluetooth fmc infiniband isdn leds media memstick message mmc mtd nfc ntb pcmcia platform power ssb staging uio uwb"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs iscsi_tcp megaraid pmcraid qla1280 9pnet_rdma svcrdma xprtrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user"
diff --git a/filter-ppc64p7.sh b/filter-ppc64p7.sh
old mode 100644
new mode 100755
index cf3a0e0ff..32c43a489
--- a/filter-ppc64p7.sh
+++ b/filter-ppc64p7.sh
@@ -11,4 +11,4 @@
 
 driverdirs="atm auxdisplay bcma bluetooth fmc infiniband isdn leds media memstick message mmc mtd nfc ntb pcmcia platform power ssb staging uio uwb"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs iscsi_tcp megaraid pmcraid qla1280 9pnet_rdma svcrdma xprtrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user"
diff --git a/filter-s390x.sh b/filter-s390x.sh
old mode 100644
new mode 100755
diff --git a/filter-x86_64.sh b/filter-x86_64.sh
old mode 100644
new mode 100755
diff --git a/firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch b/firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch
new file mode 100644
index 000000000..64b7dbefa
--- /dev/null
+++ b/firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch
@@ -0,0 +1,89 @@
+From: Laura Abbott <labbott@fedoraproject.org>
+Date: Tue, 28 Apr 2015 15:37:44 -0700
+Subject: [PATCH] firmware: Drop WARN from usermodehelper_read_trylock error
+ case
+
+We've received a number of reports of warnings when coming
+out of suspend with certain bluetooth firmware configurations:
+
+WARNING: CPU: 3 PID: 3280 at drivers/base/firmware_class.c:1126
+_request_firmware+0x558/0x810()
+Modules linked in: ccm ip6t_rpfilter ip6t_REJECT nf_reject_ipv6
+xt_conntrack ebtable_nat ebtable_broute bridge stp llc ebtable_filter
+ebtables ip6table_nat nf_conntrack_ipv6 nf_defrag_ipv6 nf_nat_ipv6
+ip6table_mangle ip6table_security ip6table_raw ip6table_filter
+ip6_tables iptable_nat nf_conntrack_ipv4 nf_defrag_ipv4 nf_nat_ipv4
+nf_nat nf_conntrack iptable_mangle iptable_security iptable_raw
+binfmt_misc bnep intel_rapl iosf_mbi arc4 x86_pkg_temp_thermal
+snd_hda_codec_hdmi coretemp kvm_intel joydev snd_hda_codec_realtek
+iwldvm snd_hda_codec_generic kvm iTCO_wdt mac80211 iTCO_vendor_support
+snd_hda_intel snd_hda_controller snd_hda_codec crct10dif_pclmul
+snd_hwdep crc32_pclmul snd_seq crc32c_intel ghash_clmulni_intel uvcvideo
+snd_seq_device iwlwifi btusb videobuf2_vmalloc snd_pcm videobuf2_core
+ serio_raw bluetooth cfg80211 videobuf2_memops sdhci_pci v4l2_common
+videodev thinkpad_acpi sdhci i2c_i801 lpc_ich mfd_core wacom mmc_core
+media snd_timer tpm_tis hid_logitech_hidpp wmi tpm rfkill snd mei_me mei
+shpchp soundcore nfsd auth_rpcgss nfs_acl lockd grace sunrpc i915
+i2c_algo_bit drm_kms_helper e1000e drm hid_logitech_dj ptp pps_core
+video
+CPU: 3 PID: 3280 Comm: kworker/u17:0 Not tainted 3.19.3-200.fc21.x86_64
+Hardware name: LENOVO 343522U/343522U, BIOS GCET96WW (2.56 ) 10/22/2013
+Workqueue: hci0 hci_power_on [bluetooth]
+ 0000000000000000 0000000089944328 ffff88040acffb78 ffffffff8176e215
+ 0000000000000000 0000000000000000 ffff88040acffbb8 ffffffff8109bc1a
+ 0000000000000000 ffff88040acffcd0 00000000fffffff5 ffff8804076bac40
+Call Trace:
+ [<ffffffff8176e215>] dump_stack+0x45/0x57
+ [<ffffffff8109bc1a>] warn_slowpath_common+0x8a/0xc0
+ [<ffffffff8109bd4a>] warn_slowpath_null+0x1a/0x20
+ [<ffffffff814dbe78>] _request_firmware+0x558/0x810
+ [<ffffffff814dc165>] request_firmware+0x35/0x50
+ [<ffffffffa03a7886>] btusb_setup_bcm_patchram+0x86/0x590 [btusb]
+ [<ffffffff814d40e6>] ? rpm_idle+0xd6/0x230
+ [<ffffffffa04d4801>] hci_dev_do_open+0xe1/0xa90 [bluetooth]
+ [<ffffffff810c51dd>] ? ttwu_do_activate.constprop.90+0x5d/0x70
+ [<ffffffffa04d5980>] hci_power_on+0x40/0x200 [bluetooth]
+ [<ffffffff810b487c>] process_one_work+0x14c/0x3f0
+ [<ffffffff810b52f3>] worker_thread+0x53/0x470
+ [<ffffffff810b52a0>] ? rescuer_thread+0x300/0x300
+ [<ffffffff810ba548>] kthread+0xd8/0xf0
+ [<ffffffff810ba470>] ? kthread_create_on_node+0x1b0/0x1b0
+ [<ffffffff81774958>] ret_from_fork+0x58/0x90
+ [<ffffffff810ba470>] ? kthread_create_on_node+0x1b0/0x1b0
+
+This occurs after every resume.
+
+When resuming, the bluetooth driver needs to re-request the
+firmware. This re-request is happening before usermodehelper
+is fully enabled. If the firmware load succeeded previously, the
+caching behavior of the firmware code typically negates the
+need to call the usermodehelper code again and the request
+succeeds. If the firmware was never loaded because it isn't
+actually present in the file system, this results in a call
+to usermodehelper and a failure warning every resume.
+
+The proper fix is to add a reset_resume functionality to the
+btusb driver to be able to handle the resume case. The
+work for this is ongoing so in the mean time just silence
+the warning since we know it's a problem.
+
+Bugzilla: 1133378
+Upstream-status: Working on it. It's a difficult problem :(
+Signed-off-by: Laura Abbott <labbott@fedoraproject.org>
+---
+ drivers/base/firmware_class.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
+index 894bda114224..f7a8d27b6459 100644
+--- a/drivers/base/firmware_class.c
++++ b/drivers/base/firmware_class.c
+@@ -1144,7 +1144,7 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
+ 		}
+ 	} else {
+ 		ret = usermodehelper_read_trylock();
+-		if (WARN_ON(ret)) {
++		if (ret) {
+ 			dev_err(device, "firmware: %s will not be loaded\n",
+ 				name);
+ 			goto out;
diff --git a/hibernate-Disable-in-a-signed-modules-environment.patch b/hibernate-Disable-in-a-signed-modules-environment.patch
index f1cc67935..f62ea08b0 100644
--- a/hibernate-Disable-in-a-signed-modules-environment.patch
+++ b/hibernate-Disable-in-a-signed-modules-environment.patch
@@ -1,6 +1,7 @@
+From 51abecb00c48941cc3db19701cc73e65082924bb Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Fri, 20 Jun 2014 08:53:24 -0400
-Subject: [PATCH] hibernate: Disable in a signed modules environment
+Subject: [PATCH 14/20] hibernate: Disable in a signed modules environment
 
 There is currently no way to verify the resume image when returning
 from hibernate.  This might compromise the signed modules trust model,
@@ -13,7 +14,7 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
-index 2329daae5255..48a8e82c7e2e 100644
+index 690f78f210f2..037303a1cba9 100644
 --- a/kernel/power/hibernate.c
 +++ b/kernel/power/hibernate.c
 @@ -29,6 +29,7 @@
@@ -34,5 +35,5 @@ index 2329daae5255..48a8e82c7e2e 100644
  
  /**
 -- 
-2.1.0
+2.4.3
 
diff --git a/hibernate-freeze-filesystems.patch b/hibernate-freeze-filesystems.patch
deleted file mode 100644
index f037468b6..000000000
--- a/hibernate-freeze-filesystems.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-Bugzilla: N/A
-Upstream-status: Sent in 2012.  Pinged again on Dec 17, 2013
-
-commit b94887bbc0621e1e8402e7f0ec4bc3adf46c9a6e
-Author: Rafael J. Wysocki <rjw@sisk.pl>
-Date:   Fri Feb 17 12:42:08 2012 -0500
-
-    Freeze all filesystems during system suspend and (kernel-driven)
-    hibernation by calling freeze_supers() for all superblocks and thaw
-    them during the subsequent resume with the help of thaw_supers().
-    
-    This makes filesystems stay in a consistent state in case something
-    goes wrong between system suspend (or hibernation) and the subsequent
-    resume (e.g. journal replays won't be necessary in those cases).  In
-    particular, this should help to solve a long-standing issue that, in
-    some cases, during resume from hibernation the boot loader causes the
-    journal to be replied for the filesystem containing the kernel image
-    and/or initrd causing it to become inconsistent with the information
-    stored in the hibernation image.
-    
-    The user-space-driven hibernation (s2disk) is not covered by this
-    change, because the freezing of filesystems prevents s2disk from
-    accessing device special files it needs to do its job.
-    
-    This change is based on earlier work by Nigel Cunningham.
-    
-    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-    
-    Rebased to 3.3-rc3 by Josh Boyer <jwboyer@redhat.com>
-
-diff --git a/fs/super.c b/fs/super.c
-index 6015c02..c8057fa 100644
---- a/fs/super.c
-+++ b/fs/super.c
-@@ -594,6 +594,79 @@ void iterate_supers_type(struct file_system_type *type,
- EXPORT_SYMBOL(iterate_supers_type);
- 
- /**
-+ *	thaw_supers - call thaw_super() for all superblocks
-+ */
-+void thaw_supers(void)
-+{
-+	struct super_block *sb, *p = NULL;
-+
-+	spin_lock(&sb_lock);
-+	list_for_each_entry(sb, &super_blocks, s_list) {
-+		if (hlist_unhashed(&sb->s_instances))
-+			continue;
-+		sb->s_count++;
-+		spin_unlock(&sb_lock);
-+
-+		if (sb->s_flags & MS_FROZEN) {
-+			thaw_super(sb);
-+			sb->s_flags &= ~MS_FROZEN;
-+		}
-+
-+		spin_lock(&sb_lock);
-+		if (p)
-+			__put_super(p);
-+		p = sb;
-+	}
-+	if (p)
-+		__put_super(p);
-+	spin_unlock(&sb_lock);
-+}
-+
-+/**
-+ *	freeze_supers - call freeze_super() for all superblocks
-+ */
-+int freeze_supers(void)
-+{
-+	struct super_block *sb, *p = NULL;
-+	int error = 0;
-+
-+	spin_lock(&sb_lock);
-+	/*
-+	 * Freeze in reverse order so filesystems depending on others are
-+	 * frozen in the right order (eg. loopback on ext3).
-+	 */
-+	list_for_each_entry_reverse(sb, &super_blocks, s_list) {
-+		if (hlist_unhashed(&sb->s_instances))
-+			continue;
-+		sb->s_count++;
-+		spin_unlock(&sb_lock);
-+
-+		if (sb->s_root && sb->s_frozen != SB_FREEZE_TRANS
-+		    && !(sb->s_flags & MS_RDONLY)) {
-+			error = freeze_super(sb);
-+			if (!error)
-+				sb->s_flags |= MS_FROZEN;
-+		}
-+
-+		spin_lock(&sb_lock);
-+		if (error)
-+			break;
-+		if (p)
-+			__put_super(p);
-+		p = sb;
-+	}
-+	if (p)
-+		__put_super(p);
-+	spin_unlock(&sb_lock);
-+
-+	if (error)
-+		thaw_supers();
-+
-+	return error;
-+}
-+
-+
-+/**
-  *	get_super - get the superblock of a device
-  *	@bdev: device to get the superblock for
-  *	
-diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 386da09..a164f4a 100644
---- a/include/linux/fs.h
-+++ b/include/linux/fs.h
-@@ -210,6 +210,7 @@ struct inodes_stat_t {
- #define MS_KERNMOUNT	(1<<22) /* this is a kern_mount call */
- #define MS_I_VERSION	(1<<23) /* Update inode I_version field */
- #define MS_STRICTATIME	(1<<24) /* Always perform atime updates */
-+#define MS_FROZEN	(1<<25) /* Frozen filesystem */
- #define MS_NOSEC	(1<<28)
- #define MS_BORN		(1<<29)
- #define MS_ACTIVE	(1<<30)
-@@ -2501,6 +2502,8 @@ extern void drop_super(struct super_block *sb);
- extern void iterate_supers(void (*)(struct super_block *, void *), void *);
- extern void iterate_supers_type(struct file_system_type *,
- 			        void (*)(struct super_block *, void *), void *);
-+extern int freeze_supers(void);
-+extern void thaw_supers(void);
- 
- extern int dcache_dir_open(struct inode *, struct file *);
- extern int dcache_dir_close(struct inode *, struct file *);
-diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
-index 6d6d288..492fc62 100644
---- a/kernel/power/hibernate.c
-+++ b/kernel/power/hibernate.c
-@@ -626,12 +626,17 @@ int hibernate(void)
- 	if (error)
- 		goto Finish;
- 
--	error = hibernation_snapshot(hibernation_mode == HIBERNATION_PLATFORM);
-+	error = freeze_supers();
- 	if (error)
- 		goto Thaw;
-+
-+	error = hibernation_snapshot(hibernation_mode == HIBERNATION_PLATFORM);
-+	if (error)
-+		goto Thaw_fs;
-+
- 	if (freezer_test_done) {
- 		freezer_test_done = false;
--		goto Thaw;
-+		goto Thaw_fs;
- 	}
- 
- 	if (in_suspend) {
-@@ -655,6 +660,8 @@ int hibernate(void)
- 		pr_debug("PM: Image restored successfully.\n");
- 	}
- 
-+ Thaw_fs:
-+	thaw_supers();
-  Thaw:
- 	thaw_processes();
-  Finish:
-diff --git a/kernel/power/power.h b/kernel/power/power.h
-index 21724ee..40d6f64 100644
---- a/kernel/power/power.h
-+++ b/kernel/power/power.h
-@@ -1,3 +1,4 @@
-+#include <linux/fs.h>
- #include <linux/suspend.h>
- #include <linux/suspend_ioctls.h>
- #include <linux/utsname.h>
-@@ -227,45 +228,3 @@ enum {
- #define TEST_MAX	(__TEST_AFTER_LAST - 1)
- 
- extern int pm_test_level;
--
--#ifdef CONFIG_SUSPEND_FREEZER
--static inline int suspend_freeze_processes(void)
--{
--	int error;
--
--	error = freeze_processes();
--
--	/*
--	 * freeze_processes() automatically thaws every task if freezing
--	 * fails. So we need not do anything extra upon error.
--	 */
--	if (error)
--		goto Finish;
--
--	error = freeze_kernel_threads();
--
--	/*
--	 * freeze_kernel_threads() thaws only kernel threads upon freezing
--	 * failure. So we have to thaw the userspace tasks ourselves.
--	 */
--	if (error)
--		thaw_processes();
--
-- Finish:
--	return error;
--}
--
--static inline void suspend_thaw_processes(void)
--{
--	thaw_processes();
--}
--#else
--static inline int suspend_freeze_processes(void)
--{
--	return 0;
--}
--
--static inline void suspend_thaw_processes(void)
--{
--}
--#endif
-diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
-index 4fd51be..5f51fc7 100644
---- a/kernel/power/suspend.c
-+++ b/kernel/power/suspend.c
-@@ -29,6 +29,62 @@
- 
- #include "power.h"
- 
-+#ifdef CONFIG_SUSPEND_FREEZER
-+
-+static inline int suspend_freeze_processes(void)
-+{
-+	int error;
-+
-+	error = freeze_processes();
-+
-+	/*
-+	 * freeze_processes() automatically thaws every task if freezing
-+	 * fails. So we need not do anything extra upon error.
-+	 */
-+
-+	if (error)
-+		goto Finish;
-+
-+	error = freeze_supers();
-+	if (error) {
-+		thaw_processes();
-+		goto Finish;
-+	}
-+
-+	error = freeze_kernel_threads();
-+
-+	/*
-+	 * freeze_kernel_threads() thaws only kernel threads upon freezing
-+	 * failure. So we have to thaw the userspace tasks ourselves.
-+	 */
-+	if (error) {
-+		thaw_supers();
-+		thaw_processes();
-+	}
-+
-+Finish:
-+	return error;
-+}
-+
-+static inline void suspend_thaw_processes(void)
-+{
-+	thaw_supers();
-+	thaw_processes();
-+}
-+
-+#else /* !CONFIG_SUSPEND_FREEZER */
-+
-+static inline int suspend_freeze_processes(void)
-+{
-+	return 0;
-+}
-+
-+static inline void suspend_thaw_processes(void)
-+{
-+}
-+
-+#endif /* !CONFIG_SUSPEND_FREEZER */
-+
- const char *const pm_states[PM_SUSPEND_MAX] = {
- 	[PM_SUSPEND_STANDBY]	= "standby",
- 	[PM_SUSPEND_MEM]	= "mem",
diff --git a/hp-wmi-fix-wifi-cannot-be-hard-unblock.patch b/hp-wmi-fix-wifi-cannot-be-hard-unblock.patch
new file mode 100644
index 000000000..27744a0c3
--- /dev/null
+++ b/hp-wmi-fix-wifi-cannot-be-hard-unblock.patch
@@ -0,0 +1,48 @@
+From patchwork Mon Jun 13 11:44:00 2016
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: hp-wmi: fix wifi cannot be hard-unblock
+From: Alex Hung <alex.hung@canonical.com>
+X-Patchwork-Id: 9172765
+Message-Id: <1465818240-11994-1-git-send-email-alex.hung@canonical.com>
+To: dvhart@infradead.org, platform-driver-x86@vger.kernel.org,
+ alex.hung@canonical.com, david.ward@ll.mit.edu
+Date: Mon, 13 Jun 2016 19:44:00 +0800
+
+Several users reported wifi cannot be unblocked as discussed in [1].
+This patch removes the useof 2009 flag by BIOS but uses the actual WMI
+function calls - it will be skipped if WMI reports unsupported
+
+[1] https://bugzilla.kernel.org/show_bug.cgi?id=69131
+
+Signed-off-by: Alex Hung <alex.hung@canonical.com>
+---
+ drivers/platform/x86/hp-wmi.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
+index 6f145f2..96ffda4 100644
+--- a/drivers/platform/x86/hp-wmi.c
++++ b/drivers/platform/x86/hp-wmi.c
+@@ -718,6 +718,11 @@ static int __init hp_wmi_rfkill_setup(struct platform_device *device)
+ 	if (err)
+ 		return err;
+ 
++	err = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 1, &wireless,
++				   sizeof(wireless), 0);
++	if (err)
++		return err;
++
+ 	if (wireless & 0x1) {
+ 		wifi_rfkill = rfkill_alloc("hp-wifi", &device->dev,
+ 					   RFKILL_TYPE_WLAN,
+@@ -882,7 +887,7 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
+ 	wwan_rfkill = NULL;
+ 	rfkill2_count = 0;
+ 
+-	if (hp_wmi_bios_2009_later() || hp_wmi_rfkill_setup(device))
++	if (hp_wmi_rfkill_setup(device))
+ 		hp_wmi_rfkill2_setup(device);
+ 
+ 	err = device_create_file(&device->dev, &dev_attr_display);
diff --git a/iSCSI-let-session-recovery_tmo-sysfs-writes-persist.patch b/iSCSI-let-session-recovery_tmo-sysfs-writes-persist.patch
new file mode 100644
index 000000000..174cccb02
--- /dev/null
+++ b/iSCSI-let-session-recovery_tmo-sysfs-writes-persist.patch
@@ -0,0 +1,89 @@
+From 9c8108a4d3a837c51a29f28229a06d97654eaeb6 Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech@redhat.com>
+Date: Tue, 16 Jun 2015 16:07:13 -0700
+Subject: iSCSI: let session recovery_tmo sysfs writes persist across recovery
+
+The iSCSI session recovery_tmo setting is writeable in sysfs, but it's
+also set every time a connection is established when parameters are set
+from iscsid over netlink.  That results in the timeout being reset to
+the default value after every recovery.
+
+The DM multipath tools want to use the sysfs interface to lower the
+default timeout when there are multiple paths to fail over.  It has
+caused confusion that we have a writeable sysfs value that seem to keep
+resetting itself.
+
+This patch adds an in-kernel flag that gets set once a sysfs write
+occurs, and then ignores netlink parameter setting once it's been
+modified via the sysfs interface.  My thinking here is that the sysfs
+interface is much simpler for external tools to influence the session
+timeout, but if we're going to allow it to be modified directly we
+should ensure that setting is maintained.
+
+Signed-off-by: Chris Leech <cleech@redhat.com>
+Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
+Signed-off-by: James Bottomley <JBottomley@Odin.com>
+
+diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
+index 55647aa..4c25539 100644
+--- a/drivers/scsi/scsi_transport_iscsi.c
++++ b/drivers/scsi/scsi_transport_iscsi.c
+@@ -2042,6 +2042,7 @@ iscsi_alloc_session(struct Scsi_Host *shost, struct iscsi_transport *transport,
+ 	session->transport = transport;
+ 	session->creator = -1;
+ 	session->recovery_tmo = 120;
++	session->recovery_tmo_sysfs_override = false;
+ 	session->state = ISCSI_SESSION_FREE;
+ 	INIT_DELAYED_WORK(&session->recovery_work, session_recovery_timedout);
+ 	INIT_LIST_HEAD(&session->sess_list);
+@@ -2786,7 +2787,8 @@ iscsi_set_param(struct iscsi_transport *transport, struct iscsi_uevent *ev)
+ 	switch (ev->u.set_param.param) {
+ 	case ISCSI_PARAM_SESS_RECOVERY_TMO:
+ 		sscanf(data, "%d", &value);
+-		session->recovery_tmo = value;
++		if (!session->recovery_tmo_sysfs_override)
++			session->recovery_tmo = value;
+ 		break;
+ 	default:
+ 		err = transport->set_param(conn, ev->u.set_param.param,
+@@ -4049,13 +4051,15 @@ store_priv_session_##field(struct device *dev,				\
+ 	if ((session->state == ISCSI_SESSION_FREE) ||			\
+ 	    (session->state == ISCSI_SESSION_FAILED))			\
+ 		return -EBUSY;						\
+-	if (strncmp(buf, "off", 3) == 0)				\
++	if (strncmp(buf, "off", 3) == 0) {				\
+ 		session->field = -1;					\
+-	else {								\
++		session->field##_sysfs_override = true;			\
++	} else {							\
+ 		val = simple_strtoul(buf, &cp, 0);			\
+ 		if (*cp != '\0' && *cp != '\n')				\
+ 			return -EINVAL;					\
+ 		session->field = val;					\
++		session->field##_sysfs_override = true;			\
+ 	}								\
+ 	return count;							\
+ }
+@@ -4066,6 +4070,7 @@ store_priv_session_##field(struct device *dev,				\
+ static ISCSI_CLASS_ATTR(priv_sess, field, S_IRUGO | S_IWUSR,		\
+ 			show_priv_session_##field,			\
+ 			store_priv_session_##field)
++
+ iscsi_priv_session_rw_attr(recovery_tmo, "%d");
+ 
+ static struct attribute *iscsi_session_attrs[] = {
+diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
+index 2555ee5..6183d20 100644
+--- a/include/scsi/scsi_transport_iscsi.h
++++ b/include/scsi/scsi_transport_iscsi.h
+@@ -241,6 +241,7 @@ struct iscsi_cls_session {
+ 
+ 	/* recovery fields */
+ 	int recovery_tmo;
++	bool recovery_tmo_sysfs_override;
+ 	struct delayed_work recovery_work;
+ 
+ 	unsigned int target_id;
+-- 
+cgit v0.10.2
+
diff --git a/ideapad-laptop-Add-Lenovo-Yoga-3-14-to-no_hw_rfkill-.patch b/ideapad-laptop-Add-Lenovo-Yoga-3-14-to-no_hw_rfkill-.patch
new file mode 100644
index 000000000..9e2838f22
--- /dev/null
+++ b/ideapad-laptop-Add-Lenovo-Yoga-3-14-to-no_hw_rfkill-.patch
@@ -0,0 +1,40 @@
+From 72695420d48c264b3ca0dacccda1a4789a52c2f6 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Fri, 24 Jul 2015 11:45:28 +0200
+Subject: [PATCH] ideapad-laptop: Add Lenovo Yoga 3 14 to no_hw_rfkill dmi list
+
+Like some of the other Yoga models the Lenovo Yoga 3 14 does not have a
+hw rfkill switch, and trying to read the hw rfkill switch through the
+ideapad module causes it to always reported blocking breaking wifi.
+
+This commit adds the Lenovo Yoga 3 14 to the no_hw_rfkill dmi list, fixing
+the wifi breakage.
+
+BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1239050
+Cc: stable@vger.kernel.org
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/platform/x86/ideapad-laptop.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
+index 76b57388d01b..81c3e582309a 100644
+--- a/drivers/platform/x86/ideapad-laptop.c
++++ b/drivers/platform/x86/ideapad-laptop.c
+@@ -853,6 +853,13 @@ static const struct dmi_system_id no_hw_rfkill_list[] = {
+ 		},
+ 	},
+ 	{
++		.ident = "Lenovo Yoga 3 14",
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
++			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 3 14"),
++		},
++	},
++	{
+ 		.ident = "Lenovo Yoga 3 Pro 1370",
+ 		.matches = {
+ 			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+-- 
+2.4.3
+
diff --git a/input-kill-stupid-messages.patch b/input-kill-stupid-messages.patch
index ccf42cdf7..04205f857 100644
--- a/input-kill-stupid-messages.patch
+++ b/input-kill-stupid-messages.patch
@@ -9,7 +9,7 @@ Upstream-status: Fedora mustard
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
-index 387c51f4b4e4..04a1c7d47aba 100644
+index ec876b5b1382..9d5216e23a09 100644
 --- a/drivers/input/keyboard/atkbd.c
 +++ b/drivers/input/keyboard/atkbd.c
 @@ -436,11 +436,15 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
@@ -28,6 +28,3 @@ index 387c51f4b4e4..04a1c7d47aba 100644
  		goto out;
  	case ATKBD_RET_ERR:
  		atkbd->err_count++;
--- 
-2.1.0
-
diff --git a/input-silence-i8042-noise.patch b/input-silence-i8042-noise.patch
index 840fc38de..d1103c244 100644
--- a/input-silence-i8042-noise.patch
+++ b/input-silence-i8042-noise.patch
@@ -16,10 +16,10 @@ Upstream-status: Fedora mustard
  3 files changed, 2 insertions(+), 9 deletions(-)
 
 diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
-index 9717d5f20139..a3101d2fd936 100644
+index 30b7bbfdc558..95863902627f 100644
 --- a/drivers/base/power/main.c
 +++ b/drivers/base/power/main.c
-@@ -122,8 +122,6 @@ void device_pm_unlock(void)
+@@ -123,8 +123,6 @@ void device_pm_unlock(void)
   */
  void device_pm_add(struct device *dev)
  {
@@ -29,7 +29,7 @@ index 9717d5f20139..a3101d2fd936 100644
  	if (dev->parent && dev->parent->power.is_prepared)
  		dev_warn(dev, "parent %s should not be sleeping\n",
 diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
-index 986a71c614b0..bfb0b2280df0 100644
+index cb5ece77fd7d..4022b75eaad7 100644
 --- a/drivers/input/serio/i8042.c
 +++ b/drivers/input/serio/i8042.c
 @@ -871,7 +871,6 @@ static int __init i8042_check_aux(void)
@@ -41,7 +41,7 @@ index 986a71c614b0..bfb0b2280df0 100644
  	}
  
 diff --git a/net/can/af_can.c b/net/can/af_can.c
-index 32d710eaf1fc..af4a20b86ee7 100644
+index 7933e62a7318..96a911003af7 100644
 --- a/net/can/af_can.c
 +++ b/net/can/af_can.c
 @@ -155,13 +155,9 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
@@ -60,6 +60,3 @@ index 32d710eaf1fc..af4a20b86ee7 100644
  
  		cp = can_get_proto(protocol);
  	}
--- 
-2.1.0
-
diff --git a/kbuild-AFTER_LINK.patch b/kbuild-AFTER_LINK.patch
index f91a19eac..6cbf7d643 100644
--- a/kbuild-AFTER_LINK.patch
+++ b/kbuild-AFTER_LINK.patch
@@ -1,3 +1,4 @@
+From 3430f2441f7176d543a76aa73ae7315db355a5b0 Mon Sep 17 00:00:00 2001
 From: Roland McGrath <roland@redhat.com>
 Date: Mon, 6 Oct 2008 23:03:03 -0700
 Subject: [PATCH] kbuild: AFTER_LINK
@@ -15,15 +16,15 @@ Signed-off-by: Roland McGrath <roland@redhat.com>
  arch/powerpc/kernel/vdso64/Makefile | 3 ++-
  arch/s390/kernel/vdso32/Makefile    | 3 ++-
  arch/s390/kernel/vdso64/Makefile    | 3 ++-
- arch/x86/vdso/Makefile              | 5 +++--
+ arch/x86/entry/vdso/Makefile        | 5 +++--
  scripts/link-vmlinux.sh             | 4 ++++
  7 files changed, 17 insertions(+), 7 deletions(-)
 
 diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile
-index ff3bddea482d..d8a439dd6351 100644
+index b467fd0..feeff5e 100644
 --- a/arch/arm64/kernel/vdso/Makefile
 +++ b/arch/arm64/kernel/vdso/Makefile
-@@ -48,7 +48,8 @@ $(obj-vdso): %.o: %.S FORCE
+@@ -55,7 +55,8 @@ $(obj-vdso): %.o: %.S FORCE
  
  # Actual build commands
  quiet_cmd_vdsold = VDSOL   $@
@@ -34,7 +35,7 @@ index ff3bddea482d..d8a439dd6351 100644
        cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $<
  
 diff --git a/arch/powerpc/kernel/vdso32/Makefile b/arch/powerpc/kernel/vdso32/Makefile
-index 53e6c9b979ec..e427844e9bb0 100644
+index 6abffb7..7b103bb 100644
 --- a/arch/powerpc/kernel/vdso32/Makefile
 +++ b/arch/powerpc/kernel/vdso32/Makefile
 @@ -43,7 +43,8 @@ $(obj-vdso32): %.o: %.S
@@ -48,7 +49,7 @@ index 53e6c9b979ec..e427844e9bb0 100644
        cmd_vdso32as = $(CROSS32CC) $(a_flags) -c -o $@ $<
  
 diff --git a/arch/powerpc/kernel/vdso64/Makefile b/arch/powerpc/kernel/vdso64/Makefile
-index effca9404b17..713891a92d23 100644
+index 8c8f2ae..a743ebe 100644
 --- a/arch/powerpc/kernel/vdso64/Makefile
 +++ b/arch/powerpc/kernel/vdso64/Makefile
 @@ -36,7 +36,8 @@ $(obj-vdso64): %.o: %.S
@@ -62,7 +63,7 @@ index effca9404b17..713891a92d23 100644
        cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<
  
 diff --git a/arch/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Makefile
-index 8ad2b34ad151..e153572ab351 100644
+index ee8a18e..63e33fa 100644
 --- a/arch/s390/kernel/vdso32/Makefile
 +++ b/arch/s390/kernel/vdso32/Makefile
 @@ -43,7 +43,8 @@ $(obj-vdso32): %.o: %.S
@@ -76,7 +77,7 @@ index 8ad2b34ad151..e153572ab351 100644
        cmd_vdso32as = $(CC) $(a_flags) -c -o $@ $<
  
 diff --git a/arch/s390/kernel/vdso64/Makefile b/arch/s390/kernel/vdso64/Makefile
-index 2a8ddfd12a5b..452ca53561fe 100644
+index c4b03f9..550450f 100644
 --- a/arch/s390/kernel/vdso64/Makefile
 +++ b/arch/s390/kernel/vdso64/Makefile
 @@ -43,7 +43,8 @@ $(obj-vdso64): %.o: %.S
@@ -89,11 +90,11 @@ index 2a8ddfd12a5b..452ca53561fe 100644
  quiet_cmd_vdso64as = VDSO64A $@
        cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<
  
-diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
-index 7b9be9822724..c4c5d4ae3dad 100644
---- a/arch/x86/vdso/Makefile
-+++ b/arch/x86/vdso/Makefile
-@@ -172,8 +172,9 @@ $(vdso32-images:%=$(obj)/%.dbg): $(obj)/vdso32-%.so.dbg: FORCE \
+diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
+index 265c0ed..fd90c7d 100644
+--- a/arch/x86/entry/vdso/Makefile
++++ b/arch/x86/entry/vdso/Makefile
+@@ -159,8 +159,9 @@ $(obj)/vdso32.so.dbg: FORCE \
  quiet_cmd_vdso = VDSO    $@
        cmd_vdso = $(CC) -nostdlib -o $@ \
  		       $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
@@ -103,14 +104,14 @@ index 7b9be9822724..c4c5d4ae3dad 100644
 +		$(if $(AFTER_LINK),; $(AFTER_LINK)) && \
 +		sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
  
- VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
+ VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=both) \
  	$(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
-index 86a4fe75f453..161637ed5611 100755
+index ba6c34e..245501e 100755
 --- a/scripts/link-vmlinux.sh
 +++ b/scripts/link-vmlinux.sh
 @@ -65,6 +65,10 @@ vmlinux_link()
- 			-lutil ${1}
+ 			-lutil -lrt -lpthread ${1}
  		rm -f linux
  	fi
 +	if [ -n "${AFTER_LINK}" ]; then
@@ -121,5 +122,5 @@ index 86a4fe75f453..161637ed5611 100755
  
  
 -- 
-2.1.0
+2.5.0
 
diff --git a/kernel-arm64.patch b/kernel-arm64.patch
deleted file mode 100644
index 6c618105b..000000000
--- a/kernel-arm64.patch
+++ /dev/null
@@ -1,21585 +0,0 @@
-commit fdd2bbd9e18e813faa3880f820c1b674267eec0c
-Author: Kyle McMartin <kmcmarti@redhat.com>
-Date:   Wed Feb 18 09:49:05 2015 -0500
-
-    fixes for xgene enet
-
-commit ac44fa9c24a21d78e8fff79c0dab3deea490d782
-Author: Kyle McMartin <kmcmarti@redhat.com>
-Date:   Tue Feb 17 12:04:33 2015 -0500
-
-    fixes for HEAD
-
-commit 7320bdde2a2abd1267f0a138ed1c19791be519c5
-Merge: 9d1c60d 796e1c5
-Author: Kyle McMartin <kmcmarti@redhat.com>
-Date:   Tue Feb 17 11:11:12 2015 -0500
-
-    Merge branch 'master' into devel
-    
-    Conflicts:
-    	arch/arm64/kernel/efi.c
-    	arch/arm64/kernel/pci.c
-    	arch/arm64/mm/dma-mapping.c
-    	arch/x86/pci/mmconfig-shared.c
-    	drivers/ata/ahci_xgene.c
-    	drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
-    	drivers/net/ethernet/apm/xgene/xgene_enet_main.c
-    	drivers/tty/serial/8250/8250_dw.c
-    	include/linux/pci.h
-
-commit 9d1c60d3f33dd3b331e1365dba5c8c5de50db77c
-Author: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
-Date:   Wed Feb 4 19:06:03 2015 +0200
-
-    firmware: dmi-sysfs: add SMBIOS entry point area attribute
-    
-    Some utils, like dmidecode and smbios, need to access SMBIOS entry
-    table area in order to get information like SMBIOS version, size, etc.
-    Currently it's done via /dev/mem. But for situation when /dev/mem
-    usage is disabled, the utils have to use dmi sysfs instead, which
-    doesn't represent SMBIOS entry. So this patch adds SMBIOS area to
-    dmi-sysfs in order to allow utils in question to work correctly with
-    dmi sysfs interface.
-    
-    Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-    Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
-
-commit 9ede97bc136e217ea00406a3388c6082a6a8d049
-Author: Mark Salter <msalter@redhat.com>
-Date:   Mon Feb 16 13:46:56 2015 -0500
-
-    ata: ahci_platform: DO NOT UPSTREAM Add HID for AMD seattle platform
-    
-    Add HID match to get modules working. The class matching works but not
-    for modules. Yet.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 794db044849e4388586abda59a262d34f18f20fa
-Author: Mark Langsdorf <mlangsdo@redhat.com>
-Date:   Thu Nov 13 21:46:59 2014 -0500
-
-    usb: make xhci platform driver use 64 bit or 32 bit DMA
-    
-    The xhci platform driver needs to work on systems that either only
-    support 64-bit DMA or only support 32-bit DMA. Attempt to set a
-    coherent dma mask for 64-bit DMA, and attempt again with 32-bit
-    DMA if that fails.
-    
-    Signed-off-by: Mark Langsdorf <mlangsdo@redhat.com>
-
-commit da4d6ecc4b7b5802b7caee5844933abaca6f7de4
-Author: Mark Salter <msalter@redhat.com>
-Date:   Mon Nov 10 16:31:05 2014 -0500
-
-    iommu/arm-smmu: fix NULL dereference with ACPI PCI devices
-    
-    Fix a NULL dereference in find_mmu_master which occurs when
-    booting with ACPI. In that case, PCI bridges with not have
-    an of_node. Add a check for NULL of_node and bail out if that
-    is the case.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit eb81ac50a2193a52251c933c07ddc05a39717c7c
-Author: Mark Salter <msalter@redhat.com>
-Date:   Mon Nov 10 21:35:11 2014 -0500
-
-    DO NOT UPSTREAM - arm64: fix dma_ops for ACPI and PCI devices
-    
-    Commit 2189064795dc3fb4101e5:
-    
-      arm64: Implement set_arch_dma_coherent_ops() to replace bus notifiers
-    
-    removed the bus notifiers from dma-mapping.c. This patch
-    adds the notifier back for ACPI and PCI devices until a
-    better permanent solution is worked out.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit efaf1674559c92ed2a862cfc44d51967ccd99928
-Author: Mark Salter <msalter@redhat.com>
-Date:   Thu Aug 14 12:32:13 2014 -0400
-
-    acpi: add utility to test for device dma coherency
-    
-    ACPI 5.1 adds a _CCA object to indicate memory coherency
-    of a bus master device. It is an integer with zero meaning
-    non-coherent and one meaning coherent. This attribute may
-    be inherited from a parent device. It may also be missing
-    entirely, in which case, an architecture-specific default
-    is assumed.
-    
-    This patch adds a utility function to parse a device handle
-    (and its parents) for a _CCA object and return the coherency
-    attribute if found.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 907e55f6d08572382856382ea0726c377ced90fc
-Author: Donald Dutile <ddutile@redhat.com>
-Date:   Sat Nov 22 12:08:53 2014 -0500
-
-    DO NOT UPSTREAM - arm64: kvm: Change vgic resource size error to info
-    
-    A new check was added to upstream to ensure a full
-    kernel page was allocated to the vgic.  The check failed
-    kvm configuration if the condition wasn't met. An arm64
-    kernel with 64K pagesize and certain early firmware will
-    fail this test. Change error to info & continue configuration
-    for now.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 7572b5b209ececd0a7a7c94e8104b829b0f22d5e
-Author: Wei Huang <wei@redhat.com>
-Date:   Sat Nov 22 10:38:45 2014 -0500
-
-    KVM/ACPI: Enable ACPI support for KVM virt GIC
-    
-    This patches enables ACPI support for KVM virtual GIC. KVM parses
-    ACPI table for virt GIC related information when DT table is not
-    present. This is done by retrieving the information defined in
-    generic_interrupt entry of MADT table.
-    
-    Note: Alexander Spyridakis from Virtual Open System posts a
-    _very_ similar patch to enable acpi-kvm. This patch borrows some
-    ideas from his patch.
-    
-    Signed-off-by: Wei Huang <wei@redhat.com>
-    [combined with subsequent patch to use acpi_disabled]
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit f40884650cda7b3f255a72f5b8ed554b1e3d660e
-Author: Wei Huang <wei@redhat.com>
-Date:   Sat Nov 22 10:18:57 2014 -0500
-
-    KVM/ACPI: Enable ACPI support for virt arch timer
-    
-    This patches enables ACPI support for KVM virtual arch_timer. It
-    allows KVM to parse ACPI table for virt arch_timer PPI when DT table
-    is not present. This is done by retrieving the information from
-    arch_timer_ppi array in arm_arch_timer driver.
-    
-    Signed-off-by: Wei Huang <wei@redhat.com>
-    [combined with subsequent patch to use acpi_disabled]
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 541a331980be3eec12baa65040ce7c2b354462af
-Author: Mark Salter <msalter@redhat.com>
-Date:   Tue Oct 7 12:54:08 2014 -0400
-
-    xgene acpi network - first cut
-
-commit a90c889901a6455730539cb7a0935df27f1a68de
-Author: Mark Salter <msalter@redhat.com>
-Date:   Mon Feb 16 16:39:38 2015 -0500
-
-    net: phy: amd: DO NOT UPSTREAM: Add support for A0 silicon xgbe phy
-    
-    From: Tom Lendacky <thomas.lendacky@amd.com>
-    Support A0 silicon xgbe phy
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit c72678575de9cfe30cfc2da2fb15b90692fd2068
-Author: Mark Salter <msalter@redhat.com>
-Date:   Mon Feb 16 16:37:15 2015 -0500
-
-    net: amd: DO NOT UPSTREAM: Add xgbe-a0 driver
-    
-    From: Tom Lendacky <thomas.lendacky@amd.com>
-    Add support for A0 silicon xgbe driver
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 72b6be9435d46fe4a3e09e5e01317f8a0951624d
-Author: Graeme Gregory <graeme.gregory@linaro.org>
-Date:   Fri Jul 26 17:55:02 2013 +0100
-
-    virtio-mmio: add ACPI probing
-    
-    Added the match table and pointers for ACPI probing to the driver.
-    
-    Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
-
-commit bcb68db63adaf54843fa5c8a559ba48034886576
-Author: Graeme Gregory <graeme.gregory@linaro.org>
-Date:   Wed Jul 24 11:29:48 2013 +0100
-
-    net: smc91x: add ACPI probing support.
-    
-    Add device ID LINA0003 for this device and add the match table.
-    
-    As its a platform device it needs no other code and will be probed in by
-    acpi_platform once device ID is added.
-    
-    Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
-
-commit 2df0d5a82afba0e0d9c55977ae7e7483e0f4080f
-Author: Mark Salter <msalter@redhat.com>
-Date:   Sun Sep 14 09:44:44 2014 -0400
-
-    Revert "ahci_xgene: Skip the PHY and clock initialization if already configured by the firmware."
-    
-    This reverts commit 0bed13bebd6c99d097796d2ca6c4f10fb5b2eabc.
-    
-    Temporarily revert for backwards compatibility with rh-0.12-1 firmware
-
-commit 52e7166eb5ecf60fcc1d557ecfe8447fd83c55d9
-Author: Mark Salter <msalter@redhat.com>
-Date:   Mon Aug 11 13:46:43 2014 -0400
-
-    xgene: add support for ACPI-probed serial port
-
-commit 862142c487e37cea64a9fef9fbd37816395de142
-Author: Mark Salter <msalter@redhat.com>
-Date:   Sat Aug 9 12:01:20 2014 -0400
-
-    sata/xgene: support acpi probing
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 7c26e9688ab62d89c5027127482dc40095a9d5ba
-Author: Mark Salter <msalter@redhat.com>
-Date:   Thu Sep 18 15:05:23 2014 -0400
-
-    arm64: add sev to parking protocol
-    
-    Parking protocol wakes secondary cores with an interrupt.
-    This patch adds an additional sev() to send an event. This
-    is a temporary hack for APM Mustang board and not intended
-    for upstream.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit be1439218c1ce70298d976f5fad95b85644ae0fa
-Author: Mark Salter <msalter@redhat.com>
-Date:   Tue Sep 9 22:59:48 2014 -0400
-
-    arm64: add parking protocol support
-    
-    This is a first-cut effort at parking protocol support. It is
-    very much a work in progress (as is the spec it is based on).
-    This code deviates from the current spec in a number of ways
-    to work around current firmware issues and issues with kernels
-    using 64K page sizes.
-    
-    caveat utilitor
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 8a0834f58a9484d5983b349779efe2921db23c30
-Author: Mark Salter <msalter@redhat.com>
-Date:   Mon Oct 13 20:49:43 2014 -0400
-
-    arm64/perf: add ACPI support
-    
-    Add ACPI support to perf_event driver. This involves getting
-    the irq info from the MADT and registering a platform device
-    when booting with ACPI. This requires updated firmware for
-    Mustang and FM for PMU driver to get correct info from ACPI.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 0a8be018986d895852300cb33de2d316e1029f77
-Author: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-Date:   Mon Feb 9 00:20:04 2015 +0800
-
-    ata: ahci_platform: Add ACPI _CLS matching
-    
-    This patch adds ACPI supports for AHCI platform driver, which uses _CLS
-    method to match the device.
-    
-    The following is an example of ASL structure in DSDT for a SATA controller,
-    which contains _CLS package to be matched by the ahci_platform driver:
-    
-      Device (AHC0) // AHCI Controller
-      {
-        Name(_HID, "AMDI0600")
-        Name (_CCA, 1)
-        Name (_CLS, Package (3)
-        {
-          0x01, // Base Class: Mass Storage
-          0x06, // Sub-Class: serial ATA
-          0x01, // Interface: AHCI
-        })
-        Name (_CRS, ResourceTemplate ()
-        {
-          Memory32Fixed (ReadWrite, 0xE0300000, 0x00010000)
-          Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive,,,) { 387 }
-        })
-      }
-    
-    Also, since ATA driver should not require PCI support for ATA_ACPI,
-    this patch removes dependency in the driver/ata/Kconfig.
-    
-    Acked-by: Tejun Heo <tj@kernel.org>
-    Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-
-commit c89b443a5d643c81be1eef7817ea5e91f9d7e2fd
-Author: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-Date:   Mon Feb 9 00:20:03 2015 +0800
-
-    ACPI / scan: Add support for ACPI _CLS device matching
-    
-    Device drivers typically use ACPI _HIDs/_CIDs listed in struct device_driver
-    acpi_match_table to match devices. However, for generic drivers, we do
-    not want to list _HID for all supported devices, and some device classes
-    do not have _CID (e.g. SATA, USB). Instead, we can leverage ACPI _CLS,
-    which specifies PCI-defined class code (i.e. base-class, subclass and
-    programming interface).
-    
-    This patch adds support for matching ACPI devices using the _CLS method.
-    
-    Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-
-commit ca42ac9e3bcde0394316ed697a05146730ed8c06
-Author: Mark Salter <msalter@redhat.com>
-Date:   Mon Sep 8 17:04:28 2014 -0400
-
-    acpi/arm64: NOT FOR UPSTREAM - remove EXPERT dependency
-    
-    For convenience to keep existing configs working, remove
-    CONFIG_EXPERT dependency from ACPI for ARM64. This shouldn't
-    go upstream just yet.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 574138b1f1aacdb83c362a44bc20e7bc4c9ddfa3
-Author: Mark Salter <msalter@redhat.com>
-Date:   Mon Jan 19 18:15:16 2015 -0500
-
-    DO NOT UPSTREAM - pci/xgene: Provide fixup for ACPI MCFG support
-    
-    Xgene doesn't decode bus bits of mmconfig region and only
-    supports devfn 0 of bus 0. For other buses/devices, some
-    internal registers need to be poked. This patch provides
-    a fixup to support ACPI MCFG tables. This is a horrible
-    hack allowing the hardware to be used for PCI testing, but
-    it is not intended to be a long term patch.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 2963b36f72691836ffe87beb2a1819dcf46c8b5f
-Author: Mark Salter <msalter@redhat.com>
-Date:   Mon Jan 19 17:43:54 2015 -0500
-
-    DO NOT UPSTREAM - provide hook for MCFG fixups
-    
-    This is a temprary mechanism needed by at least one early
-    arm64 hardware platform with broken MCFG support. This is
-    not intended for upstream and will go away as soon as newer
-    hardware with fully compliant ECAM becomes available.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit e1dee689c6b97065d8de205f78218cb348c7f600
-Author: Mark Salter <msalter@redhat.com>
-Date:   Wed Feb 11 14:46:03 2015 -0500
-
-    arm64/pci/acpi: initial support for ACPI probing of PCI
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 507ba9b44cb9454d45b79f93e2ac4f7e45233f98
-Author: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-Date:   Wed Nov 19 17:04:51 2014 +0100
-
-    pci, acpi: Share ACPI PCI config space accessors.
-    
-    MMCFG can be used perfectly for all architectures which support ACPI.
-    ACPI mandates MMCFG to describe PCI config space ranges which means
-    we should use MMCONFIG accessors by default.
-    
-    Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-    Tested-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit cc00e957e27e141416df5a48cc2bda4437992c67
-Author: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-Date:   Wed Nov 19 17:04:50 2014 +0100
-
-    x86, acpi, pci: mmconfig_64.c becomes default implementation for arch agnostic low-level direct PCI config space accessors via MMCONFIG.
-    
-    Note that x86 32bits machines still have its own low-level direct
-    PCI config space accessors.
-    
-    Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-
-commit 18343755a531c6dafdfd390bef7e62f2137e6836
-Author: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-Date:   Wed Nov 19 17:04:49 2014 +0100
-
-    x86, acpi, pci: mmconfig_{32,64}.c code refactoring - remove code duplication.
-    
-    mmconfig_64.c version is going to be default implementation for arch
-    agnostic low-level direct PCI config space accessors via MMCONFIG.
-    However, now it initialize raw_pci_ext_ops pointer which is used in
-    x86 specific code only. Moreover, mmconfig_32.c is doing the same thing
-    at the same time.
-    
-    Move it to mmconfig_shared.c so it becomes common for both and
-    mmconfig_64.c turns out to be purely arch agnostic.
-    
-    Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-    Tested-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit 36db151289ae6e5cb09a86c23127a9cd6e10129c
-Author: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-Date:   Wed Nov 19 17:04:48 2014 +0100
-
-    x86, acpi, pci: Move PCI config space accessors.
-    
-    We are going to use mmio_config_{} name convention across all architectures.
-    Currently it belongs to asm/pci_x86.h header which should be included
-    only for x86 specific files. From now on, those accessors are in asm/pci.h
-    header which can be included in non-architecture code much easier.
-    
-    Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-    Tested-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit 72208d51b9b656ac97fc632b015af87e702bd352
-Author: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-Date:   Wed Nov 19 17:04:47 2014 +0100
-
-    x86, acpi, pci: Move arch-agnostic MMCFG code out of arch/x86/ directory
-    
-    MMCFG table seems to be architecture independent and it makes sense
-    to share common code across all architectures. The ones that may need
-    architectural specific actions have default prototype (__weak).
-    
-    Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-    Tested-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit 4620b275253d117ba30e996bfc890bcc472165ba
-Author: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-Date:   Wed Nov 19 17:04:46 2014 +0100
-
-    x86, acpi, pci: Reorder logic of pci_mmconfig_insert() function
-    
-    This patch is the first step of MMCONFIG refactoring process.
-    
-    Code that uses pci_mmcfg_lock will be moved to common file and become
-    accessible for all architectures. pci_mmconfig_insert() cannot be moved
-    so easily since it is mixing generic mmcfg code with x86 specific logic
-    inside of mutual exclusive block guarded by pci_mmcfg_lock.
-    
-    To get rid of that constraint we reorder actions as fallow:
-    1. mmconfig entry allocation can be done at first, does not need lock
-    2. insertion to iomem_resource has its own lock, no need to wrap it into mutex
-    3. insertion to mmconfig list can be done as the final stage in separate
-    function (candidate for further factoring)
-    
-    Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-    Tested-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit 1686ea5a6feed1c661173e66a2996fc6286cd7c3
-Author: Suravee Suthikulanit <suravee.suthikulpanit@amd.com>
-Date:   Tue Jan 20 23:49:46 2015 -0600
-
-    DO NOT UPSTREAM YET: Introducing ACPI support for GICv2m
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit be2b8706d9bf4e69cc3fd63709859a148c0fdb6e
-Author: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-Date:   Tue Feb 3 12:55:57 2015 -0500
-
-    DO NOT UPSTREAM YET: Clean up GIC irq domain for ACPI
-    
-    Instead of using the irq_default_domain, define the acpi_irq_domain.
-    This still have the same assumption that ACPI only support a single
-    GIC domain.
-    
-    Also, rename acpi_gic_init() to acpi_irq_init()
-    
-    From: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-    [Add extern declaration for gicv2m_acpi_init()]
-    [Do not rename acpi_gic_init()]
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 6eb83df4e91d30b66fbfa16292e09677f683ee93
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Thu Jan 8 17:06:12 2015 +0000
-
-    PCI/MSI: Drop domain field from msi_controller
-    
-    The only two users of that field are not using the msi_controller
-    structure anymore, so drop it altogether.
-    
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit 8326736fc8b61b9422756c0bf0e4c5dd9dc1ce80
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Thu Jan 8 17:06:11 2015 +0000
-
-    irqchip: gicv3-its: Get rid of struct msi_controller
-    
-    The GICv3 ITS only uses the msi_controller structure as a way
-    to match the PHB with its MSI HW, and thus the msi_domain.
-    But now that we can directly associate an msi_domain with a device,
-    there is no use keeping this msi_controller around.
-    
-    Just remove all traces of msi_controller from the driver.
-    
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit fded15d5b5e0492f64564824111f2f901911b5de
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Thu Jan 8 17:06:10 2015 +0000
-
-    irqchip: GICv2m: Get rid of struct msi_controller
-    
-    GICv2m only uses the msi_controller structure as a way to match
-    the PHB with its MSI HW, and thus the msi_domain. But now that
-    we can directly associate an msi_domain with a device, there is
-    no use keeping this msi_controller around.
-    
-    Just remove all traces of msi_controller from the driver.
-    
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit 4b34322f05a85bb863f3d013776588677e326767
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Thu Jan 8 17:06:09 2015 +0000
-
-    PCI/MSI: Let pci_msi_get_domain use struct device's msi_domain
-    
-    Now that we can easily find which MSI domain a PCI device is
-    using, use dev_get_msi_domain as a way to retrieve the information.
-    
-    The original code is still used as a fallback.
-    
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit cc60a2e8d9efe415509b532a6fbb04ce1f43b1c5
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Thu Jan 8 17:06:08 2015 +0000
-
-    PCI/MSI: of: Allow msi_domain lookup using the PHB node
-    
-    A number of platforms do not need to use the msi-parent property,
-    as the host bridge itself provides the MSI controller.
-    
-    Allow this configuration by performing an irq domain lookup based
-    on the PHB node if it doesn't have a valid msi-parent property.
-    
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit af6b972b6cabcda796b88b52111d2f5883006fbc
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Thu Jan 8 17:06:07 2015 +0000
-
-    PCI/MSI: of: Add support for OF-provided msi_domain
-    
-    In order to populate the PHB msi_domain, use the "msi-parent"
-    attribute to lookup a corresponding irq domain. If found,
-    this is our MSI domain.
-    
-    This gets plugged into the core PCI code.
-    
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit 3e4b7b8d1bc9927144be8e123dfcc790e7ff1f46
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Thu Jan 8 17:06:06 2015 +0000
-
-    PCI/MSI: Add hooks to populate the msi_domain field
-    
-    In order to be able to populate the device msi_domain field,
-    add the necesary hooks to propagate the PHB msi_domain across
-    secondary busses to devices.
-    
-    So far, nobody populates the initial msi_domain.
-    
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit e44063e72aecf5273d2b2a72afdef227cf34b92e
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Thu Jan 8 17:06:05 2015 +0000
-
-    device core: Introduce per-device MSI domain pointer
-    
-    As MSI-type features are creeping into non-PCI devices, it is
-    starting to make sense to give our struct device some form of
-    support for this, by allowing a pointer to an MSI irq domain to
-    be set/retrieved.
-    
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit 2b88e0efc0079e2914b8d29eda7178d319bc451d
-Author: Al Stone <al.stone@linaro.org>
-Date:   Mon Feb 2 20:45:49 2015 +0800
-
-    arm64: ACPI: additions of ACPI documentation for arm64
-    
-    Two more documentation files are also being added:
-    (1) A verbatim copy of the "Why ACPI on ARM?" blog posting by Grant Likely,
-        which is also summarized in arm-acpi.txt, and
-    
-    (2) A section by section review of the ACPI spec (acpi_object_usage.txt)
-        to note recommendations and prohibitions on the use of the numerous
-        ACPI tables and objects.  This sets out the current expectations of
-        the firmware by Linux very explicitly (or as explicitly as I can, for
-        now).
-    
-    CC: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-    CC: Yi Li <phoenix.liyi@huawei.com>
-    CC: Mark Langsdorf <mlangsdo@redhat.com>
-    CC: Ashwin Chaugule <ashwinc@codeaurora.org>
-    Signed-off-by: Al Stone <al.stone@linaro.org>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit 11898311c598c099fff3be2fc80296ba0ce04760
-Author: Graeme Gregory <graeme.gregory@linaro.org>
-Date:   Mon Feb 2 20:45:48 2015 +0800
-
-    Documentation: ACPI for ARM64
-    
-    Add documentation for the guidelines of how to use ACPI
-    on ARM64.
-    
-    Reviewed-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-    Reviewed-by: Yi Li <phoenix.liyi@huawei.com>
-    Reviewed-by: Mark Langsdorf <mlangsdo@redhat.com>
-    Reviewed-by: Ashwin Chaugule <ashwinc@codeaurora.org>
-    Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
-    Signed-off-by: Al Stone <al.stone@linaro.org>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit 15c86f7418a04b2d6f10f6c7c22c09b2eb4f184a
-Author: Graeme Gregory <graeme.gregory@linaro.org>
-Date:   Mon Feb 2 20:45:47 2015 +0800
-
-    ARM64 / ACPI: Enable ARM64 in Kconfig
-    
-    Add Kconfigs to build ACPI on ARM64, and make ACPI available on ARM64.
-    
-    acpi_idle driver is x86/IA64 dependent now, so make CONFIG_ACPI_PROCESSOR
-    depend on X86 || IA64, and implement it on ARM64 in the future.
-    
-    CC: Rafael J. Wysocki <rjw@rjwysocki.net>
-    CC: Catalin Marinas <catalin.marinas@arm.com>
-    CC: Will Deacon <will.deacon@arm.com>
-    Reviewed-by: Grant Likely <grant.likely@linaro.org>
-    Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-    Tested-by: Yijing Wang <wangyijing@huawei.com>
-    Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
-    Tested-by: Jon Masters <jcm@redhat.com>
-    Tested-by: Timur Tabi <timur@codeaurora.org>
-    Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
-    Signed-off-by: Al Stone <al.stone@linaro.org>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit 7f6b100b64905fcb75d6daadf794a20f6dce2f1c
-Author: Mark Salter <msalter@redhat.com>
-Date:   Tue Feb 3 10:51:16 2015 -0500
-
-    acpi: fix acpi_os_ioremap for arm64
-    
-    The acpi_os_ioremap() function may be used to map normal RAM or IO
-    regions. The current implementation simply uses ioremap_cache(). This
-    will work for some architectures, but arm64 ioremap_cache() cannot be
-    used to map IO regions which don't support caching. So for arm64, use
-    ioremap() for non-RAM regions.
-    
-    CC: Rafael J Wysocki <rjw@rjwysocki.net>
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 49e6c38cd04dbc34d1582209cf54ed6d0810f10b
-Author: Al Stone <al.stone@linaro.org>
-Date:   Mon Feb 2 20:45:46 2015 +0800
-
-    ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64
-    
-    ACPI reduced hardware mode is disabled by default, but ARM64
-    can only run properly in ACPI hardware reduced mode, so select
-    ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64.
-    
-    CC: Catalin Marinas <catalin.marinas@arm.com>
-    CC: Will Deacon <will.deacon@arm.com>
-    Reviewed-by: Grant Likely <grant.likely@linaro.org>
-    Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-    Tested-by: Yijing Wang <wangyijing@huawei.com>
-    Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
-    Tested-by: Jon Masters <jcm@redhat.com>
-    Tested-by: Timur Tabi <timur@codeaurora.org>
-    Signed-off-by: Al Stone <al.stone@linaro.org>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit 2b40359067fcd5b12fcd9c0b50064bcc6d4ed8a6
-Author: Hanjun Guo <hanjun.guo@linaro.org>
-Date:   Mon Feb 2 20:45:45 2015 +0800
-
-    clocksource / arch_timer: Parse GTDT to initialize arch timer
-    
-    Using the information presented by GTDT (Generic Timer Description Table)
-    to initialize the arch timer (not memory-mapped).
-    
-    CC: Daniel Lezcano <daniel.lezcano@linaro.org>
-    Originally-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
-    Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-    Tested-by: Yijing Wang <wangyijing@huawei.com>
-    Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
-    Tested-by: Jon Masters <jcm@redhat.com>
-    Tested-by: Timur Tabi <timur@codeaurora.org>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit 19b24b7ca4887f2e6d600d380a59d32478545499
-Author: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-Date:   Mon Feb 2 20:45:44 2015 +0800
-
-    irqchip: Add GICv2 specific ACPI boot support
-    
-    ACPI kernel uses MADT table for proper GIC initialization. It needs to
-    parse GIC related subtables, collect CPU interface and distributor
-    addresses and call driver initialization function (which is hardware
-    abstraction agnostic). In a similar way, FDT initialize GICv1/2.
-    
-    NOTE: This commit allow to initialize GICv1/2 basic functionality.
-    While now simple GICv2 init call is used, any further GIC features
-    require generic infrastructure for proper ACPI irqchip initialization.
-    That mechanism and stacked irqdomains to support GICv2 MSI/vitalization
-    extension, GICv3/4 and its ITS are considered as next steps.
-    
-    CC: Jason Cooper <jason@lakedaemon.net>
-    CC: Marc Zyngier <marc.zyngier@arm.com>
-    Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-    Tested-by: Yijing Wang <wangyijing@huawei.com>
-    Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
-    Tested-by: Jon Masters <jcm@redhat.com>
-    Tested-by: Timur Tabi <timur@codeaurora.org>
-    Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit 5a8765560eac0563826a7abf83f5bca2ce158ec7
-Author: Hanjun Guo <hanjun.guo@linaro.org>
-Date:   Mon Feb 2 20:45:43 2015 +0800
-
-    ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi
-    
-    Introduce ACPI_IRQ_MODEL_GIC which is needed for ARM64 as GIC is
-    used, and then register device's gsi with the core IRQ subsystem.
-    
-    acpi_register_gsi() is similar to DT based irq_of_parse_and_map(),
-    since gsi is unique in the system, so use hwirq number directly
-    for the mapping.
-    
-    We are going to implement stacked domains when GICv2m, GICv3, ITS
-    support are added.
-    
-    CC: Marc Zyngier <marc.zyngier@arm.com>
-    Originally-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
-    Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-    Tested-by: Yijing Wang <wangyijing@huawei.com>
-    Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
-    Tested-by: Jon Masters <jcm@redhat.com>
-    Tested-by: Timur Tabi <timur@codeaurora.org>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit e81cf7fc6beaad3f9532a7db22d91e43b7fc1ae5
-Author: Hanjun Guo <hanjun.guo@linaro.org>
-Date:   Mon Feb 2 20:45:42 2015 +0800
-
-    ACPI / processor: Make it possible to get CPU hardware ID via GICC
-    
-    Introduce a new function map_gicc_mpidr() to allow MPIDRs to be obtained
-    from the GICC Structure introduced by ACPI 5.1.
-    
-    MPIDR is the CPU hardware ID as local APIC ID on x86 platform, so we use
-    MPIDR not the GIC CPU interface ID to identify CPUs.
-    
-    Further steps would typedef a phys_id_t for in arch code(with
-    appropriate size and a corresponding invalid value, say ~0) and use that
-    instead of an int in drivers/acpi/processor_core.c to store phys_id, then
-    no need for mpidr packing.
-    
-    CC: Rafael J. Wysocki <rjw@rjwysocki.net>
-    CC: Catalin Marinas <catalin.marinas@arm.com>
-    CC: Will Deacon <will.deacon@arm.com>
-    Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-    Tested-by: Yijing Wang <wangyijing@huawei.com>
-    Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
-    Tested-by: Jon Masters <jcm@redhat.com>
-    Tested-by: Timur Tabi <timur@codeaurora.org>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit 1887acdfd84b02c68bf17db11742a2c6b1461d14
-Author: Hanjun Guo <hanjun.guo@linaro.org>
-Date:   Mon Feb 2 20:45:41 2015 +0800
-
-    ARM64 / ACPI: Parse MADT for SMP initialization
-    
-    MADT contains the information for MPIDR which is essential for
-    SMP initialization, parse the GIC cpu interface structures to
-    get the MPIDR value and map it to cpu_logical_map(), and add
-    enabled cpu with valid MPIDR into cpu_possible_map.
-    
-    ACPI 5.1 only has two explicit methods to boot up SMP, PSCI and
-    Parking protocol, but the Parking protocol is only specified for
-    ARMv7 now, so make PSCI as the only way for the SMP boot protocol
-    before some updates for the ACPI spec or the Parking protocol spec.
-    
-    Parking protocol patches for SMP boot will be sent to upstream when
-    the new version of Parking protocol is ready.
-    
-    CC: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
-    CC: Catalin Marinas <catalin.marinas@arm.com>
-    CC: Will Deacon <will.deacon@arm.com>
-    CC: Mark Rutland <mark.rutland@arm.com>
-    Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-    Tested-by: Yijing Wang <wangyijing@huawei.com>
-    Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
-    Tested-by: Jon Masters <jcm@redhat.com>
-    Tested-by: Timur Tabi <timur@codeaurora.org>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-    Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-
-commit ce773743a3ea42fa3fcdb8a19c8883b0555abc87
-Author: Hanjun Guo <hanjun.guo@linaro.org>
-Date:   Mon Feb 2 20:45:40 2015 +0800
-
-    ACPI / table: Print GIC information when MADT is parsed
-    
-    When MADT is parsed, print GIC information to make the boot
-    log look pretty:
-    
-    ACPI: GICC (acpi_id[0x0000] address[00000000e112f000] MPIDR[0x0] enabled)
-    ACPI: GICC (acpi_id[0x0001] address[00000000e112f000] MPIDR[0x1] enabled)
-    ...
-    ACPI: GICC (acpi_id[0x0201] address[00000000e112f000] MPIDR[0x201] enabled)
-    
-    These information will be very helpful to bring up early systems to
-    see if acpi_id and MPIDR are matched or not as spec defined.
-    
-    CC: Rafael J. Wysocki <rjw@rjwysocki.net>
-    Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-    Tested-by: Yijing Wang <wangyijing@huawei.com>
-    Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
-    Tested-by: Jon Masters <jcm@redhat.com>
-    Tested-by: Timur Tabi <timur@codeaurora.org>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-    Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-
-commit 093da4679d8c27c8e688ad527c63cf9cf908e21c
-Author: Graeme Gregory <graeme.gregory@linaro.org>
-Date:   Mon Feb 2 20:45:39 2015 +0800
-
-    ARM64 / ACPI: Get PSCI flags in FADT for PSCI init
-    
-    There are two flags: PSCI_COMPLIANT and PSCI_USE_HVC. When set,
-    the former signals to the OS that the firmware is PSCI compliant.
-    The latter selects the appropriate conduit for PSCI calls by
-    toggling between Hypervisor Calls (HVC) and Secure Monitor Calls
-    (SMC).
-    
-    FADT table contains such information in ACPI 5.1, FADT table was
-    parsed in ACPI table init and copy to struct acpi_gbl_FADT, so
-    use the flags in struct acpi_gbl_FADT for PSCI init.
-    
-    Since ACPI 5.1 doesn't support self defined PSCI function IDs,
-    which means that only PSCI 0.2+ is supported in ACPI.
-    
-    CC: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
-    CC: Catalin Marinas <catalin.marinas@arm.com>
-    CC: Will Deacon <will.deacon@arm.com>
-    Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-    Tested-by: Yijing Wang <wangyijing@huawei.com>
-    Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
-    Tested-by: Jon Masters <jcm@redhat.com>
-    Tested-by: Timur Tabi <timur@codeaurora.org>
-    Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
-    Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit 029a9833a4e8a876bdac71fe7560718bca3a7312
-Author: Graeme Gregory <graeme.gregory@linaro.org>
-Date:   Mon Feb 2 20:45:38 2015 +0800
-
-    ARM64 / ACPI: If we chose to boot from acpi then disable FDT
-    
-    If the early boot methods of acpi are happy that we have valid ACPI
-    tables and acpi=force has been passed, then do not unflat devicetree
-    effectively disabling further hardware probing from DT.
-    
-    CC: Catalin Marinas <catalin.marinas@arm.com>
-    CC: Will Deacon <will.deacon@arm.com>
-    Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-    Tested-by: Yijing Wang <wangyijing@huawei.com>
-    Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
-    Tested-by: Jon Masters <jcm@redhat.com>
-    Tested-by: Timur Tabi <timur@codeaurora.org>
-    Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit 1d9af820ab2bc576e3d1ddc6e1797049f46d32ba
-Author: Hanjun Guo <hanjun.guo@linaro.org>
-Date:   Mon Feb 2 20:45:37 2015 +0800
-
-    ARM64 / ACPI: Disable ACPI if FADT revision is less than 5.1
-    
-    FADT Major.Minor version was introduced in ACPI 5.1, it is the same
-    as ACPI version.
-    
-    In ACPI 5.1, some major gaps are fixed for ARM, such as updates in
-    MADT table for GIC and SMP init, without those updates, we can not
-    get the MPIDR for SMP init, and GICv2/3 related init information, so
-    we can't boot arm64 ACPI properly with table versions predating 5.1.
-    
-    If firmware provides ACPI tables with ACPI version less than 5.1,
-    OS has no way to retrieve the configuration data that is necessary
-    to init SMP boot protocol and the GIC properly, so disable ACPI if
-    we get an FADT table with version less that 5.1.
-    
-    CC: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
-    CC: Catalin Marinas <catalin.marinas@arm.com>
-    CC: Will Deacon <will.deacon@arm.com>
-    Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-    Tested-by: Yijing Wang <wangyijing@huawei.com>
-    Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
-    Tested-by: Jon Masters <jcm@redhat.com>
-    Tested-by: Timur Tabi <timur@codeaurora.org>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit 1bcb26c31cbc9db1645a62a71b8bce9302d778fc
-Author: Hanjun Guo <hanjun.guo@linaro.org>
-Date:   Mon Feb 2 20:45:36 2015 +0800
-
-    dt / chosen: Add linux,uefi-stub-generated-dtb property
-    
-    When system supporting both DT and ACPI but firmware providing
-    no dtb, we can use this linux,uefi-stub-generated-dtb property
-    to let kernel know that we can try ACPI configuration data even
-    if no "acpi=force" is passed in early parameters.
-    
-    CC: Mark Rutland <mark.rutland@arm.com>
-    CC: Jonathan Corbet <corbet@lwn.net>
-    CC: Catalin Marinas <catalin.marinas@arm.com>
-    CC: Will Deacon <will.deacon@arm.com>
-    CC: Leif Lindholm <leif.lindholm@linaro.org>
-    CC: Grant Likely <grant.likely@linaro.org>
-    CC: Matt Fleming <matt.fleming@intel.com>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit db0a9f442cefc5eb655fd25baaf725c7f69440c7
-Author: Al Stone <al.stone@linaro.org>
-Date:   Mon Feb 2 20:45:35 2015 +0800
-
-    ARM64 / ACPI: Introduce early_param for "acpi" and pass acpi=force to enable ACPI
-    
-    Introduce two early parameters "off" and "force" for "acpi", acpi=off
-    will be the default behavior for ARM64, so introduce acpi=force to
-    enable ACPI on ARM64.
-    
-    Disable ACPI before early parameters parsed, and enable it to pass
-    "acpi=force" if people want use ACPI on ARM64. This ensures DT be
-    the prefer one if ACPI table and DT both are provided at this moment.
-    
-    CC: Catalin Marinas <catalin.marinas@arm.com>
-    CC: Will Deacon <will.deacon@arm.com>
-    CC: Rafael J. Wysocki <rjw@rjwysocki.net>
-    Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-    Tested-by: Yijing Wang <wangyijing@huawei.com>
-    Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
-    Tested-by: Jon Masters <jcm@redhat.com>
-    Tested-by: Timur Tabi <timur@codeaurora.org>
-    Signed-off-by: Al Stone <al.stone@linaro.org>
-    Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit 4d8a88fa316ced237776e33106aaf11696f458a0
-Author: Hanjun Guo <hanjun.guo@linaro.org>
-Date:   Mon Feb 2 20:45:34 2015 +0800
-
-    ARM64 / ACPI: Introduce PCI stub functions for ACPI
-    
-    CONFIG_ACPI depends CONFIG_PCI on x86 and ia64, in ARM64 server
-    world we will have PCIe in most cases, but some of them may not,
-    make CONFIG_ACPI depend CONFIG_PCI on ARM64 will satisfy both.
-    
-    With that case, we need some arch dependent PCI functions to
-    access the config space before the PCI root bridge is created, and
-    pci_acpi_scan_root() to create the PCI root bus. So introduce
-    some stub function here to make ACPI core compile and revisit
-    them later when implemented on ARM64.
-    
-    CC: Liviu Dudau <Liviu.Dudau@arm.com>
-    CC: Catalin Marinas <catalin.marinas@arm.com>
-    CC: Will Deacon <will.deacon@arm.com>
-    Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-    Tested-by: Yijing Wang <wangyijing@huawei.com>
-    Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
-    Tested-by: Jon Masters <jcm@redhat.com>
-    Tested-by: Timur Tabi <timur@codeaurora.org>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit b74ac8899a0e305d32808f735953b465991b8f17
-Author: Graeme Gregory <graeme.gregory@linaro.org>
-Date:   Mon Feb 2 20:45:33 2015 +0800
-
-    ACPI / sleep: Introduce sleep_arm.c
-    
-    ACPI 5.1 does not currently support S states for ARM64 hardware but
-    ACPI code will call acpi_target_system_state() for device power
-    managment, so introduce sleep_arm.c to allow other drivers to function
-    until S states are defined.
-    
-    CC: Rafael J. Wysocki <rjw@rjwysocki.net>
-    Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-    Tested-by: Yijing Wang <wangyijing@huawei.com>
-    Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
-    Tested-by: Jon Masters <jcm@redhat.com>
-    Tested-by: Timur Tabi <timur@codeaurora.org>
-    Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
-    Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit bfbe33ec40d51e51d0544fa1273ecf3dd4142a92
-Author: Al Stone <al.stone@linaro.org>
-Date:   Mon Feb 2 20:45:32 2015 +0800
-
-    ARM64 / ACPI: Get RSDP and ACPI boot-time tables
-    
-    As we want to get ACPI tables to parse and then use the information
-    for system initialization, we should get the RSDP (Root System
-    Description Pointer) first, it then locates Extended Root Description
-    Table (XSDT) which contains all the 64-bit physical address that
-    pointer to other boot-time tables.
-    
-    Introduce acpi.c and its related head file in this patch to provide
-    fundamental needs of extern variables and functions for ACPI core,
-    and then get boot-time tables as needed.
-      - asm/acenv.h for arch specific ACPICA environments and
-        implementation, It is needed unconditionally by ACPI core;
-      - asm/acpi.h for arch specific variables and functions needed by
-        ACPI driver core;
-      - acpi.c for ARM64 related ACPI implementation for ACPI driver
-        core;
-    
-    acpi_boot_table_init() is introduced to get RSDP and boot-time tables,
-    it will be called in setup_arch() before paging_init(), so we should
-    use eary_memremap() mechanism here to get the RSDP and all the table
-    pointers.
-    
-    CC: Catalin Marinas <catalin.marinas@arm.com>
-    CC: Will Deacon <will.deacon@arm.com>
-    Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-    Tested-by: Yijing Wang <wangyijing@huawei.com>
-    Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
-    Tested-by: Jon Masters <jcm@redhat.com>
-    Tested-by: Timur Tabi <timur@codeaurora.org>
-    Signed-off-by: Al Stone <al.stone@linaro.org>
-    Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
-    Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit db306fcca88084b45084a72ac7a9491994e3a1eb
-Author: Mark Salter <msalter@redhat.com>
-Date:   Mon Feb 2 20:45:31 2015 +0800
-
-    arm64: allow late use of early_ioremap
-    
-    Commit 0e63ea48b4d8 (arm64/efi: add missing call to early_ioremap_reset())
-    added a missing call to early_ioremap_reset(). This triggers a BUG if code
-    tries using early_ioremap() after the early_ioremap_reset(). This is a
-    problem for some ACPI code which needs short-lived temporary mappings
-    after paging_init() but before acpi_early_init() in start_kernel(). This
-    patch adds definitions for the __late_set_fixmap() and __late_clear_fixmap()
-    which avoids the BUG by allowing later use of early_ioremap().
-    
-    CC: Leif Lindholm <leif.lindholm@linaro.org>
-    CC: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-    Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
-    Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
-    Tested-by: Jon Masters <jcm@redhat.com>
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit df7dbcea6c185ceb3d62626e1e98024c0742b658
-Author: Graeme Gregory <graeme.gregory@linaro.org>
-Date:   Mon Feb 2 20:45:29 2015 +0800
-
-    acpi: add arm64 to the platforms that use ioremap
-    
-    Now with the base changes to the arm memory mapping it is safe
-    to convert to using ioremap to map in the tables after
-    acpi_gbl_permanent_mmap is set.
-    
-    CC: Rafael J Wysocki <rjw@rjwysocki.net>
-    Signed-off-by: Al Stone <al.stone@linaro.org>
-    Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
-    Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
-
-commit 3f61bd4dc0405314173e5b4e129e79745ec994b9
-Author: Mark Salter <msalter@redhat.com>
-Date:   Tue Sep 30 17:19:24 2014 -0400
-
-    arm64: avoid need for console= to enable serial console
-    
-    Tell kernel to prefer one of the serial ports on platforms
-    pl011, 8250, or sbsa uarts. console= on command line will
-    override these assumed preferences. This is just a hack to
-    get the behavior we want from SPCR table support. Once SPCR
-    is supported, we can drop this.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 830714ea6390e53a92751b338dea8863aabaf81f
-Author: Mark Salter <msalter@redhat.com>
-Date:   Fri Nov 21 23:21:30 2014 -0500
-
-    DO NOT UPSTREAM - tty/pl011: make ttyAMA0 the active console device
-    
-    The pl011 uart driver doesn't register itself as a console
-    until device_initcall time. This allows the virtual console
-    driver to register the active console if no console= is
-    given on the cmdline. This patch allows ttyAMA0 to take
-    over the active console device role from any existing
-    console device if no console= is given on the cmdline.
-    
-    This is just a temporary hack until SPCR table is supported.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit a1c79144bc02623b27edafa950eacb304e1b6548
-Author: Mark Salter <msalter@redhat.com>
-Date:   Wed Nov 19 10:08:29 2014 -0500
-
-    tty/sbsauart: DO NOT UPSTREAM - make ttySBSA the active console device
-    
-    The sbsauart driver doesn't register itself as a console
-    until module_initcall time. This allows the virtual console
-    driver to register the active console if no console= is
-    given on the cmdline. This patch allows ttySBSA to take
-    over the active console device role from any existing
-    console device if no console= is given on the cmdline.
-    
-    This is just a temprary hack until SPCR table is supported.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 92c29f8cd602b302e6b56823ce056df05e9116cb
-Author: Graeme Gregory <graeme.gregory@linaro.org>
-Date:   Wed Aug 13 13:47:18 2014 +0100
-
-    tty: SBSA compatible UART
-    
-    This is a subset of pl011 UART which does not supprt DMA or baud rate
-    changing.  It does, however, provide earlycon support (i.e., using
-    "earlycon=ttySBSA" on the kernel command line).
-    
-    It is specified in the Server Base System Architecture document from
-    ARM.
-    
-    Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
-
-commit 6c38227252804421b94861cd06473fd608d44276
-Author: Mark Salter <msalter@redhat.com>
-Date:   Sat Nov 8 22:25:48 2014 -0500
-
-    arm64: use UEFI for reboot
-    
-    Wire in support for UEFI reboot. We want UEFI reboot to have
-    highest priority for capsule support.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 116f11ce2a8538873fb787d42e69518e4dfb07fa
-Author: Mark Salter <msalter@redhat.com>
-Date:   Sat Nov 8 15:25:41 2014 -0500
-
-    arm64: use UEFI as last resort for poweroff
-    
-    Wire in support for poweroff via UEFI.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 5dfa57078318e948a199b9f00855c0ae2dd7e2ca
-Author: Mark Salter <msalter@redhat.com>
-Date:   Thu Jul 17 13:34:50 2014 -0400
-
-    ahci_xgene: add errata workaround for ATA_CMD_SMART
-    
-    commit 2a0bdff6b958d1b2:
-    
-     ahci_xgene: fix the dma state machine lockup for the IDENTIFY DEVICE PIO mode command.
-    
-    added a workaround for X-Gene AHCI controller errata. This was done
-    for all ATA_CMD_ID_ATA commands. The errata also appears to affect
-    ATA_CMD_SMART commands as well. This was discovered when running
-    smartd or just smartctl -x. This patch adds a dma engine restart for
-    ATA_CMD_SMART commands which clears up the issues seen with smartd.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 8dc5d6c4d782adc8a5f83f02ce7fd848eff129ca
-Author: Kyle McMartin <kmcmarti@redhat.com>
-Date:   Tue May 13 22:25:26 2014 -0400
-
-    arm64: don't set READ_IMPLIES_EXEC for EM_AARCH64 ELF objects
-    
-    Currently, we're accidentally ending up with executable stacks on
-    AArch64 when the ABI says we shouldn't be, and relying on glibc to fix
-    things up for us when we're loaded. However, SELinux will deny us
-    mucking with the stack, and hit us with execmem AVCs.
-    
-    The reason this is happening is somewhat complex:
-    
-    fs/binfmt_elf.c:load_elf_binary()
-     - initializes executable_stack = EXSTACK_DEFAULT implying the
-       architecture should make up its mind.
-     - does a pile of loading goo
-     - runs through the program headers, looking for PT_GNU_STACK
-       and setting (or unsetting) executable_stack if it finds it.
-    
-       This is our first problem, we won't generate these unless an
-       executable stack is explicitly requested.
-    
-     - more ELF loading goo
-     - sets whether we're a compat task or not (TIF_32BIT) based on compat.h
-     - for compat reasons (pre-GNU_STACK) checks if the READ_IMPLIES_EXEC
-       flag should be set for ancient toolchains
-    
-       Here's our second problem, we test if read_implies_exec based on
-       stk != EXSTACK_DISABLE_X, which is true since stk == EXSTACK_DEFAULT.
-    
-       So we set current->personality |= READ_IMPLIES_EXEC like a broken
-       legacy toolchain would want.
-    
-     - Now we call setup_arg_pages to set up the stack...
-    
-    fs/exec.c:setup_arg_pages()
-     - lots of magic happens here
-     - vm_flags gets initialized to VM_STACK_FLAGS
-    
-       Here's our third problem, VM_STACK_FLAGS on arm64 is
-       VM_DEFAULT_DATA_FLAG which tests READ_IMPLIES_EXEC and sets VM_EXEC
-       if it's true. So we end up with an executable stack mapping, since we
-       don't have executable_stack set (it's still EXSTACK_DEFAULT at this
-       point) to unset it anywhere.
-    
-    Bang. execstack AVC when the program starts running.
-    
-    The easiest way I can see to fix this is to test if we're a legacy task
-    and fix it up there. But that's not as simple as it sounds, because
-    the 32-bit ABI depends on what revision of the CPU we've enabled (not
-    that it matters since we're ARMv8...) Regardless, in the compat case,
-    set READ_IMPLIES_EXEC if we've found a GNU_STACK header which explicitly
-    requested it as in arch/arm/kernel/elf.c:arm_elf_read_implies_exec().
-    
-    Signed-off-by: Kyle McMartin <kmcmarti@redhat.com>
-    Signed-off-by: Donald Dutile <ddutile@redhat.com>
-
- Documentation/ABI/testing/sysfs-firmware-dmi     |   10 +
- Documentation/arm/uefi.txt                       |    3 +
- Documentation/arm64/acpi_object_usage.txt        |  592 +++++
- Documentation/arm64/arm-acpi.txt                 |  506 ++++
- Documentation/arm64/why_use_acpi.txt             |  231 ++
- Documentation/kernel-parameters.txt              |    3 +-
- arch/arm64/Kconfig                               |   10 +
- arch/arm64/include/asm/acenv.h                   |   18 +
- arch/arm64/include/asm/acpi.h                    |  120 +
- arch/arm64/include/asm/cpu_ops.h                 |    1 +
- arch/arm64/include/asm/elf.h                     |    3 +-
- arch/arm64/include/asm/fixmap.h                  |    3 +
- arch/arm64/include/asm/pci.h                     |   66 +
- arch/arm64/include/asm/psci.h                    |    3 +-
- arch/arm64/include/asm/smp.h                     |   10 +-
- arch/arm64/kernel/Makefile                       |    4 +-
- arch/arm64/kernel/acpi.c                         |  397 +++
- arch/arm64/kernel/cpu_ops.c                      |    6 +-
- arch/arm64/kernel/efi.c                          |   37 +
- arch/arm64/kernel/pci.c                          |  424 +++-
- arch/arm64/kernel/perf_event.c                   |  102 +
- arch/arm64/kernel/psci.c                         |   78 +-
- arch/arm64/kernel/setup.c                        |   80 +-
- arch/arm64/kernel/smp.c                          |    2 +-
- arch/arm64/kernel/smp_parking_protocol.c         |  110 +
- arch/arm64/kernel/time.c                         |    7 +
- arch/arm64/mm/dma-mapping.c                      |    6 +
- arch/x86/include/asm/pci.h                       |   42 +
- arch/x86/include/asm/pci_x86.h                   |   72 -
- arch/x86/pci/Makefile                            |    5 +-
- arch/x86/pci/acpi.c                              |    1 +
- arch/x86/pci/init.c                              |    1 +
- arch/x86/pci/mmconfig-shared.c                   |  198 +-
- arch/x86/pci/mmconfig_32.c                       |   11 +-
- arch/x86/pci/mmconfig_64.c                       |  153 --
- drivers/acpi/Kconfig                             |    3 +-
- drivers/acpi/Makefile                            |    5 +
- drivers/acpi/bus.c                               |    4 +
- drivers/acpi/mmconfig.c                          |  414 +++
- drivers/acpi/osl.c                               |    6 +-
- drivers/acpi/processor_core.c                    |   37 +
- drivers/acpi/scan.c                              |   75 +-
- drivers/acpi/sleep_arm.c                         |   28 +
- drivers/acpi/tables.c                            |   43 +
- drivers/acpi/utils.c                             |   26 +
- drivers/ata/Kconfig                              |    2 +-
- drivers/ata/ahci_platform.c                      |   12 +
- drivers/ata/ahci_xgene.c                         |   27 +-
- drivers/clocksource/arm_arch_timer.c             |  135 +-
- drivers/firmware/dmi-sysfs.c                     |   42 +
- drivers/firmware/dmi_scan.c                      |   26 +
- drivers/firmware/efi/libstub/fdt.c               |    8 +
- drivers/iommu/arm-smmu.c                         |    8 +-
- drivers/irqchip/irq-gic-v2m.c                    |  148 +-
- drivers/irqchip/irq-gic-v3-its.c                 |   33 +-
- drivers/irqchip/irq-gic-v3.c                     |   10 +
- drivers/irqchip/irq-gic.c                        |  125 +-
- drivers/irqchip/irqchip.c                        |    3 +
- 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 +++++++
- drivers/net/ethernet/apm/xgene/xgene_enet_hw.c   |   69 +-
- drivers/net/ethernet/apm/xgene/xgene_enet_main.c |  111 +-
- drivers/net/ethernet/apm/xgene/xgene_enet_main.h |    4 +-
- drivers/net/ethernet/smsc/smc91x.c               |   10 +
- drivers/net/phy/Makefile                         |    1 +
- drivers/net/phy/amd-xgbe-phy-a0.c                | 1829 +++++++++++++
- drivers/pci/host/pci-xgene.c                     |  248 ++
- drivers/pci/msi.c                                |    3 +-
- drivers/pci/of.c                                 |   20 +
- drivers/pci/pci-acpi.c                           |   36 +
- drivers/pci/probe.c                              |   33 +
- drivers/tty/Kconfig                              |    6 +
- drivers/tty/Makefile                             |    1 +
- drivers/tty/sbsauart.c                           |  358 +++
- drivers/tty/serial/8250/8250_dw.c                |    6 +-
- drivers/tty/serial/amba-pl011.c                  |    8 +
- drivers/usb/host/xhci-plat.c                     |   15 +-
- drivers/virtio/virtio_mmio.c                     |   12 +-
- include/acpi/acnames.h                           |    1 +
- include/acpi/acpi_bus.h                          |    2 +
- include/acpi/acpi_io.h                           |    3 +
- include/asm-generic/vmlinux.lds.h                |    7 +
- include/kvm/arm_vgic.h                           |   20 +-
- include/linux/acpi.h                             |   26 +
- include/linux/clocksource.h                      |    6 +
- include/linux/device.h                           |   21 +
- include/linux/dmi.h                              |    3 +
- include/linux/irqchip/arm-gic-acpi.h             |   31 +
- include/linux/irqchip/arm-gic.h                  |    7 +
- include/linux/mmconfig.h                         |   86 +
- include/linux/mod_devicetable.h                  |    6 +
- include/linux/msi.h                              |    4 +-
- include/linux/pci-acpi.h                         |    3 +
- include/linux/pci.h                              |   11 +-
- kernel/irq/msi.c                                 |   24 +
- virt/kvm/arm/arch_timer.c                        |  107 +-
- virt/kvm/arm/vgic-v2.c                           |   86 +-
- virt/kvm/arm/vgic-v3.c                           |    8 +-
- virt/kvm/arm/vgic.c                              |   32 +-
- 110 files changed, 17386 insertions(+), 733 deletions(-)
-
-diff --git a/Documentation/ABI/testing/sysfs-firmware-dmi b/Documentation/ABI/testing/sysfs-firmware-dmi
-index c78f9ab..3a9ffe8 100644
---- a/Documentation/ABI/testing/sysfs-firmware-dmi
-+++ b/Documentation/ABI/testing/sysfs-firmware-dmi
-@@ -12,6 +12,16 @@ Description:
- 		cannot ensure that the data as exported to userland is
- 		without error either.
- 
-+		The firmware provides DMI structures as a packed list of
-+		data referenced by a SMBIOS table entry point. The SMBIOS
-+		entry point contains general information, like SMBIOS
-+		version, DMI table size, etc. The structure, content and
-+		size of SMBIOS entry point is dependent on SMBIOS version.
-+		That's why SMBIOS entry point is represented in dmi sysfs
-+		like a raw attribute and is accessible via
-+		/sys/firmware/dmi/smbios_raw_header. The format of SMBIOS
-+		entry point header can be read in SMBIOS specification.
-+
- 		DMI is structured as a large table of entries, where
- 		each entry has a common header indicating the type and
- 		length of the entry, as well as a firmware-provided
-diff --git a/Documentation/arm/uefi.txt b/Documentation/arm/uefi.txt
-index d60030a..5f86eae 100644
---- a/Documentation/arm/uefi.txt
-+++ b/Documentation/arm/uefi.txt
-@@ -60,5 +60,8 @@ linux,uefi-mmap-desc-ver  | 32-bit | Version of the mmap descriptor format.
- --------------------------------------------------------------------------------
- linux,uefi-stub-kern-ver  | string | Copy of linux_banner from build.
- --------------------------------------------------------------------------------
-+linux,uefi-stub-generated-dtb  | bool | Indication for no DTB provided by
-+			       |      | firmware.
-+--------------------------------------------------------------------------------
- 
- For verbose debug messages, specify 'uefi_debug' on the kernel command line.
-diff --git a/Documentation/arm64/acpi_object_usage.txt b/Documentation/arm64/acpi_object_usage.txt
-new file mode 100644
-index 0000000..2c4f733
---- /dev/null
-+++ b/Documentation/arm64/acpi_object_usage.txt
-@@ -0,0 +1,592 @@
-+ACPI Tables
-+-----------
-+The expectations of individual ACPI tables are discussed in the list that
-+follows.
-+
-+If a section number is used, it refers to a section number in the ACPI
-+specification where the object is defined.  If "Signature Reserved" is used,
-+the table signature (the first four bytes of the table) is the only portion
-+of the table recognized by the specification, and the actual table is defined
-+outside of the UEFI Forum (see Section 5.2.6 of the specification).
-+
-+For ACPI on arm64, tables also fall into the following categories:
-+
-+	-- Required: DSDT, FADT, GTDT, MADT, MCFG, RSDP, SPCR, XSDT
-+
-+	-- Recommended: BERT, EINJ, ERST, HEST, SSDT
-+
-+	-- Optional: BGRT, CPEP, CSRT, DRTM, ECDT, FACS, FPDT, MCHI, MPST,
-+	   MSCT, RASF, SBST, SLIT, SPMI, SRAT, TCPA, TPM2, UEFI
-+
-+	-- Not supported: BOOT, DBG2, DBGP, DMAR, ETDT, HPET, IBFT, IVRS,
-+	   LPIT, MSDM, RSDT, SLIC, WAET, WDAT, WDRT, WPBT
-+
-+
-+Table	Usage for ARMv8 Linux
-+-----	----------------------------------------------------------------
-+BERT	Section 18.3 (signature == "BERT")
-+	== Boot Error Record Table ==
-+	Must be supplied if RAS support is provided by the platform.  It
-+	is recommended this table be supplied.
-+
-+BOOT	Signature Reserved (signature == "BOOT")
-+	== simple BOOT flag table ==
-+	Microsoft only table, will not be supported.
-+
-+BGRT	Section 5.2.22 (signature == "BGRT")
-+	== Boot Graphics Resource Table ==
-+	Optional, not currently supported, with no real use-case for an
-+	ARM server.
-+
-+CPEP	Section 5.2.18 (signature == "CPEP")
-+	== Corrected Platform Error Polling table ==
-+	Optional, not currently supported, and not recommended until such
-+	time as ARM-compatible hardware is available, and the specification
-+	suitably modified.
-+
-+CSRT	Signature Reserved (signature == "CSRT")
-+	== Core System Resources Table ==
-+	Optional, not currently supported.
-+
-+DBG2	Signature Reserved (signature == "DBG2")
-+	== DeBuG port table 2 ==
-+	Microsoft only table, will not be supported.
-+
-+DBGP	Signature Reserved (signature == "DBGP")
-+	== DeBuG Port table ==
-+	Microsoft only table, will not be supported.
-+
-+DSDT	Section 5.2.11.1 (signature == "DSDT")
-+	== Differentiated System Description Table ==
-+	A DSDT is required; see also SSDT.
-+
-+	ACPI tables contain only one DSDT but can contain one or more SSDTs,
-+	which are optional.  Each SSDT can only add to the ACPI namespace,
-+	but cannot modify or replace anything in the DSDT.
-+
-+DMAR	Signature Reserved (signature == "DMAR")
-+	== DMA Remapping table ==
-+	x86 only table, will not be supported.
-+
-+DRTM	Signature Reserved (signature == "DRTM")
-+	== Dynamic Root of Trust for Measurement table ==
-+	Optional, not currently supported.
-+
-+ECDT	Section 5.2.16 (signature == "ECDT")
-+	== Embedded Controller Description Table ==
-+	Optional, not currently supported, but could be used on ARM if and
-+	only if one uses the GPE_BIT field to represent an IRQ number, since
-+	there are no GPE blocks defined in hardware reduced mode.  This would
-+	need to be modified in the ACPI specification.
-+
-+EINJ	Section 18.6 (signature == "EINJ")
-+	== Error Injection table ==
-+	This table is very useful for testing platform response to error
-+	conditions; it allows one to inject an error into the system as
-+	if it had actually occurred.  However, this table should not be
-+	shipped with a production system; it should be dynamically loaded
-+	and executed with the ACPICA tools only during testing.
-+
-+ERST	Section 18.5 (signature == "ERST")
-+	== Error Record Serialization Table ==
-+	Must be supplied if RAS support is provided by the platform.  It
-+	is recommended this table be supplied.
-+
-+ETDT	Signature Reserved (signature == "ETDT")
-+	== Event Timer Description Table ==
-+	Obsolete table, will not be supported.
-+
-+FACS	Section 5.2.10 (signature == "FACS")
-+	== Firmware ACPI Control Structure ==
-+	It is unlikely that this table will be terribly useful.  If it is
-+	provided, the Global Lock will NOT be used since it is not part of
-+	the hardware reduced profile, and only 64-bit address fields will
-+	be considered valid.
-+
-+FADT	Section 5.2.9 (signature == "FACP")
-+	== Fixed ACPI Description Table ==
-+	Required for arm64.
-+
-+	The HW_REDUCED_ACPI flag must be set.  All of the fields that are
-+	to be ignored when HW_REDUCED_ACPI is set are expected to be set to
-+	zero.
-+
-+	If an FACS table is provided, the X_FIRMWARE_CTRL field is to be
-+	used, not FIRMWARE_CTRL.
-+
-+	If PSCI is used (as is recommended), make sure that ARM_BOOT_ARCH is
-+	filled in properly -- that the PSCI_COMPLIANT flag is set and that
-+	PSCI_USE_HVC is set or unset as needed (see table 5-37).
-+
-+	For the DSDT that is also required, the X_DSDT field is to be used,
-+	not the DSDT field.
-+
-+FPDT	Section 5.2.23 (signature == "FPDT")
-+	== Firmware Performance Data Table ==
-+	Optional, not currently supported.
-+
-+GTDT	Section 5.2.24 (signature == "GTDT")
-+	== Generic Timer Description Table ==
-+	Required for arm64.
-+
-+HEST	Section 18.3.2 (signature == "HEST")
-+	== Hardware Error Source Table ==
-+	Until further error source types are defined, use only types 6 (AER
-+	Root Port), 7 (AER Endpoint), 8 (AER Bridge), or 9 (Generic Hardware
-+	Error Source).  Firmware first error handling is possible if and only
-+	if Trusted Firmware is being used on arm64.
-+
-+	Must be supplied if RAS support is provided by the platform.  It
-+	is recommended this table be supplied.
-+
-+HPET	Signature Reserved (signature == "HPET")
-+	== High Precision Event timer Table ==
-+	x86 only table, will not be supported.
-+
-+IBFT	Signature Reserved (signature == "IBFT")
-+	== iSCSI Boot Firmware Table ==
-+	Microsoft defined table, support TBD.
-+
-+IVRS	Signature Reserved (signature == "IVRS")
-+	== I/O Virtualization Reporting Structure ==
-+	x86_64 (AMD) only table, will not be supported.
-+
-+LPIT	Signature Reserved (signature == "LPIT")
-+	== Low Power Idle Table ==
-+	x86 only table as of ACPI 5.1; future versions have been adapted for
-+	use with ARM and will be recommended in order to support ACPI power
-+	management.
-+
-+MADT	Section 5.2.12 (signature == "APIC")
-+	== Multiple APIC Description Table ==
-+	Required for arm64.  Only the GIC interrupt controller structures 
-+	should be used (types 0xA - 0xE).
-+
-+MCFG	Signature Reserved (signature == "MCFG")
-+	== Memory-mapped ConFiGuration space ==
-+	If the platform supports PCI/PCIe, an MCFG table is required.
-+
-+MCHI	Signature Reserved (signature == "MCHI")
-+	== Management Controller Host Interface table ==
-+	Optional, not currently supported.
-+
-+MPST	Section 5.2.21 (signature == "MPST")
-+	== Memory Power State Table ==
-+	Optional, not currently supported.
-+
-+MSDM	Signature Reserved (signature == "MSDM")
-+	== Microsoft Data Management table ==
-+	Microsoft only table, will not be supported.
-+
-+MSCT	Section 5.2.19 (signature == "MSCT")
-+	== Maximum System Characteristic Table ==
-+	Optional, not currently supported.
-+
-+RASF	Section 5.2.20 (signature == "RASF")
-+	== RAS Feature table ==
-+	Optional, not currently supported.
-+
-+RSDP	Section 5.2.5 (signature == "RSD PTR")
-+	== Root System Description PoinTeR ==
-+	Required for arm64.
-+
-+RSDT	Section 5.2.7 (signature == "RSDT")
-+	== Root System Description Table ==
-+	Since this table can only provide 32-bit addresses, it is deprecated
-+	on arm64, and will not be used.
-+
-+SBST	Section 5.2.14 (signature == "SBST")
-+	== Smart Battery Subsystem Table ==
-+	Optional, not currently supported.
-+
-+SLIC	Signature Reserved (signature == "SLIC")
-+	== Software LIcensing table ==
-+	Microsoft only table, will not be supported.
-+
-+SLIT	Section 5.2.17 (signature == "SLIT")
-+	== System Locality distance Information Table ==
-+	Optional in general, but required for NUMA systems.
-+
-+SPCR	Signature Reserved (signature == "SPCR")
-+	== Serial Port Console Redirection table ==
-+	Required for arm64.
-+
-+SPMI	Signature Reserved (signature == "SPMI")
-+	== Server Platform Management Interface table ==
-+	Optional, not currently supported.
-+
-+SRAT	Section 5.2.16 (signature == "SRAT")
-+	== System Resource Affinity Table ==
-+	Optional, but if used, only the GICC Affinity structures are read.
-+	To support NUMA, this table is required.
-+
-+SSDT	Section 5.2.11.2 (signature == "SSDT")
-+	== Secondary System Description Table ==
-+	These tables are a continuation of the DSDT; these are recommended
-+	for use with devices that can be added to a running system, but can
-+	also serve the purpose of dividing up device descriptions into more
-+	manageable pieces.
-+
-+	An SSDT can only ADD to the ACPI namespace.  It cannot modify or
-+	replace existing device descriptions already in the namespace.
-+
-+	These tables are optional, however.  ACPI tables should contain only
-+	one DSDT but can contain many SSDTs.
-+
-+TCPA	Signature Reserved (signature == "TCPA")
-+	== Trusted Computing Platform Alliance table ==
-+	Optional, not currently supported, and may need changes to fully
-+	interoperate with arm64.
-+
-+TPM2	Signature Reserved (signature == "TPM2")
-+	== Trusted Platform Module 2 table ==
-+	Optional, not currently supported, and may need changes to fully
-+	interoperate with arm64.
-+
-+UEFI	Signature Reserved (signature == "UEFI")
-+	== UEFI ACPI data table ==
-+	Optional, not currently supported.  No known use case for arm64,
-+	at present.
-+
-+WAET	Signature Reserved (signature == "WAET")
-+	== Windows ACPI Emulated devices Table ==
-+	Microsoft only table, will not be supported.
-+
-+WDAT	Signature Reserved (signature == "WDAT")
-+	== Watch Dog Action Table ==
-+	Microsoft only table, will not be supported.
-+
-+WDRT	Signature Reserved (signature == "WDRT")
-+	== Watch Dog Resource Table ==
-+	Microsoft only table, will not be supported.
-+
-+WPBT	Signature Reserved (signature == "WPBT")
-+	== Windows Platform Binary Table ==
-+	Microsoft only table, will not be supported.
-+
-+XSDT	Section 5.2.8 (signature == "XSDT")
-+	== eXtended System Description Table ==
-+	Required for arm64.
-+
-+
-+ACPI Objects
-+------------
-+The expectations on individual ACPI objects are discussed in the list that
-+follows:
-+
-+Name	Section		Usage for ARMv8 Linux
-+----	------------	-------------------------------------------------
-+_ADR	6.1.1		Use as needed.
-+
-+_BBN	6.5.5		Use as needed; PCI-specific.
-+
-+_BDN	6.5.3		Optional; not likely to be used on arm64.
-+
-+_CCA	6.2.17		This method should be defined for all bus masters
-+			on arm64.  While cache coherency is assumed, making
-+			it explicit ensures the kernel will set up DMA as
-+			it should.
-+
-+_CDM	6.2.1		Optional, to be used only for processor devices.
-+
-+_CID	6.1.2		Use as needed.
-+
-+_CLS	6.1.3		Use as needed.
-+
-+_CRS	6.2.2		Required on arm64.
-+
-+_DCK	6.5.2		Optional; not likely to be used on arm64.
-+
-+_DDN	6.1.4		This field can be used for a device name.  However,
-+			it is meant for DOS device names (e.g., COM1), so be
-+			careful of its use across OSes.
-+
-+_DEP	6.5.8		Use as needed.
-+
-+_DIS	6.2.3		Optional, for power management use.
-+
-+_DLM	5.7.5		Optional.
-+
-+_DMA	6.2.4		Optional.
-+
-+_DSD	6.2.5		To be used with caution.  If this object is used, try
-+			to use it within the constraints already defined by the
-+			Device Properties UUID.  Only in rare circumstances
-+			should it be necessary to create a new _DSD UUID.
-+
-+			In either case, submit the _DSD definition along with
-+			any driver patches for discussion, especially when
-+			device properties are used.  A driver will not be 
-+			considered complete without a corresponding _DSD
-+			description.  Once approved by kernel maintainers,
-+			the UUID or device properties must then be registered
-+			with the UEFI Forum; this may cause some iteration as
-+			more than one OS will be registering entries.
-+
-+_DSM			Do not use this method.  It is not standardized, the
-+			return values are not well documented, and it is
-+			currently a frequent source of error.
-+
-+_DSW	7.2.1		Use as needed; power management specific.
-+
-+_EDL	6.3.1		Optional.
-+
-+_EJD	6.3.2		Optional.
-+
-+_EJx	6.3.3		Optional.
-+
-+_FIX	6.2.7		x86 specific, not used on arm64.
-+
-+\_GL	5.7.1		This object is not to be used in hardware reduced
-+			mode, and therefore should not be used on arm64.
-+
-+_GLK	6.5.7		This object requires a global lock be defined; there
-+			is no global lock on arm64 since it runs in hardware
-+			reduced mode.  Hence, do not use this object on arm64.
-+
-+\_GPE	5.3.1		This namespace is for x86 use only.  Do not use it
-+			on arm64.
-+
-+_GSB	6.2.7		Optional.
-+
-+_HID	6.1.5		Use as needed.  This is the primary object to use in
-+			device probing, though _CID and _CLS may also be used.
-+
-+_HPP	6.2.8		Optional, PCI specific.
-+
-+_HPX	6.2.9		Optional, PCI specific.
-+
-+_HRV	6.1.6		Optional, use as needed to clarify device behavior; in
-+			some cases, this may be easier to use than _DSD.
-+
-+_INI	6.5.1		Not required, but can be useful in setting up devices
-+			when UEFI leaves them in a state that may not be what
-+			the driver expects before it starts probing.
-+
-+_IRC	7.2.15		Use as needed; power management specific.
-+
-+_LCK	6.3.4		Optional.
-+
-+_MAT	6.2.10		Optional; see also the MADT.
-+
-+_MLS	6.1.7		Optional, but highly recommended for use in 
-+			internationalization.
-+
-+_OFF	7.1.2		It is recommended to define this method for any device
-+			that can be turned on or off.
-+
-+_ON	7.1.3		It is recommended to define this method for any device
-+			that can be turned on or off.
-+
-+\_OS	5.7.3		This method will return "Linux" by default (this is
-+			the value of the macro ACPI_OS_NAME on Linux).  The
-+			command line parameter acpi_os=<string> can be used
-+			to set it to some other value.
-+
-+_OSC	6.2.11		This method can be a global method in ACPI (i.e.,
-+			\_SB._OSC), or it may be associated with a specific
-+			device (e.g., \_SB.DEV0._OSC), or both.  When used
-+			as a global method, only capabilities published in
-+			the ACPI specification are allowed.  When used as
-+			a device-specifc method, the process described for
-+			using _DSD MUST be used to create an _OSC definition;
-+			out-of-process use of _OSC is not allowed.  That is,
-+			submit the device-specific _OSC usage description as
-+			part of the kernel driver submission, get it approved
-+			by the kernel community, then register it with the
-+			UEFI Forum.
-+
-+\_OSI	5.7.2		Deprecated on ARM64.  Any invocation of this method
-+			will print a warning on the console and return false.
-+			That is, as far as ACPI firmware is concerned, _OSI
-+			cannot be used to determine what sort of system is
-+			being used or what functionality is provided.  The
-+			_OSC method is to be used instead.
-+
-+_OST	6.3.5		Optional.
-+
-+_PDC	8.4.1		Deprecated, do not use on arm64.
-+
-+\_PIC	5.8.1		The method should not be used.  On arm64, the only
-+			interrupt model available is GIC.
-+
-+_PLD	6.1.8		Optional.
-+
-+\_PR	5.3.1		This namespace is for x86 use only on legacy systems.
-+			Do not use it on arm64.
-+
-+_PRS	6.2.12		Optional.
-+
-+_PRT	6.2.13		Required as part of the definition of all PCI root
-+			devices.
-+
-+_PRW	7.2.13		Use as needed; power management specific.
-+
-+_PRx	7.2.8-11	Use as needed; power management specific.  If _PR0 is
-+			defined, _PR3 must also be defined. 
-+
-+_PSC	7.2.6		Use as needed; power management specific.
-+
-+_PSE	7.2.7		Use as needed; power management specific.
-+
-+_PSW	7.2.14		Use as needed; power management specific.
-+
-+_PSx	7.2.2-5		Use as needed; power management specific.  If _PS0 is
-+			defined, _PS3 must also be defined.  If clocks or
-+			regulators need adjusting to be consistent with power
-+			usage, change them in these methods.
-+
-+\_PTS	7.3.1		Use as needed; power management specific.
-+
-+_PXM	6.2.14		Optional.
-+
-+_REG	6.5.4		Use as needed.
-+
-+\_REV	5.7.4		Always returns the latest version of ACPI supported.
-+
-+_RMV	6.3.6		Optional.
-+
-+\_SB	5.3.1		Required on arm64; all devices must be defined in this
-+			namespace.
-+
-+_SEG	6.5.6		Use as needed; PCI-specific.
-+
-+\_SI	5.3.1,		Optional.
-+	9.1
-+
-+_SLI	6.2.15		Optional; recommended when SLIT table is in use.
-+
-+_STA	6.3.7,		It is recommended to define this method for any device
-+	7.1.4		that can be turned on or off.
-+
-+_SRS	6.2.16		Optional; see also _PRS.
-+
-+_STR	6.1.10		Recommended for conveying device names to end users;
-+			this is preferred over using _DDN.
-+
-+_SUB	6.1.9		Use as needed; _HID or _CID are preferred.
-+
-+_SUN	6.1.11		Optional.
-+
-+\_Sx	7.3.2		Use as needed; power management specific.
-+
-+_SxD	7.2.16-19	Use as needed; power management specific.
-+
-+_SxW	7.2.20-24	Use as needed; power management specific.
-+
-+_SWS	7.3.3		Use as needed; power management specific; this may
-+			require specification changes for use on arm64.
-+
-+\_TTS	7.3.4		Use as needed; power management specific.
-+
-+\_TZ	5.3.1		Optional.
-+
-+_UID	6.1.12		Recommended for distinguishing devices of the same
-+			class; define it if at all possible.
-+
-+\_WAK	7.3.5		Use as needed; power management specific.
-+
-+
-+ACPI Event Model
-+----------------
-+Do not use GPE block devices; these are not supported in the hardware reduced
-+profile used by arm64.  Since there are no GPE blocks defined for use on ARM
-+platforms, GPIO-signaled interrupts should be used for creating system events.
-+
-+
-+ACPI Processor Control
-+----------------------
-+Section 8 of the ACPI specification is currently undergoing change that
-+should be completed in the 6.0 version of the specification.  Processor
-+performance control will be handled differently for arm64 at that point
-+in time.  Processor aggregator devices (section 8.5) will not be used,
-+for example, but another similar mechanism instead.
-+
-+While UEFI constrains what we can say until the release of 6.0, it is
-+recommended that CPPC (8.4.5) be used as the primary model.  This will
-+still be useful into the future.  C-states and P-states will still be
-+provided, but most of the current design work appears to favor CPPC.
-+
-+Further, it is essential that the ARMv8 SoC provide a fully functional
-+implementation of PSCI; this will be the only mechanism supported by ACPI
-+to control CPU power state (including secondary CPU booting).
-+
-+More details will be provided on the release of the ACPI 6.0 specification.
-+
-+
-+ACPI System Address Map Interfaces
-+----------------------------------
-+In Section 15 of the ACPI specification, several methods are mentioned as
-+possible mechanisms for conveying memory resource information to the kernel.
-+For arm64, we will only support UEFI for booting with ACPI, hence the UEFI
-+GetMemoryMap() boot service is the only mechanism that will be used.
-+
-+
-+ACPI Platform Error Interfaces (APEI)
-+-------------------------------------
-+The APEI tables supported are described above.
-+
-+APEI requires the equivalent of an SCI and an NMI on ARMv8.  The SCI is used
-+to notify the OSPM of errors that have occurred but can be corrected and the
-+system can continue correct operation, even if possibly degraded.  The NMI is
-+used to indicate fatal errors that cannot be corrected, and require immediate
-+attention.
-+
-+Since there is no direct equivalent of the x86 SCI or NMI, arm64 handles
-+these slightly differently.  The SCI is handled as a normal GPIO-signaled
-+interrupt; given that these are corrected (or correctable) errors being
-+reported, this is sufficient.  The NMI is emulated as the highest priority
-+GPIO-signaled interrupt possible.  This implies some caution must be used
-+since there could be interrupts at higher privilege levels or even interrupts
-+at the same priority as the emulated NMI.  In Linux, this should not be the
-+case but one should be aware it could happen.
-+
-+
-+ACPI Objects Not Supported on ARM64
-+-----------------------------------
-+While this may change in the future, there are several classes of objects
-+that can be defined, but are not currently of general interest to ARM servers.
-+
-+These are not supported:
-+
-+	-- Section 9.2: ambient light sensor devices
-+
-+	-- Section 9.3: battery devices
-+
-+	-- Section 9.4: lids (e.g., laptop lids)
-+
-+	-- Section 9.8.2: IDE controllers
-+
-+	-- Section 9.9: floppy controllers
-+
-+	-- Section 9.10: GPE block devices
-+
-+	-- Section 9.15: PC/AT RTC/CMOS devices
-+
-+	-- Section 9.16: user presence detection devices
-+
-+	-- Section 9.17: I/O APIC devices; all GICs must be enumerable via MADT
-+
-+	-- Section 9.18: time and alarm devices (see 9.15)
-+
-+
-+ACPI Objects Not Yet Implemented
-+--------------------------------
-+While these objects have x86 equivalents, and they do make some sense in ARM
-+servers, there is either no hardware available at present, or in some cases
-+there may not yet be a non-ARM implementation.  Hence, they are currently not
-+implemented though that may change in the future.
-+
-+Not yet implemented are:
-+
-+	-- Section 10: power source and power meter devices
-+
-+	-- Section 11: thermal management
-+
-+	-- Section 12: embedded controllers interface
-+
-+	-- Section 13: SMBus interfaces
-+
-+	-- Section 17: NUMA support (prototypes have been submitted for
-+	   review)
-+
-diff --git a/Documentation/arm64/arm-acpi.txt b/Documentation/arm64/arm-acpi.txt
-new file mode 100644
-index 0000000..275524e
---- /dev/null
-+++ b/Documentation/arm64/arm-acpi.txt
-@@ -0,0 +1,506 @@
-+ACPI on ARMv8 Servers
-+---------------------
-+ACPI can be used for ARMv8 general purpose servers designed to follow
-+the ARM SBSA (Server Base System Architecture) [0] and SBBR (Server 
-+Base Boot Requirements) [1] specifications.  Please note that the SBBR
-+can be retrieved simply by visiting [1], but the SBSA is currently only
-+available to those with an ARM login due to ARM IP licensing concerns.
-+
-+The ARMv8 kernel implements the reduced hardware model of ACPI version
-+5.1 or later.  Links to the specification and all external documents
-+it refers to are managed by the UEFI Forum.  The specification is
-+available at http://www.uefi.org/specifications and documents referenced
-+by the specification can be found via http://www.uefi.org/acpi.
-+
-+If an ARMv8 system does not meet the requirements of the SBSA and SBBR,
-+or cannot be described using the mechanisms defined in the required ACPI
-+specifications, then ACPI may not be a good fit for the hardware.
-+
-+While the documents mentioned above set out the requirements for building
-+industry-standard ARMv8 servers, they also apply to more than one operating
-+system.  The purpose of this document is to describe the interaction between
-+ACPI and Linux only, on an ARMv8 system -- that is, what Linux expects of
-+ACPI and what ACPI can expect of Linux.
-+
-+
-+Why ACPI on ARM?
-+----------------
-+Before examining the details of the interface between ACPI and Linux, it is
-+useful to understand why ACPI is being used.  Several technologies already
-+exist in Linux for describing non-enumerable hardware, after all.  In this
-+section we summarize a blog post [2] from Grant Likely that outlines the
-+reasoning behind ACPI on ARMv8 servers.  Actually, we snitch a good portion
-+of the summary text almost directly, to be honest.
-+
-+The short form of the rationale for ACPI on ARM is:
-+
-+-- ACPI’s bytecode (AML) allows the platform to encode hardware behavior,
-+   while DT explicitly does not support this.  For hardware vendors, being
-+   able to encode behavior is a key tool used in supporting operating 
-+   system releases on new hardware.
-+
-+-- ACPI’s OSPM defines a power management model that constrains what the 
-+   platform is allowed to do into a specific model, while still providing
-+   flexibility in hardware design.
-+
-+-- In the enterprise server environment, ACPI has established bindings (such
-+   as for RAS) which are currently used in production systems.  DT does not.
-+   Such bindings could be defined in DT at some point, but doing so means ARM
-+   and x86 would end up using completely different code paths in both firmware
-+   and the kernel.
-+
-+-- Choosing a single interface to describe the abstraction between a platform
-+   and an OS is important.  Hardware vendors would not be required to implement
-+   both DT and ACPI if they want to support multiple operating systems.  And,
-+   agreeing on a single interface instead of being fragmented into per OS
-+   interfaces makes for better interoperability overall.
-+
-+-- The new ACPI governance process works well and Linux is now at the same
-+   table as hardware vendors and other OS vendors.  In fact, there is no
-+   longer any reason to feel that ACPI is only belongs to Windows or that
-+   Linux is in any way secondary to Microsoft in this arena.  The move of
-+   ACPI governance into the UEFI forum has significantly opened up the
-+   specification development process, and currently, a large portion of the
-+   changes being made to ACPI is being driven by Linux.
-+
-+Key to the use of ACPI is the support model.  For servers in general, the
-+responsibility for hardware behaviour cannot solely be the domain of the
-+kernel, but rather must be split between the platform and the kernel, in
-+order to allow for orderly change over time.  ACPI frees the OS from needing
-+to understand all the minute details of the hardware so that the OS doesn’t
-+need to be ported to each and every device individually.  It allows the
-+hardware vendors to take responsibility for power management behaviour without
-+depending on an OS release cycle which is not under their control.
-+
-+ACPI is also important because hardware and OS vendors have already worked
-+out the mechanisms for supporting a general purpose computing ecosystem.  The
-+infrastructure is in place, the bindings are in place, and the processes are
-+in place.  DT does exactly what Linux needs it to when working with vertically
-+integrated devices, but there are no good processes for supporting what the
-+server vendors need.  Linux could potentially get there with DT, but doing so
-+really just duplicates something that already works.  ACPI already does what
-+the hardware vendors need, Microsoft won’t collaborate on DT, and hardware
-+vendors would still end up providing two completely separate firmware
-+interfaces -- one for Linux and one for Windows.
-+
-+
-+Kernel Compatibility
-+--------------------
-+One of the primary motivations for ACPI is standardization, and using that
-+to provide backward compatibility for Linux kernels.  In the server market,
-+software and hardware are often used for long periods.  ACPI allows the
-+kernel and firmware to agree on a consistent abstraction that can be
-+maintained over time, even as hardware or software change.  As long as the
-+abstraction is supported, systems can be updated without necessarily having
-+to replace the kernel.
-+
-+When a Linux driver or subsystem is first implemented using ACPI, it by
-+definition ends up requiring a specific version of the ACPI specification
-+-- it's baseline.  ACPI firmware must continue to work, even though it may
-+not be optimal, with the earliest kernel version that first provides support
-+for that baseline version of ACPI.  There may be a need for additional drivers,
-+but adding new functionality (e.g., CPU power management) should not break
-+older kernel versions.  Further, ACPI firmware must also work with the most
-+recent version of the kernel.
-+
-+
-+Relationship with Device Tree
-+-----------------------------
-+ACPI support in drivers and subsystems for ARMv8 should never be mutually
-+exclusive with DT support at compile time.
-+
-+At boot time the kernel will only use one description method depending on
-+parameters passed from the bootloader (including kernel bootargs).
-+
-+Regardless of whether DT or ACPI is used, the kernel must always be capable
-+of booting with either scheme (in kernels with both schemes enabled at compile
-+time).
-+
-+
-+Booting using ACPI tables
-+-------------------------
-+The only defined method for passing ACPI tables to the kernel on ARMv8
-+is via the UEFI system configuration table.  Just so it is explicit, this
-+means that ACPI is only supported on platforms that boot via UEFI.
-+
-+When an ARMv8 system boots, it can either have DT information, ACPI tables,
-+or in some very unusual cases, both.  If no command line parameters are used,
-+the kernel will try to use DT for device enumeration; if there is no DT
-+present, the kernel will try to use ACPI tables, but only if they are present.
-+In neither is available, the kernel will not boot.  If acpi=force is used
-+on the command line, the kernel will attempt to use ACPI tables first, but
-+fall back to DT if there are no ACPI tables present.  The basic idea is that
-+the kernel will not fail to boot unless it absolutely has no other choice.
-+
-+Processing of ACPI tables may be disabled by passing acpi=off on the kernel
-+command line; this is the default behavior.
-+
-+In order for the kernel to load and use ACPI tables, the UEFI implementation
-+MUST set the ACPI_20_TABLE_GUID to point to the RSDP table (the table with
-+the ACPI signature "RSD PTR ").  If this pointer is incorrect and acpi=force
-+is used, the kernel will disable ACPI and try to use DT to boot instead; the
-+kernel has, in effect, determined that ACPI tables are not present at that
-+point.
-+
-+If the pointer to the RSDP table is correct, the table will be mapped into
-+the kernel by the ACPI core, using the address provided by UEFI.
-+
-+The ACPI core will then locate and map in all other ACPI tables provided by
-+using the addresses in the RSDP table to find the XSDT (eXtended System
-+Description Table).  The XSDT in turn provides the addresses to all other
-+ACPI tables provided by the system firmware; the ACPI core will then traverse
-+this table and map in the tables listed.
-+
-+The ACPI core will ignore any provided RSDT (Root System Description Table).
-+RSDTs have been deprecated and are ignored on arm64 since they only allow
-+for 32-bit addresses.
-+
-+Further, the ACPI core will only use the 64-bit address fields in the FADT
-+(Fixed ACPI Description Table).  Any 32-bit address fields in the FADT will
-+be ignored on arm64.
-+
-+Hardware reduced mode (see Section 4.1 of the ACPI 5.1 specification) will
-+be enforced by the ACPI core on arm64.  Doing so allows the ACPI core to
-+run less complex code since it no longer has to provide support for legacy
-+hardware from other architectures.  Any fields that are not to be used for
-+hardware reduced mode must be set to zero.
-+
-+For the ACPI core to operate properly, and in turn provide the information
-+the kernel needs to configure devices, it expects to find the following
-+tables (all section numbers refer to the ACPI 5.1 specfication):
-+
-+    -- RSDP (Root System Description Pointer), section 5.2.5
-+
-+    -- XSDT (eXtended System Description Table), section 5.2.8
-+
-+    -- FADT (Fixed ACPI Description Table), section 5.2.9
-+
-+    -- DSDT (Differentiated System Description Table), section
-+       5.2.11.1
-+
-+    -- MADT (Multiple APIC Description Table), section 5.2.12
-+
-+    -- GTDT (Generic Timer Description Table), section 5.2.24
-+
-+    -- If PCI is supported, the MCFG (Memory mapped ConFiGuration
-+       Table), section 5.2.6, specifically Table 5-31.
-+
-+If the above tables are not all present, the kernel may or may not be
-+able to boot properly since it may not be able to configure all of the
-+devices available.
-+
-+
-+ACPI Detection
-+--------------
-+Drivers should determine their probe() type by checking for a null
-+value for ACPI_HANDLE, or checking .of_node, or other information in
-+the device structure.  This is detailed further in the "Driver 
-+Recommendations" section.
-+
-+In non-driver code, if the presence of ACPI needs to be detected at
-+runtime, then check the value of acpi_disabled. If CONFIG_ACPI is not
-+set, acpi_disabled will always be 1.
-+
-+
-+Device Enumeration
-+------------------
-+Device descriptions in ACPI should use standard recognized ACPI interfaces.
-+These may contain less information than is typically provided via a Device
-+Tree description for the same device.  This is also one of the reasons that
-+ACPI can be useful -- the driver takes into account that it may have less
-+detailed information about the device and uses sensible defaults instead.
-+If done properly in the driver, the hardware can change and improve over
-+time without the driver having to change at all.
-+
-+Clocks provide an excellent example.  In DT, clocks need to be specified
-+and the drivers need to take them into account.  In ACPI, the assumption
-+is that UEFI will leave the device in a reasonable default state, including
-+any clock settings.  If for some reason the driver needs to change a clock
-+value, this can be done in an ACPI method; all the driver needs to do is
-+invoke the method and not concern itself with what the method needs to do
-+to change the clock.  Changing the hardware can then take place over time
-+by changing what the ACPI method does, and not the driver.
-+
-+In DT, the parameters needed by the driver to set up clocks as in the example
-+above are known as "bindings"; in ACPI, these are known as "Device Properties"
-+and provided to a driver via the _DSD object.
-+
-+ACPI tables are described with a formal language called ASL, the ACPI
-+Source Language (section 19 of the specification).  This means that there
-+are always multiple ways to describe the same thing -- including device
-+properties.  For example, device properties could use an ASL construct
-+that looks like this: Name(KEY0, "value0").  An ACPI device driver would
-+then retrieve the value of the property by evaluating the KEY0 object.
-+However, using Name() this way has multiple problems: (1) ACPI limits
-+names ("KEY0") to four characters unlike DT; (2) there is no industry
-+wide registry that maintains a list of names, minimzing re-use; (3)
-+there is also no registry for the definition of property values ("value0"),
-+again making re-use difficult; and (4) how does one maintain backward
-+compatibility as new hardware comes out?  The _DSD method was created
-+to solve precisely these sorts of problems; Linux drivers should ALWAYS
-+use the _DSD method for device properties and nothing else.
-+
-+The _DSM object (ACPI Section 9.14.1) could also be used for conveying
-+device properties to a driver.  Linux drivers should only expect it to
-+be used if _DSD cannot represent the data required, and there is no way
-+to create a new UUID for the _DSD object.  Note that there is even less
-+regulation of the use of _DSM than there is of _DSD.  Drivers that depend
-+on the contents of _DSM objects will be more difficult to maintain over
-+time because of this; as of this writing, the use of _DSM is the cause
-+of quite a few firmware problems and is not recommended.
-+
-+Drivers should look for device properties in the _DSD object ONLY; the _DSD
-+object is described in the ACPI specification section 6.2.5, but this only
-+describes how to define the structure of an object returned via _DSD, and
-+how specific data structures are defined by specific UUIDs.  Linux should
-+only use the _DSD Device Properties UUID [5]:
-+
-+   -- UUID: daffd814-6eba-4d8c-8a91-bc9bbf4aa301
-+   
-+   -- http://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf
-+
-+The UEFI Forum provides a mechanism for registering device properties [4]
-+so that they may be used across all operating systems supporting ACPI.
-+Device properties that have not been registered with the UEFI Forum should
-+not be used.
-+
-+Before creating new device properties, check to be sure that they have not
-+been defined before and either registered in the Linux kernel documentation
-+as DT bindings, or the UEFI Forum as device properties.  While we do not want
-+to simply move all DT bindings into ACPI device properties, we can learn from
-+what has been previously defined.
-+
-+If it is necessary to define a new device property, or if it makes sense to
-+synthesize the definition of a binding so it can be used in any firmware,
-+both DT bindings and ACPI device properties for device drivers have review
-+processes.  Use them both.  When the driver itself is submitted for review
-+to the Linux mailing lists, the device property definitions needed must be
-+submitted at the same time.  A driver that supports ACPI and uses device
-+properties will not be considered complete without their definitions.  Once
-+the device property has been accepted by the Linux community, it must be
-+registered with the UEFI Forum [4], which will review it again for consistency
-+within the registry.  This may require iteration.  The UEFI Forum, though,
-+will always be the canonical site for device property definitions.
-+
-+It may make sense to provide notice to the UEFI Forum that there is the
-+intent to register a previously unused device property name as a means of
-+reserving the name for later use.  Other operating system vendors will
-+also be submitting registration requests and this may help smooth the
-+process.
-+
-+Once registration and review have been completed, the kernel provides an
-+interface for looking up device properties in a manner independent of
-+whether DT or ACPI is being used.  This API should be used [6]; it can
-+eliminate some duplication of code paths in driver probing functions and
-+discourage divergence between DT bindings and ACPI device properties.
-+
-+
-+Programmable Power Control Resources
-+------------------------------------
-+Programmable power control resources include such resources as voltage/current
-+providers (regulators) and clock sources.
-+
-+With ACPI, the kernel clock and regulator framework is not expected to be used
-+at all.
-+
-+The kernel assumes that power control of these resources is represented with
-+Power Resource Objects (ACPI section 7.1).  The ACPI core will then handle
-+correctly enabling and disabling resources as they are needed.  In order to
-+get that to work, ACPI assumes each device has defined D-states and that these
-+can be controlled through the optional ACPI methods _PS0, _PS1, _PS2, and _PS3;
-+in ACPI, _PS0 is the method to invoke to turn a device full on, and _PS3 is for
-+turning a device full off.
-+
-+There are two options for using those Power Resources.  They can:
-+
-+   -- be managed in a _PSx method which gets called on entry to power
-+      state Dx.
-+
-+   -- be declared separately as power resources with their own _ON and _OFF
-+      methods.  They are then tied back to D-states for a particular device
-+      via _PRx which specifies which power resources a device needs to be on
-+      while in Dx.  Kernel then tracks number of devices using a power resource
-+      and calls _ON/_OFF as needed.
-+
-+The kernel ACPI code will also assume that the _PSx methods follow the normal
-+ACPI rules for such methods:
-+
-+   -- If either _PS0 or _PS3 is implemented, then the other method must also
-+      be implemented.
-+
-+   -- If a device requires usage or setup of a power resource when on, the ASL
-+      should organize that it is allocated/enabled using the _PS0 method.
-+
-+   -- Resources allocated or enabled in the _PS0 method should be disabled
-+      or de-allocated in the _PS3 method.
-+
-+   -- Firmware will leave the resources in a reasonable state before handing
-+      over control to the kernel.
-+
-+Such code in _PSx methods will of course be very platform specific.  But,
-+this allows the driver to abstract out the interface for operating the device
-+and avoid having to read special non-standard values from ACPI tables. Further,
-+abstracting the use of these resources allows the hardware to change over time
-+without requiring updates to the driver.
-+
-+
-+Clocks
-+------
-+ACPI makes the assumption that clocks are initialized by the firmware -- 
-+UEFI, in this case -- to some working value before control is handed over
-+to the kernel.  This has implications for devices such as UARTs, or SoC-driven
-+LCD displays, for example.
-+
-+When the kernel boots, the clocks are assumed to be set to reasonable
-+working values.  If for some reason the frequency needs to change -- e.g.,
-+throttling for power management -- the device driver should expect that 
-+process to be abstracted out into some ACPI method that can be invoked 
-+(please see the ACPI specification for further recommendations on standard
-+methods to be expected).  The only exceptions to this are CPU clocks where
-+CPPC provides a much richer interface than ACPI methods.  If the clocks
-+are not set, there is no direct way for Linux to control them.
-+
-+If an SoC vendor wants to provide fine-grained control of the system clocks,
-+they could do so by providing ACPI methods that could be invoked by Linux
-+drivers.  However, this is NOT recommended and Linux drivers should NOT use
-+such methods, even if they are provided.  Such methods are not currently
-+standardized in the ACPI specification, and using them could tie a kernel
-+to a very specific SoC, or tie an SoC to a very specific version of the
-+kernel, both of which we are trying to avoid.
-+
-+
-+Driver Recommendations
-+----------------------
-+DO NOT remove any DT handling when adding ACPI support for a driver.  The
-+same device may be used on many different systems.
-+
-+DO try to structure the driver so that it is data-driven.  That is, set up
-+a struct containing internal per-device state based on defaults and whatever
-+else must be discovered by the driver probe function.  Then, have the rest
-+of the driver operate off of the contents of that struct.  Doing so should
-+allow most divergence between ACPI and DT functionality to be kept local to
-+the probe function instead of being scattered throughout the driver.  For
-+example:
-+
-+static int device_probe_dt(struct platform_device *pdev)
-+{
-+	/* DT specific functionality */
-+	...
-+}
-+
-+static int device_probe_acpi(struct platform_device *pdev)
-+{
-+	/* ACPI specific functionality */
-+	...
-+}
-+
-+static int device_probe(stuct platform_device *pdev)
-+{
-+	...
-+	struct device_node node = pdev->dev.of_node;
-+	...
-+
-+	if (node)
-+		ret = device_probe_dt(pdev);
-+	else if (ACPI_HANDLE(&pdev->dev))
-+		ret = device_probe_acpi(pdev);
-+	else
-+		/* other initialization */
-+		...
-+	/* Continue with any generic probe operations */
-+	...
-+}
-+
-+DO keep the MODULE_DEVICE_TABLE entries together in the driver to make it
-+clear the different names the driver is probed for, both from DT and from
-+ACPI:
-+
-+static struct of_device_id virtio_mmio_match[] = {
-+        { .compatible = "virtio,mmio", },
-+        { }
-+};
-+MODULE_DEVICE_TABLE(of, virtio_mmio_match);
-+
-+static const struct acpi_device_id virtio_mmio_acpi_match[] = {
-+        { "LNRO0005", },
-+        { }
-+};
-+MODULE_DEVICE_TABLE(acpi, virtio_mmio_acpi_match);
-+
-+
-+ASWG
-+----
-+The ACPI specification changes regularly.  During the year 2014, for instance,
-+version 5.1 was released and version 6.0 substantially completed, with most of
-+the changes being driven by ARM-specific requirements.  Proposed changes are
-+presented and discussed in the ASWG (ACPI Specification Working Group) which
-+is a part of the UEFI Forum.
-+
-+Participation in this group is open to all UEFI members.  Please see
-+http://www.uefi.org/workinggroup for details on group membership.
-+
-+It is the intent of the ARMv8 ACPI kernel code to follow the ACPI specification
-+as closely as possible, and to only implement functionality that complies with
-+the released standards from UEFI ASWG.  As a practical matter, there will be
-+vendors that provide bad ACPI tables or violate the standards in some way.
-+If this is because of errors, quirks and fixups may be necessary, but will
-+be avoided if possible.  If there are features missing from ACPI that preclude
-+it from being used on a platform, ECRs (Engineering Change Requests) should be
-+submitted to ASWG and go through the normal approval process; for those that
-+are not UEFI members, many other members of the Linux community are and would
-+likely be willing to assist in submitting ECRs.
-+
-+
-+Linux Code
-+----------
-+Individual items specific to Linux on ARM, contained in the the Linux
-+source code, are in the list that follows:
-+
-+ACPI_OS_NAME		This macro defines the string to be returned when
-+			an ACPI method invokes the _OS method.  On ARM64
-+			systems, this macro will be "Linux" by default.
-+			The command line parameter acpi_os=<string>
-+			can be used to set it to some other value.  The
-+			default value for other architectures is "Microsoft
-+			Windows NT", for example.
-+
-+ACPI Objects
-+------------
-+Detailed expectations for ACPI tables and object are listed in the file
-+Documentation/arm64/acpi_object_usage.txt.
-+
-+
-+References
-+----------
-+[0] http://silver.arm.com -- document ARM-DEN-0029, or newer
-+    "Server Base System Architecture", version 2.3, dated 27 Mar 2014
-+
-+[1] http://infocenter.arm.com/help/topic/com.arm.doc.den0044a/Server_Base_Boot_Requirements.pdf
-+    Document ARM-DEN-0044A, or newer: "Server Base Boot Requirements, System
-+    Software on ARM Platforms", dated 16 Aug 2014
-+
-+[2] http://www.secretlab.ca/archives/151, 10 Jan 2015, Copyright (c) 2015,
-+    Linaro Ltd., written by Grant Likely.  A copy of the verbatim text (apart
-+    from formatting) is also in Documentation/arm64/why_use_acpi.txt.
-+
-+[3] AMD ACPI for Seattle platform documentation:
-+    http://amd-dev.wpengine.netdna-cdn.com/wordpress/media/2012/10/Seattle_ACPI_Guide.pdf 
-+
-+[4] http://www.uefi.org/acpi -- please see the link for the "ACPI _DSD Device
-+    Property Registry Instructions"
-+
-+[5] http://www.uefi.org/acpi -- please see the link for the "_DSD (Device
-+    Specific Data) Implementation Guide"
-+
-+[6] Kernel code for the unified device property interface can be found in
-+    include/linux/property.h and drivers/base/property.c.
-+
-+
-+Authors
-+-------
-+Al Stone <al.stone@linaro.org>
-+Graeme Gregory <graeme.gregory@linaro.org>
-+Hanjun Guo <hanjun.guo@linaro.org>
-+
-+Grant Likely <grant.likely@linaro.org>, for the "Why ACPI on ARM?" section
-+
-diff --git a/Documentation/arm64/why_use_acpi.txt b/Documentation/arm64/why_use_acpi.txt
-new file mode 100644
-index 0000000..9bb583e
---- /dev/null
-+++ b/Documentation/arm64/why_use_acpi.txt
-@@ -0,0 +1,231 @@
-+Why ACPI on ARM?
-+----------------
-+Copyright (c) 2015, Linaro, Ltd.
-+Author: Grant Likely <grant.likely@linaro.org>
-+
-+Why are we doing ACPI on ARM? That question has been asked many times, but
-+we haven’t yet had a good summary of the most important reasons for wanting
-+ACPI on ARM. This article is an attempt to state the rationale clearly.
-+
-+During an email conversation late last year, Catalin Marinas asked for
-+a summary of exactly why we want ACPI on ARM, Dong Wei replied with the 
-+following list:
-+> 1. Support multiple OSes, including Linux and Windows
-+> 2. Support device configurations
-+> 3. Support dynamic device configurations (hot add/removal)
-+> 4. Support hardware abstraction through control methods
-+> 5. Support power management
-+> 6. Support thermal management
-+> 7. Support RAS interfaces
-+
-+The above list is certainly true in that all of them need to be supported.
-+However, that list doesn’t give the rationale for choosing ACPI. We already
-+have DT mechanisms for doing most of the above, and can certainly create
-+new bindings for anything that is missing. So, if it isn’t an issue of
-+functionality, then how does ACPI differ from DT and why is ACPI a better
-+fit for general purpose ARM servers?
-+
-+The difference is in the support model. To explain what I mean, I’m first
-+going to expand on each of the items above and discuss the similarities and
-+differences between ACPI and DT. Then, with that as the groundwork, I’ll
-+discuss how ACPI is a better fit for the general purpose hardware support
-+model.
-+
-+
-+Device Configurations
-+---------------------
-+2. Support device configurations
-+3. Support dynamic device configurations (hot add/removal)
-+
-+From day one, DT was about device configurations. There isn’t any significant
-+difference between ACPI & DT here. In fact, the majority of ACPI tables are
-+completely analogous to DT descriptions. With the exception of the DSDT and
-+SSDT tables, most ACPI tables are merely flat data used to describe hardware.
-+
-+DT platforms have also supported dynamic configuration and hotplug for years.
-+There isn’t a lot here that differentiates between ACPI and DT. The biggest
-+difference is that dynamic changes to the ACPI namespace can be triggered by
-+ACPI methods, whereas for DT changes are received as messages from firmware
-+and have been very much platform specific (e.g. IBM pSeries does this)
-+
-+
-+Power Management
-+----------------
-+4. Support hardware abstraction through control methods
-+5. Support power management
-+6. Support thermal management
-+
-+Power, thermal, and clock management can all be dealt with as a group. ACPI
-+defines a power management model (OSPM) that both the platform and the OS
-+conform to. The OS implements the OSPM state machine, but the platform can
-+provide state change behaviour in the form of bytecode methods. Methods can
-+access hardware directly or hand off PM operations to a coprocessor. The OS
-+really doesn’t have to care about the details as long as the platform obeys
-+the rules of the OSPM model.
-+
-+With DT, the kernel has device drivers for each and every component in the
-+platform, and configures them using DT data. DT itself doesn’t have a PM model.
-+Rather the PM model is an implementation detail of the kernel. Device drivers
-+use DT data to decide how to handle PM state changes. We have clock, pinctrl,
-+and regulator frameworks in the kernel for working out runtime PM. However,
-+this only works when all the drivers and support code have been merged into
-+the kernel. When the kernel’s PM model doesn’t work for new hardware, then we
-+change the model. This works very well for mobile/embedded because the vendor
-+controls the kernel. We can change things when we need to, but we also struggle
-+with getting board support mainlined.
-+
-+This difference has a big impact when it comes to OS support. Engineers from
-+hardware vendors, Microsoft, and most vocally Red Hat have all told me bluntly
-+that rebuilding the kernel doesn’t work for enterprise OS support. Their model
-+is based around a fixed OS release that ideally boots out-of-the-box. It may
-+still need additional device drivers for specific peripherals/features, but
-+from a system view, the OS works. When additional drivers are provided 
-+separately, those drivers fit within the existing OSPM model for power 
-+management. This is where ACPI has a technical advantage over DT. The ACPI
-+OSPM model and it’s bytecode gives the HW vendors a level of abstraction 
-+under their control, not the kernel’s. When the hardware behaves differently
-+from what the OS expects, the vendor is able to change the behaviour without
-+changing the HW or patching the OS.
-+
-+At this point you’d be right to point out that it is harder to get the whole
-+system working correctly when behaviour is split between the kernel and the
-+platform. The OS must trust that the platform doesn’t violate the OSPM model.
-+All manner of bad things happen if it does. That is exactly why the DT model
-+doesn’t encode behaviour: It is easier to make changes and fix bugs when
-+everything is within the same code base. We don’t need a platform/kernel 
-+split when we can modify the kernel.
-+
-+However, the enterprise folks don’t have that luxury. The platform/kernel
-+split isn’t a design choice. It is a characteristic of the market. Hardware
-+and OS vendors each have their own product timetables, and they don’t line
-+up. The timeline for getting patches into the kernel and flowing through into
-+OS releases puts OS support far downstream from the actual release of hardware.
-+Hardware vendors simply cannot wait for OS support to come online to be able to
-+release their products. They need to be able to work with available releases,
-+and make their hardware behave in the way the OS expects. The advantage of ACPI
-+OSPM is that it defines behaviour and limits what the hardware is allowed to do
-+without involving the kernel.
-+
-+What remains is sorting out how we make sure everything works. How do we make
-+sure there is enough cross platform testing to ensure new hardware doesn’t 
-+ship broken and that new OS releases don’t break on old hardware? Those are
-+the reasons why a UEFI/ACPI firmware summit is being organized, it’s why the
-+UEFI forum holds plugfests 3 times a year, and it is why we’re working on 
-+FWTS and LuvOS.
-+
-+
-+Reliability, Availability & Serviceability (RAS)
-+------------------------------------------------
-+7. Support RAS interfaces
-+
-+This isn’t a question of whether or not DT can support RAS. Of course it can.
-+Rather it is a matter of RAS bindings already existing for ACPI, including a
-+usage model. We’ve barely begun to explore this on DT. This item doesn’t make
-+ACPI technically superior to DT, but it certainly makes it more mature.
-+
-+
-+Multiplatform Support
-+---------------------
-+1. Support multiple OSes, including Linux and Windows
-+
-+I’m tackling this item last because I think it is the most contentious for
-+those of us in the Linux world. I wanted to get the other issues out of the
-+way before addressing it.
-+
-+The separation between hardware vendors and OS vendors in the server market
-+is new for ARM. For the first time ARM hardware and OS release cycles are
-+completely decoupled from each other, and neither are expected to have specific
-+knowledge of the other (ie. the hardware vendor doesn’t control the choice of
-+OS). ARM and their partners want to create an ecosystem of independent OSes
-+and hardware platforms that don’t explicitly require the former to be ported
-+to the latter.
-+
-+Now, one could argue that Linux is driving the potential market for ARM
-+servers, and therefore Linux is the only thing that matters, but hardware
-+vendors don’t see it that way. For hardware vendors it is in their best
-+interest to support as wide a choice of OSes as possible in order to catch
-+the widest potential customer base. Even if the majority choose Linux, some
-+will choose BSD, some will choose Windows, and some will choose something
-+else. Whether or not we think this is foolish is beside the point; it isn’t
-+something we have influence over.
-+
-+During early ARM server planning meetings between ARM, its partners and other
-+industry representatives (myself included) we discussed this exact point.
-+Before us were two options, DT and ACPI. As one of the Linux people in the
-+room, I advised that ACPI’s closed governance model was a show stopper for
-+Linux and that DT is the working interface. Microsoft on the other hand made
-+it abundantly clear that ACPI was the only interface that they would support.
-+For their part, the hardware vendors stated the platform abstraction behaviour
-+of ACPI is a hard requirement for their support model and that they would not
-+close the door on either Linux or Windows.
-+
-+However, the one thing that all of us could agree on was that supporting
-+multiple interfaces doesn’t help anyone: It would require twice as much 
-+effort on defining bindings (once for Linux-DT and once for Windows-ACPI)
-+and it would require firmware to describe everything twice. Eventually we
-+reached the compromise to use ACPI, but on the condition of opening the
-+governance process to give Linux engineers equal influence over the
-+specification. The fact that we now have a much better seat at the ACPI
-+table, for both ARM and x86, is a direct result of these early ARM server
-+negotiations. We are no longer second class citizens in the ACPI world and
-+are actually driving much of the recent development.
-+
-+I know that this line of thought is more about market forces rather than a
-+hard technical argument between ACPI and DT, but it is an equally significant
-+one. Agreeing on a single way of doing things is important. The ARM server
-+ecosystem is better for the agreement to use the same interface for all
-+operating systems. This is what is meant by standards compliant. The standard
-+is a codification of the mutually agreed interface. It provides confidence
-+that all vendors are using the same rules for interoperability.
-+
-+
-+Summary
-+-------
-+To summarize, here is the short form rationale for ACPI on ARM:
-+
-+-- ACPI’s bytecode allows the platform to encode behaviour. DT explicitly
-+   does not support this. For hardware vendors, being able to encode behaviour
-+   is an important tool for supporting operating system releases on new
-+   hardware.
-+
-+-- ACPI’s OSPM defines a power management model that constrains what the 
-+   platform is allowed into a specific model while still having flexibility
-+   in hardware design.
-+
-+-- For enterprise use-cases, ACPI has extablished bindings, such as for RAS,
-+   which are used in production. DT does not. Yes, we can define those bindings
-+   but doing so means ARM and x86 will use completely different code paths in
-+   both firmware and the kernel.
-+
-+-- Choosing a single interface for platform/OS abstraction is important. It
-+   is not reasonable to require vendors to implement both DT and ACPI if they
-+   want to support multiple operating systems. Agreeing on a single interface
-+   instead of being fragmented into per-OS interfaces makes for better
-+   interoperability overall.
-+
-+-- The ACPI governance process works well and we’re at the same table as HW
-+   vendors and other OS vendors. In fact, there is no longer any reason to
-+   feel that ACPI is a Windows thing or that we are playing second fiddle to
-+   Microsoft. The move of ACPI governance into the UEFI forum has significantly
-+   opened up the processes, and currently, a large portion of the changes being
-+   made to ACPI is being driven by Linux.
-+
-+At the beginning of this article I made the statement that the difference
-+is in the support model. For servers, responsibility for hardware behaviour
-+cannot be purely the domain of the kernel, but rather is split between the
-+platform and the kernel. ACPI frees the OS from needing to understand all
-+the minute details of the hardware so that the OS doesn’t need to be ported
-+to each and every device individually. It allows the hardware vendors to take
-+responsibility for PM behaviour without depending on an OS release cycle which
-+it is not under their control.
-+
-+ACPI is also important because hardware and OS vendors have already worked
-+out how to use it to support the general purpose ecosystem. The infrastructure
-+is in place, the bindings are in place, and the process is in place. DT does
-+exactly what we need it to when working with vertically integrated devices,
-+but we don’t have good processes for supporting what the server vendors need.
-+We could potentially get there with DT, but doing so doesn’t buy us anything.
-+ACPI already does what the hardware vendors need, Microsoft won’t collaborate
-+with us on DT, and the hardware vendors would still need to provide two
-+completely separate firmware interface; one for Linux and one for Windows.
-+
-diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index bfcb1a6..d6c35a7 100644
---- a/Documentation/kernel-parameters.txt
-+++ b/Documentation/kernel-parameters.txt
-@@ -165,7 +165,7 @@ multipliers 'Kilo', 'Mega', and 'Giga', equalling 2^10, 2^20, and 2^30
- bytes respectively. Such letter suffixes can also be entirely omitted.
- 
- 
--	acpi=		[HW,ACPI,X86]
-+	acpi=		[HW,ACPI,X86,ARM64]
- 			Advanced Configuration and Power Interface
- 			Format: { force | off | strict | noirq | rsdt }
- 			force -- enable ACPI if default was off
-@@ -175,6 +175,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
- 				strictly ACPI specification compliant.
- 			rsdt -- prefer RSDT over (default) XSDT
- 			copy_dsdt -- copy DSDT to memory
-+			For ARM64, ONLY "acpi=off" or "acpi=force" are available
- 
- 			See also Documentation/power/runtime_pm.txt, pci=noacpi
- 
-diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 676454a..6ef7874 100644
---- a/arch/arm64/Kconfig
-+++ b/arch/arm64/Kconfig
-@@ -1,5 +1,6 @@
- config ARM64
- 	def_bool y
-+	select ACPI_REDUCED_HARDWARE_ONLY if ACPI
- 	select ARCH_BINFMT_ELF_RANDOMIZE_PIE
- 	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
- 	select ARCH_HAS_GCOV_PROFILE_ALL
-@@ -194,6 +195,10 @@ config PCI_DOMAINS_GENERIC
- config PCI_SYSCALL
- 	def_bool PCI
- 
-+config PCI_MMCONFIG
-+	def_bool y
-+	depends on PCI && ACPI
-+
- source "drivers/pci/Kconfig"
- source "drivers/pci/pcie/Kconfig"
- source "drivers/pci/hotplug/Kconfig"
-@@ -384,6 +389,9 @@ config SMP
- 
- 	  If you don't know what to do here, say N.
- 
-+config ARM_PARKING_PROTOCOL
-+	def_bool y if SMP
-+
- config SCHED_MC
- 	bool "Multi-core scheduler support"
- 	depends on SMP
-@@ -658,6 +666,8 @@ source "drivers/Kconfig"
- 
- source "drivers/firmware/Kconfig"
- 
-+source "drivers/acpi/Kconfig"
-+
- source "fs/Kconfig"
- 
- source "arch/arm64/kvm/Kconfig"
-diff --git a/arch/arm64/include/asm/acenv.h b/arch/arm64/include/asm/acenv.h
-new file mode 100644
-index 0000000..b49166f
---- /dev/null
-+++ b/arch/arm64/include/asm/acenv.h
-@@ -0,0 +1,18 @@
-+/*
-+ * ARM64 specific ACPICA environments and implementation
-+ *
-+ * Copyright (C) 2014, Linaro Ltd.
-+ *   Author: Hanjun Guo <hanjun.guo@linaro.org>
-+ *   Author: Graeme Gregory <graeme.gregory@linaro.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#ifndef _ASM_ACENV_H
-+#define _ASM_ACENV_H
-+
-+/* It is required unconditionally by ACPI core, update it when needed. */
-+
-+#endif /* _ASM_ACENV_H */
-diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h
-new file mode 100644
-index 0000000..b4d1971
---- /dev/null
-+++ b/arch/arm64/include/asm/acpi.h
-@@ -0,0 +1,120 @@
-+/*
-+ *  Copyright (C) 2013-2014, Linaro Ltd.
-+ *	Author: Al Stone <al.stone@linaro.org>
-+ *	Author: Graeme Gregory <graeme.gregory@linaro.org>
-+ *	Author: Hanjun Guo <hanjun.guo@linaro.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License version 2 as
-+ *  published by the Free Software Foundation;
-+ */
-+
-+#ifndef _ASM_ACPI_H
-+#define _ASM_ACPI_H
-+
-+#include <linux/irqchip/arm-gic-acpi.h>
-+
-+#include <linux/mm.h>
-+#include <asm/smp_plat.h>
-+
-+/* Basic configuration for ACPI */
-+#ifdef	CONFIG_ACPI
-+#define acpi_strict 1	/* No out-of-spec workarounds on ARM64 */
-+extern int acpi_disabled;
-+extern int acpi_noirq;
-+extern int acpi_pci_disabled;
-+
-+/* 1 to indicate PSCI 0.2+ is implemented */
-+static inline bool acpi_psci_present(void)
-+{
-+	return acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_COMPLIANT;
-+}
-+
-+/* 1 to indicate HVC must be used instead of SMC as the PSCI conduit */
-+static inline bool acpi_psci_use_hvc(void)
-+{
-+	return acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_USE_HVC;
-+}
-+
-+static inline void disable_acpi(void)
-+{
-+	acpi_disabled = 1;
-+	acpi_pci_disabled = 1;
-+	acpi_noirq = 1;
-+}
-+
-+static inline void enable_acpi(void)
-+{
-+	acpi_disabled = 0;
-+	acpi_pci_disabled = 0;
-+	acpi_noirq = 0;
-+}
-+
-+/* MPIDR value provided in GICC structure is 64 bits, but the
-+ * existing phys_id (CPU hardware ID) using in acpi processor
-+ * driver is 32-bit, to conform to the same datatype we need
-+ * to repack the GICC structure MPIDR.
-+ *
-+ * bits other than following 32 bits are defined as 0, so it
-+ * will be no information lost after repacked.
-+ *
-+ * Bits [0:7] Aff0;
-+ * Bits [8:15] Aff1;
-+ * Bits [16:23] Aff2;
-+ * Bits [32:39] Aff3;
-+ */
-+static inline u32 pack_mpidr(u64 mpidr)
-+{
-+	return (u32) ((mpidr & 0xff00000000) >> 8) | mpidr;
-+}
-+
-+/*
-+ * The ACPI processor driver for ACPI core code needs this macro
-+ * to find out this cpu was already mapped (mapping from CPU hardware
-+ * ID to CPU logical ID) or not.
-+ *
-+ * cpu_logical_map(cpu) is the mapping of MPIDR and the logical cpu,
-+ * and MPIDR is the cpu hardware ID we needed to pack.
-+ */
-+#define cpu_physical_id(cpu) pack_mpidr(cpu_logical_map(cpu))
-+
-+/*
-+ * It's used from ACPI core in kdump to boot UP system with SMP kernel,
-+ * with this check the ACPI core will not override the CPU index
-+ * obtained from GICC with 0 and not print some error message as well.
-+ * Since MADT must provide at least one GICC structure for GIC
-+ * initialization, CPU will be always available in MADT on ARM64.
-+ */
-+static inline bool acpi_has_cpu_in_madt(void)
-+{
-+	return true;
-+}
-+
-+static inline void arch_fix_phys_package_id(int num, u32 slot) { }
-+void __init acpi_init_cpus(void);
-+
-+extern int acpi_get_cpu_parked_address(int cpu, u64 *addr);
-+
-+#else
-+static inline void disable_acpi(void) { }
-+static inline void enable_acpi(void) { }
-+static inline bool acpi_psci_present(void) { return false; }
-+static inline bool acpi_psci_use_hvc(void) { return false; }
-+static inline void acpi_init_cpus(void) { }
-+static inline int  acpi_get_cpu_parked_address(int cpu, u64 *addr) { return  -EOPNOTSUPP; }
-+#endif /* CONFIG_ACPI */
-+
-+/*
-+ * ACPI table mapping
-+ */
-+static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys,
-+					    acpi_size size)
-+{
-+	if (!page_is_ram(phys >> PAGE_SHIFT))
-+		return ioremap(phys, size);
-+
-+       return ioremap_cache(phys, size);
-+}
-+#define acpi_os_ioremap acpi_os_ioremap
-+
-+#endif /*_ASM_ACPI_H*/
-diff --git a/arch/arm64/include/asm/cpu_ops.h b/arch/arm64/include/asm/cpu_ops.h
-index da301ee..5a31d67 100644
---- a/arch/arm64/include/asm/cpu_ops.h
-+++ b/arch/arm64/include/asm/cpu_ops.h
-@@ -66,5 +66,6 @@ struct cpu_operations {
- extern const struct cpu_operations *cpu_ops[NR_CPUS];
- int __init cpu_read_ops(struct device_node *dn, int cpu);
- void __init cpu_read_bootcpu_ops(void);
-+const struct cpu_operations *cpu_get_ops(const char *name);
- 
- #endif /* ifndef __ASM_CPU_OPS_H */
-diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
-index 1f65be3..c0f89a0 100644
---- a/arch/arm64/include/asm/elf.h
-+++ b/arch/arm64/include/asm/elf.h
-@@ -114,7 +114,8 @@ typedef struct user_fpsimd_state elf_fpregset_t;
-  */
- #define elf_check_arch(x)		((x)->e_machine == EM_AARCH64)
- 
--#define elf_read_implies_exec(ex,stk)	(stk != EXSTACK_DISABLE_X)
-+#define elf_read_implies_exec(ex,stk)	(test_thread_flag(TIF_32BIT) \
-+					 ? (stk == EXSTACK_ENABLE_X) : 0)
- 
- #define CORE_DUMP_USE_REGSET
- #define ELF_EXEC_PAGESIZE	PAGE_SIZE
-diff --git a/arch/arm64/include/asm/fixmap.h b/arch/arm64/include/asm/fixmap.h
-index defa0ff9..f196e40 100644
---- a/arch/arm64/include/asm/fixmap.h
-+++ b/arch/arm64/include/asm/fixmap.h
-@@ -62,6 +62,9 @@ void __init early_fixmap_init(void);
- 
- #define __early_set_fixmap __set_fixmap
- 
-+#define __late_set_fixmap __set_fixmap
-+#define __late_clear_fixmap(idx) __set_fixmap((idx), 0, FIXMAP_PAGE_CLEAR)
-+
- extern void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot);
- 
- #include <asm-generic/fixmap.h>
-diff --git a/arch/arm64/include/asm/pci.h b/arch/arm64/include/asm/pci.h
-index 872ba93..c47baa4 100644
---- a/arch/arm64/include/asm/pci.h
-+++ b/arch/arm64/include/asm/pci.h
-@@ -24,6 +24,12 @@
-  */
- #define PCI_DMA_BUS_IS_PHYS	(0)
- 
-+static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
-+{
-+	/* no legacy IRQ on arm64 */
-+	return -ENODEV;
-+}
-+
- extern int isa_dma_bridge_buggy;
- 
- #ifdef CONFIG_PCI
-@@ -33,5 +39,65 @@ static inline int pci_proc_domain(struct pci_bus *bus)
- }
- #endif  /* CONFIG_PCI */
- 
-+struct acpi_device;
-+
-+struct pci_sysdata {
-+	int		domain;		/* PCI domain */
-+	int		node;		/* NUMA node */
-+	struct acpi_device *companion;	/* ACPI companion device */
-+	void		*iommu;		/* IOMMU private data */
-+};
-+
-+
-+static inline unsigned char mmio_config_readb(void __iomem *pos)
-+{
-+	int offset = (__force unsigned long)pos & 3;
-+	int shift = offset * 8;
-+
-+	return readl(pos - offset) >> shift;
-+}
-+
-+static inline unsigned short mmio_config_readw(void __iomem *pos)
-+{
-+	int offset = (__force unsigned long)pos & 3;
-+	int shift = offset * 8;
-+
-+	return readl(pos - offset) >> shift;
-+}
-+
-+static inline unsigned int mmio_config_readl(void __iomem *pos)
-+{
-+	return readl(pos);
-+}
-+
-+static inline void mmio_config_writeb(void __iomem *pos, u8 val)
-+{
-+	int offset = (__force unsigned long)pos & 3;
-+	int shift = offset * 8;
-+	int mask = ~(0xff << shift);
-+	u32 v;
-+
-+	pos -= offset;
-+	v = readl(pos) & mask;
-+	writel(v | (val << shift), pos);
-+}
-+
-+static inline void mmio_config_writew(void __iomem *pos, u16 val)
-+{
-+	int offset = (__force unsigned long)pos & 3;
-+	int shift = offset * 8;
-+	int mask = ~(0xffff << shift);
-+	u32 v;
-+
-+	pos -= offset;
-+	v = readl(pos) & mask;
-+	writel(v | (val << shift), pos);
-+}
-+
-+static inline void mmio_config_writel(void __iomem *pos, u32 val)
-+{
-+	writel(val, pos);
-+}
-+
- #endif  /* __KERNEL__ */
- #endif  /* __ASM_PCI_H */
-diff --git a/arch/arm64/include/asm/psci.h b/arch/arm64/include/asm/psci.h
-index e5312ea..2454bc5 100644
---- a/arch/arm64/include/asm/psci.h
-+++ b/arch/arm64/include/asm/psci.h
-@@ -14,6 +14,7 @@
- #ifndef __ASM_PSCI_H
- #define __ASM_PSCI_H
- 
--int psci_init(void);
-+int psci_dt_init(void);
-+int psci_acpi_init(void);
- 
- #endif /* __ASM_PSCI_H */
-diff --git a/arch/arm64/include/asm/smp.h b/arch/arm64/include/asm/smp.h
-index 780f82c..3411561 100644
---- a/arch/arm64/include/asm/smp.h
-+++ b/arch/arm64/include/asm/smp.h
-@@ -39,9 +39,10 @@ extern void show_ipi_list(struct seq_file *p, int prec);
- extern void handle_IPI(int ipinr, struct pt_regs *regs);
- 
- /*
-- * Setup the set of possible CPUs (via set_cpu_possible)
-+ * Discover the set of possible CPUs and determine their
-+ * SMP operations.
-  */
--extern void smp_init_cpus(void);
-+extern void of_smp_init_cpus(void);
- 
- /*
-  * Provide a function to raise an IPI cross call on CPUs in callmap.
-@@ -51,6 +52,11 @@ extern void set_smp_cross_call(void (*)(const struct cpumask *, unsigned int));
- extern void (*__smp_cross_call)(const struct cpumask *, unsigned int);
- 
- /*
-+ * Provide a function to signal a parked secondary CPU.
-+ */
-+extern void set_smp_boot_wakeup_call(void (*)(int cpu));
-+
-+/*
-  * Called from the secondary holding pen, this is the secondary CPU entry point.
-  */
- asmlinkage void secondary_start_kernel(void);
-diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile
-index bef04af..f484339 100644
---- a/arch/arm64/kernel/Makefile
-+++ b/arch/arm64/kernel/Makefile
-@@ -23,7 +23,8 @@ arm64-obj-$(CONFIG_COMPAT)		+= sys32.o kuser32.o signal32.o 	\
- 					   ../../arm/kernel/opcodes.o
- arm64-obj-$(CONFIG_FUNCTION_TRACER)	+= ftrace.o entry-ftrace.o
- arm64-obj-$(CONFIG_MODULES)		+= arm64ksyms.o module.o
--arm64-obj-$(CONFIG_SMP)			+= smp.o smp_spin_table.o topology.o
-+arm64-obj-$(CONFIG_SMP)			+= smp.o smp_spin_table.o topology.o \
-+					   smp_parking_protocol.o
- arm64-obj-$(CONFIG_PERF_EVENTS)		+= perf_regs.o
- arm64-obj-$(CONFIG_HW_PERF_EVENTS)	+= perf_event.o
- arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)	+= hw_breakpoint.o
-@@ -34,6 +35,7 @@ arm64-obj-$(CONFIG_KGDB)		+= kgdb.o
- arm64-obj-$(CONFIG_EFI)			+= efi.o efi-stub.o efi-entry.o
- arm64-obj-$(CONFIG_PCI)			+= pci.o
- arm64-obj-$(CONFIG_ARMV8_DEPRECATED)	+= armv8_deprecated.o
-+arm64-obj-$(CONFIG_ACPI)		+= acpi.o
- 
- obj-y					+= $(arm64-obj-y) vdso/
- obj-m					+= $(arm64-obj-m)
-diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
-new file mode 100644
-index 0000000..56127e9
---- /dev/null
-+++ b/arch/arm64/kernel/acpi.c
-@@ -0,0 +1,397 @@
-+/*
-+ *  ARM64 Specific Low-Level ACPI Boot Support
-+ *
-+ *  Copyright (C) 2013-2014, Linaro Ltd.
-+ *	Author: Al Stone <al.stone@linaro.org>
-+ *	Author: Graeme Gregory <graeme.gregory@linaro.org>
-+ *	Author: Hanjun Guo <hanjun.guo@linaro.org>
-+ *	Author: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-+ *	Author: Naresh Bhat <naresh.bhat@linaro.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License version 2 as
-+ *  published by the Free Software Foundation.
-+ */
-+
-+#define pr_fmt(fmt) "ACPI: " fmt
-+
-+#include <linux/acpi.h>
-+#include <linux/bootmem.h>
-+#include <linux/cpumask.h>
-+#include <linux/init.h>
-+#include <linux/irq.h>
-+#include <linux/irqdomain.h>
-+#include <linux/memblock.h>
-+#include <linux/smp.h>
-+#include <linux/of.h>
-+
-+#include <asm/cputype.h>
-+#include <asm/cpu_ops.h>
-+#include <asm/smp_plat.h>
-+
-+int acpi_noirq;			/* skip ACPI IRQ initialization */
-+int acpi_disabled;
-+EXPORT_SYMBOL(acpi_disabled);
-+
-+int acpi_pci_disabled;		/* skip ACPI PCI scan and IRQ initialization */
-+EXPORT_SYMBOL(acpi_pci_disabled);
-+
-+static int enabled_cpus;	/* Processors (GICC) with enabled flag in MADT */
-+
-+static char *boot_method;
-+static u64 parked_address[NR_CPUS];
-+
-+/*
-+ * Since we're on ARM, the default interrupt routing model
-+ * clearly has to be GIC.
-+ */
-+enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_GIC;
-+
-+/*
-+ * __acpi_map_table() will be called before page_init(), so early_ioremap()
-+ * or early_memremap() should be called here to for ACPI table mapping.
-+ */
-+char *__init __acpi_map_table(unsigned long phys, unsigned long size)
-+{
-+	if (!phys || !size)
-+		return NULL;
-+
-+	return early_memremap(phys, size);
-+}
-+
-+void __init __acpi_unmap_table(char *map, unsigned long size)
-+{
-+	if (!map || !size)
-+		return;
-+
-+	early_memunmap(map, size);
-+}
-+
-+/**
-+ * acpi_map_gic_cpu_interface - generates a logical cpu number
-+ * and map to MPIDR represented by GICC structure
-+ * @mpidr: CPU's hardware id to register, MPIDR represented in MADT
-+ * @enabled: this cpu is enabled or not
-+ *
-+ * Returns the logical cpu number which maps to MPIDR
-+ */
-+static int __init acpi_map_gic_cpu_interface(u64 mpidr, u64 parked_addr, u8 enabled)
-+{
-+	int cpu;
-+
-+	if (mpidr == INVALID_HWID) {
-+		pr_info("Skip MADT cpu entry with invalid MPIDR\n");
-+		return -EINVAL;
-+	}
-+
-+	total_cpus++;
-+	if (!enabled)
-+		return -EINVAL;
-+
-+	if (enabled_cpus >=  NR_CPUS) {
-+		pr_warn("NR_CPUS limit of %d reached, Processor %d/0x%llx ignored.\n",
-+			NR_CPUS, total_cpus, mpidr);
-+		return -EINVAL;
-+	}
-+
-+	/* No need to check duplicate MPIDRs for the first CPU */
-+	if (enabled_cpus) {
-+		/*
-+		 * Duplicate MPIDRs are a recipe for disaster. Scan
-+		 * all initialized entries and check for
-+		 * duplicates. If any is found just ignore the CPU.
-+		 */
-+		for_each_possible_cpu(cpu) {
-+			if (cpu_logical_map(cpu) == mpidr) {
-+				pr_err("Firmware bug, duplicate CPU MPIDR: 0x%llx in MADT\n",
-+				       mpidr);
-+				return -EINVAL;
-+			}
-+		}
-+
-+		/* allocate a logical cpu id for the new comer */
-+		cpu = cpumask_next_zero(-1, cpu_possible_mask);
-+	} else {
-+		/*
-+		 * First GICC entry must be BSP as ACPI spec said
-+		 * in section 5.2.12.15
-+		 */
-+		if  (cpu_logical_map(0) != mpidr) {
-+			pr_err("First GICC entry with MPIDR 0x%llx is not BSP\n",
-+			       mpidr);
-+			return -EINVAL;
-+		}
-+
-+		/*
-+		 * boot_cpu_init() already hold bit 0 in cpu_possible_mask
-+		 * for BSP, no need to allocate again.
-+		 */
-+		cpu = 0;
-+	}
-+
-+	if (!boot_method)
-+		return -EOPNOTSUPP;
-+
-+	parked_address[cpu] = parked_addr;
-+	cpu_ops[cpu] = cpu_get_ops(boot_method);
-+	/* CPU 0 was already initialized */
-+	if (cpu) {
-+		if (!cpu_ops[cpu])
-+			return -EINVAL;
-+
-+		if (cpu_ops[cpu]->cpu_init(NULL, cpu))
-+			return -EOPNOTSUPP;
-+
-+		/* map the logical cpu id to cpu MPIDR */
-+		cpu_logical_map(cpu) = mpidr;
-+
-+		set_cpu_possible(cpu, true);
-+	}
-+
-+	enabled_cpus++;
-+	return cpu;
-+}
-+
-+static int __init
-+acpi_parse_gic_cpu_interface(struct acpi_subtable_header *header,
-+				const unsigned long end)
-+{
-+	struct acpi_madt_generic_interrupt *processor;
-+
-+	processor = (struct acpi_madt_generic_interrupt *)header;
-+
-+	if (BAD_MADT_ENTRY(processor, end))
-+		return -EINVAL;
-+
-+	acpi_table_print_madt_entry(header);
-+
-+	acpi_map_gic_cpu_interface(processor->arm_mpidr & MPIDR_HWID_BITMASK,
-+		processor->parked_address, processor->flags & ACPI_MADT_ENABLED);
-+
-+	return 0;
-+}
-+
-+/* Parse GIC cpu interface entries in MADT for SMP init */
-+void __init acpi_init_cpus(void)
-+{
-+	int count;
-+
-+	/*
-+	 * do a partial walk of MADT to determine how many CPUs
-+	 * we have including disabled CPUs, and get information
-+	 * we need for SMP init
-+	 */
-+	count = acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_INTERRUPT,
-+			acpi_parse_gic_cpu_interface, 0);
-+
-+	if (!count) {
-+		pr_err("No GIC CPU interface entries present\n");
-+		return;
-+	} else if (count < 0) {
-+		pr_err("Error parsing GIC CPU interface entry\n");
-+		return;
-+	}
-+
-+	/* Make boot-up look pretty */
-+	pr_info("%d CPUs enabled, %d CPUs total\n", enabled_cpus, total_cpus);
-+}
-+
-+static struct irq_domain *acpi_irq_domain;
-+
-+int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
-+{
-+	*irq = irq_find_mapping(acpi_irq_domain, gsi);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(acpi_gsi_to_irq);
-+
-+
-+/*
-+ * success: return IRQ number (>0)
-+ * failure: return =< 0
-+ */
-+int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity)
-+{
-+	unsigned int irq;
-+	unsigned int irq_type;
-+	struct of_phandle_args args;
-+	struct irq_data *d;
-+
-+	/*
-+	 * ACPI have no bindings to indicate SPI or PPI, so we
-+	 * use different mappings from DT in ACPI.
-+	 *
-+	 * For FDT
-+	 * PPI interrupt: in the range [0, 15];
-+	 * SPI interrupt: in the range [0, 987];
-+	 *
-+	 * For ACPI, GSI should be unique so using
-+	 * the hwirq directly for the mapping:
-+	 * PPI interrupt: in the range [16, 31];
-+	 * SPI interrupt: in the range [32, 1019];
-+	 */
-+
-+	if (trigger == ACPI_EDGE_SENSITIVE &&
-+				polarity == ACPI_ACTIVE_LOW)
-+		irq_type = IRQ_TYPE_EDGE_FALLING;
-+	else if (trigger == ACPI_EDGE_SENSITIVE &&
-+				polarity == ACPI_ACTIVE_HIGH)
-+		irq_type = IRQ_TYPE_EDGE_RISING;
-+	else if (trigger == ACPI_LEVEL_SENSITIVE &&
-+				polarity == ACPI_ACTIVE_LOW)
-+		irq_type = IRQ_TYPE_LEVEL_LOW;
-+	else if (trigger == ACPI_LEVEL_SENSITIVE &&
-+				polarity == ACPI_ACTIVE_HIGH)
-+		irq_type = IRQ_TYPE_LEVEL_HIGH;
-+	else
-+		irq_type = IRQ_TYPE_NONE;
-+
-+	if (!acpi_irq_domain)
-+		BUG();
-+
-+	args.np = acpi_irq_domain->of_node;
-+	args.args_count = 3;
-+	args.args[0] = 0;
-+	args.args[1] = gsi - 32;
-+	args.args[2] = irq_type;
-+
-+	irq = __irq_domain_alloc_irqs(acpi_irq_domain, -1, 1,
-+				      dev_to_node(dev), &args, false);
-+	if (irq < 0)
-+		return -ENOSPC;
-+
-+	d = irq_domain_get_irq_data(acpi_irq_domain, irq);
-+	if (!d)
-+		return -EFAULT;
-+
-+	d->chip->irq_set_type(d, irq_type);
-+
-+	return irq;
-+}
-+EXPORT_SYMBOL_GPL(acpi_register_gsi);
-+
-+void acpi_unregister_gsi(u32 gsi)
-+{
-+}
-+EXPORT_SYMBOL_GPL(acpi_unregister_gsi);
-+
-+static int __init acpi_parse_fadt(struct acpi_table_header *table)
-+{
-+	struct acpi_table_fadt *fadt = (struct acpi_table_fadt *)table;
-+
-+	/*
-+	 * Revision in table header is the FADT Major revision, and there
-+	 * is a minor revision of FADT which was introduced by ACPI 5.1,
-+	 * we only deal with ACPI 5.1 or newer revision to get GIC and SMP
-+	 * boot protocol configuration data, or we will disable ACPI.
-+	 */
-+	if (table->revision > 5 ||
-+	    (table->revision == 5 && fadt->minor_revision >= 1)) {
-+		/*
-+		 * ACPI 5.1 only has two explicit methods to boot up SMP,
-+		 * PSCI and Parking protocol, but the Parking protocol is
-+		 * only specified for ARMv7 now, so make PSCI as the only
-+		 * way for the SMP boot protocol before some updates for
-+		 * the Parking protocol spec.
-+		 */
-+		if (acpi_psci_present())
-+			boot_method = "psci";
-+		else if (IS_ENABLED(CONFIG_ARM_PARKING_PROTOCOL))
-+			boot_method = "parking-protocol";
-+
-+		if (!boot_method)
-+			pr_warn("No PSCI support, will not bring up secondary CPUs\n");
-+		return -EOPNOTSUPP;
-+	}
-+
-+	pr_warn("Unsupported FADT revision %d.%d, should be 5.1+, will disable ACPI\n",
-+		table->revision, fadt->minor_revision);
-+	disable_acpi();
-+
-+	return -EINVAL;
-+}
-+
-+/*
-+ * acpi_boot_table_init() called from setup_arch(), always.
-+ *	1. find RSDP and get its address, and then find XSDT
-+ *	2. extract all tables and checksums them all
-+ *	3. check ACPI FADT revision
-+ *
-+ * We can parse ACPI boot-time tables such as MADT after
-+ * this function is called.
-+ */
-+void __init acpi_boot_table_init(void)
-+{
-+	/* If acpi_disabled, bail out */
-+	if (acpi_disabled)
-+		return;
-+
-+	/* Initialize the ACPI boot-time table parser. */
-+	if (acpi_table_init()) {
-+		disable_acpi();
-+		return;
-+	}
-+
-+	if (acpi_table_parse(ACPI_SIG_FADT, acpi_parse_fadt)) {
-+		/* disable ACPI if no FADT is found */
-+		disable_acpi();
-+		pr_err("Can't find FADT\n");
-+	}
-+}
-+
-+void __init acpi_gic_init(void)
-+{
-+	struct acpi_table_header *table;
-+	acpi_status status;
-+	acpi_size tbl_size;
-+	int err;
-+
-+	if (acpi_disabled)
-+		return;
-+
-+	status = acpi_get_table_with_size(ACPI_SIG_MADT, 0, &table, &tbl_size);
-+	if (ACPI_FAILURE(status)) {
-+		const char *msg = acpi_format_exception(status);
-+
-+		pr_err("Failed to get MADT table, %s\n", msg);
-+		return;
-+	}
-+
-+	err = gic_v2_acpi_init(table, &acpi_irq_domain);
-+	if (err || !acpi_irq_domain)
-+		pr_err("Failed to initialize GIC IRQ controller");
-+
-+	early_acpi_os_unmap_memory((char *)table, tbl_size);
-+}
-+
-+/*
-+ * Parked Address in ACPI GIC structure will be used as the CPU
-+ * release address
-+ */
-+int acpi_get_cpu_parked_address(int cpu, u64 *addr)
-+{
-+	if (!addr || !parked_address[cpu])
-+		return -EINVAL;
-+
-+	*addr = parked_address[cpu];
-+
-+	return 0;
-+}
-+
-+static int __init parse_acpi(char *arg)
-+{
-+	if (!arg)
-+		return -EINVAL;
-+
-+	/* "acpi=off" disables both ACPI table parsing and interpreter */
-+	if (strcmp(arg, "off") == 0)
-+		disable_acpi();
-+	else if (strcmp(arg, "force") == 0) /* force ACPI to be enabled */
-+		enable_acpi();
-+	else
-+		return -EINVAL;	/* Core will print when we return error */
-+
-+	return 0;
-+}
-+early_param("acpi", parse_acpi);
-diff --git a/arch/arm64/kernel/cpu_ops.c b/arch/arm64/kernel/cpu_ops.c
-index cce9524..c50ca8f 100644
---- a/arch/arm64/kernel/cpu_ops.c
-+++ b/arch/arm64/kernel/cpu_ops.c
-@@ -23,6 +23,7 @@
- #include <linux/string.h>
- 
- extern const struct cpu_operations smp_spin_table_ops;
-+extern const struct cpu_operations smp_parking_protocol_ops;
- extern const struct cpu_operations cpu_psci_ops;
- 
- const struct cpu_operations *cpu_ops[NR_CPUS];
-@@ -30,12 +31,15 @@ const struct cpu_operations *cpu_ops[NR_CPUS];
- static const struct cpu_operations *supported_cpu_ops[] __initconst = {
- #ifdef CONFIG_SMP
- 	&smp_spin_table_ops,
-+#ifdef CONFIG_ARM_PARKING_PROTOCOL
-+	&smp_parking_protocol_ops,
-+#endif
- #endif
- 	&cpu_psci_ops,
- 	NULL,
- };
- 
--static const struct cpu_operations * __init cpu_get_ops(const char *name)
-+const struct cpu_operations * __init cpu_get_ops(const char *name)
- {
- 	const struct cpu_operations **ops = supported_cpu_ops;
- 
-diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
-index 2b8d70164428..f5808cee51a2 100644
---- a/arch/arm64/kernel/efi.c
-+++ b/arch/arm64/kernel/efi.c
-@@ -363,3 +363,42 @@ bool efi_poweroff_required(void)
- {
- 	return efi_enabled(EFI_RUNTIME_SERVICES);
- }
-+
-+
-+/*
-+ * If nothing else is handling pm_power_off, use EFI
-+ *
-+ * When Guenter Roeck's power-off handler call chain patches land,
-+ * we just need to return true unconditionally.
-+ */
-+bool efi_poweroff_required(void)
-+{
-+	return pm_power_off == NULL;
-+}
-+
-+static int arm64_efi_restart(struct notifier_block *this,
-+			   unsigned long mode, void *cmd)
-+{
-+	efi_reboot(reboot_mode, cmd);
-+	return NOTIFY_DONE;
-+}
-+
-+static struct notifier_block arm64_efi_restart_nb = {
-+	.notifier_call = arm64_efi_restart,
-+	.priority = INT_MAX,
-+};
-+
-+static int __init arm64_register_efi_restart(void)
-+{
-+	int ret = 0;
-+
-+	if (efi_enabled(EFI_RUNTIME_SERVICES)) {
-+		ret = register_restart_handler(&arm64_efi_restart_nb);
-+		if (ret)
-+			pr_err("%s: cannot register restart handler, %d\n",
-+			       __func__, ret);
-+	}
-+	return ret;
-+}
-+late_initcall(arm64_register_efi_restart);
-+
-diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
-index 6f93c24..c870fa4 100644
---- a/arch/arm64/kernel/pci.c
-+++ b/arch/arm64/kernel/pci.c
-@@ -10,14 +10,17 @@
-  *
-  */
- 
-+#include <linux/acpi.h>
- #include <linux/init.h>
- #include <linux/io.h>
- #include <linux/kernel.h>
- #include <linux/mm.h>
- #include <linux/of_pci.h>
- #include <linux/of_platform.h>
-+#include <linux/of_address.h>
- #include <linux/slab.h>
--
-+#include <linux/pci-acpi.h>
-+#include <linux/mmconfig.h>
- #include <asm/pci-bridge.h>
- 
- /*
-@@ -37,12 +40,429 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res,
- 	return res->start;
- }
- 
-+int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
-+{
-+	struct pci_sysdata *sd;
-+
-+	if (!acpi_disabled) {
-+		sd = bridge->bus->sysdata;
-+		ACPI_COMPANION_SET(&bridge->dev, sd->companion);
-+	}
-+	return 0;
-+}
-+
- /*
-  * Try to assign the IRQ number from DT when adding a new device
-  */
- int pcibios_add_device(struct pci_dev *dev)
- {
--	dev->irq = of_irq_parse_and_map_pci(dev, 0, 0);
-+	if (acpi_disabled)
-+		dev->irq = of_irq_parse_and_map_pci(dev, 0, 0);
-+
-+	return 0;
-+}
-+
-+void pcibios_add_bus(struct pci_bus *bus)
-+{
-+	if (!acpi_disabled)
-+		acpi_pci_add_bus(bus);
-+}
-+
-+void pcibios_remove_bus(struct pci_bus *bus)
-+{
-+	if (!acpi_disabled)
-+		acpi_pci_remove_bus(bus);
-+}
- 
-+int pcibios_enable_irq(struct pci_dev *dev)
-+{
-+	if (!acpi_disabled && !pci_dev_msi_enabled(dev))
-+		acpi_pci_irq_enable(dev);
- 	return 0;
- }
-+
-+int pcibios_disable_irq(struct pci_dev *dev)
-+{
-+	if (!acpi_disabled && !pci_dev_msi_enabled(dev))
-+		acpi_pci_irq_disable(dev);
-+	return 0;
-+}
-+
-+int pcibios_enable_device(struct pci_dev *dev, int bars)
-+{
-+	int err;
-+
-+	err = pci_enable_resources(dev, bars);
-+	if (err < 0)
-+		return err;
-+
-+	if (!pci_dev_msi_enabled(dev))
-+		return pcibios_enable_irq(dev);
-+	return 0;
-+}
-+
-+static int __init pcibios_assign_resources(void)
-+{
-+	struct pci_bus *root_bus;
-+
-+	if (acpi_disabled)
-+		return 0;
-+
-+	list_for_each_entry(root_bus, &pci_root_buses, node) {
-+		pcibios_resource_survey_bus(root_bus);
-+		pci_assign_unassigned_root_bus_resources(root_bus);
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * fs_initcall comes after subsys_initcall, so we know acpi scan
-+ * has run.
-+ */
-+fs_initcall(pcibios_assign_resources);
-+
-+#ifdef CONFIG_ACPI
-+
-+static int pci_read(struct pci_bus *bus, unsigned int devfn, int where,
-+		    int size, u32 *value)
-+{
-+	return raw_pci_read(pci_domain_nr(bus), bus->number,
-+			    devfn, where, size, value);
-+}
-+
-+static int pci_write(struct pci_bus *bus, unsigned int devfn, int where,
-+		     int size, u32 value)
-+{
-+	return raw_pci_write(pci_domain_nr(bus), bus->number,
-+			     devfn, where, size, value);
-+}
-+
-+struct pci_ops pci_root_ops = {
-+	.read = pci_read,
-+	.write = pci_write,
-+};
-+
-+struct pci_root_info {
-+	struct acpi_device *bridge;
-+	char name[16];
-+	unsigned int res_num;
-+	struct resource *res;
-+	resource_size_t *res_offset;
-+	struct pci_sysdata sd;
-+	u16 segment;
-+	u8 start_bus;
-+	u8 end_bus;
-+};
-+
-+static acpi_status resource_to_addr(struct acpi_resource *resource,
-+				    struct acpi_resource_address64 *addr)
-+{
-+	acpi_status status;
-+
-+	memset(addr, 0, sizeof(*addr));
-+	switch (resource->type) {
-+	case ACPI_RESOURCE_TYPE_ADDRESS16:
-+	case ACPI_RESOURCE_TYPE_ADDRESS32:
-+	case ACPI_RESOURCE_TYPE_ADDRESS64:
-+		status = acpi_resource_to_address64(resource, addr);
-+		if (ACPI_SUCCESS(status) &&
-+		    (addr->resource_type == ACPI_MEMORY_RANGE ||
-+		    addr->resource_type == ACPI_IO_RANGE) &&
-+		    addr->address.address_length > 0) {
-+			return AE_OK;
-+		}
-+		break;
-+	}
-+	return AE_ERROR;
-+}
-+
-+static acpi_status count_resource(struct acpi_resource *acpi_res, void *data)
-+{
-+	struct pci_root_info *info = data;
-+	struct acpi_resource_address64 addr;
-+	acpi_status status;
-+
-+	status = resource_to_addr(acpi_res, &addr);
-+	if (ACPI_SUCCESS(status))
-+		info->res_num++;
-+	return AE_OK;
-+}
-+
-+static acpi_status setup_resource(struct acpi_resource *acpi_res, void *data)
-+{
-+	struct pci_root_info *info = data;
-+	struct resource *res;
-+	struct acpi_resource_address64 addr;
-+	acpi_status status;
-+	unsigned long flags;
-+	u64 start, end;
-+
-+	status = resource_to_addr(acpi_res, &addr);
-+	if (!ACPI_SUCCESS(status))
-+		return AE_OK;
-+
-+	if (addr.resource_type == ACPI_MEMORY_RANGE) {
-+		flags = IORESOURCE_MEM;
-+		if (addr.info.mem.caching == ACPI_PREFETCHABLE_MEMORY)
-+			flags |= IORESOURCE_PREFETCH;
-+	} else if (addr.resource_type == ACPI_IO_RANGE) {
-+		flags = IORESOURCE_IO;
-+	} else
-+		return AE_OK;
-+
-+	start = addr.address.minimum + addr.address.translation_offset;
-+	end = addr.address.maximum + addr.address.translation_offset;
-+
-+	res = &info->res[info->res_num];
-+	res->name = info->name;
-+	res->flags = flags;
-+	res->start = start;
-+	res->end = end;
-+
-+	if (flags & IORESOURCE_IO) {
-+		unsigned long port;
-+		int err;
-+
-+		err = pci_register_io_range(start, addr.address.address_length);
-+		if (err)
-+			return AE_OK;
-+
-+		port = pci_address_to_pio(start);
-+		if (port == (unsigned long)-1) {
-+			res->start = -1;
-+			res->end = -1;
-+			return AE_OK;
-+		}
-+
-+		res->start = port;
-+		res->end = res->start + addr.address.address_length - 1;
-+
-+		if (pci_remap_iospace(res, start) < 0)
-+			return AE_OK;
-+
-+		info->res_offset[info->res_num] = port - addr.address.minimum;
-+	} else
-+		info->res_offset[info->res_num] = addr.address.translation_offset;
-+
-+	info->res_num++;
-+
-+	return AE_OK;
-+}
-+
-+static void coalesce_windows(struct pci_root_info *info, unsigned long type)
-+{
-+	int i, j;
-+	struct resource *res1, *res2;
-+
-+	for (i = 0; i < info->res_num; i++) {
-+		res1 = &info->res[i];
-+		if (!(res1->flags & type))
-+			continue;
-+
-+		for (j = i + 1; j < info->res_num; j++) {
-+			res2 = &info->res[j];
-+			if (!(res2->flags & type))
-+				continue;
-+
-+			/*
-+			 * I don't like throwing away windows because then
-+			 * our resources no longer match the ACPI _CRS, but
-+			 * the kernel resource tree doesn't allow overlaps.
-+			 */
-+			if (resource_overlaps(res1, res2)) {
-+				res2->start = min(res1->start, res2->start);
-+				res2->end = max(res1->end, res2->end);
-+				dev_info(&info->bridge->dev,
-+					 "host bridge window expanded to %pR; %pR ignored\n",
-+					 res2, res1);
-+				res1->flags = 0;
-+			}
-+		}
-+	}
-+}
-+
-+static void add_resources(struct pci_root_info *info,
-+			  struct list_head *resources)
-+{
-+	int i;
-+	struct resource *res, *root, *conflict;
-+
-+	coalesce_windows(info, IORESOURCE_MEM);
-+	coalesce_windows(info, IORESOURCE_IO);
-+
-+	for (i = 0; i < info->res_num; i++) {
-+		res = &info->res[i];
-+
-+		if (res->flags & IORESOURCE_MEM)
-+			root = &iomem_resource;
-+		else if (res->flags & IORESOURCE_IO)
-+			root = &ioport_resource;
-+		else
-+			continue;
-+
-+		conflict = insert_resource_conflict(root, res);
-+		if (conflict)
-+			dev_info(&info->bridge->dev,
-+				 "ignoring host bridge window %pR (conflicts with %s %pR)\n",
-+				 res, conflict->name, conflict);
-+		else
-+			pci_add_resource_offset(resources, res,
-+						info->res_offset[i]);
-+	}
-+}
-+
-+static void free_pci_root_info_res(struct pci_root_info *info)
-+{
-+	kfree(info->res);
-+	info->res = NULL;
-+	kfree(info->res_offset);
-+	info->res_offset = NULL;
-+	info->res_num = 0;
-+}
-+
-+static void __release_pci_root_info(struct pci_root_info *info)
-+{
-+	int i;
-+	struct resource *res;
-+
-+	for (i = 0; i < info->res_num; i++) {
-+		res = &info->res[i];
-+
-+		if (!res->parent)
-+			continue;
-+
-+		if (!(res->flags & (IORESOURCE_MEM | IORESOURCE_IO)))
-+			continue;
-+
-+		release_resource(res);
-+	}
-+
-+	free_pci_root_info_res(info);
-+
-+	kfree(info);
-+}
-+
-+static void release_pci_root_info(struct pci_host_bridge *bridge)
-+{
-+	struct pci_root_info *info = bridge->release_data;
-+
-+	__release_pci_root_info(info);
-+}
-+
-+static void probe_pci_root_info(struct pci_root_info *info,
-+				struct acpi_device *device,
-+				int busnum, int domain)
-+{
-+	size_t size;
-+
-+	sprintf(info->name, "PCI Bus %04x:%02x", domain, busnum);
-+	info->bridge = device;
-+
-+	info->res_num = 0;
-+	acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_resource,
-+				info);
-+	if (!info->res_num)
-+		return;
-+
-+	size = sizeof(*info->res) * info->res_num;
-+	info->res = kzalloc_node(size, GFP_KERNEL, info->sd.node);
-+	if (!info->res) {
-+		info->res_num = 0;
-+		return;
-+	}
-+
-+	size = sizeof(*info->res_offset) * info->res_num;
-+	info->res_num = 0;
-+	info->res_offset = kzalloc_node(size, GFP_KERNEL, info->sd.node);
-+	if (!info->res_offset) {
-+		kfree(info->res);
-+		info->res = NULL;
-+		return;
-+	}
-+
-+	acpi_walk_resources(device->handle, METHOD_NAME__CRS, setup_resource,
-+				info);
-+}
-+
-+/* Root bridge scanning */
-+struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
-+{
-+	struct acpi_device *device = root->device;
-+	struct pci_mmcfg_region *mcfg;
-+	struct pci_root_info *info;
-+	int domain = root->segment;
-+	int busnum = root->secondary.start;
-+	LIST_HEAD(resources);
-+	struct pci_bus *bus;
-+	struct pci_sysdata *sd;
-+	int node;
-+
-+	/* we need mmconfig */
-+	mcfg = pci_mmconfig_lookup(domain, busnum);
-+	if (!mcfg) {
-+		pr_err("pci_bus %04x:%02x has no MCFG table\n",
-+		       domain, busnum);
-+		return NULL;
-+	}
-+
-+	/* temporary hack */
-+	if (mcfg->fixup)
-+		(*mcfg->fixup)(root, mcfg);
-+
-+	if (domain && !pci_domains_supported) {
-+		pr_warn("PCI %04x:%02x: multiple domains not supported.\n",
-+			domain, busnum);
-+		return NULL;
-+	}
-+
-+	node = NUMA_NO_NODE;
-+
-+	info = kzalloc_node(sizeof(*info), GFP_KERNEL, node);
-+	if (!info) {
-+		pr_warn("PCI %04x:%02x: ignored (out of memory)\n",
-+			domain, busnum);
-+		return NULL;
-+	}
-+	info->segment = domain;
-+	info->start_bus = busnum;
-+	info->end_bus = root->secondary.end;
-+
-+	sd = &info->sd;
-+	sd->domain = domain;
-+	sd->node = node;
-+	sd->companion = device;
-+
-+	probe_pci_root_info(info, device, busnum, domain);
-+
-+	/* insert busn res at first */
-+	pci_add_resource(&resources,  &root->secondary);
-+
-+	/* then _CRS resources */
-+	add_resources(info, &resources);
-+
-+	bus = pci_create_root_bus(NULL, busnum, &pci_root_ops, sd, &resources);
-+	if (bus) {
-+		pci_scan_child_bus(bus);
-+		pci_set_host_bridge_release(to_pci_host_bridge(bus->bridge),
-+					    release_pci_root_info, info);
-+	} else {
-+		pci_free_resource_list(&resources);
-+		__release_pci_root_info(info);
-+	}
-+
-+	/* After the PCI-E bus has been walked and all devices discovered,
-+	 * configure any settings of the fabric that might be necessary.
-+	 */
-+	if (bus) {
-+		struct pci_bus *child;
-+
-+		list_for_each_entry(child, &bus->children, node)
-+			pcie_bus_configure_settings(child);
-+	}
-+
-+	if (bus && node != NUMA_NO_NODE)
-+		dev_printk(KERN_DEBUG, &bus->dev, "on NUMA node %d\n", node);
-+
-+	return bus;
-+}
-+#endif
-diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c
-index 25a5308..1e4fd17 100644
---- a/arch/arm64/kernel/perf_event.c
-+++ b/arch/arm64/kernel/perf_event.c
-@@ -29,6 +29,7 @@
- #include <linux/platform_device.h>
- #include <linux/spinlock.h>
- #include <linux/uaccess.h>
-+#include <linux/acpi.h>
- 
- #include <asm/cputype.h>
- #include <asm/irq.h>
-@@ -1310,6 +1311,107 @@ static int __init register_pmu_driver(void)
- }
- device_initcall(register_pmu_driver);
- 
-+#ifdef CONFIG_ACPI
-+struct acpi_pmu_irq {
-+	int gsi;
-+	int trigger;
-+};
-+
-+static struct acpi_pmu_irq acpi_pmu_irqs[NR_CPUS] __initdata;
-+
-+static int __init
-+acpi_parse_pmu_irqs(struct acpi_subtable_header *header,
-+		    const unsigned long end)
-+{
-+	struct acpi_madt_generic_interrupt *gic;
-+	int cpu;
-+	u64 mpidr;
-+
-+	gic = (struct acpi_madt_generic_interrupt *)header;
-+	if (BAD_MADT_ENTRY(gic, end))
-+		return -EINVAL;
-+
-+	mpidr = gic->arm_mpidr & MPIDR_HWID_BITMASK;
-+
-+	for_each_possible_cpu(cpu) {
-+		if (cpu_logical_map(cpu) != mpidr)
-+			continue;
-+
-+		acpi_pmu_irqs[cpu].gsi = gic->performance_interrupt;
-+		if (gic->flags & ACPI_MADT_PERFORMANCE_IRQ_MODE)
-+			acpi_pmu_irqs[cpu].trigger = ACPI_EDGE_SENSITIVE;
-+		else
-+			acpi_pmu_irqs[cpu].trigger = ACPI_LEVEL_SENSITIVE;
-+		return 0;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static int __init pmu_acpi_init(void)
-+{
-+	struct platform_device *pdev;
-+	struct acpi_pmu_irq *pirq = acpi_pmu_irqs;
-+	struct resource	*res, *r;
-+	int err = -ENOMEM;
-+	int i, count, irq;
-+
-+	if (acpi_disabled)
-+		return 0;
-+
-+	count = acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_INTERRUPT,
-+				      acpi_parse_pmu_irqs, num_possible_cpus());
-+	/* Must have irq for boot boot cpu, at least */
-+	if (count <= 0 || pirq->gsi == 0)
-+		return -EINVAL;
-+
-+	irq = acpi_register_gsi(NULL, pirq->gsi, pirq->trigger,
-+				ACPI_ACTIVE_HIGH);
-+
-+	if (irq_is_percpu(irq))
-+		count = 1;
-+
-+	pdev = platform_device_alloc("arm-pmu", -1);
-+	if (!pdev)
-+		return err;
-+
-+	res = kcalloc(count, sizeof(*res), GFP_KERNEL);
-+	if (!res)
-+		goto err_free_device;
-+
-+	for (i = 0, r = res; i < count; i++, pirq++, r++) {
-+		if (i)
-+			irq = acpi_register_gsi(NULL, pirq->gsi, pirq->trigger,
-+						ACPI_ACTIVE_HIGH);
-+		r->start = r->end = irq;
-+		r->flags = IORESOURCE_IRQ;
-+		if (pirq->trigger == ACPI_EDGE_SENSITIVE)
-+			r->flags |= IORESOURCE_IRQ_HIGHEDGE;
-+		else
-+			r->flags |= IORESOURCE_IRQ_HIGHLEVEL;
-+	}
-+
-+	err = platform_device_add_resources(pdev, res, count);
-+	if (err)
-+		goto err_free_res;
-+
-+	err = platform_device_add(pdev);
-+	if (err)
-+		goto err_free_res;
-+
-+	return 0;
-+
-+err_free_res:
-+	kfree(res);
-+
-+err_free_device:
-+	platform_device_put(pdev);
-+	return err;
-+}
-+arch_initcall(pmu_acpi_init);
-+
-+#endif /* ACPI */
-+
- static struct pmu_hw_events *armpmu_get_cpu_events(void)
- {
- 	return this_cpu_ptr(&cpu_hw_events);
-diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c
-index 3425f31..bab2bea 100644
---- a/arch/arm64/kernel/psci.c
-+++ b/arch/arm64/kernel/psci.c
-@@ -15,6 +15,7 @@
- 
- #define pr_fmt(fmt) "psci: " fmt
- 
-+#include <linux/acpi.h>
- #include <linux/init.h>
- #include <linux/of.h>
- #include <linux/smp.h>
-@@ -24,6 +25,7 @@
- #include <linux/slab.h>
- #include <uapi/linux/psci.h>
- 
-+#include <asm/acpi.h>
- #include <asm/compiler.h>
- #include <asm/cpu_ops.h>
- #include <asm/errno.h>
-@@ -304,6 +306,33 @@ static void psci_sys_poweroff(void)
- 	invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0);
- }
- 
-+static void __init psci_0_2_set_functions(void)
-+{
-+	pr_info("Using standard PSCI v0.2 function IDs\n");
-+	psci_function_id[PSCI_FN_CPU_SUSPEND] = PSCI_0_2_FN64_CPU_SUSPEND;
-+	psci_ops.cpu_suspend = psci_cpu_suspend;
-+
-+	psci_function_id[PSCI_FN_CPU_OFF] = PSCI_0_2_FN_CPU_OFF;
-+	psci_ops.cpu_off = psci_cpu_off;
-+
-+	psci_function_id[PSCI_FN_CPU_ON] = PSCI_0_2_FN64_CPU_ON;
-+	psci_ops.cpu_on = psci_cpu_on;
-+
-+	psci_function_id[PSCI_FN_MIGRATE] = PSCI_0_2_FN64_MIGRATE;
-+	psci_ops.migrate = psci_migrate;
-+
-+	psci_function_id[PSCI_FN_AFFINITY_INFO] = PSCI_0_2_FN64_AFFINITY_INFO;
-+	psci_ops.affinity_info = psci_affinity_info;
-+
-+	psci_function_id[PSCI_FN_MIGRATE_INFO_TYPE] =
-+		PSCI_0_2_FN_MIGRATE_INFO_TYPE;
-+	psci_ops.migrate_info_type = psci_migrate_info_type;
-+
-+	arm_pm_restart = psci_sys_reset;
-+
-+	pm_power_off = psci_sys_poweroff;
-+}
-+
- /*
-  * PSCI Function IDs for v0.2+ are well defined so use
-  * standard values.
-@@ -337,29 +366,7 @@ static int __init psci_0_2_init(struct device_node *np)
- 		}
- 	}
- 
--	pr_info("Using standard PSCI v0.2 function IDs\n");
--	psci_function_id[PSCI_FN_CPU_SUSPEND] = PSCI_0_2_FN64_CPU_SUSPEND;
--	psci_ops.cpu_suspend = psci_cpu_suspend;
--
--	psci_function_id[PSCI_FN_CPU_OFF] = PSCI_0_2_FN_CPU_OFF;
--	psci_ops.cpu_off = psci_cpu_off;
--
--	psci_function_id[PSCI_FN_CPU_ON] = PSCI_0_2_FN64_CPU_ON;
--	psci_ops.cpu_on = psci_cpu_on;
--
--	psci_function_id[PSCI_FN_MIGRATE] = PSCI_0_2_FN64_MIGRATE;
--	psci_ops.migrate = psci_migrate;
--
--	psci_function_id[PSCI_FN_AFFINITY_INFO] = PSCI_0_2_FN64_AFFINITY_INFO;
--	psci_ops.affinity_info = psci_affinity_info;
--
--	psci_function_id[PSCI_FN_MIGRATE_INFO_TYPE] =
--		PSCI_0_2_FN_MIGRATE_INFO_TYPE;
--	psci_ops.migrate_info_type = psci_migrate_info_type;
--
--	arm_pm_restart = psci_sys_reset;
--
--	pm_power_off = psci_sys_poweroff;
-+	psci_0_2_set_functions();
- 
- out_put_node:
- 	of_node_put(np);
-@@ -412,7 +419,7 @@ static const struct of_device_id psci_of_match[] __initconst = {
- 	{},
- };
- 
--int __init psci_init(void)
-+int __init psci_dt_init(void)
- {
- 	struct device_node *np;
- 	const struct of_device_id *matched_np;
-@@ -427,6 +434,29 @@ int __init psci_init(void)
- 	return init_fn(np);
- }
- 
-+/*
-+ * We use PSCI 0.2+ when ACPI is deployed on ARM64 and it's
-+ * explicitly clarified in SBBR
-+ */
-+int __init psci_acpi_init(void)
-+{
-+	if (!acpi_psci_present()) {
-+		pr_info("is not implemented in ACPI.\n");
-+		return -EOPNOTSUPP;
-+	}
-+
-+	pr_info("probing for conduit method from ACPI.\n");
-+
-+	if (acpi_psci_use_hvc())
-+		invoke_psci_fn = __invoke_psci_fn_hvc;
-+	else
-+		invoke_psci_fn = __invoke_psci_fn_smc;
-+
-+	psci_0_2_set_functions();
-+
-+	return 0;
-+}
-+
- #ifdef CONFIG_SMP
- 
- static int __init cpu_psci_cpu_init(struct device_node *dn, unsigned int cpu)
-diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
-index e8420f6..0029b7a 100644
---- a/arch/arm64/kernel/setup.c
-+++ b/arch/arm64/kernel/setup.c
-@@ -17,6 +17,7 @@
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#include <linux/acpi.h>
- #include <linux/export.h>
- #include <linux/kernel.h>
- #include <linux/stddef.h>
-@@ -62,6 +63,7 @@
- #include <asm/memblock.h>
- #include <asm/psci.h>
- #include <asm/efi.h>
-+#include <asm/acpi.h>
- 
- unsigned int processor_id;
- EXPORT_SYMBOL(processor_id);
-@@ -351,6 +353,29 @@ static void __init request_standard_resources(void)
- 	}
- }
- 
-+static int __init dt_scan_chosen(unsigned long node, const char *uname,
-+			int depth, void *data)
-+{
-+	const char *p;
-+
-+	if (depth != 1 || !data || (strcmp(uname, "chosen") != 0))
-+		return 0;
-+
-+	p = of_get_flat_dt_prop(node, "linux,uefi-stub-generated-dtb", NULL);
-+	*(bool *)data = p ? true : false;
-+
-+	return 1;
-+}
-+
-+static bool __init is_uefi_stub_generated_dtb(void)
-+{
-+	bool flag = false;
-+
-+	of_scan_flat_dt(dt_scan_chosen, &flag);
-+
-+	return flag;
-+}
-+
- u64 __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = INVALID_HWID };
- 
- void __init setup_arch(char **cmdline_p)
-@@ -369,9 +394,23 @@ void __init setup_arch(char **cmdline_p)
- 	early_fixmap_init();
- 	early_ioremap_init();
- 
-+	/*
-+	 * Disable ACPI before early parameters parsed and
-+	 * it will be enabled in parse_early_param() if
-+	 * "acpi=force" is passed
-+	 */
-+	disable_acpi();
-+
- 	parse_early_param();
- 
- 	/*
-+	 * If no dtb provided by firmware, enable ACPI and give system a
-+	 * chance to boot with ACPI configuration data
-+	 */
-+	if (is_uefi_stub_generated_dtb() && acpi_disabled)
-+		enable_acpi();
-+
-+	/*
- 	 *  Unmask asynchronous aborts after bringing up possible earlycon.
- 	 * (Report possible System Errors once we can report this occurred)
- 	 */
-@@ -380,18 +419,27 @@ void __init setup_arch(char **cmdline_p)
- 	efi_init();
- 	arm64_memblock_init();
- 
-+	/* Parse the ACPI tables for possible boot-time configuration */
-+	acpi_boot_table_init();
-+
- 	paging_init();
- 	request_standard_resources();
- 
- 	early_ioremap_reset();
- 
--	unflatten_device_tree();
--
--	psci_init();
-+	if (acpi_disabled) {
-+		unflatten_device_tree();
-+		psci_dt_init();
-+		cpu_read_bootcpu_ops();
-+#ifdef CONFIG_SMP
-+		of_smp_init_cpus();
-+#endif
-+	} else {
-+		psci_acpi_init();
-+		acpi_init_cpus();
-+	}
- 
--	cpu_read_bootcpu_ops();
- #ifdef CONFIG_SMP
--	smp_init_cpus();
- 	smp_build_mpidr_hash();
- #endif
- 
-@@ -547,3 +595,25 @@ const struct seq_operations cpuinfo_op = {
- 	.stop	= c_stop,
- 	.show	= c_show
- };
-+
-+/*
-+ * Temporary hack to avoid need for console= on command line
-+ */
-+static int __init arm64_console_setup(void)
-+{
-+	/* Allow cmdline to override our assumed preferences */
-+	if (console_set_on_cmdline)
-+		return 0;
-+
-+	if (IS_ENABLED(CONFIG_SBSAUART_TTY))
-+		add_preferred_console("ttySBSA", 0, "115200");
-+
-+	if (IS_ENABLED(CONFIG_SERIAL_AMBA_PL011))
-+		add_preferred_console("ttyAMA", 0, "115200");
-+
-+	if (IS_ENABLED(CONFIG_SERIAL_8250))
-+		add_preferred_console("ttyS", 0, "115200");
-+
-+	return 0;
-+}
-+early_initcall(arm64_console_setup);
-diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
-index 328b8ce..52998b7 100644
---- a/arch/arm64/kernel/smp.c
-+++ b/arch/arm64/kernel/smp.c
-@@ -322,7 +322,7 @@ void __init smp_prepare_boot_cpu(void)
-  * cpu logical map array containing MPIDR values related to logical
-  * cpus. Assumes that cpu_logical_map(0) has already been initialized.
-  */
--void __init smp_init_cpus(void)
-+void __init of_smp_init_cpus(void)
- {
- 	struct device_node *dn = NULL;
- 	unsigned int i, cpu = 1;
-diff --git a/arch/arm64/kernel/smp_parking_protocol.c b/arch/arm64/kernel/smp_parking_protocol.c
-new file mode 100644
-index 0000000..e1153ce
---- /dev/null
-+++ b/arch/arm64/kernel/smp_parking_protocol.c
-@@ -0,0 +1,110 @@
-+/*
-+ * Parking Protocol SMP initialisation
-+ *
-+ * Based largely on spin-table method.
-+ *
-+ * Copyright (C) 2013 ARM Ltd.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+#include <linux/delay.h>
-+#include <linux/init.h>
-+#include <linux/of.h>
-+#include <linux/smp.h>
-+#include <linux/types.h>
-+#include <linux/acpi.h>
-+
-+#include <asm/cacheflush.h>
-+#include <asm/cpu_ops.h>
-+#include <asm/cputype.h>
-+#include <asm/smp_plat.h>
-+
-+static phys_addr_t cpu_mailbox_addr[NR_CPUS];
-+
-+static void (*__smp_boot_wakeup)(int cpu);
-+
-+void set_smp_boot_wakeup_call(void (*fn)(int cpu))
-+{
-+	__smp_boot_wakeup = fn;
-+}
-+
-+static int smp_parking_protocol_cpu_init(struct device_node *dn,
-+					 unsigned int cpu)
-+{
-+	/*
-+	 * Determine the mailbox address.
-+	 */
-+	if (!acpi_get_cpu_parked_address(cpu, &cpu_mailbox_addr[cpu])) {
-+		pr_info("%s: ACPI parked addr=%llx\n",
-+			__func__, cpu_mailbox_addr[cpu]);
-+		return 0;
-+	}
-+
-+	pr_err("CPU %d: missing or invalid parking protocol mailbox\n", cpu);
-+
-+	return -1;
-+}
-+
-+static int smp_parking_protocol_cpu_prepare(unsigned int cpu)
-+{
-+	return 0;
-+}
-+
-+struct parking_protocol_mailbox {
-+	__le32 cpu_id;
-+	__le32 reserved;
-+	__le64 entry_point;
-+};
-+
-+static int smp_parking_protocol_cpu_boot(unsigned int cpu)
-+{
-+	struct parking_protocol_mailbox __iomem *mailbox;
-+
-+	if (!cpu_mailbox_addr[cpu] || !__smp_boot_wakeup)
-+		return -ENODEV;
-+
-+	/*
-+	 * The mailbox may or may not be inside the linear mapping.
-+	 * As ioremap_cache will either give us a new mapping or reuse the
-+	 * existing linear mapping, we can use it to cover both cases. In
-+	 * either case the memory will be MT_NORMAL.
-+	 */
-+	mailbox = ioremap_cache(cpu_mailbox_addr[cpu], sizeof(*mailbox));
-+	if (!mailbox)
-+		return -ENOMEM;
-+
-+	/*
-+	 * We write the entry point and cpu id as LE regardless of the
-+	 * native endianess of the kernel. Therefore, any boot-loaders
-+	 * that read this address need to convert this address to the
-+	 * Boot-Loader's endianess before jumping.
-+	 */
-+	writeq(__pa(secondary_entry), &mailbox->entry_point);
-+	writel(cpu, &mailbox->cpu_id);
-+	__flush_dcache_area(mailbox, sizeof(*mailbox));
-+	__smp_boot_wakeup(cpu);
-+
-+	/* temp hack for broken firmware */
-+	sev();
-+
-+	iounmap(mailbox);
-+
-+	return 0;
-+}
-+
-+const struct cpu_operations smp_parking_protocol_ops = {
-+	.name		= "parking-protocol",
-+	.cpu_init	= smp_parking_protocol_cpu_init,
-+	.cpu_prepare	= smp_parking_protocol_cpu_prepare,
-+	.cpu_boot	= smp_parking_protocol_cpu_boot,
-+};
-diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c
-index 1a7125c..42f9195 100644
---- a/arch/arm64/kernel/time.c
-+++ b/arch/arm64/kernel/time.c
-@@ -35,6 +35,7 @@
- #include <linux/delay.h>
- #include <linux/clocksource.h>
- #include <linux/clk-provider.h>
-+#include <linux/acpi.h>
- 
- #include <clocksource/arm_arch_timer.h>
- 
-@@ -72,6 +73,12 @@ void __init time_init(void)
- 
- 	tick_setup_hrtimer_broadcast();
- 
-+	/*
-+	 * Since ACPI or FDT will only one be available in the system,
-+	 * we can use acpi_generic_timer_init() here safely
-+	 */
-+	acpi_generic_timer_init();
-+
- 	arch_timer_rate = arch_timer_get_rate();
- 	if (!arch_timer_rate)
- 		panic("Unable to initialise architected timer.\n");
-diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
-index 0a24b9b..af90cdb 100644
---- a/arch/arm64/mm/dma-mapping.c
-+++ b/arch/arm64/mm/dma-mapping.c
-@@ -23,8 +23,14 @@
- #include <linux/genalloc.h>
- #include <linux/dma-mapping.h>
- #include <linux/dma-contiguous.h>
-+#include <linux/of.h>
-+#include <linux/of_address.h>
-+#include <linux/platform_device.h>
- #include <linux/vmalloc.h>
- #include <linux/swiotlb.h>
-+#include <linux/amba/bus.h>
-+#include <linux/acpi.h>
-+#include <linux/pci.h>
- 
- #include <asm/cacheflush.h>
- 
-diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
-index 4e370a5..f2b132b 100644
---- a/arch/x86/include/asm/pci.h
-+++ b/arch/x86/include/asm/pci.h
-@@ -71,6 +71,48 @@ void pcibios_set_master(struct pci_dev *dev);
- struct irq_routing_table *pcibios_get_irq_routing_table(void);
- int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq);
- 
-+/*
-+ * AMD Fam10h CPUs are buggy, and cannot access MMIO config space
-+ * on their northbrige except through the * %eax register. As such, you MUST
-+ * NOT use normal IOMEM accesses, you need to only use the magic mmio-config
-+ * accessor functions.
-+ * In fact just use pci_config_*, nothing else please.
-+ */
-+static inline unsigned char mmio_config_readb(void __iomem *pos)
-+{
-+	u8 val;
-+	asm volatile("movb (%1),%%al" : "=a" (val) : "r" (pos));
-+	return val;
-+}
-+
-+static inline unsigned short mmio_config_readw(void __iomem *pos)
-+{
-+	u16 val;
-+	asm volatile("movw (%1),%%ax" : "=a" (val) : "r" (pos));
-+	return val;
-+}
-+
-+static inline unsigned int mmio_config_readl(void __iomem *pos)
-+{
-+	u32 val;
-+	asm volatile("movl (%1),%%eax" : "=a" (val) : "r" (pos));
-+	return val;
-+}
-+
-+static inline void mmio_config_writeb(void __iomem *pos, u8 val)
-+{
-+	asm volatile("movb %%al,(%1)" : : "a" (val), "r" (pos) : "memory");
-+}
-+
-+static inline void mmio_config_writew(void __iomem *pos, u16 val)
-+{
-+	asm volatile("movw %%ax,(%1)" : : "a" (val), "r" (pos) : "memory");
-+}
-+
-+static inline void mmio_config_writel(void __iomem *pos, u32 val)
-+{
-+	asm volatile("movl %%eax,(%1)" : : "a" (val), "r" (pos) : "memory");
-+}
- 
- #define HAVE_PCI_MMAP
- extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
-diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h
-index fa1195d..42e7332 100644
---- a/arch/x86/include/asm/pci_x86.h
-+++ b/arch/x86/include/asm/pci_x86.h
-@@ -121,78 +121,6 @@ extern int __init pcibios_init(void);
- extern int pci_legacy_init(void);
- extern void pcibios_fixup_irqs(void);
- 
--/* pci-mmconfig.c */
--
--/* "PCI MMCONFIG %04x [bus %02x-%02x]" */
--#define PCI_MMCFG_RESOURCE_NAME_LEN (22 + 4 + 2 + 2)
--
--struct pci_mmcfg_region {
--	struct list_head list;
--	struct resource res;
--	u64 address;
--	char __iomem *virt;
--	u16 segment;
--	u8 start_bus;
--	u8 end_bus;
--	char name[PCI_MMCFG_RESOURCE_NAME_LEN];
--};
--
--extern int __init pci_mmcfg_arch_init(void);
--extern void __init pci_mmcfg_arch_free(void);
--extern int pci_mmcfg_arch_map(struct pci_mmcfg_region *cfg);
--extern void pci_mmcfg_arch_unmap(struct pci_mmcfg_region *cfg);
--extern int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end,
--			       phys_addr_t addr);
--extern int pci_mmconfig_delete(u16 seg, u8 start, u8 end);
--extern struct pci_mmcfg_region *pci_mmconfig_lookup(int segment, int bus);
--
--extern struct list_head pci_mmcfg_list;
--
--#define PCI_MMCFG_BUS_OFFSET(bus)      ((bus) << 20)
--
--/*
-- * AMD Fam10h CPUs are buggy, and cannot access MMIO config space
-- * on their northbrige except through the * %eax register. As such, you MUST
-- * NOT use normal IOMEM accesses, you need to only use the magic mmio-config
-- * accessor functions.
-- * In fact just use pci_config_*, nothing else please.
-- */
--static inline unsigned char mmio_config_readb(void __iomem *pos)
--{
--	u8 val;
--	asm volatile("movb (%1),%%al" : "=a" (val) : "r" (pos));
--	return val;
--}
--
--static inline unsigned short mmio_config_readw(void __iomem *pos)
--{
--	u16 val;
--	asm volatile("movw (%1),%%ax" : "=a" (val) : "r" (pos));
--	return val;
--}
--
--static inline unsigned int mmio_config_readl(void __iomem *pos)
--{
--	u32 val;
--	asm volatile("movl (%1),%%eax" : "=a" (val) : "r" (pos));
--	return val;
--}
--
--static inline void mmio_config_writeb(void __iomem *pos, u8 val)
--{
--	asm volatile("movb %%al,(%1)" : : "a" (val), "r" (pos) : "memory");
--}
--
--static inline void mmio_config_writew(void __iomem *pos, u16 val)
--{
--	asm volatile("movw %%ax,(%1)" : : "a" (val), "r" (pos) : "memory");
--}
--
--static inline void mmio_config_writel(void __iomem *pos, u32 val)
--{
--	asm volatile("movl %%eax,(%1)" : : "a" (val), "r" (pos) : "memory");
--}
--
- #ifdef CONFIG_PCI
- # ifdef CONFIG_ACPI
- #  define x86_default_pci_init		pci_acpi_init
-diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
-index 5c6fc35..35c765b 100644
---- a/arch/x86/pci/Makefile
-+++ b/arch/x86/pci/Makefile
-@@ -1,7 +1,10 @@
- obj-y				:= i386.o init.o
- 
- obj-$(CONFIG_PCI_BIOS)		+= pcbios.o
--obj-$(CONFIG_PCI_MMCONFIG)	+= mmconfig_$(BITS).o direct.o mmconfig-shared.o
-+obj-$(CONFIG_PCI_MMCONFIG)	+= direct.o mmconfig-shared.o
-+ifeq ($(BITS),32)
-+obj-$(CONFIG_PCI_MMCONFIG)	+= mmconfig_32.o
-+endif
- obj-$(CONFIG_PCI_DIRECT)	+= direct.o
- obj-$(CONFIG_PCI_OLPC)		+= olpc.o
- obj-$(CONFIG_PCI_XEN)		+= xen.o
-diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
-index 6ac2738..eae3846 100644
---- a/arch/x86/pci/acpi.c
-+++ b/arch/x86/pci/acpi.c
-@@ -4,6 +4,7 @@
- #include <linux/irq.h>
- #include <linux/dmi.h>
- #include <linux/slab.h>
-+#include <linux/mmconfig.h>
- #include <asm/numa.h>
- #include <asm/pci_x86.h>
- 
-diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c
-index adb62aa..b4a55df 100644
---- a/arch/x86/pci/init.c
-+++ b/arch/x86/pci/init.c
-@@ -1,5 +1,6 @@
- #include <linux/pci.h>
- #include <linux/init.h>
-+#include <linux/mmconfig.h>
- #include <asm/pci_x86.h>
- #include <asm/x86_init.h>
- 
-diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
-index dd30b7e..ce3d93c 100644
---- a/arch/x86/pci/mmconfig-shared.c
-+++ b/arch/x86/pci/mmconfig-shared.c
-@@ -18,6 +18,7 @@
- #include <linux/slab.h>
- #include <linux/mutex.h>
- #include <linux/rculist.h>
-+#include <linux/mmconfig.h>
- #include <asm/e820.h>
- #include <asm/pci_x86.h>
- #include <asm/acpi.h>
-@@ -27,103 +28,11 @@
- /* Indicate if the mmcfg resources have been placed into the resource table. */
- static bool pci_mmcfg_running_state;
- static bool pci_mmcfg_arch_init_failed;
--static DEFINE_MUTEX(pci_mmcfg_lock);
- 
--LIST_HEAD(pci_mmcfg_list);
--
--static void __init pci_mmconfig_remove(struct pci_mmcfg_region *cfg)
--{
--	if (cfg->res.parent)
--		release_resource(&cfg->res);
--	list_del(&cfg->list);
--	kfree(cfg);
--}
--
--static void __init free_all_mmcfg(void)
--{
--	struct pci_mmcfg_region *cfg, *tmp;
--
--	pci_mmcfg_arch_free();
--	list_for_each_entry_safe(cfg, tmp, &pci_mmcfg_list, list)
--		pci_mmconfig_remove(cfg);
--}
--
--static void list_add_sorted(struct pci_mmcfg_region *new)
--{
--	struct pci_mmcfg_region *cfg;
--
--	/* keep list sorted by segment and starting bus number */
--	list_for_each_entry_rcu(cfg, &pci_mmcfg_list, list) {
--		if (cfg->segment > new->segment ||
--		    (cfg->segment == new->segment &&
--		     cfg->start_bus >= new->start_bus)) {
--			list_add_tail_rcu(&new->list, &cfg->list);
--			return;
--		}
--	}
--	list_add_tail_rcu(&new->list, &pci_mmcfg_list);
--}
--
--static struct pci_mmcfg_region *pci_mmconfig_alloc(int segment, int start,
--						   int end, u64 addr)
--{
--	struct pci_mmcfg_region *new;
--	struct resource *res;
--
--	if (addr == 0)
--		return NULL;
--
--	new = kzalloc(sizeof(*new), GFP_KERNEL);
--	if (!new)
--		return NULL;
--
--	new->address = addr;
--	new->segment = segment;
--	new->start_bus = start;
--	new->end_bus = end;
--
--	res = &new->res;
--	res->start = addr + PCI_MMCFG_BUS_OFFSET(start);
--	res->end = addr + PCI_MMCFG_BUS_OFFSET(end + 1) - 1;
--	res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
--	snprintf(new->name, PCI_MMCFG_RESOURCE_NAME_LEN,
--		 "PCI MMCONFIG %04x [bus %02x-%02x]", segment, start, end);
--	res->name = new->name;
--
--	return new;
--}
--
--static struct pci_mmcfg_region *__init pci_mmconfig_add(int segment, int start,
--							int end, u64 addr)
--{
--	struct pci_mmcfg_region *new;
--
--	new = pci_mmconfig_alloc(segment, start, end, addr);
--	if (new) {
--		mutex_lock(&pci_mmcfg_lock);
--		list_add_sorted(new);
--		mutex_unlock(&pci_mmcfg_lock);
--
--		pr_info(PREFIX
--		       "MMCONFIG for domain %04x [bus %02x-%02x] at %pR "
--		       "(base %#lx)\n",
--		       segment, start, end, &new->res, (unsigned long)addr);
--	}
--
--	return new;
--}
--
--struct pci_mmcfg_region *pci_mmconfig_lookup(int segment, int bus)
--{
--	struct pci_mmcfg_region *cfg;
--
--	list_for_each_entry_rcu(cfg, &pci_mmcfg_list, list)
--		if (cfg->segment == segment &&
--		    cfg->start_bus <= bus && bus <= cfg->end_bus)
--			return cfg;
--
--	return NULL;
--}
-+const struct pci_raw_ops pci_mmcfg = {
-+	.read =		pci_mmcfg_read,
-+	.write =	pci_mmcfg_write,
-+};
- 
- static const char *__init pci_mmcfg_e7520(void)
- {
-@@ -543,7 +452,7 @@ static void __init pci_mmcfg_reject_broken(int early)
- 	}
- }
- 
--static int __init acpi_mcfg_check_entry(struct acpi_table_mcfg *mcfg,
-+int __init acpi_mcfg_check_entry(struct acpi_table_mcfg *mcfg,
- 					struct acpi_mcfg_allocation *cfg)
- {
- 	int year;
-@@ -652,9 +561,10 @@ static void __init __pci_mmcfg_init(int early)
- 		}
- 	}
- 
--	if (pci_mmcfg_arch_init())
-+	if (pci_mmcfg_arch_init()) {
-+		raw_pci_ext_ops = &pci_mmcfg;
- 		pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;
--	else {
-+	} else {
- 		free_all_mmcfg();
- 		pci_mmcfg_arch_init_failed = true;
- 	}
-@@ -731,88 +641,40 @@ int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end,
- 	if (!(pci_probe & PCI_PROBE_MMCONF) || pci_mmcfg_arch_init_failed)
- 		return -ENODEV;
- 
--	if (start > end)
-+	if (start > end || !addr)
- 		return -EINVAL;
- 
--	mutex_lock(&pci_mmcfg_lock);
--	cfg = pci_mmconfig_lookup(seg, start);
--	if (cfg) {
--		if (cfg->end_bus < end)
--			dev_info(dev, FW_INFO
--				 "MMCONFIG for "
--				 "domain %04x [bus %02x-%02x] "
--				 "only partially covers this bridge\n",
--				  cfg->segment, cfg->start_bus, cfg->end_bus);
--		mutex_unlock(&pci_mmcfg_lock);
--		return -EEXIST;
--	}
--
--	if (!addr) {
--		mutex_unlock(&pci_mmcfg_lock);
--		return -EINVAL;
--	}
--
- 	rc = -EBUSY;
- 	cfg = pci_mmconfig_alloc(seg, start, end, addr);
- 	if (cfg == NULL) {
- 		dev_warn(dev, "fail to add MMCONFIG (out of memory)\n");
--		rc = -ENOMEM;
-+		return -ENOMEM;
- 	} else if (!pci_mmcfg_check_reserved(dev, cfg, 0)) {
- 		dev_warn(dev, FW_BUG "MMCONFIG %pR isn't reserved\n",
- 			 &cfg->res);
--	} else {
--		/* Insert resource if it's not in boot stage */
--		if (pci_mmcfg_running_state)
--			tmp = insert_resource_conflict(&iomem_resource,
--						       &cfg->res);
--
--		if (tmp) {
--			dev_warn(dev,
--				 "MMCONFIG %pR conflicts with "
--				 "%s %pR\n",
--				 &cfg->res, tmp->name, tmp);
--		} else if (pci_mmcfg_arch_map(cfg)) {
--			dev_warn(dev, "fail to map MMCONFIG %pR.\n",
--				 &cfg->res);
--		} else {
--			list_add_sorted(cfg);
--			dev_info(dev, "MMCONFIG at %pR (base %#lx)\n",
--				 &cfg->res, (unsigned long)addr);
--			cfg = NULL;
--			rc = 0;
--		}
--	}
--
--	if (cfg) {
--		if (cfg->res.parent)
--			release_resource(&cfg->res);
--		kfree(cfg);
-+		goto error;
- 	}
- 
--	mutex_unlock(&pci_mmcfg_lock);
-+	/* Insert resource if it's not in boot stage */
-+	if (pci_mmcfg_running_state)
-+		tmp = insert_resource_conflict(&iomem_resource, &cfg->res);
- 
--	return rc;
--}
-+	if (tmp) {
-+		dev_warn(dev,
-+			 "MMCONFIG %pR conflicts with %s %pR\n",
-+			 &cfg->res, tmp->name, tmp);
-+		goto error;
-+	}
- 
--/* Delete MMCFG information for host bridges */
--int pci_mmconfig_delete(u16 seg, u8 start, u8 end)
--{
--	struct pci_mmcfg_region *cfg;
-+	rc = pci_mmconfig_inject(cfg);
-+	if (rc)
-+		goto error;
- 
--	mutex_lock(&pci_mmcfg_lock);
--	list_for_each_entry_rcu(cfg, &pci_mmcfg_list, list)
--		if (cfg->segment == seg && cfg->start_bus == start &&
--		    cfg->end_bus == end) {
--			list_del_rcu(&cfg->list);
--			synchronize_rcu();
--			pci_mmcfg_arch_unmap(cfg);
--			if (cfg->res.parent)
--				release_resource(&cfg->res);
--			mutex_unlock(&pci_mmcfg_lock);
--			kfree(cfg);
--			return 0;
--		}
--	mutex_unlock(&pci_mmcfg_lock);
-+	return 0;
- 
--	return -ENOENT;
-+error:
-+	if (cfg->res.parent)
-+		release_resource(&cfg->res);
-+	kfree(cfg);
-+	return rc;
- }
-diff --git a/arch/x86/pci/mmconfig_32.c b/arch/x86/pci/mmconfig_32.c
-index 43984bc..c0106a6 100644
---- a/arch/x86/pci/mmconfig_32.c
-+++ b/arch/x86/pci/mmconfig_32.c
-@@ -12,6 +12,7 @@
- #include <linux/pci.h>
- #include <linux/init.h>
- #include <linux/rcupdate.h>
-+#include <linux/mmconfig.h>
- #include <asm/e820.h>
- #include <asm/pci_x86.h>
- 
-@@ -49,7 +50,7 @@ static void pci_exp_set_dev_base(unsigned int base, int bus, int devfn)
- 	}
- }
- 
--static int pci_mmcfg_read(unsigned int seg, unsigned int bus,
-+int pci_mmcfg_read(unsigned int seg, unsigned int bus,
- 			  unsigned int devfn, int reg, int len, u32 *value)
- {
- 	unsigned long flags;
-@@ -88,7 +89,7 @@ err:		*value = -1;
- 	return 0;
- }
- 
--static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
-+int pci_mmcfg_write(unsigned int seg, unsigned int bus,
- 			   unsigned int devfn, int reg, int len, u32 value)
- {
- 	unsigned long flags;
-@@ -125,15 +126,9 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
- 	return 0;
- }
- 
--const struct pci_raw_ops pci_mmcfg = {
--	.read =		pci_mmcfg_read,
--	.write =	pci_mmcfg_write,
--};
--
- int __init pci_mmcfg_arch_init(void)
- {
- 	printk(KERN_INFO "PCI: Using MMCONFIG for extended config space\n");
--	raw_pci_ext_ops = &pci_mmcfg;
- 	return 1;
- }
- 
-diff --git a/arch/x86/pci/mmconfig_64.c b/arch/x86/pci/mmconfig_64.c
-deleted file mode 100644
-index bea5249..0000000
---- a/arch/x86/pci/mmconfig_64.c
-+++ /dev/null
-@@ -1,153 +0,0 @@
--/*
-- * mmconfig.c - Low-level direct PCI config space access via MMCONFIG
-- *
-- * This is an 64bit optimized version that always keeps the full mmconfig
-- * space mapped. This allows lockless config space operation.
-- */
--
--#include <linux/pci.h>
--#include <linux/init.h>
--#include <linux/acpi.h>
--#include <linux/bitmap.h>
--#include <linux/rcupdate.h>
--#include <asm/e820.h>
--#include <asm/pci_x86.h>
--
--#define PREFIX "PCI: "
--
--static char __iomem *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn)
--{
--	struct pci_mmcfg_region *cfg = pci_mmconfig_lookup(seg, bus);
--
--	if (cfg && cfg->virt)
--		return cfg->virt + (PCI_MMCFG_BUS_OFFSET(bus) | (devfn << 12));
--	return NULL;
--}
--
--static int pci_mmcfg_read(unsigned int seg, unsigned int bus,
--			  unsigned int devfn, int reg, int len, u32 *value)
--{
--	char __iomem *addr;
--
--	/* Why do we have this when nobody checks it. How about a BUG()!? -AK */
--	if (unlikely((bus > 255) || (devfn > 255) || (reg > 4095))) {
--err:		*value = -1;
--		return -EINVAL;
--	}
--
--	rcu_read_lock();
--	addr = pci_dev_base(seg, bus, devfn);
--	if (!addr) {
--		rcu_read_unlock();
--		goto err;
--	}
--
--	switch (len) {
--	case 1:
--		*value = mmio_config_readb(addr + reg);
--		break;
--	case 2:
--		*value = mmio_config_readw(addr + reg);
--		break;
--	case 4:
--		*value = mmio_config_readl(addr + reg);
--		break;
--	}
--	rcu_read_unlock();
--
--	return 0;
--}
--
--static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
--			   unsigned int devfn, int reg, int len, u32 value)
--{
--	char __iomem *addr;
--
--	/* Why do we have this when nobody checks it. How about a BUG()!? -AK */
--	if (unlikely((bus > 255) || (devfn > 255) || (reg > 4095)))
--		return -EINVAL;
--
--	rcu_read_lock();
--	addr = pci_dev_base(seg, bus, devfn);
--	if (!addr) {
--		rcu_read_unlock();
--		return -EINVAL;
--	}
--
--	switch (len) {
--	case 1:
--		mmio_config_writeb(addr + reg, value);
--		break;
--	case 2:
--		mmio_config_writew(addr + reg, value);
--		break;
--	case 4:
--		mmio_config_writel(addr + reg, value);
--		break;
--	}
--	rcu_read_unlock();
--
--	return 0;
--}
--
--const struct pci_raw_ops pci_mmcfg = {
--	.read =		pci_mmcfg_read,
--	.write =	pci_mmcfg_write,
--};
--
--static void __iomem *mcfg_ioremap(struct pci_mmcfg_region *cfg)
--{
--	void __iomem *addr;
--	u64 start, size;
--	int num_buses;
--
--	start = cfg->address + PCI_MMCFG_BUS_OFFSET(cfg->start_bus);
--	num_buses = cfg->end_bus - cfg->start_bus + 1;
--	size = PCI_MMCFG_BUS_OFFSET(num_buses);
--	addr = ioremap_nocache(start, size);
--	if (addr)
--		addr -= PCI_MMCFG_BUS_OFFSET(cfg->start_bus);
--	return addr;
--}
--
--int __init pci_mmcfg_arch_init(void)
--{
--	struct pci_mmcfg_region *cfg;
--
--	list_for_each_entry(cfg, &pci_mmcfg_list, list)
--		if (pci_mmcfg_arch_map(cfg)) {
--			pci_mmcfg_arch_free();
--			return 0;
--		}
--
--	raw_pci_ext_ops = &pci_mmcfg;
--
--	return 1;
--}
--
--void __init pci_mmcfg_arch_free(void)
--{
--	struct pci_mmcfg_region *cfg;
--
--	list_for_each_entry(cfg, &pci_mmcfg_list, list)
--		pci_mmcfg_arch_unmap(cfg);
--}
--
--int pci_mmcfg_arch_map(struct pci_mmcfg_region *cfg)
--{
--	cfg->virt = mcfg_ioremap(cfg);
--	if (!cfg->virt) {
--		pr_err(PREFIX "can't map MMCONFIG at %pR\n", &cfg->res);
--		return -ENOMEM;
--	}
--
--	return 0;
--}
--
--void pci_mmcfg_arch_unmap(struct pci_mmcfg_region *cfg)
--{
--	if (cfg && cfg->virt) {
--		iounmap(cfg->virt + PCI_MMCFG_BUS_OFFSET(cfg->start_bus));
--		cfg->virt = NULL;
--	}
--}
-diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
-index e6c3ddd..aad0a08 100644
---- a/drivers/acpi/Kconfig
-+++ b/drivers/acpi/Kconfig
-@@ -5,7 +5,7 @@
- menuconfig ACPI
- 	bool "ACPI (Advanced Configuration and Power Interface) Support"
- 	depends on !IA64_HP_SIM
--	depends on IA64 || X86
-+	depends on IA64 || X86 || ARM64
- 	depends on PCI
- 	select PNP
- 	default y
-@@ -163,6 +163,7 @@ config ACPI_PROCESSOR
- 	tristate "Processor"
- 	select THERMAL
- 	select CPU_IDLE
-+	depends on X86 || IA64
- 	default y
- 	help
- 	  This driver installs ACPI as the idle handler for Linux and uses
-diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
-index b18cd21..0e6abf9 100644
---- a/drivers/acpi/Makefile
-+++ b/drivers/acpi/Makefile
-@@ -23,7 +23,11 @@ acpi-y				+= nvs.o
- 
- # Power management related files
- acpi-y				+= wakeup.o
-+ifeq ($(ARCH), arm64)
-+acpi-y				+= sleep_arm.o
-+else # X86, IA64
- acpi-y				+= sleep.o
-+endif
- acpi-y				+= device_pm.o
- acpi-$(CONFIG_ACPI_SLEEP)	+= proc.o
- 
-@@ -66,6 +70,7 @@ obj-$(CONFIG_ACPI_BUTTON)	+= button.o
- obj-$(CONFIG_ACPI_FAN)		+= fan.o
- obj-$(CONFIG_ACPI_VIDEO)	+= video.o
- obj-$(CONFIG_ACPI_PCI_SLOT)	+= pci_slot.o
-+obj-$(CONFIG_PCI_MMCONFIG)	+= mmconfig.o
- obj-$(CONFIG_ACPI_PROCESSOR)	+= processor.o
- obj-y				+= container.o
- obj-$(CONFIG_ACPI_THERMAL)	+= thermal.o
-diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
-index 8b67bd0..6d5412ab 100644
---- a/drivers/acpi/bus.c
-+++ b/drivers/acpi/bus.c
-@@ -41,6 +41,7 @@
- #include <acpi/apei.h>
- #include <linux/dmi.h>
- #include <linux/suspend.h>
-+#include <linux/mmconfig.h>
- 
- #include "internal.h"
- 
-@@ -448,6 +449,9 @@ static int __init acpi_bus_init_irq(void)
- 	case ACPI_IRQ_MODEL_IOSAPIC:
- 		message = "IOSAPIC";
- 		break;
-+	case ACPI_IRQ_MODEL_GIC:
-+		message = "GIC";
-+		break;
- 	case ACPI_IRQ_MODEL_PLATFORM:
- 		message = "platform specific model";
- 		break;
-diff --git a/drivers/acpi/mmconfig.c b/drivers/acpi/mmconfig.c
-new file mode 100644
-index 0000000..b13a9e4
---- /dev/null
-+++ b/drivers/acpi/mmconfig.c
-@@ -0,0 +1,414 @@
-+/*
-+ * Arch agnostic low-level direct PCI config space access via MMCONFIG
-+ *
-+ * Per-architecture code takes care of the mappings, region validation and
-+ * accesses themselves.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#include <linux/mutex.h>
-+#include <linux/rculist.h>
-+#include <linux/pci.h>
-+#include <linux/mmconfig.h>
-+
-+#include <asm/pci.h>
-+
-+#define PREFIX "PCI: "
-+
-+static DEFINE_MUTEX(pci_mmcfg_lock);
-+
-+LIST_HEAD(pci_mmcfg_list);
-+
-+extern struct acpi_mcfg_fixup __start_acpi_mcfg_fixups[];
-+extern struct acpi_mcfg_fixup __end_acpi_mcfg_fixups[];
-+
-+/*
-+ * raw_pci_read/write - ACPI PCI config space accessors.
-+ *
-+ * ACPI spec defines MMCFG as the way we can access PCI config space,
-+ * so let MMCFG be default (__weak).
-+ *
-+ * If platform needs more fancy stuff, should provides its own implementation.
-+ */
-+int __weak raw_pci_read(unsigned int domain, unsigned int bus,
-+			unsigned int devfn, int reg, int len, u32 *val)
-+{
-+	return pci_mmcfg_read(domain, bus, devfn, reg, len, val);
-+}
-+
-+int __weak raw_pci_write(unsigned int domain, unsigned int bus,
-+			 unsigned int devfn, int reg, int len, u32 val)
-+{
-+	return pci_mmcfg_write(domain, bus, devfn, reg, len, val);
-+}
-+
-+int __weak pci_mmcfg_read(unsigned int seg, unsigned int bus,
-+			  unsigned int devfn, int reg, int len, u32 *value)
-+{
-+	struct pci_mmcfg_region *cfg;
-+	char __iomem *addr;
-+
-+	/* Why do we have this when nobody checks it. How about a BUG()!? -AK */
-+	if (unlikely((bus > 255) || (devfn > 255) || (reg > 4095))) {
-+err:		*value = -1;
-+		return -EINVAL;
-+	}
-+
-+	rcu_read_lock();
-+	cfg = pci_mmconfig_lookup(seg, bus);
-+	if (!cfg || !cfg->virt) {
-+		rcu_read_unlock();
-+		goto err;
-+	}
-+	if (cfg->read)
-+		(*cfg->read)(cfg, bus, devfn, reg, len, value);
-+	else {
-+		addr = cfg->virt + (PCI_MMCFG_BUS_OFFSET(bus) | (devfn << 12));
-+
-+		switch (len) {
-+		case 1:
-+			*value = mmio_config_readb(addr + reg);
-+			break;
-+		case 2:
-+			*value = mmio_config_readw(addr + reg);
-+			break;
-+		case 4:
-+			*value = mmio_config_readl(addr + reg);
-+			break;
-+		}
-+	}
-+	rcu_read_unlock();
-+
-+	return 0;
-+}
-+
-+int __weak pci_mmcfg_write(unsigned int seg, unsigned int bus,
-+			   unsigned int devfn, int reg, int len, u32 value)
-+{
-+	struct pci_mmcfg_region *cfg;
-+	char __iomem *addr;
-+
-+	/* Why do we have this when nobody checks it. How about a BUG()!? -AK */
-+	if (unlikely((bus > 255) || (devfn > 255) || (reg > 4095)))
-+		return -EINVAL;
-+
-+	rcu_read_lock();
-+	cfg = pci_mmconfig_lookup(seg, bus);
-+	if (!cfg || !cfg->virt) {
-+		rcu_read_unlock();
-+		return -EINVAL;
-+	}
-+	if (cfg->write)
-+		(*cfg->write)(cfg, bus, devfn, reg, len, value);
-+	else {
-+		addr = cfg->virt + (PCI_MMCFG_BUS_OFFSET(bus) | (devfn << 12));
-+
-+		switch (len) {
-+		case 1:
-+			mmio_config_writeb(addr + reg, value);
-+			break;
-+		case 2:
-+			mmio_config_writew(addr + reg, value);
-+			break;
-+		case 4:
-+			mmio_config_writel(addr + reg, value);
-+			break;
-+		}
-+	}
-+	rcu_read_unlock();
-+
-+	return 0;
-+}
-+
-+static void __iomem *mcfg_ioremap(struct pci_mmcfg_region *cfg)
-+{
-+	void __iomem *addr;
-+	u64 start, size;
-+	int num_buses;
-+
-+	start = cfg->address + PCI_MMCFG_BUS_OFFSET(cfg->start_bus);
-+	num_buses = cfg->end_bus - cfg->start_bus + 1;
-+	size = PCI_MMCFG_BUS_OFFSET(num_buses);
-+	addr = ioremap_nocache(start, size);
-+	if (addr)
-+		addr -= PCI_MMCFG_BUS_OFFSET(cfg->start_bus);
-+	return addr;
-+}
-+
-+int __init __weak pci_mmcfg_arch_init(void)
-+{
-+	struct pci_mmcfg_region *cfg;
-+
-+	list_for_each_entry(cfg, &pci_mmcfg_list, list)
-+		if (pci_mmcfg_arch_map(cfg)) {
-+			pci_mmcfg_arch_free();
-+			return 0;
-+		}
-+
-+	return 1;
-+}
-+
-+void __init __weak pci_mmcfg_arch_free(void)
-+{
-+	struct pci_mmcfg_region *cfg;
-+
-+	list_for_each_entry(cfg, &pci_mmcfg_list, list)
-+		pci_mmcfg_arch_unmap(cfg);
-+}
-+
-+int __weak pci_mmcfg_arch_map(struct pci_mmcfg_region *cfg)
-+{
-+	cfg->virt = mcfg_ioremap(cfg);
-+	if (!cfg->virt) {
-+		pr_err(PREFIX "can't map MMCONFIG at %pR\n", &cfg->res);
-+		return -ENOMEM;
-+	}
-+
-+	return 0;
-+}
-+
-+void __weak pci_mmcfg_arch_unmap(struct pci_mmcfg_region *cfg)
-+{
-+	if (cfg && cfg->virt) {
-+		iounmap(cfg->virt + PCI_MMCFG_BUS_OFFSET(cfg->start_bus));
-+		cfg->virt = NULL;
-+	}
-+}
-+
-+static void __init pci_mmconfig_remove(struct pci_mmcfg_region *cfg)
-+{
-+	if (cfg->res.parent)
-+		release_resource(&cfg->res);
-+	list_del(&cfg->list);
-+	kfree(cfg);
-+}
-+
-+void __init free_all_mmcfg(void)
-+{
-+	struct pci_mmcfg_region *cfg, *tmp;
-+
-+	pci_mmcfg_arch_free();
-+	list_for_each_entry_safe(cfg, tmp, &pci_mmcfg_list, list)
-+		pci_mmconfig_remove(cfg);
-+}
-+
-+void list_add_sorted(struct pci_mmcfg_region *new)
-+{
-+	struct pci_mmcfg_region *cfg;
-+
-+	/* keep list sorted by segment and starting bus number */
-+	list_for_each_entry_rcu(cfg, &pci_mmcfg_list, list) {
-+		if (cfg->segment > new->segment ||
-+		    (cfg->segment == new->segment &&
-+		     cfg->start_bus >= new->start_bus)) {
-+			list_add_tail_rcu(&new->list, &cfg->list);
-+			return;
-+		}
-+	}
-+	list_add_tail_rcu(&new->list, &pci_mmcfg_list);
-+}
-+
-+struct pci_mmcfg_region *pci_mmconfig_alloc(int segment, int start,
-+					    int end, u64 addr)
-+{
-+	struct pci_mmcfg_region *new;
-+	struct resource *res;
-+
-+	if (addr == 0)
-+		return NULL;
-+
-+	new = kzalloc(sizeof(*new), GFP_KERNEL);
-+	if (!new)
-+		return NULL;
-+
-+	new->address = addr;
-+	new->segment = segment;
-+	new->start_bus = start;
-+	new->end_bus = end;
-+
-+	res = &new->res;
-+	res->start = addr + PCI_MMCFG_BUS_OFFSET(start);
-+	res->end = addr + PCI_MMCFG_BUS_OFFSET(end + 1) - 1;
-+	res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
-+	snprintf(new->name, PCI_MMCFG_RESOURCE_NAME_LEN,
-+		 "PCI MMCONFIG %04x [bus %02x-%02x]", segment, start, end);
-+	res->name = new->name;
-+
-+	return new;
-+}
-+
-+struct pci_mmcfg_region *pci_mmconfig_add(int segment, int start,
-+					  int end, u64 addr)
-+{
-+	struct pci_mmcfg_region *new;
-+
-+	new = pci_mmconfig_alloc(segment, start, end, addr);
-+	if (new) {
-+		mutex_lock(&pci_mmcfg_lock);
-+		list_add_sorted(new);
-+		mutex_unlock(&pci_mmcfg_lock);
-+
-+		pr_info(PREFIX
-+		       "MMCONFIG for domain %04x [bus %02x-%02x] at %pR "
-+		       "(base %#lx)\n",
-+		       segment, start, end, &new->res, (unsigned long)addr);
-+	}
-+
-+	return new;
-+}
-+
-+int __init pci_mmconfig_inject(struct pci_mmcfg_region *cfg)
-+{
-+	struct pci_mmcfg_region *cfg_conflict;
-+	int err = 0;
-+
-+	mutex_lock(&pci_mmcfg_lock);
-+	cfg_conflict = pci_mmconfig_lookup(cfg->segment, cfg->start_bus);
-+	if (cfg_conflict) {
-+		if (cfg_conflict->end_bus < cfg->end_bus)
-+			pr_info(FW_INFO "MMCONFIG for "
-+				"domain %04x [bus %02x-%02x] "
-+				"only partially covers this bridge\n",
-+				cfg_conflict->segment, cfg_conflict->start_bus,
-+				cfg_conflict->end_bus);
-+		err = -EEXIST;
-+		goto out;
-+	}
-+
-+	if (pci_mmcfg_arch_map(cfg)) {
-+		pr_warn("fail to map MMCONFIG %pR.\n", &cfg->res);
-+		err = -ENOMEM;
-+		goto out;
-+	} else {
-+		list_add_sorted(cfg);
-+		pr_info("MMCONFIG at %pR (base %#lx)\n",
-+			&cfg->res, (unsigned long)cfg->address);
-+
-+	}
-+out:
-+	mutex_unlock(&pci_mmcfg_lock);
-+	return err;
-+}
-+
-+struct pci_mmcfg_region *pci_mmconfig_lookup(int segment, int bus)
-+{
-+	struct pci_mmcfg_region *cfg;
-+
-+	list_for_each_entry_rcu(cfg, &pci_mmcfg_list, list)
-+		if (cfg->segment == segment &&
-+		    cfg->start_bus <= bus && bus <= cfg->end_bus)
-+			return cfg;
-+
-+	return NULL;
-+}
-+
-+int __init __weak acpi_mcfg_check_entry(struct acpi_table_mcfg *mcfg,
-+					struct acpi_mcfg_allocation *cfg)
-+{
-+	return 0;
-+}
-+
-+int __init pci_parse_mcfg(struct acpi_table_header *header)
-+{
-+	struct acpi_table_mcfg *mcfg;
-+	struct acpi_mcfg_allocation *cfg_table, *cfg;
-+	struct acpi_mcfg_fixup *fixup;
-+	struct pci_mmcfg_region *new;
-+	unsigned long i;
-+	int entries;
-+
-+	if (!header)
-+		return -EINVAL;
-+
-+	mcfg = (struct acpi_table_mcfg *)header;
-+
-+	/* how many config structures do we have */
-+	free_all_mmcfg();
-+	entries = 0;
-+	i = header->length - sizeof(struct acpi_table_mcfg);
-+	while (i >= sizeof(struct acpi_mcfg_allocation)) {
-+		entries++;
-+		i -= sizeof(struct acpi_mcfg_allocation);
-+	}
-+	if (entries == 0) {
-+		pr_err(PREFIX "MMCONFIG has no entries\n");
-+		return -ENODEV;
-+	}
-+
-+	fixup = __start_acpi_mcfg_fixups;
-+	while (fixup < __end_acpi_mcfg_fixups) {
-+		if (!strncmp(fixup->oem_id, header->oem_id, 6) &&
-+		    !strncmp(fixup->oem_table_id, header->oem_table_id, 8))
-+			break;
-+		++fixup;
-+	}
-+
-+	cfg_table = (struct acpi_mcfg_allocation *) &mcfg[1];
-+	for (i = 0; i < entries; i++) {
-+		cfg = &cfg_table[i];
-+		if (acpi_mcfg_check_entry(mcfg, cfg)) {
-+			free_all_mmcfg();
-+			return -ENODEV;
-+		}
-+
-+		new = pci_mmconfig_add(cfg->pci_segment, cfg->start_bus_number,
-+				       cfg->end_bus_number, cfg->address);
-+		if (!new) {
-+			pr_warn(PREFIX "no memory for MCFG entries\n");
-+			free_all_mmcfg();
-+			return -ENOMEM;
-+		}
-+		if (fixup < __end_acpi_mcfg_fixups)
-+			new->fixup = fixup->hook;
-+	}
-+
-+	return 0;
-+}
-+
-+/* Delete MMCFG information for host bridges */
-+int pci_mmconfig_delete(u16 seg, u8 start, u8 end)
-+{
-+	struct pci_mmcfg_region *cfg;
-+
-+	mutex_lock(&pci_mmcfg_lock);
-+	list_for_each_entry_rcu(cfg, &pci_mmcfg_list, list)
-+		if (cfg->segment == seg && cfg->start_bus == start &&
-+		    cfg->end_bus == end) {
-+			list_del_rcu(&cfg->list);
-+			synchronize_rcu();
-+			pci_mmcfg_arch_unmap(cfg);
-+			if (cfg->res.parent)
-+				release_resource(&cfg->res);
-+			mutex_unlock(&pci_mmcfg_lock);
-+			kfree(cfg);
-+			return 0;
-+		}
-+	mutex_unlock(&pci_mmcfg_lock);
-+
-+	return -ENOENT;
-+}
-+
-+void __init __weak pci_mmcfg_early_init(void)
-+{
-+
-+}
-+
-+void __init __weak pci_mmcfg_late_init(void)
-+{
-+	struct pci_mmcfg_region *cfg;
-+
-+	acpi_table_parse(ACPI_SIG_MCFG, pci_parse_mcfg);
-+
-+	if (list_empty(&pci_mmcfg_list))
-+		return;
-+
-+	if (!pci_mmcfg_arch_init())
-+		free_all_mmcfg();
-+
-+	list_for_each_entry(cfg, &pci_mmcfg_list, list)
-+		insert_resource(&iomem_resource, &cfg->res);
-+}
-diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
-index f9eeae8..39748bb 100644
---- a/drivers/acpi/osl.c
-+++ b/drivers/acpi/osl.c
-@@ -336,11 +336,11 @@ acpi_map_lookup_virt(void __iomem *virt, acpi_size size)
- 	return NULL;
- }
- 
--#ifndef CONFIG_IA64
--#define should_use_kmap(pfn)   page_is_ram(pfn)
--#else
-+#if defined(CONFIG_IA64) || defined(CONFIG_ARM64)
- /* ioremap will take care of cache attributes */
- #define should_use_kmap(pfn)   0
-+#else
-+#define should_use_kmap(pfn)   page_is_ram(pfn)
- #endif
- 
- static void __iomem *acpi_map(acpi_physical_address pg_off, unsigned long pg_sz)
-diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
-index 7962651..b289cb4 100644
---- a/drivers/acpi/processor_core.c
-+++ b/drivers/acpi/processor_core.c
-@@ -83,6 +83,38 @@ static int map_lsapic_id(struct acpi_subtable_header *entry,
- 	return 0;
- }
- 
-+/*
-+ * On ARM platform, MPIDR value is the hardware ID as apic ID
-+ * on Intel platforms
-+ */
-+static int map_gicc_mpidr(struct acpi_subtable_header *entry,
-+		int device_declaration, u32 acpi_id, int *mpidr)
-+{
-+	struct acpi_madt_generic_interrupt *gicc =
-+	    container_of(entry, struct acpi_madt_generic_interrupt, header);
-+
-+	if (!(gicc->flags & ACPI_MADT_ENABLED))
-+		return -ENODEV;
-+
-+	/* In the GIC interrupt model, logical processors are
-+	 * required to have a Processor Device object in the DSDT,
-+	 * so we should check device_declaration here
-+	 */
-+	if (device_declaration && (gicc->uid == acpi_id)) {
-+		/*
-+		 * bits other than [0:7] Aff0, [8:15] Aff1, [16:23] Aff2 and
-+		 * [32:39] Aff3 must be 0 which is defined in ACPI 5.1, so pack
-+		 * the Affx fields into a single 32 bit identifier to accommodate
-+		 * the acpi processor drivers.
-+		 */
-+		*mpidr = ((gicc->arm_mpidr & 0xff00000000) >> 8)
-+			 | gicc->arm_mpidr;
-+		return 0;
-+	}
-+
-+	return -EINVAL;
-+}
-+
- static int map_madt_entry(int type, u32 acpi_id)
- {
- 	unsigned long madt_end, entry;
-@@ -111,6 +143,9 @@ static int map_madt_entry(int type, u32 acpi_id)
- 		} else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) {
- 			if (!map_lsapic_id(header, type, acpi_id, &phys_id))
- 				break;
-+		} else if (header->type == ACPI_MADT_TYPE_GENERIC_INTERRUPT) {
-+			if (!map_gicc_mpidr(header, type, acpi_id, &phys_id))
-+				break;
- 		}
- 		entry += header->length;
- 	}
-@@ -143,6 +178,8 @@ static int map_mat_entry(acpi_handle handle, int type, u32 acpi_id)
- 		map_lsapic_id(header, type, acpi_id, &phys_id);
- 	else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC)
- 		map_x2apic_id(header, type, acpi_id, &phys_id);
-+	else if (header->type == ACPI_MADT_TYPE_GENERIC_INTERRUPT)
-+		map_gicc_mpidr(header, type, acpi_id, &phys_id);
- 
- exit:
- 	kfree(buffer.pointer);
-diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index bbca783..1b9cca3 100644
---- a/drivers/acpi/scan.c
-+++ b/drivers/acpi/scan.c
-@@ -987,13 +987,82 @@ static bool acpi_of_driver_match_device(struct device *dev,
- bool acpi_driver_match_device(struct device *dev,
- 			      const struct device_driver *drv)
- {
--	if (!drv->acpi_match_table)
--		return acpi_of_driver_match_device(dev, drv);
-+	bool ret = false;
- 
--	return !!acpi_match_device(drv->acpi_match_table, dev);
-+	if (drv->acpi_match_table)
-+		ret = !!acpi_match_device(drv->acpi_match_table, dev);
-+
-+	/* Next, try to match with special "PRP0001" _HID */
-+	if (!ret && drv->of_match_table)
-+		ret = acpi_of_driver_match_device(dev, drv);
-+
-+	/* Next, try to match with PCI-defined class-code */
-+	if (!ret && drv->acpi_match_cls)
-+		ret = acpi_match_device_cls(drv->acpi_match_cls, dev);
-+
-+	return ret;
- }
- EXPORT_SYMBOL_GPL(acpi_driver_match_device);
- 
-+/**
-+ * acpi_match_device_cls - Match a struct device against a ACPI _CLS method
-+ * @dev_cls: A pointer to struct acpi_device_cls object to match against.
-+ * @dev: The ACPI device structure to match.
-+ *
-+ * Check if @dev has a valid ACPI and _CLS handle. If there is a
-+ * struct acpi_device_cls object for that handle, use that object to match
-+ * against the given struct acpi_device_cls object.
-+ *
-+ * Return true on success or false on failure.
-+ */
-+bool acpi_match_device_cls(const struct acpi_device_cls *dev_cls,
-+			  const struct device *dev)
-+{
-+	acpi_status status;
-+	union acpi_object *pkg;
-+	struct acpi_device_cls cls;
-+	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-+	struct acpi_buffer format = { sizeof("NNN"), "NNN" };
-+	struct acpi_buffer state = { 0, NULL };
-+	struct acpi_device *adev = ACPI_COMPANION(dev);
-+
-+	if (!adev || !adev->status.present || !dev_cls)
-+		return false;
-+
-+	status = acpi_evaluate_object(adev->handle, METHOD_NAME__CLS,
-+				      NULL, &buffer);
-+	if (ACPI_FAILURE(status))
-+		return false;
-+
-+	/**
-+	 * Note:
-+	 * ACPIv5.1 defines the package to contain 3 integers for
-+	 * Base-Class code, Sub-Class code, and Programming Interface code.
-+	 */
-+	pkg = buffer.pointer;
-+	if (!pkg ||
-+	    (pkg->type != ACPI_TYPE_PACKAGE) ||
-+	    (pkg->package.count != 3)) {
-+		dev_dbg(&adev->dev, "Invalid _CLS data\n");
-+		goto out;
-+	}
-+
-+	state.length = sizeof(struct acpi_device_cls);
-+	state.pointer = &cls;
-+
-+	status = acpi_extract_package(pkg, &format, &state);
-+	if (ACPI_FAILURE(status))
-+		goto out;
-+
-+	return (dev_cls->base_class == cls.base_class &&
-+		dev_cls->sub_class == cls.sub_class &&
-+		dev_cls->prog_interface == cls.prog_interface);
-+out:
-+	kfree(pkg);
-+	return false;
-+}
-+EXPORT_SYMBOL_GPL(acpi_match_device_cls);
-+
- static void acpi_free_power_resources_lists(struct acpi_device *device)
- {
- 	int i;
-diff --git a/drivers/acpi/sleep_arm.c b/drivers/acpi/sleep_arm.c
-new file mode 100644
-index 0000000..54578ef
---- /dev/null
-+++ b/drivers/acpi/sleep_arm.c
-@@ -0,0 +1,28 @@
-+/*
-+ *  ARM64 Specific Sleep Functionality
-+ *
-+ *  Copyright (C) 2013-2014, Linaro Ltd.
-+ *      Author: Graeme Gregory <graeme.gregory@linaro.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License version 2 as
-+ *  published by the Free Software Foundation.
-+ */
-+
-+#include <linux/acpi.h>
-+
-+/*
-+ * Currently the ACPI 5.1 standard does not define S states in a
-+ * manner which is usable for ARM64. These two stubs are sufficient
-+ * that system initialises and device PM works.
-+ */
-+u32 acpi_target_system_state(void)
-+{
-+	return ACPI_STATE_S0;
-+}
-+EXPORT_SYMBOL_GPL(acpi_target_system_state);
-+
-+int __init acpi_sleep_init(void)
-+{
-+	return -ENOSYS;
-+}
-diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
-index 93b8152..42d314f 100644
---- a/drivers/acpi/tables.c
-+++ b/drivers/acpi/tables.c
-@@ -183,6 +183,49 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header)
- 		}
- 		break;
- 
-+	case ACPI_MADT_TYPE_GENERIC_INTERRUPT:
-+		{
-+			struct acpi_madt_generic_interrupt *p =
-+				(struct acpi_madt_generic_interrupt *)header;
-+			pr_info("GICC (acpi_id[0x%04x] address[%p] MPIDR[0x%llx] %s)\n",
-+				p->uid, (void *)(unsigned long)p->base_address,
-+				p->arm_mpidr,
-+				(p->flags & ACPI_MADT_ENABLED) ? "enabled" : "disabled");
-+
-+		}
-+		break;
-+
-+	case ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR:
-+		{
-+			struct acpi_madt_generic_distributor *p =
-+				(struct acpi_madt_generic_distributor *)header;
-+			pr_info("GIC Distributor (gic_id[0x%04x] address[%p] gsi_base[%d])\n",
-+				p->gic_id,
-+				(void *)(unsigned long)p->base_address,
-+				p->global_irq_base);
-+		}
-+		break;
-+
-+	case ACPI_MADT_TYPE_GENERIC_MSI_FRAME:
-+		{
-+			struct acpi_madt_generic_msi_frame *p =
-+				(struct acpi_madt_generic_msi_frame *)header;
-+			pr_info("GIC MSI Frame (msi_fame_id[%d] address[%p])\n",
-+				p->msi_frame_id,
-+				(void *)(unsigned long)p->base_address);
-+		}
-+		break;
-+
-+	case ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR:
-+		{
-+			struct acpi_madt_generic_redistributor *p =
-+				(struct acpi_madt_generic_redistributor *)header;
-+			pr_info("GIC Redistributor (address[%p] region_size[0x%x])\n",
-+				(void *)(unsigned long)p->base_address,
-+				p->length);
-+		}
-+		break;
-+
- 	default:
- 		pr_warn("Found unsupported MADT entry (type = 0x%x)\n",
- 			header->type);
-diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
-index cd49a39..7f68f96 100644
---- a/drivers/acpi/utils.c
-+++ b/drivers/acpi/utils.c
-@@ -712,3 +712,29 @@ bool acpi_check_dsm(acpi_handle handle, const u8 *uuid, int rev, u64 funcs)
- 	return false;
- }
- EXPORT_SYMBOL(acpi_check_dsm);
-+
-+/**
-+ * acpi_check_coherency - check for memory coherency of a device
-+ * @handle: ACPI device handle
-+ * @val:    Pointer to returned value
-+ *
-+ * Search a device and its parents for a _CCA method and return
-+ * its value.
-+ */
-+acpi_status acpi_check_coherency(acpi_handle handle, int *val)
-+{
-+	unsigned long long data;
-+	acpi_status status;
-+
-+	do {
-+		status = acpi_evaluate_integer(handle, "_CCA", NULL, &data);
-+		if (!ACPI_FAILURE(status)) {
-+			*val = data;
-+			break;
-+		}
-+		status = acpi_get_parent(handle, &handle);
-+	} while (!ACPI_FAILURE(status));
-+
-+	return status;
-+}
-+EXPORT_SYMBOL(acpi_check_coherency);
-diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
-index 5f60155..50305e3 100644
---- a/drivers/ata/Kconfig
-+++ b/drivers/ata/Kconfig
-@@ -48,7 +48,7 @@ config ATA_VERBOSE_ERROR
- 
- config ATA_ACPI
- 	bool "ATA ACPI Support"
--	depends on ACPI && PCI
-+	depends on ACPI
- 	default y
- 	help
- 	  This option adds support for ATA-related ACPI objects.
-diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
-index 78d6ae0..d110c95 100644
---- a/drivers/ata/ahci_platform.c
-+++ b/drivers/ata/ahci_platform.c
-@@ -78,12 +78,24 @@ static const struct of_device_id ahci_of_match[] = {
- };
- MODULE_DEVICE_TABLE(of, ahci_of_match);
- 
-+#ifdef CONFIG_ATA_ACPI
-+static const struct acpi_device_id ahci_acpi_match[] = {
-+	{ "AMDI0600", 0 }, /* AMD Seattle AHCI */
-+	{ },
-+};
-+MODULE_DEVICE_TABLE(acpi, ahci_acpi_match);
-+#endif
-+
-+static const struct acpi_device_cls ahci_cls = {0x01, 0x06, 0x01};
-+
- static struct platform_driver ahci_driver = {
- 	.probe = ahci_probe,
- 	.remove = ata_platform_remove_one,
- 	.driver = {
- 		.name = DRV_NAME,
- 		.of_match_table = ahci_of_match,
-+		.acpi_match_cls = &ahci_cls,
-+		.acpi_match_table = ACPI_PTR(ahci_acpi_match),
- 		.pm = &ahci_pm_ops,
- 	},
- };
-diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
-index 2e8bb60..33d7784 100644
---- a/drivers/ata/ahci_xgene.c
-+++ b/drivers/ata/ahci_xgene.c
-@@ -28,6 +28,7 @@
- #include <linux/of_address.h>
- #include <linux/of_irq.h>
- #include <linux/phy/phy.h>
-+#include <linux/acpi.h>
- #include "ahci.h"
- 
- #define DRV_NAME "xgene-ahci"
-@@ -225,14 +226,6 @@ static unsigned int xgene_ahci_qc_issue(struct ata_queued_cmd *qc)
- 	return rc;
- }
- 
--static bool xgene_ahci_is_memram_inited(struct xgene_ahci_context *ctx)
--{
--	void __iomem *diagcsr = ctx->csr_diag;
--
--	return (readl(diagcsr + CFG_MEM_RAM_SHUTDOWN) == 0 &&
--	        readl(diagcsr + BLOCK_MEM_RDY) == 0xFFFFFFFF);
--}
--
- /**
-  * xgene_ahci_read_id - Read ID data from the specified device
-  * @dev: device
-@@ -685,11 +678,6 @@ static int xgene_ahci_probe(struct platform_device *pdev)
- 		return -ENODEV;
- 	}
- 
--	if (xgene_ahci_is_memram_inited(ctx)) {
--		dev_info(dev, "skip clock and PHY initialization\n");
--		goto skip_clk_phy;
--	}
--
- 	/* Due to errata, HW requires full toggle transition */
- 	rc = ahci_platform_enable_clks(hpriv);
- 	if (rc)
-@@ -702,7 +690,7 @@ static int xgene_ahci_probe(struct platform_device *pdev)
- 
- 	/* Configure the host controller */
- 	xgene_ahci_hw_init(hpriv);
--skip_clk_phy:
-+
- 	hpriv->flags = AHCI_HFLAG_NO_PMP | AHCI_HFLAG_NO_NCQ;
- 
- 	rc = ahci_platform_init_host(pdev, hpriv, &xgene_ahci_port_info,
-@@ -718,6 +706,16 @@ disable_resources:
- 	return rc;
- }
- 
-+#ifdef CONFIG_ACPI
-+static const struct acpi_device_id xgene_ahci_acpi_match[] = {
-+	{ "APMC0D00", },
-+	{ "APMC0D0D", },
-+	{ "APMC0D09", },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(acpi, xgene_ahci_acpi_match);
-+#endif
-+
- static const struct of_device_id xgene_ahci_of_match[] = {
- 	{.compatible = "apm,xgene-ahci"},
- 	{},
-@@ -730,6 +728,7 @@ static struct platform_driver xgene_ahci_driver = {
- 	.driver = {
- 		.name = DRV_NAME,
- 		.of_match_table = xgene_ahci_of_match,
-+		.acpi_match_table = ACPI_PTR(xgene_ahci_acpi_match),
- 	},
- };
- 
-diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
-index a3025e7..3b2e2d0 100644
---- a/drivers/clocksource/arm_arch_timer.c
-+++ b/drivers/clocksource/arm_arch_timer.c
-@@ -22,6 +22,7 @@
- #include <linux/io.h>
- #include <linux/slab.h>
- #include <linux/sched_clock.h>
-+#include <linux/acpi.h>
- 
- #include <asm/arch_timer.h>
- #include <asm/virt.h>
-@@ -62,7 +63,8 @@ enum ppi_nr {
- 	MAX_TIMER_PPI
- };
- 
--static int arch_timer_ppi[MAX_TIMER_PPI];
-+int arch_timer_ppi[MAX_TIMER_PPI];
-+EXPORT_SYMBOL(arch_timer_ppi);
- 
- static struct clock_event_device __percpu *arch_timer_evt;
- 
-@@ -371,8 +373,12 @@ arch_timer_detect_rate(void __iomem *cntbase, struct device_node *np)
- 	if (arch_timer_rate)
- 		return;
- 
--	/* Try to determine the frequency from the device tree or CNTFRQ */
--	if (of_property_read_u32(np, "clock-frequency", &arch_timer_rate)) {
-+	/*
-+	 * Try to determine the frequency from the device tree or CNTFRQ,
-+	 * if ACPI is enabled, get the frequency from CNTFRQ ONLY.
-+	 */
-+	if (!acpi_disabled ||
-+	    of_property_read_u32(np, "clock-frequency", &arch_timer_rate)) {
- 		if (cntbase)
- 			arch_timer_rate = readl_relaxed(cntbase + CNTFRQ);
- 		else
-@@ -691,28 +697,8 @@ static void __init arch_timer_common_init(void)
- 	arch_timer_arch_init();
- }
- 
--static void __init arch_timer_init(struct device_node *np)
-+static void __init arch_timer_init(void)
- {
--	int i;
--
--	if (arch_timers_present & ARCH_CP15_TIMER) {
--		pr_warn("arch_timer: multiple nodes in dt, skipping\n");
--		return;
--	}
--
--	arch_timers_present |= ARCH_CP15_TIMER;
--	for (i = PHYS_SECURE_PPI; i < MAX_TIMER_PPI; i++)
--		arch_timer_ppi[i] = irq_of_parse_and_map(np, i);
--	arch_timer_detect_rate(NULL, np);
--
--	/*
--	 * If we cannot rely on firmware initializing the timer registers then
--	 * we should use the physical timers instead.
--	 */
--	if (IS_ENABLED(CONFIG_ARM) &&
--	    of_property_read_bool(np, "arm,cpu-registers-not-fw-configured"))
--			arch_timer_use_virtual = false;
--
- 	/*
- 	 * If HYP mode is available, we know that the physical timer
- 	 * has been configured to be accessible from PL1. Use it, so
-@@ -731,13 +717,39 @@ static void __init arch_timer_init(struct device_node *np)
- 		}
- 	}
- 
--	arch_timer_c3stop = !of_property_read_bool(np, "always-on");
--
- 	arch_timer_register();
- 	arch_timer_common_init();
- }
--CLOCKSOURCE_OF_DECLARE(armv7_arch_timer, "arm,armv7-timer", arch_timer_init);
--CLOCKSOURCE_OF_DECLARE(armv8_arch_timer, "arm,armv8-timer", arch_timer_init);
-+
-+static void __init arch_timer_of_init(struct device_node *np)
-+{
-+	int i;
-+
-+	if (arch_timers_present & ARCH_CP15_TIMER) {
-+		pr_warn("arch_timer: multiple nodes in dt, skipping\n");
-+		return;
-+	}
-+
-+	arch_timers_present |= ARCH_CP15_TIMER;
-+	for (i = PHYS_SECURE_PPI; i < MAX_TIMER_PPI; i++)
-+		arch_timer_ppi[i] = irq_of_parse_and_map(np, i);
-+
-+	arch_timer_detect_rate(NULL, np);
-+
-+	arch_timer_c3stop = !of_property_read_bool(np, "always-on");
-+
-+	/*
-+	 * If we cannot rely on firmware initializing the timer registers then
-+	 * we should use the physical timers instead.
-+	 */
-+	if (IS_ENABLED(CONFIG_ARM) &&
-+	    of_property_read_bool(np, "arm,cpu-registers-not-fw-configured"))
-+			arch_timer_use_virtual = false;
-+
-+	arch_timer_init();
-+}
-+CLOCKSOURCE_OF_DECLARE(armv7_arch_timer, "arm,armv7-timer", arch_timer_of_init);
-+CLOCKSOURCE_OF_DECLARE(armv8_arch_timer, "arm,armv8-timer", arch_timer_of_init);
- 
- static void __init arch_timer_mem_init(struct device_node *np)
- {
-@@ -804,3 +816,70 @@ static void __init arch_timer_mem_init(struct device_node *np)
- }
- CLOCKSOURCE_OF_DECLARE(armv7_arch_timer_mem, "arm,armv7-timer-mem",
- 		       arch_timer_mem_init);
-+
-+#ifdef CONFIG_ACPI
-+static int __init map_generic_timer_interrupt(u32 interrupt, u32 flags)
-+{
-+	int trigger, polarity;
-+
-+	if (!interrupt)
-+		return 0;
-+
-+	trigger = (flags & ACPI_GTDT_INTERRUPT_MODE) ? ACPI_EDGE_SENSITIVE
-+			: ACPI_LEVEL_SENSITIVE;
-+
-+	polarity = (flags & ACPI_GTDT_INTERRUPT_POLARITY) ? ACPI_ACTIVE_LOW
-+			: ACPI_ACTIVE_HIGH;
-+
-+	return acpi_register_gsi(NULL, interrupt, trigger, polarity);
-+}
-+
-+/* Initialize per-processor generic timer */
-+static int __init arch_timer_acpi_init(struct acpi_table_header *table)
-+{
-+	struct acpi_table_gtdt *gtdt;
-+
-+	if (arch_timers_present & ARCH_CP15_TIMER) {
-+		pr_warn("arch_timer: already initialized, skipping\n");
-+		return -EINVAL;
-+	}
-+
-+	gtdt = container_of(table, struct acpi_table_gtdt, header);
-+
-+	arch_timers_present |= ARCH_CP15_TIMER;
-+
-+	arch_timer_ppi[PHYS_SECURE_PPI] =
-+		map_generic_timer_interrupt(gtdt->secure_el1_interrupt,
-+		gtdt->secure_el1_flags);
-+
-+	arch_timer_ppi[PHYS_NONSECURE_PPI] =
-+		map_generic_timer_interrupt(gtdt->non_secure_el1_interrupt,
-+		gtdt->non_secure_el1_flags);
-+
-+	arch_timer_ppi[VIRT_PPI] =
-+		map_generic_timer_interrupt(gtdt->virtual_timer_interrupt,
-+		gtdt->virtual_timer_flags);
-+
-+	arch_timer_ppi[HYP_PPI] =
-+		map_generic_timer_interrupt(gtdt->non_secure_el2_interrupt,
-+		gtdt->non_secure_el2_flags);
-+
-+	/* Get the frequency from CNTFRQ */
-+	arch_timer_detect_rate(NULL, NULL);
-+
-+	/* Always-on capability */
-+	arch_timer_c3stop = !(gtdt->non_secure_el1_flags & ACPI_GTDT_ALWAYS_ON);
-+
-+	arch_timer_init();
-+	return 0;
-+}
-+
-+/* Initialize all the generic timers presented in GTDT */
-+void __init acpi_generic_timer_init(void)
-+{
-+	if (acpi_disabled)
-+		return;
-+
-+	acpi_table_parse(ACPI_SIG_GTDT, arch_timer_acpi_init);
-+}
-+#endif
-diff --git a/drivers/firmware/dmi-sysfs.c b/drivers/firmware/dmi-sysfs.c
-index e0f1cb3..9b396d7 100644
---- a/drivers/firmware/dmi-sysfs.c
-+++ b/drivers/firmware/dmi-sysfs.c
-@@ -29,6 +29,8 @@
- #define MAX_ENTRY_TYPE 255 /* Most of these aren't used, but we consider
- 			      the top entry type is only 8 bits */
- 
-+static const u8 *smbios_raw_header;
-+
- struct dmi_sysfs_entry {
- 	struct dmi_header dh;
- 	struct kobject kobj;
-@@ -646,9 +648,37 @@ static void cleanup_entry_list(void)
- 	}
- }
- 
-+static ssize_t smbios_entry_area_raw_read(struct file *filp,
-+					  struct kobject *kobj,
-+					  struct bin_attribute *bin_attr,
-+					  char *buf, loff_t pos, size_t count)
-+{
-+	ssize_t size;
-+
-+	size = bin_attr->size;
-+
-+	if (size > pos)
-+		size -= pos;
-+	else
-+		return 0;
-+
-+	if (count < size)
-+		size = count;
-+
-+	memcpy(buf, &smbios_raw_header[pos], size);
-+
-+	return size;
-+}
-+
-+static struct bin_attribute smbios_raw_area_attr = {
-+	.read = smbios_entry_area_raw_read,
-+	.attr = {.name = "smbios_raw_header", .mode = 0400},
-+};
-+
- static int __init dmi_sysfs_init(void)
- {
- 	int error = -ENOMEM;
-+	int size;
- 	int val;
- 
- 	/* Set up our directory */
-@@ -669,6 +699,18 @@ static int __init dmi_sysfs_init(void)
- 		goto err;
- 	}
- 
-+	smbios_raw_header = dmi_get_smbios_entry_area(&size);
-+	if (!smbios_raw_header) {
-+		pr_debug("dmi-sysfs: SMBIOS raw data is not available.\n");
-+		error = -EINVAL;
-+		goto err;
-+	}
-+
-+	/* Create the raw binary file to access the entry area */
-+	smbios_raw_area_attr.size = size;
-+	if (sysfs_create_bin_file(dmi_kobj, &smbios_raw_area_attr))
-+		goto err;
-+
- 	pr_debug("dmi-sysfs: loaded.\n");
- 
- 	return 0;
-diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
-index c5f7b4e..d55c712 100644
---- a/drivers/firmware/dmi_scan.c
-+++ b/drivers/firmware/dmi_scan.c
-@@ -113,6 +113,8 @@ static void dmi_table(u8 *buf, int len, int num,
- 	}
- }
- 
-+static u8 smbios_header[32];
-+static int smbios_header_size;
- static phys_addr_t dmi_base;
- static u32 dmi_len;
- static u16 dmi_num;
-@@ -474,6 +476,8 @@ static int __init dmi_present(const u8 *buf)
- 	if (memcmp(buf, "_SM_", 4) == 0 &&
- 	    buf[5] < 32 && dmi_checksum(buf, buf[5])) {
- 		smbios_ver = get_unaligned_be16(buf + 6);
-+		smbios_header_size = buf[5];
-+		memcpy(smbios_header, buf, smbios_header_size);
- 
- 		/* Some BIOS report weird SMBIOS version, fix that up */
- 		switch (smbios_ver) {
-@@ -505,6 +509,8 @@ static int __init dmi_present(const u8 *buf)
- 				pr_info("SMBIOS %d.%d present.\n",
- 				       dmi_ver >> 8, dmi_ver & 0xFF);
- 			} else {
-+				smbios_header_size = 15;
-+				memcpy(smbios_header, buf, smbios_header_size);
- 				dmi_ver = (buf[14] & 0xF0) << 4 |
- 					   (buf[14] & 0x0F);
- 				pr_info("Legacy DMI %d.%d present.\n",
-@@ -530,6 +536,8 @@ static int __init dmi_smbios3_present(const u8 *buf)
- 		dmi_ver = get_unaligned_be16(buf + 7);
- 		dmi_len = get_unaligned_le32(buf + 12);
- 		dmi_base = get_unaligned_le64(buf + 16);
-+		smbios_header_size = buf[6];
-+		memcpy(smbios_header, buf, smbios_header_size);
- 
- 		/*
- 		 * The 64-bit SMBIOS 3.0 entry point no longer has a field
-@@ -941,3 +949,21 @@ void dmi_memdev_name(u16 handle, const char **bank, const char **device)
- 	}
- }
- EXPORT_SYMBOL_GPL(dmi_memdev_name);
-+
-+/**
-+ * dmi_get_smbios_entry_area - copy SMBIOS entry point area to array.
-+ * @size - pointer to assign actual size of SMBIOS entry point area.
-+ *
-+ * returns NULL if table is not available, otherwise returns pointer on
-+ * SMBIOS entry point area array.
-+ */
-+const u8 *dmi_get_smbios_entry_area(int *size)
-+{
-+	if (!smbios_header_size || !dmi_available)
-+		return NULL;
-+
-+	*size = smbios_header_size;
-+
-+	return smbios_header;
-+}
-+EXPORT_SYMBOL_GPL(dmi_get_smbios_entry_area);
-diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c
-index 91da56c..7c62760 100644
---- a/drivers/firmware/efi/libstub/fdt.c
-+++ b/drivers/firmware/efi/libstub/fdt.c
-@@ -156,6 +156,14 @@ efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt,
- 	if (status)
- 		goto fdt_set_fail;
- 
-+	/* Add a property to show the dtb is generated by uefi stub */
-+	if (!orig_fdt) {
-+		status = fdt_setprop(fdt, node,
-+				     "linux,uefi-stub-generated-dtb", NULL, 0);
-+		if (status)
-+			goto fdt_set_fail;
-+	}
-+
- 	return EFI_SUCCESS;
- 
- fdt_set_fail:
-diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
-index fc13dd5..3143a6e 100644
---- a/drivers/iommu/arm-smmu.c
-+++ b/drivers/iommu/arm-smmu.c
-@@ -381,7 +381,10 @@ static struct device_node *dev_get_dev_node(struct device *dev)
- 
- 		while (!pci_is_root_bus(bus))
- 			bus = bus->parent;
--		return bus->bridge->parent->of_node;
-+		if (bus->bridge->parent)
-+			return bus->bridge->parent->of_node;
-+		else
-+			return NULL;
- 	}
- 
- 	return dev->of_node;
-@@ -497,6 +500,9 @@ static struct arm_smmu_device *find_smmu_for_device(struct device *dev)
- 	struct arm_smmu_master *master = NULL;
- 	struct device_node *dev_node = dev_get_dev_node(dev);
- 
-+	if (!dev_node)
-+		return NULL;
-+
- 	spin_lock(&arm_smmu_devices_lock);
- 	list_for_each_entry(smmu, &arm_smmu_devices, list) {
- 		master = find_smmu_master(smmu, dev_node);
-diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c
-index fdf7065..235524d 100644
---- a/drivers/irqchip/irq-gic-v2m.c
-+++ b/drivers/irqchip/irq-gic-v2m.c
-@@ -15,6 +15,7 @@
- 
- #define pr_fmt(fmt) "GICv2m: " fmt
- 
-+#include <linux/acpi.h>
- #include <linux/irq.h>
- #include <linux/irqdomain.h>
- #include <linux/kernel.h>
-@@ -45,7 +46,6 @@
- 
- struct v2m_data {
- 	spinlock_t msi_cnt_lock;
--	struct msi_controller mchip;
- 	struct resource res;	/* GICv2m resource */
- 	void __iomem *base;	/* GICv2m virt address */
- 	u32 spi_start;		/* The SPI number that MSIs start */
-@@ -192,7 +192,7 @@ static void gicv2m_irq_domain_free(struct irq_domain *domain,
- 	irq_domain_free_irqs_parent(domain, virq, nr_irqs);
- }
- 
--static const struct irq_domain_ops gicv2m_domain_ops = {
-+static struct irq_domain_ops gicv2m_domain_ops = {
- 	.alloc			= gicv2m_irq_domain_alloc,
- 	.free			= gicv2m_irq_domain_free,
- };
-@@ -213,11 +213,17 @@ static bool is_msi_spi_valid(u32 base, u32 num)
- 	return true;
- }
- 
--static int __init gicv2m_init_one(struct device_node *node,
--				  struct irq_domain *parent)
-+char gicv2m_msi_domain_name[] = "V2M-MSI";
-+char gicv2m_domain_name[] = "GICV2M";
-+static int __init gicv2m_init_one(struct irq_domain *parent,
-+				  u32 spi_start, u32 nr_spis,
-+				  struct resource *res,
-+				  struct device_node *node,
-+				  u32 msi_frame_id)
- {
- 	int ret;
- 	struct v2m_data *v2m;
-+	struct irq_domain *inner_domain;
- 
- 	v2m = kzalloc(sizeof(struct v2m_data), GFP_KERNEL);
- 	if (!v2m) {
-@@ -225,23 +231,17 @@ static int __init gicv2m_init_one(struct device_node *node,
- 		return -ENOMEM;
- 	}
- 
--	ret = of_address_to_resource(node, 0, &v2m->res);
--	if (ret) {
--		pr_err("Failed to allocate v2m resource.\n");
--		goto err_free_v2m;
--	}
--
--	v2m->base = ioremap(v2m->res.start, resource_size(&v2m->res));
-+	v2m->base = ioremap(res->start, resource_size(res));
- 	if (!v2m->base) {
- 		pr_err("Failed to map GICv2m resource\n");
- 		ret = -ENOMEM;
- 		goto err_free_v2m;
- 	}
-+	memcpy(&v2m->res,res, sizeof(struct resource));
- 
--	if (!of_property_read_u32(node, "arm,msi-base-spi", &v2m->spi_start) &&
--	    !of_property_read_u32(node, "arm,msi-num-spis", &v2m->nr_spis)) {
--		pr_info("Overriding V2M MSI_TYPER (base:%u, num:%u)\n",
--			v2m->spi_start, v2m->nr_spis);
-+	if (spi_start && nr_spis) {
-+		v2m->spi_start = spi_start;
-+		v2m->nr_spis = nr_spis;
- 	} else {
- 		u32 typer = readl_relaxed(v2m->base + V2M_MSI_TYPER);
- 
-@@ -261,43 +261,35 @@ static int __init gicv2m_init_one(struct device_node *node,
- 		goto err_iounmap;
- 	}
- 
--	v2m->domain = irq_domain_add_tree(NULL, &gicv2m_domain_ops, v2m);
--	if (!v2m->domain) {
-+	inner_domain = irq_domain_add_tree(NULL, &gicv2m_domain_ops, v2m);
-+	if (!inner_domain) {
- 		pr_err("Failed to create GICv2m domain\n");
- 		ret = -ENOMEM;
- 		goto err_free_bm;
- 	}
- 
--	v2m->domain->parent = parent;
--	v2m->mchip.of_node = node;
--	v2m->mchip.domain = pci_msi_create_irq_domain(node,
--						      &gicv2m_msi_domain_info,
--						      v2m->domain);
--	if (!v2m->mchip.domain) {
-+	inner_domain->parent = parent;
-+	inner_domain->name = gicv2m_domain_name;
-+	gicv2m_msi_domain_info.acpi_msi_frame_id = msi_frame_id;
-+	v2m->domain = pci_msi_create_irq_domain(node, &gicv2m_msi_domain_info,
-+						inner_domain);
-+	if (!v2m->domain) {
- 		pr_err("Failed to create MSI domain\n");
- 		ret = -ENOMEM;
- 		goto err_free_domains;
- 	}
- 
--	spin_lock_init(&v2m->msi_cnt_lock);
-+	v2m->domain->name = gicv2m_msi_domain_name;
- 
--	ret = of_pci_msi_chip_add(&v2m->mchip);
--	if (ret) {
--		pr_err("Failed to add msi_chip.\n");
--		goto err_free_domains;
--	}
--
--	pr_info("Node %s: range[%#lx:%#lx], SPI[%d:%d]\n", node->name,
--		(unsigned long)v2m->res.start, (unsigned long)v2m->res.end,
--		v2m->spi_start, (v2m->spi_start + v2m->nr_spis));
-+	spin_lock_init(&v2m->msi_cnt_lock);
- 
- 	return 0;
- 
- err_free_domains:
--	if (v2m->mchip.domain)
--		irq_domain_remove(v2m->mchip.domain);
- 	if (v2m->domain)
- 		irq_domain_remove(v2m->domain);
-+	if (inner_domain)
-+		irq_domain_remove(inner_domain);
- err_free_bm:
- 	kfree(v2m->bm);
- err_iounmap:
-@@ -319,15 +311,99 @@ int __init gicv2m_of_init(struct device_node *node, struct irq_domain *parent)
- 
- 	for (child = of_find_matching_node(node, gicv2m_device_id); child;
- 	     child = of_find_matching_node(child, gicv2m_device_id)) {
-+		u32 spi_start = 0, nr_spis = 0;
-+		struct resource res;
-+
- 		if (!of_find_property(child, "msi-controller", NULL))
- 			continue;
- 
--		ret = gicv2m_init_one(child, parent);
-+		ret = of_address_to_resource(child, 0, &res);
-+		if (ret) {
-+			pr_err("Failed to allocate v2m resource.\n");
-+			break;
-+		}
-+
-+		if (!of_property_read_u32(child, "arm,msi-base-spi", &spi_start) &&
-+		    !of_property_read_u32(child, "arm,msi-num-spis", &nr_spis))
-+			pr_info("Overriding V2M MSI_TYPER (base:%u, num:%u)\n",
-+				spi_start, nr_spis);
-+
-+		ret = gicv2m_init_one(parent, spi_start, nr_spis, &res, child, 0);
- 		if (ret) {
- 			of_node_put(node);
- 			break;
- 		}
-+
-+		pr_info("Node %s: range[%#lx:%#lx], SPI[%d:%d]\n", child->name,
-+			(unsigned long)res.start, (unsigned long)res.end,
-+			spi_start, (spi_start + nr_spis));
-+	}
-+
-+	return ret;
-+}
-+
-+#ifdef CONFIG_ACPI
-+static struct acpi_madt_generic_msi_frame *msi_frame;
-+
-+static int __init
-+gic_acpi_parse_madt_msi(struct acpi_subtable_header *header,
-+			const unsigned long end)
-+{
-+	struct acpi_madt_generic_msi_frame *frame;
-+
-+	frame = (struct acpi_madt_generic_msi_frame *)header;
-+	if (BAD_MADT_ENTRY(frame, end))
-+		return -EINVAL;
-+
-+	if (msi_frame)
-+		pr_warn("Only one GIC MSI FRAME supported.\n");
-+	else
-+		msi_frame = frame;
-+
-+	return 0;
-+}
-+
-+int __init gicv2m_acpi_init(struct acpi_table_header *table,
-+			    struct irq_domain *parent)
-+{
-+	int ret = 0;
-+	int count, i;
-+	static struct acpi_madt_generic_msi_frame *cur;
-+
-+	count = acpi_parse_entries(ACPI_SIG_MADT, sizeof(struct acpi_table_madt),
-+				   gic_acpi_parse_madt_msi, table,
-+				   ACPI_MADT_TYPE_GENERIC_MSI_FRAME, 0);
-+	if ((count <= 0) || !msi_frame) {
-+		pr_debug("No valid ACPI GIC MSI FRAME exist\n");
-+		return 0;
- 	}
- 
-+	for (i = 0, cur = msi_frame; i < count; i++, cur++) {
-+		struct resource res;
-+		u32 spi_start = 0, nr_spis = 0;
-+
-+		res.start = cur->base_address;
-+		res.end = cur->base_address + 0x1000;
-+
-+		if (cur->flags & ACPI_MADT_OVERRIDE_SPI_VALUES) {
-+			spi_start = cur->spi_base;
-+			nr_spis = cur->spi_count;
-+
-+			pr_info("ACPI overriding V2M MSI_TYPER (base:%u, num:%u)\n",
-+				spi_start, nr_spis);
-+		}
-+
-+		ret = gicv2m_init_one(parent, spi_start, nr_spis, &res, NULL,
-+				      cur->msi_frame_id);
-+		if (ret)
-+			break;
-+
-+		pr_info("MSI frame ID %u: range[%#lx:%#lx], SPI[%d:%d]\n",
-+			cur->msi_frame_id,
-+			(unsigned long)res.start, (unsigned long)res.end,
-+			spi_start, (spi_start + nr_spis));
-+	}
- 	return ret;
- }
-+
-+#endif /* CONFIG_ACPI */
-diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
-index d8996bd..c76884b 100644
---- a/drivers/irqchip/irq-gic-v3-its.c
-+++ b/drivers/irqchip/irq-gic-v3-its.c
-@@ -54,13 +54,12 @@ struct its_collection {
- 
- /*
-  * The ITS structure - contains most of the infrastructure, with the
-- * msi_controller, the command queue, the collections, and the list of
-- * devices writing to it.
-+ * top-level MSI domain, the command queue, the collections, and the
-+ * list of devices writing to it.
-  */
- struct its_node {
- 	raw_spinlock_t		lock;
- 	struct list_head	entry;
--	struct msi_controller	msi_chip;
- 	struct irq_domain	*domain;
- 	void __iomem		*base;
- 	unsigned long		phys_base;
-@@ -875,7 +874,7 @@ retry_baser:
- 
- 		if (val != tmp) {
- 			pr_err("ITS: %s: GITS_BASER%d doesn't stick: %lx %lx\n",
--			       its->msi_chip.of_node->full_name, i,
-+			       its->domain->of_node->full_name, i,
- 			       (unsigned long) val, (unsigned long) tmp);
- 			err = -ENXIO;
- 			goto out_free;
-@@ -1260,6 +1259,7 @@ static int its_probe(struct device_node *node, struct irq_domain *parent)
- 	struct resource res;
- 	struct its_node *its;
- 	void __iomem *its_base;
-+	struct irq_domain *inner_domain = NULL;
- 	u32 val;
- 	u64 baser, tmp;
- 	int err;
-@@ -1296,7 +1296,6 @@ static int its_probe(struct device_node *node, struct irq_domain *parent)
- 	INIT_LIST_HEAD(&its->its_device_list);
- 	its->base = its_base;
- 	its->phys_base = res.start;
--	its->msi_chip.of_node = node;
- 	its->ite_size = ((readl_relaxed(its_base + GITS_TYPER) >> 4) & 0xf) + 1;
- 
- 	its->cmd_base = kzalloc(ITS_CMD_QUEUE_SZ, GFP_KERNEL);
-@@ -1330,26 +1329,22 @@ static int its_probe(struct device_node *node, struct irq_domain *parent)
- 		its->flags |= ITS_FLAGS_CMDQ_NEEDS_FLUSHING;
- 	}
- 
--	if (of_property_read_bool(its->msi_chip.of_node, "msi-controller")) {
--		its->domain = irq_domain_add_tree(NULL, &its_domain_ops, its);
--		if (!its->domain) {
-+	if (of_property_read_bool(node, "msi-controller")) {
-+		inner_domain = irq_domain_add_tree(NULL, &its_domain_ops, its);
-+		if (!inner_domain) {
- 			err = -ENOMEM;
- 			goto out_free_tables;
- 		}
- 
--		its->domain->parent = parent;
-+		inner_domain->parent = parent;
- 
--		its->msi_chip.domain = pci_msi_create_irq_domain(node,
--								 &its_pci_msi_domain_info,
--								 its->domain);
--		if (!its->msi_chip.domain) {
-+		its->domain = pci_msi_create_irq_domain(node,
-+							&its_pci_msi_domain_info,
-+							inner_domain);
-+		if (!its->domain) {
- 			err = -ENOMEM;
- 			goto out_free_domains;
- 		}
--
--		err = of_pci_msi_chip_add(&its->msi_chip);
--		if (err)
--			goto out_free_domains;
- 	}
- 
- 	spin_lock(&its_lock);
-@@ -1359,10 +1354,10 @@ static int its_probe(struct device_node *node, struct irq_domain *parent)
- 	return 0;
- 
- out_free_domains:
--	if (its->msi_chip.domain)
--		irq_domain_remove(its->msi_chip.domain);
- 	if (its->domain)
- 		irq_domain_remove(its->domain);
-+	if (inner_domain)
-+		irq_domain_remove(inner_domain);
- out_free_tables:
- 	its_free_tables(its);
- out_free_cmd:
-diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
-index 1c6dea2..7f073f0 100644
---- a/drivers/irqchip/irq-gic-v3.c
-+++ b/drivers/irqchip/irq-gic-v3.c
-@@ -524,9 +524,19 @@ static void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)
- 	isb();
- }
- 
-+#ifdef CONFIG_ARM_PARKING_PROTOCOL
-+static void gic_wakeup_parked_cpu(int cpu)
-+{
-+	gic_raise_softirq(cpumask_of(cpu), 0);
-+}
-+#endif
-+
- static void gic_smp_init(void)
- {
- 	set_smp_cross_call(gic_raise_softirq);
-+#ifdef CONFIG_ARM_PARKING_PROTOCOL
-+	set_smp_boot_wakeup_call(gic_wakeup_parked_cpu);
-+#endif
- 	register_cpu_notifier(&gic_cpu_notifier);
- }
- 
-diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
-index 4634cf7..d2df23b 100644
---- a/drivers/irqchip/irq-gic.c
-+++ b/drivers/irqchip/irq-gic.c
-@@ -33,12 +33,14 @@
- #include <linux/of.h>
- #include <linux/of_address.h>
- #include <linux/of_irq.h>
-+#include <linux/acpi.h>
- #include <linux/irqdomain.h>
- #include <linux/interrupt.h>
- #include <linux/percpu.h>
- #include <linux/slab.h>
- #include <linux/irqchip/chained_irq.h>
- #include <linux/irqchip/arm-gic.h>
-+#include <linux/irqchip/arm-gic-acpi.h>
- 
- #include <asm/cputype.h>
- #include <asm/irq.h>
-@@ -644,6 +646,13 @@ static void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)
- 
- 	raw_spin_unlock_irqrestore(&irq_controller_lock, flags);
- }
-+
-+#ifdef CONFIG_ARM_PARKING_PROTOCOL
-+static void gic_wakeup_parked_cpu(int cpu)
-+{
-+	gic_raise_softirq(cpumask_of(cpu), GIC_DIST_SOFTINT_NSATT);
-+}
-+#endif
- #endif
- 
- #ifdef CONFIG_BL_SWITCHER
-@@ -984,7 +993,10 @@ void __init gic_init_bases(unsigned int gic_nr, int irq_start,
- 		gic_irqs = 1020;
- 	gic->gic_irqs = gic_irqs;
- 
--	if (node) {		/* DT case */
-+	if (!acpi_disabled) {	/* ACPI case */
-+		gic->domain = irq_domain_add_linear(node, gic_irqs,
-+					    &gic_irq_domain_hierarchy_ops, gic);
-+	} else if (node) {	/* DT case */
- 		const struct irq_domain_ops *ops = &gic_irq_domain_hierarchy_ops;
- 
- 		if (!of_property_read_u32(node, "arm,routable-irqs",
-@@ -1028,6 +1040,9 @@ void __init gic_init_bases(unsigned int gic_nr, int irq_start,
- #ifdef CONFIG_SMP
- 		set_smp_cross_call(gic_raise_softirq);
- 		register_cpu_notifier(&gic_cpu_notifier);
-+#ifdef CONFIG_ARM_PARKING_PROTOCOL
-+		set_smp_boot_wakeup_call(gic_wakeup_parked_cpu);
-+#endif
- #endif
- 		set_handle_irq(gic_handle_irq);
- 	}
-@@ -1038,9 +1053,9 @@ void __init gic_init_bases(unsigned int gic_nr, int irq_start,
- 	gic_pm_init(gic);
- }
- 
--#ifdef CONFIG_OF
- static int gic_cnt __initdata;
- 
-+#ifdef CONFIG_OF
- static int __init
- gic_of_init(struct device_node *node, struct device_node *parent)
- {
-@@ -1086,3 +1101,109 @@ IRQCHIP_DECLARE(msm_8660_qgic, "qcom,msm-8660-qgic", gic_of_init);
- IRQCHIP_DECLARE(msm_qgic2, "qcom,msm-qgic2", gic_of_init);
- 
- #endif
-+
-+#ifdef CONFIG_ACPI
-+static phys_addr_t dist_phy_base, cpu_phy_base;
-+static int cpu_base_assigned;
-+
-+static int __init
-+gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header,
-+			const unsigned long end)
-+{
-+	struct acpi_madt_generic_interrupt *processor;
-+	phys_addr_t gic_cpu_base;
-+
-+	processor = (struct acpi_madt_generic_interrupt *)header;
-+
-+	if (BAD_MADT_ENTRY(processor, end))
-+		return -EINVAL;
-+
-+	/*
-+	 * There is no support for non-banked GICv1/2 register in ACPI spec.
-+	 * All CPU interface addresses have to be the same.
-+	 */
-+	gic_cpu_base = processor->base_address;
-+	if (cpu_base_assigned && gic_cpu_base != cpu_phy_base)
-+		return -EINVAL;
-+
-+	cpu_phy_base = gic_cpu_base;
-+	cpu_base_assigned = 1;
-+	return 0;
-+}
-+
-+static int __init
-+gic_acpi_parse_madt_distributor(struct acpi_subtable_header *header,
-+				const unsigned long end)
-+{
-+	struct acpi_madt_generic_distributor *dist;
-+
-+	dist = (struct acpi_madt_generic_distributor *)header;
-+
-+	if (BAD_MADT_ENTRY(dist, end))
-+		return -EINVAL;
-+
-+	dist_phy_base = dist->base_address;
-+	return 0;
-+}
-+
-+int __init
-+gic_v2_acpi_init(struct acpi_table_header *table, struct irq_domain **domain)
-+{
-+	void __iomem *cpu_base, *dist_base;
-+	int count;
-+
-+	/* Collect CPU base addresses */
-+	count = acpi_parse_entries(ACPI_SIG_MADT,
-+				   sizeof(struct acpi_table_madt),
-+				   gic_acpi_parse_madt_cpu, table,
-+				   ACPI_MADT_TYPE_GENERIC_INTERRUPT, 0);
-+	if (count <= 0) {
-+		pr_err("No valid GICC entries exist\n");
-+		return -EINVAL;
-+	}
-+
-+	/*
-+	 * Find distributor base address. We expect one distributor entry since
-+	 * ACPI 5.1 spec neither support multi-GIC instances nor GIC cascade.
-+	 */
-+	count = acpi_parse_entries(ACPI_SIG_MADT,
-+				   sizeof(struct acpi_table_madt),
-+				   gic_acpi_parse_madt_distributor, table,
-+				   ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR, 0);
-+	if (count <= 0) {
-+		pr_err("No valid GICD entries exist\n");
-+		return -EINVAL;
-+	} else if (count > 1) {
-+		pr_err("More than one GICD entry detected\n");
-+		return -EINVAL;
-+	}
-+
-+	cpu_base = ioremap(cpu_phy_base, ACPI_GIC_CPU_IF_MEM_SIZE);
-+	if (!cpu_base) {
-+		pr_err("Unable to map GICC registers\n");
-+		return -ENOMEM;
-+	}
-+
-+	dist_base = ioremap(dist_phy_base, ACPI_GICV2_DIST_MEM_SIZE);
-+	if (!dist_base) {
-+		pr_err("Unable to map GICD registers\n");
-+		iounmap(cpu_base);
-+		return -ENOMEM;
-+	}
-+
-+	gic_init_bases(gic_cnt, -1, dist_base, cpu_base, 0, NULL);
-+	*domain = gic_data[gic_cnt].domain;
-+
-+	if (!*domain) {
-+		pr_err("Unable to create domain\n");
-+		return -EFAULT;
-+	}
-+
-+	if (IS_ENABLED(CONFIG_ARM_GIC_V2M)) {
-+		gicv2m_acpi_init(table, gic_data[gic_cnt].domain);
-+	}
-+
-+	gic_cnt++;
-+	return 0;
-+}
-+#endif
-diff --git a/drivers/irqchip/irqchip.c b/drivers/irqchip/irqchip.c
-index 0fe2f71..5855240 100644
---- a/drivers/irqchip/irqchip.c
-+++ b/drivers/irqchip/irqchip.c
-@@ -8,6 +8,7 @@
-  * warranty of any kind, whether express or implied.
-  */
- 
-+#include <linux/acpi.h>
- #include <linux/init.h>
- #include <linux/of_irq.h>
- #include <linux/irqchip.h>
-@@ -26,4 +27,6 @@ extern struct of_device_id __irqchip_of_table[];
- void __init irqchip_init(void)
- {
- 	of_irq_init(__irqchip_of_table);
-+
-+	acpi_irq_init();
- }
-diff --git a/drivers/net/ethernet/amd/Makefile b/drivers/net/ethernet/amd/Makefile
-index a38a2dc..bf0cf2f 100644
---- a/drivers/net/ethernet/amd/Makefile
-+++ b/drivers/net/ethernet/amd/Makefile
-@@ -18,3 +18,4 @@ obj-$(CONFIG_PCNET32) += pcnet32.o
- obj-$(CONFIG_SUN3LANCE) += sun3lance.o
- obj-$(CONFIG_SUNLANCE) += sunlance.o
- obj-$(CONFIG_AMD_XGBE) += xgbe/
-+obj-$(CONFIG_AMD_XGBE) += xgbe-a0/
-diff --git a/drivers/net/ethernet/amd/xgbe-a0/Makefile b/drivers/net/ethernet/amd/xgbe-a0/Makefile
-new file mode 100644
-index 0000000..561116f
---- /dev/null
-+++ b/drivers/net/ethernet/amd/xgbe-a0/Makefile
-@@ -0,0 +1,8 @@
-+obj-$(CONFIG_AMD_XGBE) += amd-xgbe-a0.o
-+
-+amd-xgbe-a0-objs := xgbe-main.o xgbe-drv.o xgbe-dev.o \
-+		 xgbe-desc.o xgbe-ethtool.o xgbe-mdio.o \
-+		 xgbe-ptp.o
-+
-+amd-xgbe-a0-$(CONFIG_AMD_XGBE_DCB) += xgbe-dcb.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
-new file mode 100644
-index 0000000..75b08c6
---- /dev/null
-+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-common.h
-@@ -0,0 +1,1142 @@
-+/*
-+ * AMD 10Gb Ethernet driver
-+ *
-+ * This file is available to you under your choice of the following two
-+ * licenses:
-+ *
-+ * License 1: GPLv2
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ *
-+ * This file is free software; you may copy, redistribute and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 2 of the License, or (at
-+ * your option) any later version.
-+ *
-+ * This file is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ *
-+ * License 2: Modified BSD
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above copyright
-+ *       notice, this list of conditions and the following disclaimer in the
-+ *       documentation and/or other materials provided with the distribution.
-+ *     * Neither the name of Advanced Micro Devices, Inc. nor the
-+ *       names of its contributors may be used to endorse or promote products
-+ *       derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#ifndef __XGBE_COMMON_H__
-+#define __XGBE_COMMON_H__
-+
-+/* DMA register offsets */
-+#define DMA_MR				0x3000
-+#define DMA_SBMR			0x3004
-+#define DMA_ISR				0x3008
-+#define DMA_AXIARCR			0x3010
-+#define DMA_AXIAWCR			0x3018
-+#define DMA_DSR0			0x3020
-+#define DMA_DSR1			0x3024
-+
-+/* DMA register entry bit positions and sizes */
-+#define DMA_AXIARCR_DRC_INDEX		0
-+#define DMA_AXIARCR_DRC_WIDTH		4
-+#define DMA_AXIARCR_DRD_INDEX		4
-+#define DMA_AXIARCR_DRD_WIDTH		2
-+#define DMA_AXIARCR_TEC_INDEX		8
-+#define DMA_AXIARCR_TEC_WIDTH		4
-+#define DMA_AXIARCR_TED_INDEX		12
-+#define DMA_AXIARCR_TED_WIDTH		2
-+#define DMA_AXIARCR_THC_INDEX		16
-+#define DMA_AXIARCR_THC_WIDTH		4
-+#define DMA_AXIARCR_THD_INDEX		20
-+#define DMA_AXIARCR_THD_WIDTH		2
-+#define DMA_AXIAWCR_DWC_INDEX		0
-+#define DMA_AXIAWCR_DWC_WIDTH		4
-+#define DMA_AXIAWCR_DWD_INDEX		4
-+#define DMA_AXIAWCR_DWD_WIDTH		2
-+#define DMA_AXIAWCR_RPC_INDEX		8
-+#define DMA_AXIAWCR_RPC_WIDTH		4
-+#define DMA_AXIAWCR_RPD_INDEX		12
-+#define DMA_AXIAWCR_RPD_WIDTH		2
-+#define DMA_AXIAWCR_RHC_INDEX		16
-+#define DMA_AXIAWCR_RHC_WIDTH		4
-+#define DMA_AXIAWCR_RHD_INDEX		20
-+#define DMA_AXIAWCR_RHD_WIDTH		2
-+#define DMA_AXIAWCR_TDC_INDEX		24
-+#define DMA_AXIAWCR_TDC_WIDTH		4
-+#define DMA_AXIAWCR_TDD_INDEX		28
-+#define DMA_AXIAWCR_TDD_WIDTH		2
-+#define DMA_ISR_MACIS_INDEX		17
-+#define DMA_ISR_MACIS_WIDTH		1
-+#define DMA_ISR_MTLIS_INDEX		16
-+#define DMA_ISR_MTLIS_WIDTH		1
-+#define DMA_MR_SWR_INDEX		0
-+#define DMA_MR_SWR_WIDTH		1
-+#define DMA_SBMR_EAME_INDEX		11
-+#define DMA_SBMR_EAME_WIDTH		1
-+#define DMA_SBMR_BLEN_256_INDEX		7
-+#define DMA_SBMR_BLEN_256_WIDTH		1
-+#define DMA_SBMR_UNDEF_INDEX		0
-+#define DMA_SBMR_UNDEF_WIDTH		1
-+
-+/* DMA register values */
-+#define DMA_DSR_RPS_WIDTH		4
-+#define DMA_DSR_TPS_WIDTH		4
-+#define DMA_DSR_Q_WIDTH			(DMA_DSR_RPS_WIDTH + DMA_DSR_TPS_WIDTH)
-+#define DMA_DSR0_RPS_START		8
-+#define DMA_DSR0_TPS_START		12
-+#define DMA_DSRX_FIRST_QUEUE		3
-+#define DMA_DSRX_INC			4
-+#define DMA_DSRX_QPR			4
-+#define DMA_DSRX_RPS_START		0
-+#define DMA_DSRX_TPS_START		4
-+#define DMA_TPS_STOPPED			0x00
-+#define DMA_TPS_SUSPENDED		0x06
-+
-+/* DMA channel register offsets
-+ *   Multiple channels can be active.  The first channel has registers
-+ *   that begin at 0x3100.  Each subsequent channel has registers that
-+ *   are accessed using an offset of 0x80 from the previous channel.
-+ */
-+#define DMA_CH_BASE			0x3100
-+#define DMA_CH_INC			0x80
-+
-+#define DMA_CH_CR			0x00
-+#define DMA_CH_TCR			0x04
-+#define DMA_CH_RCR			0x08
-+#define DMA_CH_TDLR_HI			0x10
-+#define DMA_CH_TDLR_LO			0x14
-+#define DMA_CH_RDLR_HI			0x18
-+#define DMA_CH_RDLR_LO			0x1c
-+#define DMA_CH_TDTR_LO			0x24
-+#define DMA_CH_RDTR_LO			0x2c
-+#define DMA_CH_TDRLR			0x30
-+#define DMA_CH_RDRLR			0x34
-+#define DMA_CH_IER			0x38
-+#define DMA_CH_RIWT			0x3c
-+#define DMA_CH_CATDR_LO			0x44
-+#define DMA_CH_CARDR_LO			0x4c
-+#define DMA_CH_CATBR_HI			0x50
-+#define DMA_CH_CATBR_LO			0x54
-+#define DMA_CH_CARBR_HI			0x58
-+#define DMA_CH_CARBR_LO			0x5c
-+#define DMA_CH_SR			0x60
-+
-+/* DMA channel register entry bit positions and sizes */
-+#define DMA_CH_CR_PBLX8_INDEX		16
-+#define DMA_CH_CR_PBLX8_WIDTH		1
-+#define DMA_CH_CR_SPH_INDEX		24
-+#define DMA_CH_CR_SPH_WIDTH		1
-+#define DMA_CH_IER_AIE_INDEX		15
-+#define DMA_CH_IER_AIE_WIDTH		1
-+#define DMA_CH_IER_FBEE_INDEX		12
-+#define DMA_CH_IER_FBEE_WIDTH		1
-+#define DMA_CH_IER_NIE_INDEX		16
-+#define DMA_CH_IER_NIE_WIDTH		1
-+#define DMA_CH_IER_RBUE_INDEX		7
-+#define DMA_CH_IER_RBUE_WIDTH		1
-+#define DMA_CH_IER_RIE_INDEX		6
-+#define DMA_CH_IER_RIE_WIDTH		1
-+#define DMA_CH_IER_RSE_INDEX		8
-+#define DMA_CH_IER_RSE_WIDTH		1
-+#define DMA_CH_IER_TBUE_INDEX		2
-+#define DMA_CH_IER_TBUE_WIDTH		1
-+#define DMA_CH_IER_TIE_INDEX		0
-+#define DMA_CH_IER_TIE_WIDTH		1
-+#define DMA_CH_IER_TXSE_INDEX		1
-+#define DMA_CH_IER_TXSE_WIDTH		1
-+#define DMA_CH_RCR_PBL_INDEX		16
-+#define DMA_CH_RCR_PBL_WIDTH		6
-+#define DMA_CH_RCR_RBSZ_INDEX		1
-+#define DMA_CH_RCR_RBSZ_WIDTH		14
-+#define DMA_CH_RCR_SR_INDEX		0
-+#define DMA_CH_RCR_SR_WIDTH		1
-+#define DMA_CH_RIWT_RWT_INDEX		0
-+#define DMA_CH_RIWT_RWT_WIDTH		8
-+#define DMA_CH_SR_FBE_INDEX		12
-+#define DMA_CH_SR_FBE_WIDTH		1
-+#define DMA_CH_SR_RBU_INDEX		7
-+#define DMA_CH_SR_RBU_WIDTH		1
-+#define DMA_CH_SR_RI_INDEX		6
-+#define DMA_CH_SR_RI_WIDTH		1
-+#define DMA_CH_SR_RPS_INDEX		8
-+#define DMA_CH_SR_RPS_WIDTH		1
-+#define DMA_CH_SR_TBU_INDEX		2
-+#define DMA_CH_SR_TBU_WIDTH		1
-+#define DMA_CH_SR_TI_INDEX		0
-+#define DMA_CH_SR_TI_WIDTH		1
-+#define DMA_CH_SR_TPS_INDEX		1
-+#define DMA_CH_SR_TPS_WIDTH		1
-+#define DMA_CH_TCR_OSP_INDEX		4
-+#define DMA_CH_TCR_OSP_WIDTH		1
-+#define DMA_CH_TCR_PBL_INDEX		16
-+#define DMA_CH_TCR_PBL_WIDTH		6
-+#define DMA_CH_TCR_ST_INDEX		0
-+#define DMA_CH_TCR_ST_WIDTH		1
-+#define DMA_CH_TCR_TSE_INDEX		12
-+#define DMA_CH_TCR_TSE_WIDTH		1
-+
-+/* DMA channel register values */
-+#define DMA_OSP_DISABLE			0x00
-+#define DMA_OSP_ENABLE			0x01
-+#define DMA_PBL_1			1
-+#define DMA_PBL_2			2
-+#define DMA_PBL_4			4
-+#define DMA_PBL_8			8
-+#define DMA_PBL_16			16
-+#define DMA_PBL_32			32
-+#define DMA_PBL_64			64      /* 8 x 8 */
-+#define DMA_PBL_128			128     /* 8 x 16 */
-+#define DMA_PBL_256			256     /* 8 x 32 */
-+#define DMA_PBL_X8_DISABLE		0x00
-+#define DMA_PBL_X8_ENABLE		0x01
-+
-+/* MAC register offsets */
-+#define MAC_TCR				0x0000
-+#define MAC_RCR				0x0004
-+#define MAC_PFR				0x0008
-+#define MAC_WTR				0x000c
-+#define MAC_HTR0			0x0010
-+#define MAC_VLANTR			0x0050
-+#define MAC_VLANHTR			0x0058
-+#define MAC_VLANIR			0x0060
-+#define MAC_IVLANIR			0x0064
-+#define MAC_RETMR			0x006c
-+#define MAC_Q0TFCR			0x0070
-+#define MAC_RFCR			0x0090
-+#define MAC_RQC0R			0x00a0
-+#define MAC_RQC1R			0x00a4
-+#define MAC_RQC2R			0x00a8
-+#define MAC_RQC3R			0x00ac
-+#define MAC_ISR				0x00b0
-+#define MAC_IER				0x00b4
-+#define MAC_RTSR			0x00b8
-+#define MAC_PMTCSR			0x00c0
-+#define MAC_RWKPFR			0x00c4
-+#define MAC_LPICSR			0x00d0
-+#define MAC_LPITCR			0x00d4
-+#define MAC_VR				0x0110
-+#define MAC_DR				0x0114
-+#define MAC_HWF0R			0x011c
-+#define MAC_HWF1R			0x0120
-+#define MAC_HWF2R			0x0124
-+#define MAC_GPIOCR			0x0278
-+#define MAC_GPIOSR			0x027c
-+#define MAC_MACA0HR			0x0300
-+#define MAC_MACA0LR			0x0304
-+#define MAC_MACA1HR			0x0308
-+#define MAC_MACA1LR			0x030c
-+#define MAC_RSSCR			0x0c80
-+#define MAC_RSSAR			0x0c88
-+#define MAC_RSSDR			0x0c8c
-+#define MAC_TSCR			0x0d00
-+#define MAC_SSIR			0x0d04
-+#define MAC_STSR			0x0d08
-+#define MAC_STNR			0x0d0c
-+#define MAC_STSUR			0x0d10
-+#define MAC_STNUR			0x0d14
-+#define MAC_TSAR			0x0d18
-+#define MAC_TSSR			0x0d20
-+#define MAC_TXSNR			0x0d30
-+#define MAC_TXSSR			0x0d34
-+
-+#define MAC_QTFCR_INC			4
-+#define MAC_MACA_INC			4
-+#define MAC_HTR_INC			4
-+
-+#define MAC_RQC2_INC			4
-+#define MAC_RQC2_Q_PER_REG		4
-+
-+/* MAC register entry bit positions and sizes */
-+#define MAC_HWF0R_ADDMACADRSEL_INDEX	18
-+#define MAC_HWF0R_ADDMACADRSEL_WIDTH	5
-+#define MAC_HWF0R_ARPOFFSEL_INDEX	9
-+#define MAC_HWF0R_ARPOFFSEL_WIDTH	1
-+#define MAC_HWF0R_EEESEL_INDEX		13
-+#define MAC_HWF0R_EEESEL_WIDTH		1
-+#define MAC_HWF0R_GMIISEL_INDEX		1
-+#define MAC_HWF0R_GMIISEL_WIDTH		1
-+#define MAC_HWF0R_MGKSEL_INDEX		7
-+#define MAC_HWF0R_MGKSEL_WIDTH		1
-+#define MAC_HWF0R_MMCSEL_INDEX		8
-+#define MAC_HWF0R_MMCSEL_WIDTH		1
-+#define MAC_HWF0R_RWKSEL_INDEX		6
-+#define MAC_HWF0R_RWKSEL_WIDTH		1
-+#define MAC_HWF0R_RXCOESEL_INDEX	16
-+#define MAC_HWF0R_RXCOESEL_WIDTH	1
-+#define MAC_HWF0R_SAVLANINS_INDEX	27
-+#define MAC_HWF0R_SAVLANINS_WIDTH	1
-+#define MAC_HWF0R_SMASEL_INDEX		5
-+#define MAC_HWF0R_SMASEL_WIDTH		1
-+#define MAC_HWF0R_TSSEL_INDEX		12
-+#define MAC_HWF0R_TSSEL_WIDTH		1
-+#define MAC_HWF0R_TSSTSSEL_INDEX	25
-+#define MAC_HWF0R_TSSTSSEL_WIDTH	2
-+#define MAC_HWF0R_TXCOESEL_INDEX	14
-+#define MAC_HWF0R_TXCOESEL_WIDTH	1
-+#define MAC_HWF0R_VLHASH_INDEX		4
-+#define MAC_HWF0R_VLHASH_WIDTH		1
-+#define MAC_HWF1R_ADVTHWORD_INDEX	13
-+#define MAC_HWF1R_ADVTHWORD_WIDTH	1
-+#define MAC_HWF1R_DBGMEMA_INDEX		19
-+#define MAC_HWF1R_DBGMEMA_WIDTH		1
-+#define MAC_HWF1R_DCBEN_INDEX		16
-+#define MAC_HWF1R_DCBEN_WIDTH		1
-+#define MAC_HWF1R_HASHTBLSZ_INDEX	24
-+#define MAC_HWF1R_HASHTBLSZ_WIDTH	3
-+#define MAC_HWF1R_L3L4FNUM_INDEX	27
-+#define MAC_HWF1R_L3L4FNUM_WIDTH	4
-+#define MAC_HWF1R_NUMTC_INDEX		21
-+#define MAC_HWF1R_NUMTC_WIDTH		3
-+#define MAC_HWF1R_RSSEN_INDEX		20
-+#define MAC_HWF1R_RSSEN_WIDTH		1
-+#define MAC_HWF1R_RXFIFOSIZE_INDEX	0
-+#define MAC_HWF1R_RXFIFOSIZE_WIDTH	5
-+#define MAC_HWF1R_SPHEN_INDEX		17
-+#define MAC_HWF1R_SPHEN_WIDTH		1
-+#define MAC_HWF1R_TSOEN_INDEX		18
-+#define MAC_HWF1R_TSOEN_WIDTH		1
-+#define MAC_HWF1R_TXFIFOSIZE_INDEX	6
-+#define MAC_HWF1R_TXFIFOSIZE_WIDTH	5
-+#define MAC_HWF2R_AUXSNAPNUM_INDEX	28
-+#define MAC_HWF2R_AUXSNAPNUM_WIDTH	3
-+#define MAC_HWF2R_PPSOUTNUM_INDEX	24
-+#define MAC_HWF2R_PPSOUTNUM_WIDTH	3
-+#define MAC_HWF2R_RXCHCNT_INDEX		12
-+#define MAC_HWF2R_RXCHCNT_WIDTH		4
-+#define MAC_HWF2R_RXQCNT_INDEX		0
-+#define MAC_HWF2R_RXQCNT_WIDTH		4
-+#define MAC_HWF2R_TXCHCNT_INDEX		18
-+#define MAC_HWF2R_TXCHCNT_WIDTH		4
-+#define MAC_HWF2R_TXQCNT_INDEX		6
-+#define MAC_HWF2R_TXQCNT_WIDTH		4
-+#define MAC_IER_TSIE_INDEX		12
-+#define MAC_IER_TSIE_WIDTH		1
-+#define MAC_ISR_MMCRXIS_INDEX		9
-+#define MAC_ISR_MMCRXIS_WIDTH		1
-+#define MAC_ISR_MMCTXIS_INDEX		10
-+#define MAC_ISR_MMCTXIS_WIDTH		1
-+#define MAC_ISR_PMTIS_INDEX		4
-+#define MAC_ISR_PMTIS_WIDTH		1
-+#define MAC_ISR_TSIS_INDEX		12
-+#define MAC_ISR_TSIS_WIDTH		1
-+#define MAC_MACA1HR_AE_INDEX		31
-+#define MAC_MACA1HR_AE_WIDTH		1
-+#define MAC_PFR_HMC_INDEX		2
-+#define MAC_PFR_HMC_WIDTH		1
-+#define MAC_PFR_HPF_INDEX		10
-+#define MAC_PFR_HPF_WIDTH		1
-+#define MAC_PFR_HUC_INDEX		1
-+#define MAC_PFR_HUC_WIDTH		1
-+#define MAC_PFR_PM_INDEX		4
-+#define MAC_PFR_PM_WIDTH		1
-+#define MAC_PFR_PR_INDEX		0
-+#define MAC_PFR_PR_WIDTH		1
-+#define MAC_PFR_VTFE_INDEX		16
-+#define MAC_PFR_VTFE_WIDTH		1
-+#define MAC_PMTCSR_MGKPKTEN_INDEX	1
-+#define MAC_PMTCSR_MGKPKTEN_WIDTH	1
-+#define MAC_PMTCSR_PWRDWN_INDEX		0
-+#define MAC_PMTCSR_PWRDWN_WIDTH		1
-+#define MAC_PMTCSR_RWKFILTRST_INDEX	31
-+#define MAC_PMTCSR_RWKFILTRST_WIDTH	1
-+#define MAC_PMTCSR_RWKPKTEN_INDEX	2
-+#define MAC_PMTCSR_RWKPKTEN_WIDTH	1
-+#define MAC_Q0TFCR_PT_INDEX		16
-+#define MAC_Q0TFCR_PT_WIDTH		16
-+#define MAC_Q0TFCR_TFE_INDEX		1
-+#define MAC_Q0TFCR_TFE_WIDTH		1
-+#define MAC_RCR_ACS_INDEX		1
-+#define MAC_RCR_ACS_WIDTH		1
-+#define MAC_RCR_CST_INDEX		2
-+#define MAC_RCR_CST_WIDTH		1
-+#define MAC_RCR_DCRCC_INDEX		3
-+#define MAC_RCR_DCRCC_WIDTH		1
-+#define MAC_RCR_HDSMS_INDEX		12
-+#define MAC_RCR_HDSMS_WIDTH		3
-+#define MAC_RCR_IPC_INDEX		9
-+#define MAC_RCR_IPC_WIDTH		1
-+#define MAC_RCR_JE_INDEX		8
-+#define MAC_RCR_JE_WIDTH		1
-+#define MAC_RCR_LM_INDEX		10
-+#define MAC_RCR_LM_WIDTH		1
-+#define MAC_RCR_RE_INDEX		0
-+#define MAC_RCR_RE_WIDTH		1
-+#define MAC_RFCR_PFCE_INDEX		8
-+#define MAC_RFCR_PFCE_WIDTH		1
-+#define MAC_RFCR_RFE_INDEX		0
-+#define MAC_RFCR_RFE_WIDTH		1
-+#define MAC_RFCR_UP_INDEX		1
-+#define MAC_RFCR_UP_WIDTH		1
-+#define MAC_RQC0R_RXQ0EN_INDEX		0
-+#define MAC_RQC0R_RXQ0EN_WIDTH		2
-+#define MAC_RSSAR_ADDRT_INDEX		2
-+#define MAC_RSSAR_ADDRT_WIDTH		1
-+#define MAC_RSSAR_CT_INDEX		1
-+#define MAC_RSSAR_CT_WIDTH		1
-+#define MAC_RSSAR_OB_INDEX		0
-+#define MAC_RSSAR_OB_WIDTH		1
-+#define MAC_RSSAR_RSSIA_INDEX		8
-+#define MAC_RSSAR_RSSIA_WIDTH		8
-+#define MAC_RSSCR_IP2TE_INDEX		1
-+#define MAC_RSSCR_IP2TE_WIDTH		1
-+#define MAC_RSSCR_RSSE_INDEX		0
-+#define MAC_RSSCR_RSSE_WIDTH		1
-+#define MAC_RSSCR_TCP4TE_INDEX		2
-+#define MAC_RSSCR_TCP4TE_WIDTH		1
-+#define MAC_RSSCR_UDP4TE_INDEX		3
-+#define MAC_RSSCR_UDP4TE_WIDTH		1
-+#define MAC_RSSDR_DMCH_INDEX		0
-+#define MAC_RSSDR_DMCH_WIDTH		4
-+#define MAC_SSIR_SNSINC_INDEX		8
-+#define MAC_SSIR_SNSINC_WIDTH		8
-+#define MAC_SSIR_SSINC_INDEX		16
-+#define MAC_SSIR_SSINC_WIDTH		8
-+#define MAC_TCR_SS_INDEX		29
-+#define MAC_TCR_SS_WIDTH		2
-+#define MAC_TCR_TE_INDEX		0
-+#define MAC_TCR_TE_WIDTH		1
-+#define MAC_TSCR_AV8021ASMEN_INDEX	28
-+#define MAC_TSCR_AV8021ASMEN_WIDTH	1
-+#define MAC_TSCR_SNAPTYPSEL_INDEX	16
-+#define MAC_TSCR_SNAPTYPSEL_WIDTH	2
-+#define MAC_TSCR_TSADDREG_INDEX		5
-+#define MAC_TSCR_TSADDREG_WIDTH		1
-+#define MAC_TSCR_TSCFUPDT_INDEX		1
-+#define MAC_TSCR_TSCFUPDT_WIDTH		1
-+#define MAC_TSCR_TSCTRLSSR_INDEX	9
-+#define MAC_TSCR_TSCTRLSSR_WIDTH	1
-+#define MAC_TSCR_TSENA_INDEX		0
-+#define MAC_TSCR_TSENA_WIDTH		1
-+#define MAC_TSCR_TSENALL_INDEX		8
-+#define MAC_TSCR_TSENALL_WIDTH		1
-+#define MAC_TSCR_TSEVNTENA_INDEX	14
-+#define MAC_TSCR_TSEVNTENA_WIDTH	1
-+#define MAC_TSCR_TSINIT_INDEX		2
-+#define MAC_TSCR_TSINIT_WIDTH		1
-+#define MAC_TSCR_TSIPENA_INDEX		11
-+#define MAC_TSCR_TSIPENA_WIDTH		1
-+#define MAC_TSCR_TSIPV4ENA_INDEX	13
-+#define MAC_TSCR_TSIPV4ENA_WIDTH	1
-+#define MAC_TSCR_TSIPV6ENA_INDEX	12
-+#define MAC_TSCR_TSIPV6ENA_WIDTH	1
-+#define MAC_TSCR_TSMSTRENA_INDEX	15
-+#define MAC_TSCR_TSMSTRENA_WIDTH	1
-+#define MAC_TSCR_TSVER2ENA_INDEX	10
-+#define MAC_TSCR_TSVER2ENA_WIDTH	1
-+#define MAC_TSCR_TXTSSTSM_INDEX		24
-+#define MAC_TSCR_TXTSSTSM_WIDTH		1
-+#define MAC_TSSR_TXTSC_INDEX		15
-+#define MAC_TSSR_TXTSC_WIDTH		1
-+#define MAC_TXSNR_TXTSSTSMIS_INDEX	31
-+#define MAC_TXSNR_TXTSSTSMIS_WIDTH	1
-+#define MAC_VLANHTR_VLHT_INDEX		0
-+#define MAC_VLANHTR_VLHT_WIDTH		16
-+#define MAC_VLANIR_VLTI_INDEX		20
-+#define MAC_VLANIR_VLTI_WIDTH		1
-+#define MAC_VLANIR_CSVL_INDEX		19
-+#define MAC_VLANIR_CSVL_WIDTH		1
-+#define MAC_VLANTR_DOVLTC_INDEX		20
-+#define MAC_VLANTR_DOVLTC_WIDTH		1
-+#define MAC_VLANTR_ERSVLM_INDEX		19
-+#define MAC_VLANTR_ERSVLM_WIDTH		1
-+#define MAC_VLANTR_ESVL_INDEX		18
-+#define MAC_VLANTR_ESVL_WIDTH		1
-+#define MAC_VLANTR_ETV_INDEX		16
-+#define MAC_VLANTR_ETV_WIDTH		1
-+#define MAC_VLANTR_EVLS_INDEX		21
-+#define MAC_VLANTR_EVLS_WIDTH		2
-+#define MAC_VLANTR_EVLRXS_INDEX		24
-+#define MAC_VLANTR_EVLRXS_WIDTH		1
-+#define MAC_VLANTR_VL_INDEX		0
-+#define MAC_VLANTR_VL_WIDTH		16
-+#define MAC_VLANTR_VTHM_INDEX		25
-+#define MAC_VLANTR_VTHM_WIDTH		1
-+#define MAC_VLANTR_VTIM_INDEX		17
-+#define MAC_VLANTR_VTIM_WIDTH		1
-+#define MAC_VR_DEVID_INDEX		8
-+#define MAC_VR_DEVID_WIDTH		8
-+#define MAC_VR_SNPSVER_INDEX		0
-+#define MAC_VR_SNPSVER_WIDTH		8
-+#define MAC_VR_USERVER_INDEX		16
-+#define MAC_VR_USERVER_WIDTH		8
-+
-+/* MMC register offsets */
-+#define MMC_CR				0x0800
-+#define MMC_RISR			0x0804
-+#define MMC_TISR			0x0808
-+#define MMC_RIER			0x080c
-+#define MMC_TIER			0x0810
-+#define MMC_TXOCTETCOUNT_GB_LO		0x0814
-+#define MMC_TXOCTETCOUNT_GB_HI		0x0818
-+#define MMC_TXFRAMECOUNT_GB_LO		0x081c
-+#define MMC_TXFRAMECOUNT_GB_HI		0x0820
-+#define MMC_TXBROADCASTFRAMES_G_LO	0x0824
-+#define MMC_TXBROADCASTFRAMES_G_HI	0x0828
-+#define MMC_TXMULTICASTFRAMES_G_LO	0x082c
-+#define MMC_TXMULTICASTFRAMES_G_HI	0x0830
-+#define MMC_TX64OCTETS_GB_LO		0x0834
-+#define MMC_TX64OCTETS_GB_HI		0x0838
-+#define MMC_TX65TO127OCTETS_GB_LO	0x083c
-+#define MMC_TX65TO127OCTETS_GB_HI	0x0840
-+#define MMC_TX128TO255OCTETS_GB_LO	0x0844
-+#define MMC_TX128TO255OCTETS_GB_HI	0x0848
-+#define MMC_TX256TO511OCTETS_GB_LO	0x084c
-+#define MMC_TX256TO511OCTETS_GB_HI	0x0850
-+#define MMC_TX512TO1023OCTETS_GB_LO	0x0854
-+#define MMC_TX512TO1023OCTETS_GB_HI	0x0858
-+#define MMC_TX1024TOMAXOCTETS_GB_LO	0x085c
-+#define MMC_TX1024TOMAXOCTETS_GB_HI	0x0860
-+#define MMC_TXUNICASTFRAMES_GB_LO	0x0864
-+#define MMC_TXUNICASTFRAMES_GB_HI	0x0868
-+#define MMC_TXMULTICASTFRAMES_GB_LO	0x086c
-+#define MMC_TXMULTICASTFRAMES_GB_HI	0x0870
-+#define MMC_TXBROADCASTFRAMES_GB_LO	0x0874
-+#define MMC_TXBROADCASTFRAMES_GB_HI	0x0878
-+#define MMC_TXUNDERFLOWERROR_LO		0x087c
-+#define MMC_TXUNDERFLOWERROR_HI		0x0880
-+#define MMC_TXOCTETCOUNT_G_LO		0x0884
-+#define MMC_TXOCTETCOUNT_G_HI		0x0888
-+#define MMC_TXFRAMECOUNT_G_LO		0x088c
-+#define MMC_TXFRAMECOUNT_G_HI		0x0890
-+#define MMC_TXPAUSEFRAMES_LO		0x0894
-+#define MMC_TXPAUSEFRAMES_HI		0x0898
-+#define MMC_TXVLANFRAMES_G_LO		0x089c
-+#define MMC_TXVLANFRAMES_G_HI		0x08a0
-+#define MMC_RXFRAMECOUNT_GB_LO		0x0900
-+#define MMC_RXFRAMECOUNT_GB_HI		0x0904
-+#define MMC_RXOCTETCOUNT_GB_LO		0x0908
-+#define MMC_RXOCTETCOUNT_GB_HI		0x090c
-+#define MMC_RXOCTETCOUNT_G_LO		0x0910
-+#define MMC_RXOCTETCOUNT_G_HI		0x0914
-+#define MMC_RXBROADCASTFRAMES_G_LO	0x0918
-+#define MMC_RXBROADCASTFRAMES_G_HI	0x091c
-+#define MMC_RXMULTICASTFRAMES_G_LO	0x0920
-+#define MMC_RXMULTICASTFRAMES_G_HI	0x0924
-+#define MMC_RXCRCERROR_LO		0x0928
-+#define MMC_RXCRCERROR_HI		0x092c
-+#define MMC_RXRUNTERROR			0x0930
-+#define MMC_RXJABBERERROR		0x0934
-+#define MMC_RXUNDERSIZE_G		0x0938
-+#define MMC_RXOVERSIZE_G		0x093c
-+#define MMC_RX64OCTETS_GB_LO		0x0940
-+#define MMC_RX64OCTETS_GB_HI		0x0944
-+#define MMC_RX65TO127OCTETS_GB_LO	0x0948
-+#define MMC_RX65TO127OCTETS_GB_HI	0x094c
-+#define MMC_RX128TO255OCTETS_GB_LO	0x0950
-+#define MMC_RX128TO255OCTETS_GB_HI	0x0954
-+#define MMC_RX256TO511OCTETS_GB_LO	0x0958
-+#define MMC_RX256TO511OCTETS_GB_HI	0x095c
-+#define MMC_RX512TO1023OCTETS_GB_LO	0x0960
-+#define MMC_RX512TO1023OCTETS_GB_HI	0x0964
-+#define MMC_RX1024TOMAXOCTETS_GB_LO	0x0968
-+#define MMC_RX1024TOMAXOCTETS_GB_HI	0x096c
-+#define MMC_RXUNICASTFRAMES_G_LO	0x0970
-+#define MMC_RXUNICASTFRAMES_G_HI	0x0974
-+#define MMC_RXLENGTHERROR_LO		0x0978
-+#define MMC_RXLENGTHERROR_HI		0x097c
-+#define MMC_RXOUTOFRANGETYPE_LO		0x0980
-+#define MMC_RXOUTOFRANGETYPE_HI		0x0984
-+#define MMC_RXPAUSEFRAMES_LO		0x0988
-+#define MMC_RXPAUSEFRAMES_HI		0x098c
-+#define MMC_RXFIFOOVERFLOW_LO		0x0990
-+#define MMC_RXFIFOOVERFLOW_HI		0x0994
-+#define MMC_RXVLANFRAMES_GB_LO		0x0998
-+#define MMC_RXVLANFRAMES_GB_HI		0x099c
-+#define MMC_RXWATCHDOGERROR		0x09a0
-+
-+/* MMC register entry bit positions and sizes */
-+#define MMC_CR_CR_INDEX				0
-+#define MMC_CR_CR_WIDTH				1
-+#define MMC_CR_CSR_INDEX			1
-+#define MMC_CR_CSR_WIDTH			1
-+#define MMC_CR_ROR_INDEX			2
-+#define MMC_CR_ROR_WIDTH			1
-+#define MMC_CR_MCF_INDEX			3
-+#define MMC_CR_MCF_WIDTH			1
-+#define MMC_CR_MCT_INDEX			4
-+#define MMC_CR_MCT_WIDTH			2
-+#define MMC_RIER_ALL_INTERRUPTS_INDEX		0
-+#define MMC_RIER_ALL_INTERRUPTS_WIDTH		23
-+#define MMC_RISR_RXFRAMECOUNT_GB_INDEX		0
-+#define MMC_RISR_RXFRAMECOUNT_GB_WIDTH		1
-+#define MMC_RISR_RXOCTETCOUNT_GB_INDEX		1
-+#define MMC_RISR_RXOCTETCOUNT_GB_WIDTH		1
-+#define MMC_RISR_RXOCTETCOUNT_G_INDEX		2
-+#define MMC_RISR_RXOCTETCOUNT_G_WIDTH		1
-+#define MMC_RISR_RXBROADCASTFRAMES_G_INDEX	3
-+#define MMC_RISR_RXBROADCASTFRAMES_G_WIDTH	1
-+#define MMC_RISR_RXMULTICASTFRAMES_G_INDEX	4
-+#define MMC_RISR_RXMULTICASTFRAMES_G_WIDTH	1
-+#define MMC_RISR_RXCRCERROR_INDEX		5
-+#define MMC_RISR_RXCRCERROR_WIDTH		1
-+#define MMC_RISR_RXRUNTERROR_INDEX		6
-+#define MMC_RISR_RXRUNTERROR_WIDTH		1
-+#define MMC_RISR_RXJABBERERROR_INDEX		7
-+#define MMC_RISR_RXJABBERERROR_WIDTH		1
-+#define MMC_RISR_RXUNDERSIZE_G_INDEX		8
-+#define MMC_RISR_RXUNDERSIZE_G_WIDTH		1
-+#define MMC_RISR_RXOVERSIZE_G_INDEX		9
-+#define MMC_RISR_RXOVERSIZE_G_WIDTH		1
-+#define MMC_RISR_RX64OCTETS_GB_INDEX		10
-+#define MMC_RISR_RX64OCTETS_GB_WIDTH		1
-+#define MMC_RISR_RX65TO127OCTETS_GB_INDEX	11
-+#define MMC_RISR_RX65TO127OCTETS_GB_WIDTH	1
-+#define MMC_RISR_RX128TO255OCTETS_GB_INDEX	12
-+#define MMC_RISR_RX128TO255OCTETS_GB_WIDTH	1
-+#define MMC_RISR_RX256TO511OCTETS_GB_INDEX	13
-+#define MMC_RISR_RX256TO511OCTETS_GB_WIDTH	1
-+#define MMC_RISR_RX512TO1023OCTETS_GB_INDEX	14
-+#define MMC_RISR_RX512TO1023OCTETS_GB_WIDTH	1
-+#define MMC_RISR_RX1024TOMAXOCTETS_GB_INDEX	15
-+#define MMC_RISR_RX1024TOMAXOCTETS_GB_WIDTH	1
-+#define MMC_RISR_RXUNICASTFRAMES_G_INDEX	16
-+#define MMC_RISR_RXUNICASTFRAMES_G_WIDTH	1
-+#define MMC_RISR_RXLENGTHERROR_INDEX		17
-+#define MMC_RISR_RXLENGTHERROR_WIDTH		1
-+#define MMC_RISR_RXOUTOFRANGETYPE_INDEX		18
-+#define MMC_RISR_RXOUTOFRANGETYPE_WIDTH		1
-+#define MMC_RISR_RXPAUSEFRAMES_INDEX		19
-+#define MMC_RISR_RXPAUSEFRAMES_WIDTH		1
-+#define MMC_RISR_RXFIFOOVERFLOW_INDEX		20
-+#define MMC_RISR_RXFIFOOVERFLOW_WIDTH		1
-+#define MMC_RISR_RXVLANFRAMES_GB_INDEX		21
-+#define MMC_RISR_RXVLANFRAMES_GB_WIDTH		1
-+#define MMC_RISR_RXWATCHDOGERROR_INDEX		22
-+#define MMC_RISR_RXWATCHDOGERROR_WIDTH		1
-+#define MMC_TIER_ALL_INTERRUPTS_INDEX		0
-+#define MMC_TIER_ALL_INTERRUPTS_WIDTH		18
-+#define MMC_TISR_TXOCTETCOUNT_GB_INDEX		0
-+#define MMC_TISR_TXOCTETCOUNT_GB_WIDTH		1
-+#define MMC_TISR_TXFRAMECOUNT_GB_INDEX		1
-+#define MMC_TISR_TXFRAMECOUNT_GB_WIDTH		1
-+#define MMC_TISR_TXBROADCASTFRAMES_G_INDEX	2
-+#define MMC_TISR_TXBROADCASTFRAMES_G_WIDTH	1
-+#define MMC_TISR_TXMULTICASTFRAMES_G_INDEX	3
-+#define MMC_TISR_TXMULTICASTFRAMES_G_WIDTH	1
-+#define MMC_TISR_TX64OCTETS_GB_INDEX		4
-+#define MMC_TISR_TX64OCTETS_GB_WIDTH		1
-+#define MMC_TISR_TX65TO127OCTETS_GB_INDEX	5
-+#define MMC_TISR_TX65TO127OCTETS_GB_WIDTH	1
-+#define MMC_TISR_TX128TO255OCTETS_GB_INDEX	6
-+#define MMC_TISR_TX128TO255OCTETS_GB_WIDTH	1
-+#define MMC_TISR_TX256TO511OCTETS_GB_INDEX	7
-+#define MMC_TISR_TX256TO511OCTETS_GB_WIDTH	1
-+#define MMC_TISR_TX512TO1023OCTETS_GB_INDEX	8
-+#define MMC_TISR_TX512TO1023OCTETS_GB_WIDTH	1
-+#define MMC_TISR_TX1024TOMAXOCTETS_GB_INDEX	9
-+#define MMC_TISR_TX1024TOMAXOCTETS_GB_WIDTH	1
-+#define MMC_TISR_TXUNICASTFRAMES_GB_INDEX	10
-+#define MMC_TISR_TXUNICASTFRAMES_GB_WIDTH	1
-+#define MMC_TISR_TXMULTICASTFRAMES_GB_INDEX	11
-+#define MMC_TISR_TXMULTICASTFRAMES_GB_WIDTH	1
-+#define MMC_TISR_TXBROADCASTFRAMES_GB_INDEX	12
-+#define MMC_TISR_TXBROADCASTFRAMES_GB_WIDTH	1
-+#define MMC_TISR_TXUNDERFLOWERROR_INDEX		13
-+#define MMC_TISR_TXUNDERFLOWERROR_WIDTH		1
-+#define MMC_TISR_TXOCTETCOUNT_G_INDEX		14
-+#define MMC_TISR_TXOCTETCOUNT_G_WIDTH		1
-+#define MMC_TISR_TXFRAMECOUNT_G_INDEX		15
-+#define MMC_TISR_TXFRAMECOUNT_G_WIDTH		1
-+#define MMC_TISR_TXPAUSEFRAMES_INDEX		16
-+#define MMC_TISR_TXPAUSEFRAMES_WIDTH		1
-+#define MMC_TISR_TXVLANFRAMES_G_INDEX		17
-+#define MMC_TISR_TXVLANFRAMES_G_WIDTH		1
-+
-+/* MTL register offsets */
-+#define MTL_OMR				0x1000
-+#define MTL_FDCR			0x1008
-+#define MTL_FDSR			0x100c
-+#define MTL_FDDR			0x1010
-+#define MTL_ISR				0x1020
-+#define MTL_RQDCM0R			0x1030
-+#define MTL_TCPM0R			0x1040
-+#define MTL_TCPM1R			0x1044
-+
-+#define MTL_RQDCM_INC			4
-+#define MTL_RQDCM_Q_PER_REG		4
-+#define MTL_TCPM_INC			4
-+#define MTL_TCPM_TC_PER_REG		4
-+
-+/* MTL register entry bit positions and sizes */
-+#define MTL_OMR_ETSALG_INDEX		5
-+#define MTL_OMR_ETSALG_WIDTH		2
-+#define MTL_OMR_RAA_INDEX		2
-+#define MTL_OMR_RAA_WIDTH		1
-+
-+/* MTL queue register offsets
-+ *   Multiple queues can be active.  The first queue has registers
-+ *   that begin at 0x1100.  Each subsequent queue has registers that
-+ *   are accessed using an offset of 0x80 from the previous queue.
-+ */
-+#define MTL_Q_BASE			0x1100
-+#define MTL_Q_INC			0x80
-+
-+#define MTL_Q_TQOMR			0x00
-+#define MTL_Q_TQUR			0x04
-+#define MTL_Q_TQDR			0x08
-+#define MTL_Q_RQOMR			0x40
-+#define MTL_Q_RQMPOCR			0x44
-+#define MTL_Q_RQDR			0x4c
-+#define MTL_Q_IER			0x70
-+#define MTL_Q_ISR			0x74
-+
-+/* MTL queue register entry bit positions and sizes */
-+#define MTL_Q_RQOMR_EHFC_INDEX		7
-+#define MTL_Q_RQOMR_EHFC_WIDTH		1
-+#define MTL_Q_RQOMR_RFA_INDEX		8
-+#define MTL_Q_RQOMR_RFA_WIDTH		3
-+#define MTL_Q_RQOMR_RFD_INDEX		13
-+#define MTL_Q_RQOMR_RFD_WIDTH		3
-+#define MTL_Q_RQOMR_RQS_INDEX		16
-+#define MTL_Q_RQOMR_RQS_WIDTH		9
-+#define MTL_Q_RQOMR_RSF_INDEX		5
-+#define MTL_Q_RQOMR_RSF_WIDTH		1
-+#define MTL_Q_RQOMR_RTC_INDEX		0
-+#define MTL_Q_RQOMR_RTC_WIDTH		2
-+#define MTL_Q_TQOMR_FTQ_INDEX		0
-+#define MTL_Q_TQOMR_FTQ_WIDTH		1
-+#define MTL_Q_TQOMR_Q2TCMAP_INDEX	8
-+#define MTL_Q_TQOMR_Q2TCMAP_WIDTH	3
-+#define MTL_Q_TQOMR_TQS_INDEX		16
-+#define MTL_Q_TQOMR_TQS_WIDTH		10
-+#define MTL_Q_TQOMR_TSF_INDEX		1
-+#define MTL_Q_TQOMR_TSF_WIDTH		1
-+#define MTL_Q_TQOMR_TTC_INDEX		4
-+#define MTL_Q_TQOMR_TTC_WIDTH		3
-+#define MTL_Q_TQOMR_TXQEN_INDEX		2
-+#define MTL_Q_TQOMR_TXQEN_WIDTH		2
-+
-+/* MTL queue register value */
-+#define MTL_RSF_DISABLE			0x00
-+#define MTL_RSF_ENABLE			0x01
-+#define MTL_TSF_DISABLE			0x00
-+#define MTL_TSF_ENABLE			0x01
-+
-+#define MTL_RX_THRESHOLD_64		0x00
-+#define MTL_RX_THRESHOLD_96		0x02
-+#define MTL_RX_THRESHOLD_128		0x03
-+#define MTL_TX_THRESHOLD_32		0x01
-+#define MTL_TX_THRESHOLD_64		0x00
-+#define MTL_TX_THRESHOLD_96		0x02
-+#define MTL_TX_THRESHOLD_128		0x03
-+#define MTL_TX_THRESHOLD_192		0x04
-+#define MTL_TX_THRESHOLD_256		0x05
-+#define MTL_TX_THRESHOLD_384		0x06
-+#define MTL_TX_THRESHOLD_512		0x07
-+
-+#define MTL_ETSALG_WRR			0x00
-+#define MTL_ETSALG_WFQ			0x01
-+#define MTL_ETSALG_DWRR			0x02
-+#define MTL_RAA_SP			0x00
-+#define MTL_RAA_WSP			0x01
-+
-+#define MTL_Q_DISABLED			0x00
-+#define MTL_Q_ENABLED			0x02
-+
-+/* MTL traffic class register offsets
-+ *   Multiple traffic classes can be active.  The first class has registers
-+ *   that begin at 0x1100.  Each subsequent queue has registers that
-+ *   are accessed using an offset of 0x80 from the previous queue.
-+ */
-+#define MTL_TC_BASE			MTL_Q_BASE
-+#define MTL_TC_INC			MTL_Q_INC
-+
-+#define MTL_TC_ETSCR			0x10
-+#define MTL_TC_ETSSR			0x14
-+#define MTL_TC_QWR			0x18
-+
-+/* MTL traffic class register entry bit positions and sizes */
-+#define MTL_TC_ETSCR_TSA_INDEX		0
-+#define MTL_TC_ETSCR_TSA_WIDTH		2
-+#define MTL_TC_QWR_QW_INDEX		0
-+#define MTL_TC_QWR_QW_WIDTH		21
-+
-+/* MTL traffic class register value */
-+#define MTL_TSA_SP			0x00
-+#define MTL_TSA_ETS			0x02
-+
-+/* PCS MMD select register offset
-+ *  The MMD select register is used for accessing PCS registers
-+ *  when the underlying APB3 interface is using indirect addressing.
-+ *  Indirect addressing requires accessing registers in two phases,
-+ *  an address phase and a data phase.  The address phases requires
-+ *  writing an address selection value to the MMD select regiesters.
-+ */
-+#define PCS_MMD_SELECT			0xff
-+
-+/* Descriptor/Packet entry bit positions and sizes */
-+#define RX_PACKET_ERRORS_CRC_INDEX		2
-+#define RX_PACKET_ERRORS_CRC_WIDTH		1
-+#define RX_PACKET_ERRORS_FRAME_INDEX		3
-+#define RX_PACKET_ERRORS_FRAME_WIDTH		1
-+#define RX_PACKET_ERRORS_LENGTH_INDEX		0
-+#define RX_PACKET_ERRORS_LENGTH_WIDTH		1
-+#define RX_PACKET_ERRORS_OVERRUN_INDEX		1
-+#define RX_PACKET_ERRORS_OVERRUN_WIDTH		1
-+
-+#define RX_PACKET_ATTRIBUTES_CSUM_DONE_INDEX	0
-+#define RX_PACKET_ATTRIBUTES_CSUM_DONE_WIDTH	1
-+#define RX_PACKET_ATTRIBUTES_VLAN_CTAG_INDEX	1
-+#define RX_PACKET_ATTRIBUTES_VLAN_CTAG_WIDTH	1
-+#define RX_PACKET_ATTRIBUTES_INCOMPLETE_INDEX	2
-+#define RX_PACKET_ATTRIBUTES_INCOMPLETE_WIDTH	1
-+#define RX_PACKET_ATTRIBUTES_CONTEXT_NEXT_INDEX	3
-+#define RX_PACKET_ATTRIBUTES_CONTEXT_NEXT_WIDTH	1
-+#define RX_PACKET_ATTRIBUTES_CONTEXT_INDEX	4
-+#define RX_PACKET_ATTRIBUTES_CONTEXT_WIDTH	1
-+#define RX_PACKET_ATTRIBUTES_RX_TSTAMP_INDEX	5
-+#define RX_PACKET_ATTRIBUTES_RX_TSTAMP_WIDTH	1
-+#define RX_PACKET_ATTRIBUTES_RSS_HASH_INDEX	6
-+#define RX_PACKET_ATTRIBUTES_RSS_HASH_WIDTH	1
-+
-+#define RX_NORMAL_DESC0_OVT_INDEX		0
-+#define RX_NORMAL_DESC0_OVT_WIDTH		16
-+#define RX_NORMAL_DESC2_HL_INDEX		0
-+#define RX_NORMAL_DESC2_HL_WIDTH		10
-+#define RX_NORMAL_DESC3_CDA_INDEX		27
-+#define RX_NORMAL_DESC3_CDA_WIDTH		1
-+#define RX_NORMAL_DESC3_CTXT_INDEX		30
-+#define RX_NORMAL_DESC3_CTXT_WIDTH		1
-+#define RX_NORMAL_DESC3_ES_INDEX		15
-+#define RX_NORMAL_DESC3_ES_WIDTH		1
-+#define RX_NORMAL_DESC3_ETLT_INDEX		16
-+#define RX_NORMAL_DESC3_ETLT_WIDTH		4
-+#define RX_NORMAL_DESC3_FD_INDEX		29
-+#define RX_NORMAL_DESC3_FD_WIDTH		1
-+#define RX_NORMAL_DESC3_INTE_INDEX		30
-+#define RX_NORMAL_DESC3_INTE_WIDTH		1
-+#define RX_NORMAL_DESC3_L34T_INDEX		20
-+#define RX_NORMAL_DESC3_L34T_WIDTH		4
-+#define RX_NORMAL_DESC3_LD_INDEX		28
-+#define RX_NORMAL_DESC3_LD_WIDTH		1
-+#define RX_NORMAL_DESC3_OWN_INDEX		31
-+#define RX_NORMAL_DESC3_OWN_WIDTH		1
-+#define RX_NORMAL_DESC3_PL_INDEX		0
-+#define RX_NORMAL_DESC3_PL_WIDTH		14
-+#define RX_NORMAL_DESC3_RSV_INDEX		26
-+#define RX_NORMAL_DESC3_RSV_WIDTH		1
-+
-+#define RX_DESC3_L34T_IPV4_TCP			1
-+#define RX_DESC3_L34T_IPV4_UDP			2
-+#define RX_DESC3_L34T_IPV4_ICMP			3
-+#define RX_DESC3_L34T_IPV6_TCP			9
-+#define RX_DESC3_L34T_IPV6_UDP			10
-+#define RX_DESC3_L34T_IPV6_ICMP			11
-+
-+#define RX_CONTEXT_DESC3_TSA_INDEX		4
-+#define RX_CONTEXT_DESC3_TSA_WIDTH		1
-+#define RX_CONTEXT_DESC3_TSD_INDEX		6
-+#define RX_CONTEXT_DESC3_TSD_WIDTH		1
-+
-+#define TX_PACKET_ATTRIBUTES_CSUM_ENABLE_INDEX	0
-+#define TX_PACKET_ATTRIBUTES_CSUM_ENABLE_WIDTH	1
-+#define TX_PACKET_ATTRIBUTES_TSO_ENABLE_INDEX	1
-+#define TX_PACKET_ATTRIBUTES_TSO_ENABLE_WIDTH	1
-+#define TX_PACKET_ATTRIBUTES_VLAN_CTAG_INDEX	2
-+#define TX_PACKET_ATTRIBUTES_VLAN_CTAG_WIDTH	1
-+#define TX_PACKET_ATTRIBUTES_PTP_INDEX		3
-+#define TX_PACKET_ATTRIBUTES_PTP_WIDTH		1
-+
-+#define TX_CONTEXT_DESC2_MSS_INDEX		0
-+#define TX_CONTEXT_DESC2_MSS_WIDTH		15
-+#define TX_CONTEXT_DESC3_CTXT_INDEX		30
-+#define TX_CONTEXT_DESC3_CTXT_WIDTH		1
-+#define TX_CONTEXT_DESC3_TCMSSV_INDEX		26
-+#define TX_CONTEXT_DESC3_TCMSSV_WIDTH		1
-+#define TX_CONTEXT_DESC3_VLTV_INDEX		16
-+#define TX_CONTEXT_DESC3_VLTV_WIDTH		1
-+#define TX_CONTEXT_DESC3_VT_INDEX		0
-+#define TX_CONTEXT_DESC3_VT_WIDTH		16
-+
-+#define TX_NORMAL_DESC2_HL_B1L_INDEX		0
-+#define TX_NORMAL_DESC2_HL_B1L_WIDTH		14
-+#define TX_NORMAL_DESC2_IC_INDEX		31
-+#define TX_NORMAL_DESC2_IC_WIDTH		1
-+#define TX_NORMAL_DESC2_TTSE_INDEX		30
-+#define TX_NORMAL_DESC2_TTSE_WIDTH		1
-+#define TX_NORMAL_DESC2_VTIR_INDEX		14
-+#define TX_NORMAL_DESC2_VTIR_WIDTH		2
-+#define TX_NORMAL_DESC3_CIC_INDEX		16
-+#define TX_NORMAL_DESC3_CIC_WIDTH		2
-+#define TX_NORMAL_DESC3_CPC_INDEX		26
-+#define TX_NORMAL_DESC3_CPC_WIDTH		2
-+#define TX_NORMAL_DESC3_CTXT_INDEX		30
-+#define TX_NORMAL_DESC3_CTXT_WIDTH		1
-+#define TX_NORMAL_DESC3_FD_INDEX		29
-+#define TX_NORMAL_DESC3_FD_WIDTH		1
-+#define TX_NORMAL_DESC3_FL_INDEX		0
-+#define TX_NORMAL_DESC3_FL_WIDTH		15
-+#define TX_NORMAL_DESC3_LD_INDEX		28
-+#define TX_NORMAL_DESC3_LD_WIDTH		1
-+#define TX_NORMAL_DESC3_OWN_INDEX		31
-+#define TX_NORMAL_DESC3_OWN_WIDTH		1
-+#define TX_NORMAL_DESC3_TCPHDRLEN_INDEX		19
-+#define TX_NORMAL_DESC3_TCPHDRLEN_WIDTH		4
-+#define TX_NORMAL_DESC3_TCPPL_INDEX		0
-+#define TX_NORMAL_DESC3_TCPPL_WIDTH		18
-+#define TX_NORMAL_DESC3_TSE_INDEX		18
-+#define TX_NORMAL_DESC3_TSE_WIDTH		1
-+
-+#define TX_NORMAL_DESC2_VLAN_INSERT		0x2
-+
-+/* MDIO undefined or vendor specific registers */
-+#ifndef MDIO_AN_COMP_STAT
-+#define MDIO_AN_COMP_STAT		0x0030
-+#endif
-+
-+/* Bit setting and getting macros
-+ *  The get macro will extract the current bit field value from within
-+ *  the variable
-+ *
-+ *  The set macro will clear the current bit field value within the
-+ *  variable and then set the bit field of the variable to the
-+ *  specified value
-+ */
-+#define GET_BITS(_var, _index, _width)					\
-+	(((_var) >> (_index)) & ((0x1 << (_width)) - 1))
-+
-+#define SET_BITS(_var, _index, _width, _val)				\
-+do {									\
-+	(_var) &= ~(((0x1 << (_width)) - 1) << (_index));		\
-+	(_var) |= (((_val) & ((0x1 << (_width)) - 1)) << (_index));	\
-+} while (0)
-+
-+#define GET_BITS_LE(_var, _index, _width)				\
-+	((le32_to_cpu((_var)) >> (_index)) & ((0x1 << (_width)) - 1))
-+
-+#define SET_BITS_LE(_var, _index, _width, _val)				\
-+do {									\
-+	(_var) &= cpu_to_le32(~(((0x1 << (_width)) - 1) << (_index)));	\
-+	(_var) |= cpu_to_le32((((_val) &				\
-+			      ((0x1 << (_width)) - 1)) << (_index)));	\
-+} while (0)
-+
-+/* Bit setting and getting macros based on register fields
-+ *  The get macro uses the bit field definitions formed using the input
-+ *  names to extract the current bit field value from within the
-+ *  variable
-+ *
-+ *  The set macro uses the bit field definitions formed using the input
-+ *  names to set the bit field of the variable to the specified value
-+ */
-+#define XGMAC_GET_BITS(_var, _prefix, _field)				\
-+	GET_BITS((_var),						\
-+		 _prefix##_##_field##_INDEX,				\
-+		 _prefix##_##_field##_WIDTH)
-+
-+#define XGMAC_SET_BITS(_var, _prefix, _field, _val)			\
-+	SET_BITS((_var),						\
-+		 _prefix##_##_field##_INDEX,				\
-+		 _prefix##_##_field##_WIDTH, (_val))
-+
-+#define XGMAC_GET_BITS_LE(_var, _prefix, _field)			\
-+	GET_BITS_LE((_var),						\
-+		 _prefix##_##_field##_INDEX,				\
-+		 _prefix##_##_field##_WIDTH)
-+
-+#define XGMAC_SET_BITS_LE(_var, _prefix, _field, _val)			\
-+	SET_BITS_LE((_var),						\
-+		 _prefix##_##_field##_INDEX,				\
-+		 _prefix##_##_field##_WIDTH, (_val))
-+
-+/* Macros for reading or writing registers
-+ *  The ioread macros will get bit fields or full values using the
-+ *  register definitions formed using the input names
-+ *
-+ *  The iowrite macros will set bit fields or full values using the
-+ *  register definitions formed using the input names
-+ */
-+#define XGMAC_IOREAD(_pdata, _reg)					\
-+	ioread32((_pdata)->xgmac_regs + _reg)
-+
-+#define XGMAC_IOREAD_BITS(_pdata, _reg, _field)				\
-+	GET_BITS(XGMAC_IOREAD((_pdata), _reg),				\
-+		 _reg##_##_field##_INDEX,				\
-+		 _reg##_##_field##_WIDTH)
-+
-+#define XGMAC_IOWRITE(_pdata, _reg, _val)				\
-+	iowrite32((_val), (_pdata)->xgmac_regs + _reg)
-+
-+#define XGMAC_IOWRITE_BITS(_pdata, _reg, _field, _val)			\
-+do {									\
-+	u32 reg_val = XGMAC_IOREAD((_pdata), _reg);			\
-+	SET_BITS(reg_val,						\
-+		 _reg##_##_field##_INDEX,				\
-+		 _reg##_##_field##_WIDTH, (_val));			\
-+	XGMAC_IOWRITE((_pdata), _reg, reg_val);				\
-+} while (0)
-+
-+/* Macros for reading or writing MTL queue or traffic class registers
-+ *  Similar to the standard read and write macros except that the
-+ *  base register value is calculated by the queue or traffic class number
-+ */
-+#define XGMAC_MTL_IOREAD(_pdata, _n, _reg)				\
-+	ioread32((_pdata)->xgmac_regs +					\
-+		 MTL_Q_BASE + ((_n) * MTL_Q_INC) + _reg)
-+
-+#define XGMAC_MTL_IOREAD_BITS(_pdata, _n, _reg, _field)			\
-+	GET_BITS(XGMAC_MTL_IOREAD((_pdata), (_n), _reg),		\
-+		 _reg##_##_field##_INDEX,				\
-+		 _reg##_##_field##_WIDTH)
-+
-+#define XGMAC_MTL_IOWRITE(_pdata, _n, _reg, _val)			\
-+	iowrite32((_val), (_pdata)->xgmac_regs +			\
-+		  MTL_Q_BASE + ((_n) * MTL_Q_INC) + _reg)
-+
-+#define XGMAC_MTL_IOWRITE_BITS(_pdata, _n, _reg, _field, _val)		\
-+do {									\
-+	u32 reg_val = XGMAC_MTL_IOREAD((_pdata), (_n), _reg);		\
-+	SET_BITS(reg_val,						\
-+		 _reg##_##_field##_INDEX,				\
-+		 _reg##_##_field##_WIDTH, (_val));			\
-+	XGMAC_MTL_IOWRITE((_pdata), (_n), _reg, reg_val);		\
-+} while (0)
-+
-+/* Macros for reading or writing DMA channel registers
-+ *  Similar to the standard read and write macros except that the
-+ *  base register value is obtained from the ring
-+ */
-+#define XGMAC_DMA_IOREAD(_channel, _reg)				\
-+	ioread32((_channel)->dma_regs + _reg)
-+
-+#define XGMAC_DMA_IOREAD_BITS(_channel, _reg, _field)			\
-+	GET_BITS(XGMAC_DMA_IOREAD((_channel), _reg),			\
-+		 _reg##_##_field##_INDEX,				\
-+		 _reg##_##_field##_WIDTH)
-+
-+#define XGMAC_DMA_IOWRITE(_channel, _reg, _val)				\
-+	iowrite32((_val), (_channel)->dma_regs + _reg)
-+
-+#define XGMAC_DMA_IOWRITE_BITS(_channel, _reg, _field, _val)		\
-+do {									\
-+	u32 reg_val = XGMAC_DMA_IOREAD((_channel), _reg);		\
-+	SET_BITS(reg_val,						\
-+		 _reg##_##_field##_INDEX,				\
-+		 _reg##_##_field##_WIDTH, (_val));			\
-+	XGMAC_DMA_IOWRITE((_channel), _reg, reg_val);			\
-+} while (0)
-+
-+/* Macros for building, reading or writing register values or bits
-+ * within the register values of XPCS registers.
-+ */
-+#define XPCS_IOWRITE(_pdata, _off, _val)				\
-+	iowrite32(_val, (_pdata)->xpcs_regs + (_off))
-+
-+#define XPCS_IOREAD(_pdata, _off)					\
-+	ioread32((_pdata)->xpcs_regs + (_off))
-+
-+/* Macros for building, reading or writing register values or bits
-+ * using MDIO.  Different from above because of the use of standardized
-+ * Linux include values.  No shifting is performed with the bit
-+ * operations, everything works on mask values.
-+ */
-+#define XMDIO_READ(_pdata, _mmd, _reg)					\
-+	((_pdata)->hw_if.read_mmd_regs((_pdata), 0,			\
-+		MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
-+
-+#define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask)			\
-+	(XMDIO_READ((_pdata), _mmd, _reg) & _mask)
-+
-+#define XMDIO_WRITE(_pdata, _mmd, _reg, _val)				\
-+	((_pdata)->hw_if.write_mmd_regs((_pdata), 0,			\
-+		MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
-+
-+#define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val)		\
-+do {									\
-+	u32 mmd_val = XMDIO_READ((_pdata), _mmd, _reg);			\
-+	mmd_val &= ~_mask;						\
-+	mmd_val |= (_val);						\
-+	XMDIO_WRITE((_pdata), _mmd, _reg, mmd_val);			\
-+} while (0)
-+
-+#endif
-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
-index 0000000..343301c
---- /dev/null
-+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-dcb.c
-@@ -0,0 +1,269 @@
-+/*
-+ * AMD 10Gb Ethernet driver
-+ *
-+ * This file is available to you under your choice of the following two
-+ * licenses:
-+ *
-+ * License 1: GPLv2
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ *
-+ * This file is free software; you may copy, redistribute and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 2 of the License, or (at
-+ * your option) any later version.
-+ *
-+ * This file is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ *
-+ * License 2: Modified BSD
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above copyright
-+ *       notice, this list of conditions and the following disclaimer in the
-+ *       documentation and/or other materials provided with the distribution.
-+ *     * Neither the name of Advanced Micro Devices, Inc. nor the
-+ *       names of its contributors may be used to endorse or promote products
-+ *       derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <linux/netdevice.h>
-+#include <net/dcbnl.h>
-+
-+#include "xgbe.h"
-+#include "xgbe-common.h"
-+
-+static int xgbe_dcb_ieee_getets(struct net_device *netdev,
-+				struct ieee_ets *ets)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+
-+	/* Set number of supported traffic classes */
-+	ets->ets_cap = pdata->hw_feat.tc_cnt;
-+
-+	if (pdata->ets) {
-+		ets->cbs = pdata->ets->cbs;
-+		memcpy(ets->tc_tx_bw, pdata->ets->tc_tx_bw,
-+		       sizeof(ets->tc_tx_bw));
-+		memcpy(ets->tc_tsa, pdata->ets->tc_tsa,
-+		       sizeof(ets->tc_tsa));
-+		memcpy(ets->prio_tc, pdata->ets->prio_tc,
-+		       sizeof(ets->prio_tc));
-+	}
-+
-+	return 0;
-+}
-+
-+static int xgbe_dcb_ieee_setets(struct net_device *netdev,
-+				struct ieee_ets *ets)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	unsigned int i, tc_ets, tc_ets_weight;
-+
-+	tc_ets = 0;
-+	tc_ets_weight = 0;
-+	for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {
-+		DBGPR("  TC%u: tx_bw=%hhu, rx_bw=%hhu, tsa=%hhu\n", i,
-+		      ets->tc_tx_bw[i], ets->tc_rx_bw[i], ets->tc_tsa[i]);
-+		DBGPR("  PRIO%u: TC=%hhu\n", i, ets->prio_tc[i]);
-+
-+		if ((ets->tc_tx_bw[i] || ets->tc_tsa[i]) &&
-+		    (i >= pdata->hw_feat.tc_cnt))
-+				return -EINVAL;
-+
-+		if (ets->prio_tc[i] >= pdata->hw_feat.tc_cnt)
-+			return -EINVAL;
-+
-+		switch (ets->tc_tsa[i]) {
-+		case IEEE_8021QAZ_TSA_STRICT:
-+			break;
-+		case IEEE_8021QAZ_TSA_ETS:
-+			tc_ets = 1;
-+			tc_ets_weight += ets->tc_tx_bw[i];
-+			break;
-+
-+		default:
-+			return -EINVAL;
-+		}
-+	}
-+
-+	/* Weights must add up to 100% */
-+	if (tc_ets && (tc_ets_weight != 100))
-+		return -EINVAL;
-+
-+	if (!pdata->ets) {
-+		pdata->ets = devm_kzalloc(pdata->dev, sizeof(*pdata->ets),
-+					  GFP_KERNEL);
-+		if (!pdata->ets)
-+			return -ENOMEM;
-+	}
-+
-+	memcpy(pdata->ets, ets, sizeof(*pdata->ets));
-+
-+	pdata->hw_if.config_dcb_tc(pdata);
-+
-+	return 0;
-+}
-+
-+static int xgbe_dcb_ieee_getpfc(struct net_device *netdev,
-+				struct ieee_pfc *pfc)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+
-+	/* Set number of supported PFC traffic classes */
-+	pfc->pfc_cap = pdata->hw_feat.tc_cnt;
-+
-+	if (pdata->pfc) {
-+		pfc->pfc_en = pdata->pfc->pfc_en;
-+		pfc->mbc = pdata->pfc->mbc;
-+		pfc->delay = pdata->pfc->delay;
-+	}
-+
-+	return 0;
-+}
-+
-+static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
-+				struct ieee_pfc *pfc)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+
-+	DBGPR("  cap=%hhu, en=%hhx, mbc=%hhu, delay=%hhu\n",
-+	      pfc->pfc_cap, pfc->pfc_en, pfc->mbc, pfc->delay);
-+
-+	if (!pdata->pfc) {
-+		pdata->pfc = devm_kzalloc(pdata->dev, sizeof(*pdata->pfc),
-+					  GFP_KERNEL);
-+		if (!pdata->pfc)
-+			return -ENOMEM;
-+	}
-+
-+	memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
-+
-+	pdata->hw_if.config_dcb_pfc(pdata);
-+
-+	return 0;
-+}
-+
-+static u8 xgbe_dcb_getdcbx(struct net_device *netdev)
-+{
-+	return DCB_CAP_DCBX_HOST | DCB_CAP_DCBX_VER_IEEE;
-+}
-+
-+static u8 xgbe_dcb_setdcbx(struct net_device *netdev, u8 dcbx)
-+{
-+	u8 support = xgbe_dcb_getdcbx(netdev);
-+
-+	DBGPR("  DCBX=%#hhx\n", dcbx);
-+
-+	if (dcbx & ~support)
-+		return 1;
-+
-+	if ((dcbx & support) != support)
-+		return 1;
-+
-+	return 0;
-+}
-+
-+static const struct dcbnl_rtnl_ops xgbe_dcbnl_ops = {
-+	/* IEEE 802.1Qaz std */
-+	.ieee_getets = xgbe_dcb_ieee_getets,
-+	.ieee_setets = xgbe_dcb_ieee_setets,
-+	.ieee_getpfc = xgbe_dcb_ieee_getpfc,
-+	.ieee_setpfc = xgbe_dcb_ieee_setpfc,
-+
-+	/* DCBX configuration */
-+	.getdcbx     = xgbe_dcb_getdcbx,
-+	.setdcbx     = xgbe_dcb_setdcbx,
-+};
-+
-+const struct dcbnl_rtnl_ops *xgbe_a0_get_dcbnl_ops(void)
-+{
-+	return &xgbe_dcbnl_ops;
-+}
-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
-index 0000000..ecfa6f9
---- /dev/null
-+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-debugfs.c
-@@ -0,0 +1,373 @@
-+/*
-+ * AMD 10Gb Ethernet driver
-+ *
-+ * This file is available to you under your choice of the following two
-+ * licenses:
-+ *
-+ * License 1: GPLv2
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ *
-+ * This file is free software; you may copy, redistribute and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 2 of the License, or (at
-+ * your option) any later version.
-+ *
-+ * This file is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ *
-+ * License 2: Modified BSD
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above copyright
-+ *       notice, this list of conditions and the following disclaimer in the
-+ *       documentation and/or other materials provided with the distribution.
-+ *     * Neither the name of Advanced Micro Devices, Inc. nor the
-+ *       names of its contributors may be used to endorse or promote products
-+ *       derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <linux/debugfs.h>
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+
-+#include "xgbe.h"
-+#include "xgbe-common.h"
-+
-+static ssize_t xgbe_common_read(char __user *buffer, size_t count,
-+				loff_t *ppos, unsigned int value)
-+{
-+	char *buf;
-+	ssize_t len;
-+
-+	if (*ppos != 0)
-+		return 0;
-+
-+	buf = kasprintf(GFP_KERNEL, "0x%08x\n", value);
-+	if (!buf)
-+		return -ENOMEM;
-+
-+	if (count < strlen(buf)) {
-+		kfree(buf);
-+		return -ENOSPC;
-+	}
-+
-+	len = simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
-+	kfree(buf);
-+
-+	return len;
-+}
-+
-+static ssize_t xgbe_common_write(const char __user *buffer, size_t count,
-+				 loff_t *ppos, unsigned int *value)
-+{
-+	char workarea[32];
-+	ssize_t len;
-+	int ret;
-+
-+	if (*ppos != 0)
-+		return 0;
-+
-+	if (count >= sizeof(workarea))
-+		return -ENOSPC;
-+
-+	len = simple_write_to_buffer(workarea, sizeof(workarea) - 1, ppos,
-+				     buffer, count);
-+	if (len < 0)
-+		return len;
-+
-+	workarea[len] = '\0';
-+	ret = kstrtouint(workarea, 16, value);
-+	if (ret)
-+		return -EIO;
-+
-+	return len;
-+}
-+
-+static ssize_t xgmac_reg_addr_read(struct file *filp, char __user *buffer,
-+				   size_t count, loff_t *ppos)
-+{
-+	struct xgbe_prv_data *pdata = filp->private_data;
-+
-+	return xgbe_common_read(buffer, count, ppos, pdata->debugfs_xgmac_reg);
-+}
-+
-+static ssize_t xgmac_reg_addr_write(struct file *filp,
-+				    const char __user *buffer,
-+				    size_t count, loff_t *ppos)
-+{
-+	struct xgbe_prv_data *pdata = filp->private_data;
-+
-+	return xgbe_common_write(buffer, count, ppos,
-+				 &pdata->debugfs_xgmac_reg);
-+}
-+
-+static ssize_t xgmac_reg_value_read(struct file *filp, char __user *buffer,
-+				    size_t count, loff_t *ppos)
-+{
-+	struct xgbe_prv_data *pdata = filp->private_data;
-+	unsigned int value;
-+
-+	value = XGMAC_IOREAD(pdata, pdata->debugfs_xgmac_reg);
-+
-+	return xgbe_common_read(buffer, count, ppos, value);
-+}
-+
-+static ssize_t xgmac_reg_value_write(struct file *filp,
-+				     const char __user *buffer,
-+				     size_t count, loff_t *ppos)
-+{
-+	struct xgbe_prv_data *pdata = filp->private_data;
-+	unsigned int value;
-+	ssize_t len;
-+
-+	len = xgbe_common_write(buffer, count, ppos, &value);
-+	if (len < 0)
-+		return len;
-+
-+	XGMAC_IOWRITE(pdata, pdata->debugfs_xgmac_reg, value);
-+
-+	return len;
-+}
-+
-+static const struct file_operations xgmac_reg_addr_fops = {
-+	.owner = THIS_MODULE,
-+	.open = simple_open,
-+	.read =  xgmac_reg_addr_read,
-+	.write = xgmac_reg_addr_write,
-+};
-+
-+static const struct file_operations xgmac_reg_value_fops = {
-+	.owner = THIS_MODULE,
-+	.open = simple_open,
-+	.read =  xgmac_reg_value_read,
-+	.write = xgmac_reg_value_write,
-+};
-+
-+static ssize_t xpcs_mmd_read(struct file *filp, char __user *buffer,
-+			     size_t count, loff_t *ppos)
-+{
-+	struct xgbe_prv_data *pdata = filp->private_data;
-+
-+	return xgbe_common_read(buffer, count, ppos, pdata->debugfs_xpcs_mmd);
-+}
-+
-+static ssize_t xpcs_mmd_write(struct file *filp, const char __user *buffer,
-+			      size_t count, loff_t *ppos)
-+{
-+	struct xgbe_prv_data *pdata = filp->private_data;
-+
-+	return xgbe_common_write(buffer, count, ppos,
-+				 &pdata->debugfs_xpcs_mmd);
-+}
-+
-+static ssize_t xpcs_reg_addr_read(struct file *filp, char __user *buffer,
-+				  size_t count, loff_t *ppos)
-+{
-+	struct xgbe_prv_data *pdata = filp->private_data;
-+
-+	return xgbe_common_read(buffer, count, ppos, pdata->debugfs_xpcs_reg);
-+}
-+
-+static ssize_t xpcs_reg_addr_write(struct file *filp, const char __user *buffer,
-+				   size_t count, loff_t *ppos)
-+{
-+	struct xgbe_prv_data *pdata = filp->private_data;
-+
-+	return xgbe_common_write(buffer, count, ppos,
-+				 &pdata->debugfs_xpcs_reg);
-+}
-+
-+static ssize_t xpcs_reg_value_read(struct file *filp, char __user *buffer,
-+				   size_t count, loff_t *ppos)
-+{
-+	struct xgbe_prv_data *pdata = filp->private_data;
-+	unsigned int value;
-+
-+	value = XMDIO_READ(pdata, pdata->debugfs_xpcs_mmd,
-+			   pdata->debugfs_xpcs_reg);
-+
-+	return xgbe_common_read(buffer, count, ppos, value);
-+}
-+
-+static ssize_t xpcs_reg_value_write(struct file *filp,
-+				    const char __user *buffer,
-+				    size_t count, loff_t *ppos)
-+{
-+	struct xgbe_prv_data *pdata = filp->private_data;
-+	unsigned int value;
-+	ssize_t len;
-+
-+	len = xgbe_common_write(buffer, count, ppos, &value);
-+	if (len < 0)
-+		return len;
-+
-+	XMDIO_WRITE(pdata, pdata->debugfs_xpcs_mmd, pdata->debugfs_xpcs_reg,
-+		    value);
-+
-+	return len;
-+}
-+
-+static const struct file_operations xpcs_mmd_fops = {
-+	.owner = THIS_MODULE,
-+	.open = simple_open,
-+	.read =  xpcs_mmd_read,
-+	.write = xpcs_mmd_write,
-+};
-+
-+static const struct file_operations xpcs_reg_addr_fops = {
-+	.owner = THIS_MODULE,
-+	.open = simple_open,
-+	.read =  xpcs_reg_addr_read,
-+	.write = xpcs_reg_addr_write,
-+};
-+
-+static const struct file_operations xpcs_reg_value_fops = {
-+	.owner = THIS_MODULE,
-+	.open = simple_open,
-+	.read =  xpcs_reg_value_read,
-+	.write = xpcs_reg_value_write,
-+};
-+
-+void xgbe_a0_debugfs_init(struct xgbe_prv_data *pdata)
-+{
-+	struct dentry *pfile;
-+	char *buf;
-+
-+	/* Set defaults */
-+	pdata->debugfs_xgmac_reg = 0;
-+	pdata->debugfs_xpcs_mmd = 1;
-+	pdata->debugfs_xpcs_reg = 0;
-+
-+	buf = kasprintf(GFP_KERNEL, "amd-xgbe-a0-%s", pdata->netdev->name);
-+	pdata->xgbe_debugfs = debugfs_create_dir(buf, NULL);
-+	if (!pdata->xgbe_debugfs) {
-+		netdev_err(pdata->netdev, "debugfs_create_dir failed\n");
-+		return;
-+	}
-+
-+	pfile = debugfs_create_file("xgmac_register", 0600,
-+				    pdata->xgbe_debugfs, pdata,
-+				    &xgmac_reg_addr_fops);
-+	if (!pfile)
-+		netdev_err(pdata->netdev, "debugfs_create_file failed\n");
-+
-+	pfile = debugfs_create_file("xgmac_register_value", 0600,
-+				    pdata->xgbe_debugfs, pdata,
-+				    &xgmac_reg_value_fops);
-+	if (!pfile)
-+		netdev_err(pdata->netdev, "debugfs_create_file failed\n");
-+
-+	pfile = debugfs_create_file("xpcs_mmd", 0600,
-+				    pdata->xgbe_debugfs, pdata,
-+				    &xpcs_mmd_fops);
-+	if (!pfile)
-+		netdev_err(pdata->netdev, "debugfs_create_file failed\n");
-+
-+	pfile = debugfs_create_file("xpcs_register", 0600,
-+				    pdata->xgbe_debugfs, pdata,
-+				    &xpcs_reg_addr_fops);
-+	if (!pfile)
-+		netdev_err(pdata->netdev, "debugfs_create_file failed\n");
-+
-+	pfile = debugfs_create_file("xpcs_register_value", 0600,
-+				    pdata->xgbe_debugfs, pdata,
-+				    &xpcs_reg_value_fops);
-+	if (!pfile)
-+		netdev_err(pdata->netdev, "debugfs_create_file failed\n");
-+
-+	kfree(buf);
-+}
-+
-+void xgbe_a0_debugfs_exit(struct xgbe_prv_data *pdata)
-+{
-+	debugfs_remove_recursive(pdata->xgbe_debugfs);
-+	pdata->xgbe_debugfs = NULL;
-+}
-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
-index 0000000..5dd5777
---- /dev/null
-+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-desc.c
-@@ -0,0 +1,636 @@
-+/*
-+ * AMD 10Gb Ethernet driver
-+ *
-+ * This file is available to you under your choice of the following two
-+ * licenses:
-+ *
-+ * License 1: GPLv2
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ *
-+ * This file is free software; you may copy, redistribute and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 2 of the License, or (at
-+ * your option) any later version.
-+ *
-+ * This file is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ *
-+ * License 2: Modified BSD
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above copyright
-+ *       notice, this list of conditions and the following disclaimer in the
-+ *       documentation and/or other materials provided with the distribution.
-+ *     * Neither the name of Advanced Micro Devices, Inc. nor the
-+ *       names of its contributors may be used to endorse or promote products
-+ *       derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include "xgbe.h"
-+#include "xgbe-common.h"
-+
-+static void xgbe_unmap_rdata(struct xgbe_prv_data *, struct xgbe_ring_data *);
-+
-+static void xgbe_free_ring(struct xgbe_prv_data *pdata,
-+			   struct xgbe_ring *ring)
-+{
-+	struct xgbe_ring_data *rdata;
-+	unsigned int i;
-+
-+	if (!ring)
-+		return;
-+
-+	if (ring->rdata) {
-+		for (i = 0; i < ring->rdesc_count; i++) {
-+			rdata = XGBE_GET_DESC_DATA(ring, i);
-+			xgbe_unmap_rdata(pdata, rdata);
-+		}
-+
-+		kfree(ring->rdata);
-+		ring->rdata = NULL;
-+	}
-+
-+	if (ring->rx_hdr_pa.pages) {
-+		dma_unmap_page(pdata->dev, ring->rx_hdr_pa.pages_dma,
-+			       ring->rx_hdr_pa.pages_len, DMA_FROM_DEVICE);
-+		put_page(ring->rx_hdr_pa.pages);
-+
-+		ring->rx_hdr_pa.pages = NULL;
-+		ring->rx_hdr_pa.pages_len = 0;
-+		ring->rx_hdr_pa.pages_offset = 0;
-+		ring->rx_hdr_pa.pages_dma = 0;
-+	}
-+
-+	if (ring->rx_buf_pa.pages) {
-+		dma_unmap_page(pdata->dev, ring->rx_buf_pa.pages_dma,
-+			       ring->rx_buf_pa.pages_len, DMA_FROM_DEVICE);
-+		put_page(ring->rx_buf_pa.pages);
-+
-+		ring->rx_buf_pa.pages = NULL;
-+		ring->rx_buf_pa.pages_len = 0;
-+		ring->rx_buf_pa.pages_offset = 0;
-+		ring->rx_buf_pa.pages_dma = 0;
-+	}
-+
-+	if (ring->rdesc) {
-+		dma_free_coherent(pdata->dev,
-+				  (sizeof(struct xgbe_ring_desc) *
-+				   ring->rdesc_count),
-+				  ring->rdesc, ring->rdesc_dma);
-+		ring->rdesc = NULL;
-+	}
-+}
-+
-+static void xgbe_free_ring_resources(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	DBGPR("-->xgbe_free_ring_resources\n");
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		xgbe_free_ring(pdata, channel->tx_ring);
-+		xgbe_free_ring(pdata, channel->rx_ring);
-+	}
-+
-+	DBGPR("<--xgbe_free_ring_resources\n");
-+}
-+
-+static int xgbe_init_ring(struct xgbe_prv_data *pdata,
-+			  struct xgbe_ring *ring, unsigned int rdesc_count)
-+{
-+	DBGPR("-->xgbe_init_ring\n");
-+
-+	if (!ring)
-+		return 0;
-+
-+	/* Descriptors */
-+	ring->rdesc_count = rdesc_count;
-+	ring->rdesc = dma_alloc_coherent(pdata->dev,
-+					 (sizeof(struct xgbe_ring_desc) *
-+					  rdesc_count), &ring->rdesc_dma,
-+					 GFP_KERNEL);
-+	if (!ring->rdesc)
-+		return -ENOMEM;
-+
-+	/* Descriptor information */
-+	ring->rdata = kcalloc(rdesc_count, sizeof(struct xgbe_ring_data),
-+			      GFP_KERNEL);
-+	if (!ring->rdata)
-+		return -ENOMEM;
-+
-+	DBGPR("    rdesc=0x%p, rdesc_dma=0x%llx, rdata=0x%p\n",
-+	      ring->rdesc, ring->rdesc_dma, ring->rdata);
-+
-+	DBGPR("<--xgbe_init_ring\n");
-+
-+	return 0;
-+}
-+
-+static int xgbe_alloc_ring_resources(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+	int ret;
-+
-+	DBGPR("-->xgbe_alloc_ring_resources\n");
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		DBGPR("  %s - tx_ring:\n", channel->name);
-+		ret = xgbe_init_ring(pdata, channel->tx_ring,
-+				     pdata->tx_desc_count);
-+		if (ret) {
-+			netdev_alert(pdata->netdev,
-+				     "error initializing Tx ring\n");
-+			goto err_ring;
-+		}
-+
-+		DBGPR("  %s - rx_ring:\n", channel->name);
-+		ret = xgbe_init_ring(pdata, channel->rx_ring,
-+				     pdata->rx_desc_count);
-+		if (ret) {
-+			netdev_alert(pdata->netdev,
-+				     "error initializing Tx ring\n");
-+			goto err_ring;
-+		}
-+	}
-+
-+	DBGPR("<--xgbe_alloc_ring_resources\n");
-+
-+	return 0;
-+
-+err_ring:
-+	xgbe_free_ring_resources(pdata);
-+
-+	return ret;
-+}
-+
-+static int xgbe_alloc_pages(struct xgbe_prv_data *pdata,
-+			    struct xgbe_page_alloc *pa, gfp_t gfp, int order)
-+{
-+	struct page *pages = NULL;
-+	dma_addr_t pages_dma;
-+	int ret;
-+
-+	/* Try to obtain pages, decreasing order if necessary */
-+	gfp |= __GFP_COLD | __GFP_COMP;
-+	while (order >= 0) {
-+		pages = alloc_pages(gfp, order);
-+		if (pages)
-+			break;
-+
-+		order--;
-+	}
-+	if (!pages)
-+		return -ENOMEM;
-+
-+	/* Map the pages */
-+	pages_dma = dma_map_page(pdata->dev, pages, 0,
-+				 PAGE_SIZE << order, DMA_FROM_DEVICE);
-+	ret = dma_mapping_error(pdata->dev, pages_dma);
-+	if (ret) {
-+		put_page(pages);
-+		return ret;
-+	}
-+
-+	pa->pages = pages;
-+	pa->pages_len = PAGE_SIZE << order;
-+	pa->pages_offset = 0;
-+	pa->pages_dma = pages_dma;
-+
-+	return 0;
-+}
-+
-+static void xgbe_set_buffer_data(struct xgbe_buffer_data *bd,
-+				 struct xgbe_page_alloc *pa,
-+				 unsigned int len)
-+{
-+	get_page(pa->pages);
-+	bd->pa = *pa;
-+
-+	bd->dma = pa->pages_dma + pa->pages_offset;
-+	bd->dma_len = len;
-+
-+	pa->pages_offset += len;
-+	if ((pa->pages_offset + len) > pa->pages_len) {
-+		/* This data descriptor is responsible for unmapping page(s) */
-+		bd->pa_unmap = *pa;
-+
-+		/* Get a new allocation next time */
-+		pa->pages = NULL;
-+		pa->pages_len = 0;
-+		pa->pages_offset = 0;
-+		pa->pages_dma = 0;
-+	}
-+}
-+
-+static int xgbe_map_rx_buffer(struct xgbe_prv_data *pdata,
-+			      struct xgbe_ring *ring,
-+			      struct xgbe_ring_data *rdata)
-+{
-+	int order, ret;
-+
-+	if (!ring->rx_hdr_pa.pages) {
-+		ret = xgbe_alloc_pages(pdata, &ring->rx_hdr_pa, GFP_ATOMIC, 0);
-+		if (ret)
-+			return ret;
-+	}
-+
-+	if (!ring->rx_buf_pa.pages) {
-+		order = max_t(int, PAGE_ALLOC_COSTLY_ORDER - 1, 0);
-+		ret = xgbe_alloc_pages(pdata, &ring->rx_buf_pa, GFP_ATOMIC,
-+				       order);
-+		if (ret)
-+			return ret;
-+	}
-+
-+	/* Set up the header page info */
-+	xgbe_set_buffer_data(&rdata->rx.hdr, &ring->rx_hdr_pa,
-+			     XGBE_SKB_ALLOC_SIZE);
-+
-+	/* Set up the buffer page info */
-+	xgbe_set_buffer_data(&rdata->rx.buf, &ring->rx_buf_pa,
-+			     pdata->rx_buf_size);
-+
-+	return 0;
-+}
-+
-+static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	struct xgbe_channel *channel;
-+	struct xgbe_ring *ring;
-+	struct xgbe_ring_data *rdata;
-+	struct xgbe_ring_desc *rdesc;
-+	dma_addr_t rdesc_dma;
-+	unsigned int i, j;
-+
-+	DBGPR("-->xgbe_wrapper_tx_descriptor_init\n");
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		ring = channel->tx_ring;
-+		if (!ring)
-+			break;
-+
-+		rdesc = ring->rdesc;
-+		rdesc_dma = ring->rdesc_dma;
-+
-+		for (j = 0; j < ring->rdesc_count; j++) {
-+			rdata = XGBE_GET_DESC_DATA(ring, j);
-+
-+			rdata->rdesc = rdesc;
-+			rdata->rdesc_dma = rdesc_dma;
-+
-+			rdesc++;
-+			rdesc_dma += sizeof(struct xgbe_ring_desc);
-+		}
-+
-+		ring->cur = 0;
-+		ring->dirty = 0;
-+		memset(&ring->tx, 0, sizeof(ring->tx));
-+
-+		hw_if->tx_desc_init(channel);
-+	}
-+
-+	DBGPR("<--xgbe_wrapper_tx_descriptor_init\n");
-+}
-+
-+static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	struct xgbe_channel *channel;
-+	struct xgbe_ring *ring;
-+	struct xgbe_ring_desc *rdesc;
-+	struct xgbe_ring_data *rdata;
-+	dma_addr_t rdesc_dma;
-+	unsigned int i, j;
-+
-+	DBGPR("-->xgbe_wrapper_rx_descriptor_init\n");
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		ring = channel->rx_ring;
-+		if (!ring)
-+			break;
-+
-+		rdesc = ring->rdesc;
-+		rdesc_dma = ring->rdesc_dma;
-+
-+		for (j = 0; j < ring->rdesc_count; j++) {
-+			rdata = XGBE_GET_DESC_DATA(ring, j);
-+
-+			rdata->rdesc = rdesc;
-+			rdata->rdesc_dma = rdesc_dma;
-+
-+			if (xgbe_map_rx_buffer(pdata, ring, rdata))
-+				break;
-+
-+			rdesc++;
-+			rdesc_dma += sizeof(struct xgbe_ring_desc);
-+		}
-+
-+		ring->cur = 0;
-+		ring->dirty = 0;
-+
-+		hw_if->rx_desc_init(channel);
-+	}
-+
-+	DBGPR("<--xgbe_wrapper_rx_descriptor_init\n");
-+}
-+
-+static void xgbe_unmap_rdata(struct xgbe_prv_data *pdata,
-+			     struct xgbe_ring_data *rdata)
-+{
-+	if (rdata->skb_dma) {
-+		if (rdata->mapped_as_page) {
-+			dma_unmap_page(pdata->dev, rdata->skb_dma,
-+				       rdata->skb_dma_len, DMA_TO_DEVICE);
-+		} else {
-+			dma_unmap_single(pdata->dev, rdata->skb_dma,
-+					 rdata->skb_dma_len, DMA_TO_DEVICE);
-+		}
-+		rdata->skb_dma = 0;
-+		rdata->skb_dma_len = 0;
-+	}
-+
-+	if (rdata->skb) {
-+		dev_kfree_skb_any(rdata->skb);
-+		rdata->skb = NULL;
-+	}
-+
-+	if (rdata->rx.hdr.pa.pages)
-+		put_page(rdata->rx.hdr.pa.pages);
-+
-+	if (rdata->rx.hdr.pa_unmap.pages) {
-+		dma_unmap_page(pdata->dev, rdata->rx.hdr.pa_unmap.pages_dma,
-+			       rdata->rx.hdr.pa_unmap.pages_len,
-+			       DMA_FROM_DEVICE);
-+		put_page(rdata->rx.hdr.pa_unmap.pages);
-+	}
-+
-+	if (rdata->rx.buf.pa.pages)
-+		put_page(rdata->rx.buf.pa.pages);
-+
-+	if (rdata->rx.buf.pa_unmap.pages) {
-+		dma_unmap_page(pdata->dev, rdata->rx.buf.pa_unmap.pages_dma,
-+			       rdata->rx.buf.pa_unmap.pages_len,
-+			       DMA_FROM_DEVICE);
-+		put_page(rdata->rx.buf.pa_unmap.pages);
-+	}
-+
-+	memset(&rdata->tx, 0, sizeof(rdata->tx));
-+	memset(&rdata->rx, 0, sizeof(rdata->rx));
-+
-+	rdata->mapped_as_page = 0;
-+
-+	if (rdata->state_saved) {
-+		rdata->state_saved = 0;
-+		rdata->state.incomplete = 0;
-+		rdata->state.context_next = 0;
-+		rdata->state.skb = NULL;
-+		rdata->state.len = 0;
-+		rdata->state.error = 0;
-+	}
-+}
-+
-+static int xgbe_map_tx_skb(struct xgbe_channel *channel, struct sk_buff *skb)
-+{
-+	struct xgbe_prv_data *pdata = channel->pdata;
-+	struct xgbe_ring *ring = channel->tx_ring;
-+	struct xgbe_ring_data *rdata;
-+	struct xgbe_packet_data *packet;
-+	struct skb_frag_struct *frag;
-+	dma_addr_t skb_dma;
-+	unsigned int start_index, cur_index;
-+	unsigned int offset, tso, vlan, datalen, len;
-+	unsigned int i;
-+
-+	DBGPR("-->xgbe_map_tx_skb: cur = %d\n", ring->cur);
-+
-+	offset = 0;
-+	start_index = ring->cur;
-+	cur_index = ring->cur;
-+
-+	packet = &ring->packet_data;
-+	packet->rdesc_count = 0;
-+	packet->length = 0;
-+
-+	tso = XGMAC_GET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES,
-+			     TSO_ENABLE);
-+	vlan = XGMAC_GET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES,
-+			      VLAN_CTAG);
-+
-+	/* Save space for a context descriptor if needed */
-+	if ((tso && (packet->mss != ring->tx.cur_mss)) ||
-+	    (vlan && (packet->vlan_ctag != ring->tx.cur_vlan_ctag)))
-+		cur_index++;
-+	rdata = XGBE_GET_DESC_DATA(ring, cur_index);
-+
-+	if (tso) {
-+		DBGPR("  TSO packet\n");
-+
-+		/* Map the TSO header */
-+		skb_dma = dma_map_single(pdata->dev, skb->data,
-+					 packet->header_len, DMA_TO_DEVICE);
-+		if (dma_mapping_error(pdata->dev, skb_dma)) {
-+			netdev_alert(pdata->netdev, "dma_map_single failed\n");
-+			goto err_out;
-+		}
-+		rdata->skb_dma = skb_dma;
-+		rdata->skb_dma_len = packet->header_len;
-+
-+		offset = packet->header_len;
-+
-+		packet->length += packet->header_len;
-+
-+		cur_index++;
-+		rdata = XGBE_GET_DESC_DATA(ring, cur_index);
-+	}
-+
-+	/* Map the (remainder of the) packet */
-+	for (datalen = skb_headlen(skb) - offset; datalen; ) {
-+		len = min_t(unsigned int, datalen, XGBE_TX_MAX_BUF_SIZE);
-+
-+		skb_dma = dma_map_single(pdata->dev, skb->data + offset, len,
-+					 DMA_TO_DEVICE);
-+		if (dma_mapping_error(pdata->dev, skb_dma)) {
-+			netdev_alert(pdata->netdev, "dma_map_single failed\n");
-+			goto err_out;
-+		}
-+		rdata->skb_dma = skb_dma;
-+		rdata->skb_dma_len = len;
-+		DBGPR("  skb data: index=%u, dma=0x%llx, len=%u\n",
-+		      cur_index, skb_dma, len);
-+
-+		datalen -= len;
-+		offset += len;
-+
-+		packet->length += len;
-+
-+		cur_index++;
-+		rdata = XGBE_GET_DESC_DATA(ring, cur_index);
-+	}
-+
-+	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-+		DBGPR("  mapping frag %u\n", i);
-+
-+		frag = &skb_shinfo(skb)->frags[i];
-+		offset = 0;
-+
-+		for (datalen = skb_frag_size(frag); datalen; ) {
-+			len = min_t(unsigned int, datalen,
-+				    XGBE_TX_MAX_BUF_SIZE);
-+
-+			skb_dma = skb_frag_dma_map(pdata->dev, frag, offset,
-+						   len, DMA_TO_DEVICE);
-+			if (dma_mapping_error(pdata->dev, skb_dma)) {
-+				netdev_alert(pdata->netdev,
-+					     "skb_frag_dma_map failed\n");
-+				goto err_out;
-+			}
-+			rdata->skb_dma = skb_dma;
-+			rdata->skb_dma_len = len;
-+			rdata->mapped_as_page = 1;
-+			DBGPR("  skb data: index=%u, dma=0x%llx, len=%u\n",
-+			      cur_index, skb_dma, len);
-+
-+			datalen -= len;
-+			offset += len;
-+
-+			packet->length += len;
-+
-+			cur_index++;
-+			rdata = XGBE_GET_DESC_DATA(ring, cur_index);
-+		}
-+	}
-+
-+	/* Save the skb address in the last entry. We always have some data
-+	 * that has been mapped so rdata is always advanced past the last
-+	 * piece of mapped data - use the entry pointed to by cur_index - 1.
-+	 */
-+	rdata = XGBE_GET_DESC_DATA(ring, cur_index - 1);
-+	rdata->skb = skb;
-+
-+	/* Save the number of descriptor entries used */
-+	packet->rdesc_count = cur_index - start_index;
-+
-+	DBGPR("<--xgbe_map_tx_skb: count=%u\n", packet->rdesc_count);
-+
-+	return packet->rdesc_count;
-+
-+err_out:
-+	while (start_index < cur_index) {
-+		rdata = XGBE_GET_DESC_DATA(ring, start_index++);
-+		xgbe_unmap_rdata(pdata, rdata);
-+	}
-+
-+	DBGPR("<--xgbe_map_tx_skb: count=0\n");
-+
-+	return 0;
-+}
-+
-+void xgbe_a0_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
-+{
-+	DBGPR("-->xgbe_a0_init_function_ptrs_desc\n");
-+
-+	desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
-+	desc_if->free_ring_resources = xgbe_free_ring_resources;
-+	desc_if->map_tx_skb = xgbe_map_tx_skb;
-+	desc_if->map_rx_buffer = xgbe_map_rx_buffer;
-+	desc_if->unmap_rdata = xgbe_unmap_rdata;
-+	desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
-+	desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
-+
-+	DBGPR("<--xgbe_a0_init_function_ptrs_desc\n");
-+}
-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
-index 0000000..f6a3a58
---- /dev/null
-+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-dev.c
-@@ -0,0 +1,2964 @@
-+/*
-+ * AMD 10Gb Ethernet driver
-+ *
-+ * This file is available to you under your choice of the following two
-+ * licenses:
-+ *
-+ * License 1: GPLv2
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ *
-+ * This file is free software; you may copy, redistribute and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 2 of the License, or (at
-+ * your option) any later version.
-+ *
-+ * This file is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ *
-+ * License 2: Modified BSD
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above copyright
-+ *       notice, this list of conditions and the following disclaimer in the
-+ *       documentation and/or other materials provided with the distribution.
-+ *     * Neither the name of Advanced Micro Devices, Inc. nor the
-+ *       names of its contributors may be used to endorse or promote products
-+ *       derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <linux/phy.h>
-+#include <linux/mdio.h>
-+#include <linux/clk.h>
-+#include <linux/bitrev.h>
-+#include <linux/crc32.h>
-+
-+#include "xgbe.h"
-+#include "xgbe-common.h"
-+
-+static unsigned int xgbe_usec_to_riwt(struct xgbe_prv_data *pdata,
-+				      unsigned int usec)
-+{
-+	unsigned long rate;
-+	unsigned int ret;
-+
-+	DBGPR("-->xgbe_usec_to_riwt\n");
-+
-+	rate = pdata->sysclk_rate;
-+
-+	/*
-+	 * Convert the input usec value to the watchdog timer value. Each
-+	 * watchdog timer value is equivalent to 256 clock cycles.
-+	 * Calculate the required value as:
-+	 *   ( usec * ( system_clock_mhz / 10^6 ) / 256
-+	 */
-+	ret = (usec * (rate / 1000000)) / 256;
-+
-+	DBGPR("<--xgbe_usec_to_riwt\n");
-+
-+	return ret;
-+}
-+
-+static unsigned int xgbe_riwt_to_usec(struct xgbe_prv_data *pdata,
-+				      unsigned int riwt)
-+{
-+	unsigned long rate;
-+	unsigned int ret;
-+
-+	DBGPR("-->xgbe_riwt_to_usec\n");
-+
-+	rate = pdata->sysclk_rate;
-+
-+	/*
-+	 * Convert the input watchdog timer value to the usec value. Each
-+	 * watchdog timer value is equivalent to 256 clock cycles.
-+	 * Calculate the required value as:
-+	 *   ( riwt * 256 ) / ( system_clock_mhz / 10^6 )
-+	 */
-+	ret = (riwt * 256) / (rate / 1000000);
-+
-+	DBGPR("<--xgbe_riwt_to_usec\n");
-+
-+	return ret;
-+}
-+
-+static int xgbe_config_pblx8(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++)
-+		XGMAC_DMA_IOWRITE_BITS(channel, DMA_CH_CR, PBLX8,
-+				       pdata->pblx8);
-+
-+	return 0;
-+}
-+
-+static int xgbe_get_tx_pbl_val(struct xgbe_prv_data *pdata)
-+{
-+	return XGMAC_DMA_IOREAD_BITS(pdata->channel, DMA_CH_TCR, PBL);
-+}
-+
-+static int xgbe_config_tx_pbl_val(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->tx_ring)
-+			break;
-+
-+		XGMAC_DMA_IOWRITE_BITS(channel, DMA_CH_TCR, PBL,
-+				       pdata->tx_pbl);
-+	}
-+
-+	return 0;
-+}
-+
-+static int xgbe_get_rx_pbl_val(struct xgbe_prv_data *pdata)
-+{
-+	return XGMAC_DMA_IOREAD_BITS(pdata->channel, DMA_CH_RCR, PBL);
-+}
-+
-+static int xgbe_config_rx_pbl_val(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->rx_ring)
-+			break;
-+
-+		XGMAC_DMA_IOWRITE_BITS(channel, DMA_CH_RCR, PBL,
-+				       pdata->rx_pbl);
-+	}
-+
-+	return 0;
-+}
-+
-+static int xgbe_config_osp_mode(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->tx_ring)
-+			break;
-+
-+		XGMAC_DMA_IOWRITE_BITS(channel, DMA_CH_TCR, OSP,
-+				       pdata->tx_osp_mode);
-+	}
-+
-+	return 0;
-+}
-+
-+static int xgbe_config_rsf_mode(struct xgbe_prv_data *pdata, unsigned int val)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < pdata->rx_q_count; i++)
-+		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_RQOMR, RSF, val);
-+
-+	return 0;
-+}
-+
-+static int xgbe_config_tsf_mode(struct xgbe_prv_data *pdata, unsigned int val)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < pdata->tx_q_count; i++)
-+		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_TQOMR, TSF, val);
-+
-+	return 0;
-+}
-+
-+static int xgbe_config_rx_threshold(struct xgbe_prv_data *pdata,
-+				    unsigned int val)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < pdata->rx_q_count; i++)
-+		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_RQOMR, RTC, val);
-+
-+	return 0;
-+}
-+
-+static int xgbe_config_tx_threshold(struct xgbe_prv_data *pdata,
-+				    unsigned int val)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < pdata->tx_q_count; i++)
-+		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_TQOMR, TTC, val);
-+
-+	return 0;
-+}
-+
-+static int xgbe_config_rx_coalesce(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->rx_ring)
-+			break;
-+
-+		XGMAC_DMA_IOWRITE_BITS(channel, DMA_CH_RIWT, RWT,
-+				       pdata->rx_riwt);
-+	}
-+
-+	return 0;
-+}
-+
-+static int xgbe_config_tx_coalesce(struct xgbe_prv_data *pdata)
-+{
-+	return 0;
-+}
-+
-+static void xgbe_config_rx_buffer_size(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->rx_ring)
-+			break;
-+
-+		XGMAC_DMA_IOWRITE_BITS(channel, DMA_CH_RCR, RBSZ,
-+				       pdata->rx_buf_size);
-+	}
-+}
-+
-+static void xgbe_config_tso_mode(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->tx_ring)
-+			break;
-+
-+		XGMAC_DMA_IOWRITE_BITS(channel, DMA_CH_TCR, TSE, 1);
-+	}
-+}
-+
-+static void xgbe_config_sph_mode(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->rx_ring)
-+			break;
-+
-+		XGMAC_DMA_IOWRITE_BITS(channel, DMA_CH_CR, SPH, 1);
-+	}
-+
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RCR, HDSMS, XGBE_SPH_HDSMS_SIZE);
-+}
-+
-+static int xgbe_write_rss_reg(struct xgbe_prv_data *pdata, unsigned int type,
-+			      unsigned int index, unsigned int val)
-+{
-+	unsigned int wait;
-+	int ret = 0;
-+
-+	mutex_lock(&pdata->rss_mutex);
-+
-+	if (XGMAC_IOREAD_BITS(pdata, MAC_RSSAR, OB)) {
-+		ret = -EBUSY;
-+		goto unlock;
-+	}
-+
-+	XGMAC_IOWRITE(pdata, MAC_RSSDR, val);
-+
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RSSAR, RSSIA, index);
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RSSAR, ADDRT, type);
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RSSAR, CT, 0);
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RSSAR, OB, 1);
-+
-+	wait = 1000;
-+	while (wait--) {
-+		if (!XGMAC_IOREAD_BITS(pdata, MAC_RSSAR, OB))
-+			goto unlock;
-+
-+		usleep_range(1000, 1500);
-+	}
-+
-+	ret = -EBUSY;
-+
-+unlock:
-+	mutex_unlock(&pdata->rss_mutex);
-+
-+	return ret;
-+}
-+
-+static int xgbe_write_rss_hash_key(struct xgbe_prv_data *pdata)
-+{
-+	unsigned int key_regs = sizeof(pdata->rss_key) / sizeof(u32);
-+	unsigned int *key = (unsigned int *)&pdata->rss_key;
-+	int ret;
-+
-+	while (key_regs--) {
-+		ret = xgbe_write_rss_reg(pdata, XGBE_RSS_HASH_KEY_TYPE,
-+					 key_regs, *key++);
-+		if (ret)
-+			return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static int xgbe_write_rss_lookup_table(struct xgbe_prv_data *pdata)
-+{
-+	unsigned int i;
-+	int ret;
-+
-+	for (i = 0; i < ARRAY_SIZE(pdata->rss_table); i++) {
-+		ret = xgbe_write_rss_reg(pdata,
-+					 XGBE_RSS_LOOKUP_TABLE_TYPE, i,
-+					 pdata->rss_table[i]);
-+		if (ret)
-+			return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static int xgbe_set_rss_hash_key(struct xgbe_prv_data *pdata, const u8 *key)
-+{
-+	memcpy(pdata->rss_key, key, sizeof(pdata->rss_key));
-+
-+	return xgbe_write_rss_hash_key(pdata);
-+}
-+
-+static int xgbe_set_rss_lookup_table(struct xgbe_prv_data *pdata,
-+				     const u32 *table)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(pdata->rss_table); i++)
-+		XGMAC_SET_BITS(pdata->rss_table[i], MAC_RSSDR, DMCH, table[i]);
-+
-+	return xgbe_write_rss_lookup_table(pdata);
-+}
-+
-+static int xgbe_enable_rss(struct xgbe_prv_data *pdata)
-+{
-+	int ret;
-+
-+	if (!pdata->hw_feat.rss)
-+		return -EOPNOTSUPP;
-+
-+	/* Program the hash key */
-+	ret = xgbe_write_rss_hash_key(pdata);
-+	if (ret)
-+		return ret;
-+
-+	/* Program the lookup table */
-+	ret = xgbe_write_rss_lookup_table(pdata);
-+	if (ret)
-+		return ret;
-+
-+	/* Set the RSS options */
-+	XGMAC_IOWRITE(pdata, MAC_RSSCR, pdata->rss_options);
-+
-+	/* Enable RSS */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RSSCR, RSSE, 1);
-+
-+	return 0;
-+}
-+
-+static int xgbe_disable_rss(struct xgbe_prv_data *pdata)
-+{
-+	if (!pdata->hw_feat.rss)
-+		return -EOPNOTSUPP;
-+
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RSSCR, RSSE, 0);
-+
-+	return 0;
-+}
-+
-+static void xgbe_config_rss(struct xgbe_prv_data *pdata)
-+{
-+	int ret;
-+
-+	if (!pdata->hw_feat.rss)
-+		return;
-+
-+	if (pdata->netdev->features & NETIF_F_RXHASH)
-+		ret = xgbe_enable_rss(pdata);
-+	else
-+		ret = xgbe_disable_rss(pdata);
-+
-+	if (ret)
-+		netdev_err(pdata->netdev,
-+			   "error configuring RSS, RSS disabled\n");
-+}
-+
-+static int xgbe_disable_tx_flow_control(struct xgbe_prv_data *pdata)
-+{
-+	unsigned int max_q_count, q_count;
-+	unsigned int reg, reg_val;
-+	unsigned int i;
-+
-+	/* Clear MTL flow control */
-+	for (i = 0; i < pdata->rx_q_count; i++)
-+		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_RQOMR, EHFC, 0);
-+
-+	/* Clear MAC flow control */
-+	max_q_count = XGMAC_MAX_FLOW_CONTROL_QUEUES;
-+	q_count = min_t(unsigned int, pdata->tx_q_count, max_q_count);
-+	reg = MAC_Q0TFCR;
-+	for (i = 0; i < q_count; i++) {
-+		reg_val = XGMAC_IOREAD(pdata, reg);
-+		XGMAC_SET_BITS(reg_val, MAC_Q0TFCR, TFE, 0);
-+		XGMAC_IOWRITE(pdata, reg, reg_val);
-+
-+		reg += MAC_QTFCR_INC;
-+	}
-+
-+	return 0;
-+}
-+
-+static int xgbe_enable_tx_flow_control(struct xgbe_prv_data *pdata)
-+{
-+	unsigned int max_q_count, q_count;
-+	unsigned int reg, reg_val;
-+	unsigned int i;
-+
-+	/* Set MTL flow control */
-+	for (i = 0; i < pdata->rx_q_count; i++)
-+		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_RQOMR, EHFC, 1);
-+
-+	/* Set MAC flow control */
-+	max_q_count = XGMAC_MAX_FLOW_CONTROL_QUEUES;
-+	q_count = min_t(unsigned int, pdata->tx_q_count, max_q_count);
-+	reg = MAC_Q0TFCR;
-+	for (i = 0; i < q_count; i++) {
-+		reg_val = XGMAC_IOREAD(pdata, reg);
-+
-+		/* Enable transmit flow control */
-+		XGMAC_SET_BITS(reg_val, MAC_Q0TFCR, TFE, 1);
-+		/* Set pause time */
-+		XGMAC_SET_BITS(reg_val, MAC_Q0TFCR, PT, 0xffff);
-+
-+		XGMAC_IOWRITE(pdata, reg, reg_val);
-+
-+		reg += MAC_QTFCR_INC;
-+	}
-+
-+	return 0;
-+}
-+
-+static int xgbe_disable_rx_flow_control(struct xgbe_prv_data *pdata)
-+{
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RFCR, RFE, 0);
-+
-+	return 0;
-+}
-+
-+static int xgbe_enable_rx_flow_control(struct xgbe_prv_data *pdata)
-+{
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RFCR, RFE, 1);
-+
-+	return 0;
-+}
-+
-+static int xgbe_config_tx_flow_control(struct xgbe_prv_data *pdata)
-+{
-+	struct ieee_pfc *pfc = pdata->pfc;
-+
-+	if (pdata->tx_pause || (pfc && pfc->pfc_en))
-+		xgbe_enable_tx_flow_control(pdata);
-+	else
-+		xgbe_disable_tx_flow_control(pdata);
-+
-+	return 0;
-+}
-+
-+static int xgbe_config_rx_flow_control(struct xgbe_prv_data *pdata)
-+{
-+	struct ieee_pfc *pfc = pdata->pfc;
-+
-+	if (pdata->rx_pause || (pfc && pfc->pfc_en))
-+		xgbe_enable_rx_flow_control(pdata);
-+	else
-+		xgbe_disable_rx_flow_control(pdata);
-+
-+	return 0;
-+}
-+
-+static void xgbe_config_flow_control(struct xgbe_prv_data *pdata)
-+{
-+	struct ieee_pfc *pfc = pdata->pfc;
-+
-+	xgbe_config_tx_flow_control(pdata);
-+	xgbe_config_rx_flow_control(pdata);
-+
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RFCR, PFCE,
-+			   (pfc && pfc->pfc_en) ? 1 : 0);
-+}
-+
-+static void xgbe_enable_dma_interrupts(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int dma_ch_isr, dma_ch_ier;
-+	unsigned int i;
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		/* Clear all the interrupts which are set */
-+		dma_ch_isr = XGMAC_DMA_IOREAD(channel, DMA_CH_SR);
-+		XGMAC_DMA_IOWRITE(channel, DMA_CH_SR, dma_ch_isr);
-+
-+		/* Clear all interrupt enable bits */
-+		dma_ch_ier = 0;
-+
-+		/* Enable following interrupts
-+		 *   NIE  - Normal Interrupt Summary Enable
-+		 *   AIE  - Abnormal Interrupt Summary Enable
-+		 *   FBEE - Fatal Bus Error Enable
-+		 */
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, NIE, 1);
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, AIE, 1);
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, FBEE, 1);
-+
-+		if (channel->tx_ring) {
-+			/* Enable the following Tx interrupts
-+			 *   TIE  - Transmit Interrupt Enable (unless using
-+			 *          per channel interrupts)
-+			 */
-+			if (!pdata->per_channel_irq)
-+				XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, TIE, 1);
-+		}
-+		if (channel->rx_ring) {
-+			/* Enable following Rx interrupts
-+			 *   RBUE - Receive Buffer Unavailable Enable
-+			 *   RIE  - Receive Interrupt Enable (unless using
-+			 *          per channel interrupts)
-+			 */
-+			XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, RBUE, 1);
-+			if (!pdata->per_channel_irq)
-+				XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, RIE, 1);
-+		}
-+
-+		XGMAC_DMA_IOWRITE(channel, DMA_CH_IER, dma_ch_ier);
-+	}
-+}
-+
-+static void xgbe_enable_mtl_interrupts(struct xgbe_prv_data *pdata)
-+{
-+	unsigned int mtl_q_isr;
-+	unsigned int q_count, i;
-+
-+	q_count = max(pdata->hw_feat.tx_q_cnt, pdata->hw_feat.rx_q_cnt);
-+	for (i = 0; i < q_count; i++) {
-+		/* Clear all the interrupts which are set */
-+		mtl_q_isr = XGMAC_MTL_IOREAD(pdata, i, MTL_Q_ISR);
-+		XGMAC_MTL_IOWRITE(pdata, i, MTL_Q_ISR, mtl_q_isr);
-+
-+		/* No MTL interrupts to be enabled */
-+		XGMAC_MTL_IOWRITE(pdata, i, MTL_Q_IER, 0);
-+	}
-+}
-+
-+static void xgbe_enable_mac_interrupts(struct xgbe_prv_data *pdata)
-+{
-+	unsigned int mac_ier = 0;
-+
-+	/* Enable Timestamp interrupt */
-+	XGMAC_SET_BITS(mac_ier, MAC_IER, TSIE, 1);
-+
-+	XGMAC_IOWRITE(pdata, MAC_IER, mac_ier);
-+
-+	/* Enable all counter interrupts */
-+	XGMAC_IOWRITE_BITS(pdata, MMC_RIER, ALL_INTERRUPTS, 0xffffffff);
-+	XGMAC_IOWRITE_BITS(pdata, MMC_TIER, ALL_INTERRUPTS, 0xffffffff);
-+}
-+
-+static int xgbe_set_gmii_speed(struct xgbe_prv_data *pdata)
-+{
-+	if (XGMAC_IOREAD_BITS(pdata, MAC_TCR, SS) == 0x3)
-+		return 0;
-+
-+	XGMAC_IOWRITE_BITS(pdata, MAC_TCR, SS, 0x3);
-+
-+	return 0;
-+}
-+
-+static int xgbe_set_gmii_2500_speed(struct xgbe_prv_data *pdata)
-+{
-+	if (XGMAC_IOREAD_BITS(pdata, MAC_TCR, SS) == 0x2)
-+		return 0;
-+
-+	XGMAC_IOWRITE_BITS(pdata, MAC_TCR, SS, 0x2);
-+
-+	return 0;
-+}
-+
-+static int xgbe_set_xgmii_speed(struct xgbe_prv_data *pdata)
-+{
-+	if (XGMAC_IOREAD_BITS(pdata, MAC_TCR, SS) == 0)
-+		return 0;
-+
-+	XGMAC_IOWRITE_BITS(pdata, MAC_TCR, SS, 0);
-+
-+	return 0;
-+}
-+
-+static int xgbe_set_promiscuous_mode(struct xgbe_prv_data *pdata,
-+				     unsigned int enable)
-+{
-+	unsigned int val = enable ? 1 : 0;
-+
-+	if (XGMAC_IOREAD_BITS(pdata, MAC_PFR, PR) == val)
-+		return 0;
-+
-+	DBGPR("  %s promiscuous mode\n", enable ? "entering" : "leaving");
-+	XGMAC_IOWRITE_BITS(pdata, MAC_PFR, PR, val);
-+
-+	return 0;
-+}
-+
-+static int xgbe_set_all_multicast_mode(struct xgbe_prv_data *pdata,
-+				       unsigned int enable)
-+{
-+	unsigned int val = enable ? 1 : 0;
-+
-+	if (XGMAC_IOREAD_BITS(pdata, MAC_PFR, PM) == val)
-+		return 0;
-+
-+	DBGPR("  %s allmulti mode\n", enable ? "entering" : "leaving");
-+	XGMAC_IOWRITE_BITS(pdata, MAC_PFR, PM, val);
-+
-+	return 0;
-+}
-+
-+static void xgbe_set_mac_reg(struct xgbe_prv_data *pdata,
-+			     struct netdev_hw_addr *ha, unsigned int *mac_reg)
-+{
-+	unsigned int mac_addr_hi, mac_addr_lo;
-+	u8 *mac_addr;
-+
-+	mac_addr_lo = 0;
-+	mac_addr_hi = 0;
-+
-+	if (ha) {
-+		mac_addr = (u8 *)&mac_addr_lo;
-+		mac_addr[0] = ha->addr[0];
-+		mac_addr[1] = ha->addr[1];
-+		mac_addr[2] = ha->addr[2];
-+		mac_addr[3] = ha->addr[3];
-+		mac_addr = (u8 *)&mac_addr_hi;
-+		mac_addr[0] = ha->addr[4];
-+		mac_addr[1] = ha->addr[5];
-+
-+		DBGPR("  adding mac address %pM at 0x%04x\n", ha->addr,
-+		      *mac_reg);
-+
-+		XGMAC_SET_BITS(mac_addr_hi, MAC_MACA1HR, AE, 1);
-+	}
-+
-+	XGMAC_IOWRITE(pdata, *mac_reg, mac_addr_hi);
-+	*mac_reg += MAC_MACA_INC;
-+	XGMAC_IOWRITE(pdata, *mac_reg, mac_addr_lo);
-+	*mac_reg += MAC_MACA_INC;
-+}
-+
-+static void xgbe_set_mac_addn_addrs(struct xgbe_prv_data *pdata)
-+{
-+	struct net_device *netdev = pdata->netdev;
-+	struct netdev_hw_addr *ha;
-+	unsigned int mac_reg;
-+	unsigned int addn_macs;
-+
-+	mac_reg = MAC_MACA1HR;
-+	addn_macs = pdata->hw_feat.addn_mac;
-+
-+	if (netdev_uc_count(netdev) > addn_macs) {
-+		xgbe_set_promiscuous_mode(pdata, 1);
-+	} else {
-+		netdev_for_each_uc_addr(ha, netdev) {
-+			xgbe_set_mac_reg(pdata, ha, &mac_reg);
-+			addn_macs--;
-+		}
-+
-+		if (netdev_mc_count(netdev) > addn_macs) {
-+			xgbe_set_all_multicast_mode(pdata, 1);
-+		} else {
-+			netdev_for_each_mc_addr(ha, netdev) {
-+				xgbe_set_mac_reg(pdata, ha, &mac_reg);
-+				addn_macs--;
-+			}
-+		}
-+	}
-+
-+	/* Clear remaining additional MAC address entries */
-+	while (addn_macs--)
-+		xgbe_set_mac_reg(pdata, NULL, &mac_reg);
-+}
-+
-+static void xgbe_set_mac_hash_table(struct xgbe_prv_data *pdata)
-+{
-+	struct net_device *netdev = pdata->netdev;
-+	struct netdev_hw_addr *ha;
-+	unsigned int hash_reg;
-+	unsigned int hash_table_shift, hash_table_count;
-+	u32 hash_table[XGBE_MAC_HASH_TABLE_SIZE];
-+	u32 crc;
-+	unsigned int i;
-+
-+	hash_table_shift = 26 - (pdata->hw_feat.hash_table_size >> 7);
-+	hash_table_count = pdata->hw_feat.hash_table_size / 32;
-+	memset(hash_table, 0, sizeof(hash_table));
-+
-+	/* Build the MAC Hash Table register values */
-+	netdev_for_each_uc_addr(ha, netdev) {
-+		crc = bitrev32(~crc32_le(~0, ha->addr, ETH_ALEN));
-+		crc >>= hash_table_shift;
-+		hash_table[crc >> 5] |= (1 << (crc & 0x1f));
-+	}
-+
-+	netdev_for_each_mc_addr(ha, netdev) {
-+		crc = bitrev32(~crc32_le(~0, ha->addr, ETH_ALEN));
-+		crc >>= hash_table_shift;
-+		hash_table[crc >> 5] |= (1 << (crc & 0x1f));
-+	}
-+
-+	/* Set the MAC Hash Table registers */
-+	hash_reg = MAC_HTR0;
-+	for (i = 0; i < hash_table_count; i++) {
-+		XGMAC_IOWRITE(pdata, hash_reg, hash_table[i]);
-+		hash_reg += MAC_HTR_INC;
-+	}
-+}
-+
-+static int xgbe_add_mac_addresses(struct xgbe_prv_data *pdata)
-+{
-+	if (pdata->hw_feat.hash_table_size)
-+		xgbe_set_mac_hash_table(pdata);
-+	else
-+		xgbe_set_mac_addn_addrs(pdata);
-+
-+	return 0;
-+}
-+
-+static int xgbe_set_mac_address(struct xgbe_prv_data *pdata, u8 *addr)
-+{
-+	unsigned int mac_addr_hi, mac_addr_lo;
-+
-+	mac_addr_hi = (addr[5] <<  8) | (addr[4] <<  0);
-+	mac_addr_lo = (addr[3] << 24) | (addr[2] << 16) |
-+		      (addr[1] <<  8) | (addr[0] <<  0);
-+
-+	XGMAC_IOWRITE(pdata, MAC_MACA0HR, mac_addr_hi);
-+	XGMAC_IOWRITE(pdata, MAC_MACA0LR, mac_addr_lo);
-+
-+	return 0;
-+}
-+
-+static int xgbe_read_mmd_regs(struct xgbe_prv_data *pdata, int prtad,
-+			      int mmd_reg)
-+{
-+	unsigned int mmd_address;
-+	int mmd_data;
-+
-+	if (mmd_reg & MII_ADDR_C45)
-+		mmd_address = mmd_reg & ~MII_ADDR_C45;
-+	else
-+		mmd_address = (pdata->mdio_mmd << 16) | (mmd_reg & 0xffff);
-+
-+	/* The PCS implementation has reversed the devices in
-+	 * package registers so we need to change 05 to 06 and
-+	 * 06 to 05 if being read (these registers are readonly
-+	 * so no need to do this in the write function)
-+	 */
-+	if ((mmd_address & 0xffff) == 0x05)
-+		mmd_address = (mmd_address & ~0xffff) | 0x06;
-+	else if ((mmd_address & 0xffff) == 0x06)
-+		mmd_address = (mmd_address & ~0xffff) | 0x05;
-+
-+	/* The PCS registers are accessed using mmio. The underlying APB3
-+	 * management interface uses indirect addressing to access the MMD
-+	 * register sets. This requires accessing of the PCS register in two
-+	 * phases, an address phase and a data phase.
-+	 *
-+	 * The mmio interface is based on 32-bit offsets and values. All
-+	 * register offsets must therefore be adjusted by left shifting the
-+	 * offset 2 bits and reading 32 bits of data.
-+	 */
-+	mutex_lock(&pdata->xpcs_mutex);
-+	XPCS_IOWRITE(pdata, PCS_MMD_SELECT << 2, mmd_address >> 8);
-+	mmd_data = XPCS_IOREAD(pdata, (mmd_address & 0xff) << 2);
-+	mutex_unlock(&pdata->xpcs_mutex);
-+
-+	return mmd_data;
-+}
-+
-+static void xgbe_write_mmd_regs(struct xgbe_prv_data *pdata, int prtad,
-+				int mmd_reg, int mmd_data)
-+{
-+	unsigned int mmd_address;
-+
-+	if (mmd_reg & MII_ADDR_C45)
-+		mmd_address = mmd_reg & ~MII_ADDR_C45;
-+	else
-+		mmd_address = (pdata->mdio_mmd << 16) | (mmd_reg & 0xffff);
-+
-+	/* If the PCS is changing modes, match the MAC speed to it */
-+	if (((mmd_address >> 16) == MDIO_MMD_PCS) &&
-+	    ((mmd_address & 0xffff) == MDIO_CTRL2)) {
-+		struct phy_device *phydev = pdata->phydev;
-+
-+		if (mmd_data & MDIO_PCS_CTRL2_TYPE) {
-+			/* KX mode */
-+			if (phydev->supported & SUPPORTED_1000baseKX_Full)
-+				xgbe_set_gmii_speed(pdata);
-+			else
-+				xgbe_set_gmii_2500_speed(pdata);
-+		} else {
-+			/* KR mode */
-+			xgbe_set_xgmii_speed(pdata);
-+		}
-+	}
-+
-+	/* The PCS registers are accessed using mmio. The underlying APB3
-+	 * management interface uses indirect addressing to access the MMD
-+	 * register sets. This requires accessing of the PCS register in two
-+	 * phases, an address phase and a data phase.
-+	 *
-+	 * The mmio interface is based on 32-bit offsets and values. All
-+	 * register offsets must therefore be adjusted by left shifting the
-+	 * offset 2 bits and reading 32 bits of data.
-+	 */
-+	mutex_lock(&pdata->xpcs_mutex);
-+	XPCS_IOWRITE(pdata, PCS_MMD_SELECT << 2, mmd_address >> 8);
-+	XPCS_IOWRITE(pdata, (mmd_address & 0xff) << 2, mmd_data);
-+	mutex_unlock(&pdata->xpcs_mutex);
-+}
-+
-+static int xgbe_tx_complete(struct xgbe_ring_desc *rdesc)
-+{
-+	return !XGMAC_GET_BITS_LE(rdesc->desc3, TX_NORMAL_DESC3, OWN);
-+}
-+
-+static int xgbe_disable_rx_csum(struct xgbe_prv_data *pdata)
-+{
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RCR, IPC, 0);
-+
-+	return 0;
-+}
-+
-+static int xgbe_enable_rx_csum(struct xgbe_prv_data *pdata)
-+{
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RCR, IPC, 1);
-+
-+	return 0;
-+}
-+
-+static int xgbe_enable_rx_vlan_stripping(struct xgbe_prv_data *pdata)
-+{
-+	/* Put the VLAN tag in the Rx descriptor */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, EVLRXS, 1);
-+
-+	/* Don't check the VLAN type */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, DOVLTC, 1);
-+
-+	/* Check only C-TAG (0x8100) packets */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, ERSVLM, 0);
-+
-+	/* Don't consider an S-TAG (0x88A8) packet as a VLAN packet */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, ESVL, 0);
-+
-+	/* Enable VLAN tag stripping */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, EVLS, 0x3);
-+
-+	return 0;
-+}
-+
-+static int xgbe_disable_rx_vlan_stripping(struct xgbe_prv_data *pdata)
-+{
-+	XGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, EVLS, 0);
-+
-+	return 0;
-+}
-+
-+static int xgbe_enable_rx_vlan_filtering(struct xgbe_prv_data *pdata)
-+{
-+	/* Enable VLAN filtering */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_PFR, VTFE, 1);
-+
-+	/* Enable VLAN Hash Table filtering */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, VTHM, 1);
-+
-+	/* Disable VLAN tag inverse matching */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, VTIM, 0);
-+
-+	/* Only filter on the lower 12-bits of the VLAN tag */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, ETV, 1);
-+
-+	/* In order for the VLAN Hash Table filtering to be effective,
-+	 * the VLAN tag identifier in the VLAN Tag Register must not
-+	 * be zero.  Set the VLAN tag identifier to "1" to enable the
-+	 * VLAN Hash Table filtering.  This implies that a VLAN tag of
-+	 * 1 will always pass filtering.
-+	 */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, VL, 1);
-+
-+	return 0;
-+}
-+
-+static int xgbe_disable_rx_vlan_filtering(struct xgbe_prv_data *pdata)
-+{
-+	/* Disable VLAN filtering */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_PFR, VTFE, 0);
-+
-+	return 0;
-+}
-+
-+#ifndef CRCPOLY_LE
-+#define CRCPOLY_LE 0xedb88320
-+#endif
-+static u32 xgbe_vid_crc32_le(__le16 vid_le)
-+{
-+	u32 poly = CRCPOLY_LE;
-+	u32 crc = ~0;
-+	u32 temp = 0;
-+	unsigned char *data = (unsigned char *)&vid_le;
-+	unsigned char data_byte = 0;
-+	int i, bits;
-+
-+	bits = get_bitmask_order(VLAN_VID_MASK);
-+	for (i = 0; i < bits; i++) {
-+		if ((i % 8) == 0)
-+			data_byte = data[i / 8];
-+
-+		temp = ((crc & 1) ^ data_byte) & 1;
-+		crc >>= 1;
-+		data_byte >>= 1;
-+
-+		if (temp)
-+			crc ^= poly;
-+	}
-+
-+	return crc;
-+}
-+
-+static int xgbe_update_vlan_hash_table(struct xgbe_prv_data *pdata)
-+{
-+	u32 crc;
-+	u16 vid;
-+	__le16 vid_le;
-+	u16 vlan_hash_table = 0;
-+
-+	/* Generate the VLAN Hash Table value */
-+	for_each_set_bit(vid, pdata->active_vlans, VLAN_N_VID) {
-+		/* Get the CRC32 value of the VLAN ID */
-+		vid_le = cpu_to_le16(vid);
-+		crc = bitrev32(~xgbe_vid_crc32_le(vid_le)) >> 28;
-+
-+		vlan_hash_table |= (1 << crc);
-+	}
-+
-+	/* Set the VLAN Hash Table filtering register */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_VLANHTR, VLHT, vlan_hash_table);
-+
-+	return 0;
-+}
-+
-+static void xgbe_tx_desc_reset(struct xgbe_ring_data *rdata)
-+{
-+	struct xgbe_ring_desc *rdesc = rdata->rdesc;
-+
-+	/* Reset the Tx descriptor
-+	 *   Set buffer 1 (lo) address to zero
-+	 *   Set buffer 1 (hi) address to zero
-+	 *   Reset all other control bits (IC, TTSE, B2L & B1L)
-+	 *   Reset all other control bits (OWN, CTXT, FD, LD, CPC, CIC, etc)
-+	 */
-+	rdesc->desc0 = 0;
-+	rdesc->desc1 = 0;
-+	rdesc->desc2 = 0;
-+	rdesc->desc3 = 0;
-+
-+	/* Make sure ownership is written to the descriptor */
-+	wmb();
-+}
-+
-+static void xgbe_tx_desc_init(struct xgbe_channel *channel)
-+{
-+	struct xgbe_ring *ring = channel->tx_ring;
-+	struct xgbe_ring_data *rdata;
-+	int i;
-+	int start_index = ring->cur;
-+
-+	DBGPR("-->tx_desc_init\n");
-+
-+	/* Initialze all descriptors */
-+	for (i = 0; i < ring->rdesc_count; i++) {
-+		rdata = XGBE_GET_DESC_DATA(ring, i);
-+
-+		/* Initialize Tx descriptor */
-+		xgbe_tx_desc_reset(rdata);
-+	}
-+
-+	/* Update the total number of Tx descriptors */
-+	XGMAC_DMA_IOWRITE(channel, DMA_CH_TDRLR, ring->rdesc_count - 1);
-+
-+	/* Update the starting address of descriptor ring */
-+	rdata = XGBE_GET_DESC_DATA(ring, start_index);
-+	XGMAC_DMA_IOWRITE(channel, DMA_CH_TDLR_HI,
-+			  upper_32_bits(rdata->rdesc_dma));
-+	XGMAC_DMA_IOWRITE(channel, DMA_CH_TDLR_LO,
-+			  lower_32_bits(rdata->rdesc_dma));
-+
-+	DBGPR("<--tx_desc_init\n");
-+}
-+
-+static void xgbe_rx_desc_reset(struct xgbe_ring_data *rdata)
-+{
-+	struct xgbe_ring_desc *rdesc = rdata->rdesc;
-+
-+	/* Reset the Rx descriptor
-+	 *   Set buffer 1 (lo) address to header dma address (lo)
-+	 *   Set buffer 1 (hi) address to header dma address (hi)
-+	 *   Set buffer 2 (lo) address to buffer dma address (lo)
-+	 *   Set buffer 2 (hi) address to buffer dma address (hi) and
-+	 *     set control bits OWN and INTE
-+	 */
-+	rdesc->desc0 = cpu_to_le32(lower_32_bits(rdata->rx.hdr.dma));
-+	rdesc->desc1 = cpu_to_le32(upper_32_bits(rdata->rx.hdr.dma));
-+	rdesc->desc2 = cpu_to_le32(lower_32_bits(rdata->rx.buf.dma));
-+	rdesc->desc3 = cpu_to_le32(upper_32_bits(rdata->rx.buf.dma));
-+
-+	XGMAC_SET_BITS_LE(rdesc->desc3, RX_NORMAL_DESC3, INTE,
-+			  rdata->interrupt ? 1 : 0);
-+
-+	/* Since the Rx DMA engine is likely running, make sure everything
-+	 * is written to the descriptor(s) before setting the OWN bit
-+	 * for the descriptor
-+	 */
-+	wmb();
-+
-+	XGMAC_SET_BITS_LE(rdesc->desc3, RX_NORMAL_DESC3, OWN, 1);
-+
-+	/* Make sure ownership is written to the descriptor */
-+	wmb();
-+}
-+
-+static void xgbe_rx_desc_init(struct xgbe_channel *channel)
-+{
-+	struct xgbe_prv_data *pdata = channel->pdata;
-+	struct xgbe_ring *ring = channel->rx_ring;
-+	struct xgbe_ring_data *rdata;
-+	unsigned int start_index = ring->cur;
-+	unsigned int rx_coalesce, rx_frames;
-+	unsigned int i;
-+
-+	DBGPR("-->rx_desc_init\n");
-+
-+	rx_coalesce = (pdata->rx_riwt || pdata->rx_frames) ? 1 : 0;
-+	rx_frames = pdata->rx_frames;
-+
-+	/* Initialize all descriptors */
-+	for (i = 0; i < ring->rdesc_count; i++) {
-+		rdata = XGBE_GET_DESC_DATA(ring, i);
-+
-+		/* Set interrupt on completion bit as appropriate */
-+		if (rx_coalesce && (!rx_frames || ((i + 1) % rx_frames)))
-+			rdata->interrupt = 0;
-+		else
-+			rdata->interrupt = 1;
-+
-+		/* Initialize Rx descriptor */
-+		xgbe_rx_desc_reset(rdata);
-+	}
-+
-+	/* Update the total number of Rx descriptors */
-+	XGMAC_DMA_IOWRITE(channel, DMA_CH_RDRLR, ring->rdesc_count - 1);
-+
-+	/* Update the starting address of descriptor ring */
-+	rdata = XGBE_GET_DESC_DATA(ring, start_index);
-+	XGMAC_DMA_IOWRITE(channel, DMA_CH_RDLR_HI,
-+			  upper_32_bits(rdata->rdesc_dma));
-+	XGMAC_DMA_IOWRITE(channel, DMA_CH_RDLR_LO,
-+			  lower_32_bits(rdata->rdesc_dma));
-+
-+	/* Update the Rx Descriptor Tail Pointer */
-+	rdata = XGBE_GET_DESC_DATA(ring, start_index + ring->rdesc_count - 1);
-+	XGMAC_DMA_IOWRITE(channel, DMA_CH_RDTR_LO,
-+			  lower_32_bits(rdata->rdesc_dma));
-+
-+	DBGPR("<--rx_desc_init\n");
-+}
-+
-+static void xgbe_update_tstamp_addend(struct xgbe_prv_data *pdata,
-+				      unsigned int addend)
-+{
-+	/* Set the addend register value and tell the device */
-+	XGMAC_IOWRITE(pdata, MAC_TSAR, addend);
-+	XGMAC_IOWRITE_BITS(pdata, MAC_TSCR, TSADDREG, 1);
-+
-+	/* Wait for addend update to complete */
-+	while (XGMAC_IOREAD_BITS(pdata, MAC_TSCR, TSADDREG))
-+		udelay(5);
-+}
-+
-+static void xgbe_set_tstamp_time(struct xgbe_prv_data *pdata, unsigned int sec,
-+				 unsigned int nsec)
-+{
-+	/* Set the time values and tell the device */
-+	XGMAC_IOWRITE(pdata, MAC_STSUR, sec);
-+	XGMAC_IOWRITE(pdata, MAC_STNUR, nsec);
-+	XGMAC_IOWRITE_BITS(pdata, MAC_TSCR, TSINIT, 1);
-+
-+	/* Wait for time update to complete */
-+	while (XGMAC_IOREAD_BITS(pdata, MAC_TSCR, TSINIT))
-+		udelay(5);
-+}
-+
-+static u64 xgbe_get_tstamp_time(struct xgbe_prv_data *pdata)
-+{
-+	u64 nsec;
-+
-+	nsec = XGMAC_IOREAD(pdata, MAC_STSR);
-+	nsec *= NSEC_PER_SEC;
-+	nsec += XGMAC_IOREAD(pdata, MAC_STNR);
-+
-+	return nsec;
-+}
-+
-+static u64 xgbe_get_tx_tstamp(struct xgbe_prv_data *pdata)
-+{
-+	unsigned int tx_snr;
-+	u64 nsec;
-+
-+	tx_snr = XGMAC_IOREAD(pdata, MAC_TXSNR);
-+	if (XGMAC_GET_BITS(tx_snr, MAC_TXSNR, TXTSSTSMIS))
-+		return 0;
-+
-+	nsec = XGMAC_IOREAD(pdata, MAC_TXSSR);
-+	nsec *= NSEC_PER_SEC;
-+	nsec += tx_snr;
-+
-+	return nsec;
-+}
-+
-+static void xgbe_get_rx_tstamp(struct xgbe_packet_data *packet,
-+			       struct xgbe_ring_desc *rdesc)
-+{
-+	u64 nsec;
-+
-+	if (XGMAC_GET_BITS_LE(rdesc->desc3, RX_CONTEXT_DESC3, TSA) &&
-+	    !XGMAC_GET_BITS_LE(rdesc->desc3, RX_CONTEXT_DESC3, TSD)) {
-+		nsec = le32_to_cpu(rdesc->desc1);
-+		nsec <<= 32;
-+		nsec |= le32_to_cpu(rdesc->desc0);
-+		if (nsec != 0xffffffffffffffffULL) {
-+			packet->rx_tstamp = nsec;
-+			XGMAC_SET_BITS(packet->attributes, RX_PACKET_ATTRIBUTES,
-+				       RX_TSTAMP, 1);
-+		}
-+	}
-+}
-+
-+static int xgbe_config_tstamp(struct xgbe_prv_data *pdata,
-+			      unsigned int mac_tscr)
-+{
-+	/* Set one nano-second accuracy */
-+	XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSCTRLSSR, 1);
-+
-+	/* Set fine timestamp update */
-+	XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSCFUPDT, 1);
-+
-+	/* Overwrite earlier timestamps */
-+	XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TXTSSTSM, 1);
-+
-+	XGMAC_IOWRITE(pdata, MAC_TSCR, mac_tscr);
-+
-+	/* Exit if timestamping is not enabled */
-+	if (!XGMAC_GET_BITS(mac_tscr, MAC_TSCR, TSENA))
-+		return 0;
-+
-+	/* Initialize time registers */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_SSIR, SSINC, XGBE_TSTAMP_SSINC);
-+	XGMAC_IOWRITE_BITS(pdata, MAC_SSIR, SNSINC, XGBE_TSTAMP_SNSINC);
-+	xgbe_update_tstamp_addend(pdata, pdata->tstamp_addend);
-+	xgbe_set_tstamp_time(pdata, 0, 0);
-+
-+	/* Initialize the timecounter */
-+	timecounter_init(&pdata->tstamp_tc, &pdata->tstamp_cc,
-+			 ktime_to_ns(ktime_get_real()));
-+
-+	return 0;
-+}
-+
-+static void xgbe_config_dcb_tc(struct xgbe_prv_data *pdata)
-+{
-+	struct ieee_ets *ets = pdata->ets;
-+	unsigned int total_weight, min_weight, weight;
-+	unsigned int i;
-+
-+	if (!ets)
-+		return;
-+
-+	/* Set Tx to deficit weighted round robin scheduling algorithm (when
-+	 * traffic class is using ETS algorithm)
-+	 */
-+	XGMAC_IOWRITE_BITS(pdata, MTL_OMR, ETSALG, MTL_ETSALG_DWRR);
-+
-+	/* Set Traffic Class algorithms */
-+	total_weight = pdata->netdev->mtu * pdata->hw_feat.tc_cnt;
-+	min_weight = total_weight / 100;
-+	if (!min_weight)
-+		min_weight = 1;
-+
-+	for (i = 0; i < pdata->hw_feat.tc_cnt; i++) {
-+		switch (ets->tc_tsa[i]) {
-+		case IEEE_8021QAZ_TSA_STRICT:
-+			DBGPR("  TC%u using SP\n", i);
-+			XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_TC_ETSCR, TSA,
-+					       MTL_TSA_SP);
-+			break;
-+		case IEEE_8021QAZ_TSA_ETS:
-+			weight = total_weight * ets->tc_tx_bw[i] / 100;
-+			weight = clamp(weight, min_weight, total_weight);
-+
-+			DBGPR("  TC%u using DWRR (weight %u)\n", i, weight);
-+			XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_TC_ETSCR, TSA,
-+					       MTL_TSA_ETS);
-+			XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_TC_QWR, QW,
-+					       weight);
-+			break;
-+		}
-+	}
-+}
-+
-+static void xgbe_config_dcb_pfc(struct xgbe_prv_data *pdata)
-+{
-+	struct ieee_pfc *pfc = pdata->pfc;
-+	struct ieee_ets *ets = pdata->ets;
-+	unsigned int mask, reg, reg_val;
-+	unsigned int tc, prio;
-+
-+	if (!pfc || !ets)
-+		return;
-+
-+	for (tc = 0; tc < pdata->hw_feat.tc_cnt; tc++) {
-+		mask = 0;
-+		for (prio = 0; prio < IEEE_8021QAZ_MAX_TCS; prio++) {
-+			if ((pfc->pfc_en & (1 << prio)) &&
-+			    (ets->prio_tc[prio] == tc))
-+				mask |= (1 << prio);
-+		}
-+		mask &= 0xff;
-+
-+		DBGPR("  TC%u PFC mask=%#x\n", tc, mask);
-+		reg = MTL_TCPM0R + (MTL_TCPM_INC * (tc / MTL_TCPM_TC_PER_REG));
-+		reg_val = XGMAC_IOREAD(pdata, reg);
-+
-+		reg_val &= ~(0xff << ((tc % MTL_TCPM_TC_PER_REG) << 3));
-+		reg_val |= (mask << ((tc % MTL_TCPM_TC_PER_REG) << 3));
-+
-+		XGMAC_IOWRITE(pdata, reg, reg_val);
-+	}
-+
-+	xgbe_config_flow_control(pdata);
-+}
-+
-+static void xgbe_tx_start_xmit(struct xgbe_channel *channel,
-+			       struct xgbe_ring *ring)
-+{
-+	struct xgbe_prv_data *pdata = channel->pdata;
-+	struct xgbe_ring_data *rdata;
-+
-+	/* Issue a poll command to Tx DMA by writing address
-+	 * of next immediate free descriptor */
-+	rdata = XGBE_GET_DESC_DATA(ring, ring->cur);
-+	XGMAC_DMA_IOWRITE(channel, DMA_CH_TDTR_LO,
-+			  lower_32_bits(rdata->rdesc_dma));
-+
-+	/* Start the Tx coalescing timer */
-+	if (pdata->tx_usecs && !channel->tx_timer_active) {
-+		channel->tx_timer_active = 1;
-+		hrtimer_start(&channel->tx_timer,
-+			      ktime_set(0, pdata->tx_usecs * NSEC_PER_USEC),
-+			      HRTIMER_MODE_REL);
-+	}
-+
-+	ring->tx.xmit_more = 0;
-+}
-+
-+static void xgbe_dev_xmit(struct xgbe_channel *channel)
-+{
-+	struct xgbe_prv_data *pdata = channel->pdata;
-+	struct xgbe_ring *ring = channel->tx_ring;
-+	struct xgbe_ring_data *rdata;
-+	struct xgbe_ring_desc *rdesc;
-+	struct xgbe_packet_data *packet = &ring->packet_data;
-+	unsigned int csum, tso, vlan;
-+	unsigned int tso_context, vlan_context;
-+	unsigned int tx_set_ic;
-+	int start_index = ring->cur;
-+	int cur_index = ring->cur;
-+	int i;
-+
-+	DBGPR("-->xgbe_dev_xmit\n");
-+
-+	csum = XGMAC_GET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES,
-+			      CSUM_ENABLE);
-+	tso = XGMAC_GET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES,
-+			     TSO_ENABLE);
-+	vlan = XGMAC_GET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES,
-+			      VLAN_CTAG);
-+
-+	if (tso && (packet->mss != ring->tx.cur_mss))
-+		tso_context = 1;
-+	else
-+		tso_context = 0;
-+
-+	if (vlan && (packet->vlan_ctag != ring->tx.cur_vlan_ctag))
-+		vlan_context = 1;
-+	else
-+		vlan_context = 0;
-+
-+	/* Determine if an interrupt should be generated for this Tx:
-+	 *   Interrupt:
-+	 *     - Tx frame count exceeds the frame count setting
-+	 *     - Addition of Tx frame count to the frame count since the
-+	 *       last interrupt was set exceeds the frame count setting
-+	 *   No interrupt:
-+	 *     - No frame count setting specified (ethtool -C ethX tx-frames 0)
-+	 *     - Addition of Tx frame count to the frame count since the
-+	 *       last interrupt was set does not exceed the frame count setting
-+	 */
-+	ring->coalesce_count += packet->tx_packets;
-+	if (!pdata->tx_frames)
-+		tx_set_ic = 0;
-+	else if (packet->tx_packets > pdata->tx_frames)
-+		tx_set_ic = 1;
-+	else if ((ring->coalesce_count % pdata->tx_frames) <
-+		 packet->tx_packets)
-+		tx_set_ic = 1;
-+	else
-+		tx_set_ic = 0;
-+
-+	rdata = XGBE_GET_DESC_DATA(ring, cur_index);
-+	rdesc = rdata->rdesc;
-+
-+	/* Create a context descriptor if this is a TSO packet */
-+	if (tso_context || vlan_context) {
-+		if (tso_context) {
-+			DBGPR("  TSO context descriptor, mss=%u\n",
-+			      packet->mss);
-+
-+			/* Set the MSS size */
-+			XGMAC_SET_BITS_LE(rdesc->desc2, TX_CONTEXT_DESC2,
-+					  MSS, packet->mss);
-+
-+			/* Mark it as a CONTEXT descriptor */
-+			XGMAC_SET_BITS_LE(rdesc->desc3, TX_CONTEXT_DESC3,
-+					  CTXT, 1);
-+
-+			/* Indicate this descriptor contains the MSS */
-+			XGMAC_SET_BITS_LE(rdesc->desc3, TX_CONTEXT_DESC3,
-+					  TCMSSV, 1);
-+
-+			ring->tx.cur_mss = packet->mss;
-+		}
-+
-+		if (vlan_context) {
-+			DBGPR("  VLAN context descriptor, ctag=%u\n",
-+			      packet->vlan_ctag);
-+
-+			/* Mark it as a CONTEXT descriptor */
-+			XGMAC_SET_BITS_LE(rdesc->desc3, TX_CONTEXT_DESC3,
-+					  CTXT, 1);
-+
-+			/* Set the VLAN tag */
-+			XGMAC_SET_BITS_LE(rdesc->desc3, TX_CONTEXT_DESC3,
-+					  VT, packet->vlan_ctag);
-+
-+			/* Indicate this descriptor contains the VLAN tag */
-+			XGMAC_SET_BITS_LE(rdesc->desc3, TX_CONTEXT_DESC3,
-+					  VLTV, 1);
-+
-+			ring->tx.cur_vlan_ctag = packet->vlan_ctag;
-+		}
-+
-+		cur_index++;
-+		rdata = XGBE_GET_DESC_DATA(ring, cur_index);
-+		rdesc = rdata->rdesc;
-+	}
-+
-+	/* Update buffer address (for TSO this is the header) */
-+	rdesc->desc0 =  cpu_to_le32(lower_32_bits(rdata->skb_dma));
-+	rdesc->desc1 =  cpu_to_le32(upper_32_bits(rdata->skb_dma));
-+
-+	/* Update the buffer length */
-+	XGMAC_SET_BITS_LE(rdesc->desc2, TX_NORMAL_DESC2, HL_B1L,
-+			  rdata->skb_dma_len);
-+
-+	/* VLAN tag insertion check */
-+	if (vlan)
-+		XGMAC_SET_BITS_LE(rdesc->desc2, TX_NORMAL_DESC2, VTIR,
-+				  TX_NORMAL_DESC2_VLAN_INSERT);
-+
-+	/* Timestamp enablement check */
-+	if (XGMAC_GET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES, PTP))
-+		XGMAC_SET_BITS_LE(rdesc->desc2, TX_NORMAL_DESC2, TTSE, 1);
-+
-+	/* Mark it as First Descriptor */
-+	XGMAC_SET_BITS_LE(rdesc->desc3, TX_NORMAL_DESC3, FD, 1);
-+
-+	/* Mark it as a NORMAL descriptor */
-+	XGMAC_SET_BITS_LE(rdesc->desc3, TX_NORMAL_DESC3, CTXT, 0);
-+
-+	/* Set OWN bit if not the first descriptor */
-+	if (cur_index != start_index)
-+		XGMAC_SET_BITS_LE(rdesc->desc3, TX_NORMAL_DESC3, OWN, 1);
-+
-+	if (tso) {
-+		/* Enable TSO */
-+		XGMAC_SET_BITS_LE(rdesc->desc3, TX_NORMAL_DESC3, TSE, 1);
-+		XGMAC_SET_BITS_LE(rdesc->desc3, TX_NORMAL_DESC3, TCPPL,
-+				  packet->tcp_payload_len);
-+		XGMAC_SET_BITS_LE(rdesc->desc3, TX_NORMAL_DESC3, TCPHDRLEN,
-+				  packet->tcp_header_len / 4);
-+	} else {
-+		/* Enable CRC and Pad Insertion */
-+		XGMAC_SET_BITS_LE(rdesc->desc3, TX_NORMAL_DESC3, CPC, 0);
-+
-+		/* Enable HW CSUM */
-+		if (csum)
-+			XGMAC_SET_BITS_LE(rdesc->desc3, TX_NORMAL_DESC3,
-+					  CIC, 0x3);
-+
-+		/* Set the total length to be transmitted */
-+		XGMAC_SET_BITS_LE(rdesc->desc3, TX_NORMAL_DESC3, FL,
-+				  packet->length);
-+	}
-+
-+	for (i = cur_index - start_index + 1; i < packet->rdesc_count; i++) {
-+		cur_index++;
-+		rdata = XGBE_GET_DESC_DATA(ring, cur_index);
-+		rdesc = rdata->rdesc;
-+
-+		/* Update buffer address */
-+		rdesc->desc0 = cpu_to_le32(lower_32_bits(rdata->skb_dma));
-+		rdesc->desc1 = cpu_to_le32(upper_32_bits(rdata->skb_dma));
-+
-+		/* Update the buffer length */
-+		XGMAC_SET_BITS_LE(rdesc->desc2, TX_NORMAL_DESC2, HL_B1L,
-+				  rdata->skb_dma_len);
-+
-+		/* Set OWN bit */
-+		XGMAC_SET_BITS_LE(rdesc->desc3, TX_NORMAL_DESC3, OWN, 1);
-+
-+		/* Mark it as NORMAL descriptor */
-+		XGMAC_SET_BITS_LE(rdesc->desc3, TX_NORMAL_DESC3, CTXT, 0);
-+
-+		/* Enable HW CSUM */
-+		if (csum)
-+			XGMAC_SET_BITS_LE(rdesc->desc3, TX_NORMAL_DESC3,
-+					  CIC, 0x3);
-+	}
-+
-+	/* Set LAST bit for the last descriptor */
-+	XGMAC_SET_BITS_LE(rdesc->desc3, TX_NORMAL_DESC3, LD, 1);
-+
-+	/* Set IC bit based on Tx coalescing settings */
-+	if (tx_set_ic)
-+		XGMAC_SET_BITS_LE(rdesc->desc2, TX_NORMAL_DESC2, IC, 1);
-+
-+	/* Save the Tx info to report back during cleanup */
-+	rdata->tx.packets = packet->tx_packets;
-+	rdata->tx.bytes = packet->tx_bytes;
-+
-+	/* In case the Tx DMA engine is running, make sure everything
-+	 * is written to the descriptor(s) before setting the OWN bit
-+	 * for the first descriptor
-+	 */
-+	wmb();
-+
-+	/* Set OWN bit for the first descriptor */
-+	rdata = XGBE_GET_DESC_DATA(ring, start_index);
-+	rdesc = rdata->rdesc;
-+	XGMAC_SET_BITS_LE(rdesc->desc3, TX_NORMAL_DESC3, OWN, 1);
-+
-+#ifdef XGMAC_ENABLE_TX_DESC_DUMP
-+	xgbe_a0_dump_tx_desc(ring, start_index, packet->rdesc_count, 1);
-+#endif
-+
-+	/* Make sure ownership is written to the descriptor */
-+	wmb();
-+
-+	ring->cur = cur_index + 1;
-+	if (!packet->skb->xmit_more ||
-+	    netif_xmit_stopped(netdev_get_tx_queue(pdata->netdev,
-+						   channel->queue_index)))
-+		xgbe_tx_start_xmit(channel, ring);
-+	else
-+		ring->tx.xmit_more = 1;
-+
-+	DBGPR("  %s: descriptors %u to %u written\n",
-+	      channel->name, start_index & (ring->rdesc_count - 1),
-+	      (ring->cur - 1) & (ring->rdesc_count - 1));
-+
-+	DBGPR("<--xgbe_dev_xmit\n");
-+}
-+
-+static int xgbe_dev_read(struct xgbe_channel *channel)
-+{
-+	struct xgbe_ring *ring = channel->rx_ring;
-+	struct xgbe_ring_data *rdata;
-+	struct xgbe_ring_desc *rdesc;
-+	struct xgbe_packet_data *packet = &ring->packet_data;
-+	struct net_device *netdev = channel->pdata->netdev;
-+	unsigned int err, etlt, l34t;
-+
-+	DBGPR("-->xgbe_dev_read: cur = %d\n", ring->cur);
-+
-+	rdata = XGBE_GET_DESC_DATA(ring, ring->cur);
-+	rdesc = rdata->rdesc;
-+
-+	/* Check for data availability */
-+	if (XGMAC_GET_BITS_LE(rdesc->desc3, RX_NORMAL_DESC3, OWN))
-+		return 1;
-+
-+	/* Make sure descriptor fields are read after reading the OWN bit */
-+	rmb();
-+
-+#ifdef XGMAC_ENABLE_RX_DESC_DUMP
-+	xgbe_a0_dump_rx_desc(ring, rdesc, ring->cur);
-+#endif
-+
-+	if (XGMAC_GET_BITS_LE(rdesc->desc3, RX_NORMAL_DESC3, CTXT)) {
-+		/* Timestamp Context Descriptor */
-+		xgbe_get_rx_tstamp(packet, rdesc);
-+
-+		XGMAC_SET_BITS(packet->attributes, RX_PACKET_ATTRIBUTES,
-+			       CONTEXT, 1);
-+		XGMAC_SET_BITS(packet->attributes, RX_PACKET_ATTRIBUTES,
-+			       CONTEXT_NEXT, 0);
-+		return 0;
-+	}
-+
-+	/* Normal Descriptor, be sure Context Descriptor bit is off */
-+	XGMAC_SET_BITS(packet->attributes, RX_PACKET_ATTRIBUTES, CONTEXT, 0);
-+
-+	/* Indicate if a Context Descriptor is next */
-+	if (XGMAC_GET_BITS_LE(rdesc->desc3, RX_NORMAL_DESC3, CDA))
-+		XGMAC_SET_BITS(packet->attributes, RX_PACKET_ATTRIBUTES,
-+			       CONTEXT_NEXT, 1);
-+
-+	/* Get the header length */
-+	if (XGMAC_GET_BITS_LE(rdesc->desc3, RX_NORMAL_DESC3, FD))
-+		rdata->rx.hdr_len = XGMAC_GET_BITS_LE(rdesc->desc2,
-+						      RX_NORMAL_DESC2, HL);
-+
-+	/* Get the RSS hash */
-+	if (XGMAC_GET_BITS_LE(rdesc->desc3, RX_NORMAL_DESC3, RSV)) {
-+		XGMAC_SET_BITS(packet->attributes, RX_PACKET_ATTRIBUTES,
-+			       RSS_HASH, 1);
-+
-+		packet->rss_hash = le32_to_cpu(rdesc->desc1);
-+
-+		l34t = XGMAC_GET_BITS_LE(rdesc->desc3, RX_NORMAL_DESC3, L34T);
-+		switch (l34t) {
-+		case RX_DESC3_L34T_IPV4_TCP:
-+		case RX_DESC3_L34T_IPV4_UDP:
-+		case RX_DESC3_L34T_IPV6_TCP:
-+		case RX_DESC3_L34T_IPV6_UDP:
-+			packet->rss_hash_type = PKT_HASH_TYPE_L4;
-+			break;
-+		default:
-+			packet->rss_hash_type = PKT_HASH_TYPE_L3;
-+		}
-+	}
-+
-+	/* Get the packet length */
-+	rdata->rx.len = XGMAC_GET_BITS_LE(rdesc->desc3, RX_NORMAL_DESC3, PL);
-+
-+	if (!XGMAC_GET_BITS_LE(rdesc->desc3, RX_NORMAL_DESC3, LD)) {
-+		/* Not all the data has been transferred for this packet */
-+		XGMAC_SET_BITS(packet->attributes, RX_PACKET_ATTRIBUTES,
-+			       INCOMPLETE, 1);
-+		return 0;
-+	}
-+
-+	/* This is the last of the data for this packet */
-+	XGMAC_SET_BITS(packet->attributes, RX_PACKET_ATTRIBUTES,
-+		       INCOMPLETE, 0);
-+
-+	/* Set checksum done indicator as appropriate */
-+	if (channel->pdata->netdev->features & NETIF_F_RXCSUM)
-+		XGMAC_SET_BITS(packet->attributes, RX_PACKET_ATTRIBUTES,
-+			       CSUM_DONE, 1);
-+
-+	/* Check for errors (only valid in last descriptor) */
-+	err = XGMAC_GET_BITS_LE(rdesc->desc3, RX_NORMAL_DESC3, ES);
-+	etlt = XGMAC_GET_BITS_LE(rdesc->desc3, RX_NORMAL_DESC3, ETLT);
-+	DBGPR("  err=%u, etlt=%#x\n", err, etlt);
-+
-+	if (!err || !etlt) {
-+		/* No error if err is 0 or etlt is 0 */
-+		if ((etlt == 0x09) &&
-+		    (netdev->features & NETIF_F_HW_VLAN_CTAG_RX)) {
-+			XGMAC_SET_BITS(packet->attributes, RX_PACKET_ATTRIBUTES,
-+				       VLAN_CTAG, 1);
-+			packet->vlan_ctag = XGMAC_GET_BITS_LE(rdesc->desc0,
-+							      RX_NORMAL_DESC0,
-+							      OVT);
-+			DBGPR("  vlan-ctag=0x%04x\n", packet->vlan_ctag);
-+		}
-+	} else {
-+		if ((etlt == 0x05) || (etlt == 0x06))
-+			XGMAC_SET_BITS(packet->attributes, RX_PACKET_ATTRIBUTES,
-+				       CSUM_DONE, 0);
-+		else
-+			XGMAC_SET_BITS(packet->errors, RX_PACKET_ERRORS,
-+				       FRAME, 1);
-+	}
-+
-+	DBGPR("<--xgbe_dev_read: %s - descriptor=%u (cur=%d)\n", channel->name,
-+	      ring->cur & (ring->rdesc_count - 1), ring->cur);
-+
-+	return 0;
-+}
-+
-+static int xgbe_is_context_desc(struct xgbe_ring_desc *rdesc)
-+{
-+	/* Rx and Tx share CTXT bit, so check TDES3.CTXT bit */
-+	return XGMAC_GET_BITS_LE(rdesc->desc3, TX_NORMAL_DESC3, CTXT);
-+}
-+
-+static int xgbe_is_last_desc(struct xgbe_ring_desc *rdesc)
-+{
-+	/* Rx and Tx share LD bit, so check TDES3.LD bit */
-+	return XGMAC_GET_BITS_LE(rdesc->desc3, TX_NORMAL_DESC3, LD);
-+}
-+
-+static int xgbe_enable_int(struct xgbe_channel *channel,
-+			   enum xgbe_int int_id)
-+{
-+	unsigned int dma_ch_ier;
-+
-+	dma_ch_ier = XGMAC_DMA_IOREAD(channel, DMA_CH_IER);
-+
-+	switch (int_id) {
-+	case XGMAC_INT_DMA_CH_SR_TI:
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, TIE, 1);
-+		break;
-+	case XGMAC_INT_DMA_CH_SR_TPS:
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, TXSE, 1);
-+		break;
-+	case XGMAC_INT_DMA_CH_SR_TBU:
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, TBUE, 1);
-+		break;
-+	case XGMAC_INT_DMA_CH_SR_RI:
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, RIE, 1);
-+		break;
-+	case XGMAC_INT_DMA_CH_SR_RBU:
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, RBUE, 1);
-+		break;
-+	case XGMAC_INT_DMA_CH_SR_RPS:
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, RSE, 1);
-+		break;
-+	case XGMAC_INT_DMA_CH_SR_TI_RI:
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, TIE, 1);
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, RIE, 1);
-+		break;
-+	case XGMAC_INT_DMA_CH_SR_FBE:
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, FBEE, 1);
-+		break;
-+	case XGMAC_INT_DMA_ALL:
-+		dma_ch_ier |= channel->saved_ier;
-+		break;
-+	default:
-+		return -1;
-+	}
-+
-+	XGMAC_DMA_IOWRITE(channel, DMA_CH_IER, dma_ch_ier);
-+
-+	return 0;
-+}
-+
-+static int xgbe_disable_int(struct xgbe_channel *channel,
-+			    enum xgbe_int int_id)
-+{
-+	unsigned int dma_ch_ier;
-+
-+	dma_ch_ier = XGMAC_DMA_IOREAD(channel, DMA_CH_IER);
-+
-+	switch (int_id) {
-+	case XGMAC_INT_DMA_CH_SR_TI:
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, TIE, 0);
-+		break;
-+	case XGMAC_INT_DMA_CH_SR_TPS:
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, TXSE, 0);
-+		break;
-+	case XGMAC_INT_DMA_CH_SR_TBU:
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, TBUE, 0);
-+		break;
-+	case XGMAC_INT_DMA_CH_SR_RI:
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, RIE, 0);
-+		break;
-+	case XGMAC_INT_DMA_CH_SR_RBU:
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, RBUE, 0);
-+		break;
-+	case XGMAC_INT_DMA_CH_SR_RPS:
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, RSE, 0);
-+		break;
-+	case XGMAC_INT_DMA_CH_SR_TI_RI:
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, TIE, 0);
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, RIE, 0);
-+		break;
-+	case XGMAC_INT_DMA_CH_SR_FBE:
-+		XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, FBEE, 0);
-+		break;
-+	case XGMAC_INT_DMA_ALL:
-+		channel->saved_ier = dma_ch_ier & XGBE_DMA_INTERRUPT_MASK;
-+		dma_ch_ier &= ~XGBE_DMA_INTERRUPT_MASK;
-+		break;
-+	default:
-+		return -1;
-+	}
-+
-+	XGMAC_DMA_IOWRITE(channel, DMA_CH_IER, dma_ch_ier);
-+
-+	return 0;
-+}
-+
-+static int xgbe_exit(struct xgbe_prv_data *pdata)
-+{
-+	unsigned int count = 2000;
-+
-+	DBGPR("-->xgbe_exit\n");
-+
-+	/* Issue a software reset */
-+	XGMAC_IOWRITE_BITS(pdata, DMA_MR, SWR, 1);
-+	usleep_range(10, 15);
-+
-+	/* Poll Until Poll Condition */
-+	while (count-- && XGMAC_IOREAD_BITS(pdata, DMA_MR, SWR))
-+		usleep_range(500, 600);
-+
-+	if (!count)
-+		return -EBUSY;
-+
-+	DBGPR("<--xgbe_exit\n");
-+
-+	return 0;
-+}
-+
-+static int xgbe_flush_tx_queues(struct xgbe_prv_data *pdata)
-+{
-+	unsigned int i, count;
-+
-+	if (XGMAC_GET_BITS(pdata->hw_feat.version, MAC_VR, SNPSVER) < 0x21)
-+		return 0;
-+
-+	for (i = 0; i < pdata->tx_q_count; i++)
-+		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_TQOMR, FTQ, 1);
-+
-+	/* Poll Until Poll Condition */
-+	for (i = 0; i < pdata->tx_q_count; i++) {
-+		count = 2000;
-+		while (count-- && XGMAC_MTL_IOREAD_BITS(pdata, i,
-+							MTL_Q_TQOMR, FTQ))
-+			usleep_range(500, 600);
-+
-+		if (!count)
-+			return -EBUSY;
-+	}
-+
-+	return 0;
-+}
-+
-+static void xgbe_config_dma_bus(struct xgbe_prv_data *pdata)
-+{
-+	/* Set enhanced addressing mode */
-+	XGMAC_IOWRITE_BITS(pdata, DMA_SBMR, EAME, 1);
-+
-+	/* Set the System Bus mode */
-+	XGMAC_IOWRITE_BITS(pdata, DMA_SBMR, UNDEF, 1);
-+	XGMAC_IOWRITE_BITS(pdata, DMA_SBMR, BLEN_256, 1);
-+}
-+
-+static void xgbe_config_dma_cache(struct xgbe_prv_data *pdata)
-+{
-+	unsigned int arcache, awcache;
-+
-+	arcache = 0;
-+	XGMAC_SET_BITS(arcache, DMA_AXIARCR, DRC, pdata->arcache);
-+	XGMAC_SET_BITS(arcache, DMA_AXIARCR, DRD, pdata->axdomain);
-+	XGMAC_SET_BITS(arcache, DMA_AXIARCR, TEC, pdata->arcache);
-+	XGMAC_SET_BITS(arcache, DMA_AXIARCR, TED, pdata->axdomain);
-+	XGMAC_SET_BITS(arcache, DMA_AXIARCR, THC, pdata->arcache);
-+	XGMAC_SET_BITS(arcache, DMA_AXIARCR, THD, pdata->axdomain);
-+	XGMAC_IOWRITE(pdata, DMA_AXIARCR, arcache);
-+
-+	awcache = 0;
-+	XGMAC_SET_BITS(awcache, DMA_AXIAWCR, DWC, pdata->awcache);
-+	XGMAC_SET_BITS(awcache, DMA_AXIAWCR, DWD, pdata->axdomain);
-+	XGMAC_SET_BITS(awcache, DMA_AXIAWCR, RPC, pdata->awcache);
-+	XGMAC_SET_BITS(awcache, DMA_AXIAWCR, RPD, pdata->axdomain);
-+	XGMAC_SET_BITS(awcache, DMA_AXIAWCR, RHC, pdata->awcache);
-+	XGMAC_SET_BITS(awcache, DMA_AXIAWCR, RHD, pdata->axdomain);
-+	XGMAC_SET_BITS(awcache, DMA_AXIAWCR, TDC, pdata->awcache);
-+	XGMAC_SET_BITS(awcache, DMA_AXIAWCR, TDD, pdata->axdomain);
-+	XGMAC_IOWRITE(pdata, DMA_AXIAWCR, awcache);
-+}
-+
-+static void xgbe_config_mtl_mode(struct xgbe_prv_data *pdata)
-+{
-+	unsigned int i;
-+
-+	/* Set Tx to weighted round robin scheduling algorithm */
-+	XGMAC_IOWRITE_BITS(pdata, MTL_OMR, ETSALG, MTL_ETSALG_WRR);
-+
-+	/* Set Tx traffic classes to use WRR algorithm with equal weights */
-+	for (i = 0; i < pdata->hw_feat.tc_cnt; i++) {
-+		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_TC_ETSCR, TSA,
-+				       MTL_TSA_ETS);
-+		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_TC_QWR, QW, 1);
-+	}
-+
-+	/* Set Rx to strict priority algorithm */
-+	XGMAC_IOWRITE_BITS(pdata, MTL_OMR, RAA, MTL_RAA_SP);
-+}
-+
-+static unsigned int xgbe_calculate_per_queue_fifo(unsigned int fifo_size,
-+						  unsigned int queue_count)
-+{
-+	unsigned int q_fifo_size = 0;
-+	enum xgbe_mtl_fifo_size p_fifo = XGMAC_MTL_FIFO_SIZE_256;
-+
-+	/* Calculate Tx/Rx fifo share per queue */
-+	switch (fifo_size) {
-+	case 0:
-+		q_fifo_size = XGBE_FIFO_SIZE_B(128);
-+		break;
-+	case 1:
-+		q_fifo_size = XGBE_FIFO_SIZE_B(256);
-+		break;
-+	case 2:
-+		q_fifo_size = XGBE_FIFO_SIZE_B(512);
-+		break;
-+	case 3:
-+		q_fifo_size = XGBE_FIFO_SIZE_KB(1);
-+		break;
-+	case 4:
-+		q_fifo_size = XGBE_FIFO_SIZE_KB(2);
-+		break;
-+	case 5:
-+		q_fifo_size = XGBE_FIFO_SIZE_KB(4);
-+		break;
-+	case 6:
-+		q_fifo_size = XGBE_FIFO_SIZE_KB(8);
-+		break;
-+	case 7:
-+		q_fifo_size = XGBE_FIFO_SIZE_KB(16);
-+		break;
-+	case 8:
-+		q_fifo_size = XGBE_FIFO_SIZE_KB(32);
-+		break;
-+	case 9:
-+		q_fifo_size = XGBE_FIFO_SIZE_KB(64);
-+		break;
-+	case 10:
-+		q_fifo_size = XGBE_FIFO_SIZE_KB(128);
-+		break;
-+	case 11:
-+		q_fifo_size = XGBE_FIFO_SIZE_KB(256);
-+		break;
-+	}
-+
-+	/* The configured value is not the actual amount of fifo RAM */
-+	q_fifo_size = min_t(unsigned int, XGBE_FIFO_MAX, q_fifo_size);
-+
-+	q_fifo_size = q_fifo_size / queue_count;
-+
-+	/* Set the queue fifo size programmable value */
-+	if (q_fifo_size >= XGBE_FIFO_SIZE_KB(256))
-+		p_fifo = XGMAC_MTL_FIFO_SIZE_256K;
-+	else if (q_fifo_size >= XGBE_FIFO_SIZE_KB(128))
-+		p_fifo = XGMAC_MTL_FIFO_SIZE_128K;
-+	else if (q_fifo_size >= XGBE_FIFO_SIZE_KB(64))
-+		p_fifo = XGMAC_MTL_FIFO_SIZE_64K;
-+	else if (q_fifo_size >= XGBE_FIFO_SIZE_KB(32))
-+		p_fifo = XGMAC_MTL_FIFO_SIZE_32K;
-+	else if (q_fifo_size >= XGBE_FIFO_SIZE_KB(16))
-+		p_fifo = XGMAC_MTL_FIFO_SIZE_16K;
-+	else if (q_fifo_size >= XGBE_FIFO_SIZE_KB(8))
-+		p_fifo = XGMAC_MTL_FIFO_SIZE_8K;
-+	else if (q_fifo_size >= XGBE_FIFO_SIZE_KB(4))
-+		p_fifo = XGMAC_MTL_FIFO_SIZE_4K;
-+	else if (q_fifo_size >= XGBE_FIFO_SIZE_KB(2))
-+		p_fifo = XGMAC_MTL_FIFO_SIZE_2K;
-+	else if (q_fifo_size >= XGBE_FIFO_SIZE_KB(1))
-+		p_fifo = XGMAC_MTL_FIFO_SIZE_1K;
-+	else if (q_fifo_size >= XGBE_FIFO_SIZE_B(512))
-+		p_fifo = XGMAC_MTL_FIFO_SIZE_512;
-+	else if (q_fifo_size >= XGBE_FIFO_SIZE_B(256))
-+		p_fifo = XGMAC_MTL_FIFO_SIZE_256;
-+
-+	return p_fifo;
-+}
-+
-+static void xgbe_config_tx_fifo_size(struct xgbe_prv_data *pdata)
-+{
-+	enum xgbe_mtl_fifo_size fifo_size;
-+	unsigned int i;
-+
-+	fifo_size = xgbe_calculate_per_queue_fifo(pdata->hw_feat.tx_fifo_size,
-+						  pdata->tx_q_count);
-+
-+	for (i = 0; i < pdata->tx_q_count; i++)
-+		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_TQOMR, TQS, fifo_size);
-+
-+	netdev_notice(pdata->netdev, "%d Tx queues, %d byte fifo per queue\n",
-+		      pdata->tx_q_count, ((fifo_size + 1) * 256));
-+}
-+
-+static void xgbe_config_rx_fifo_size(struct xgbe_prv_data *pdata)
-+{
-+	enum xgbe_mtl_fifo_size fifo_size;
-+	unsigned int i;
-+
-+	fifo_size = xgbe_calculate_per_queue_fifo(pdata->hw_feat.rx_fifo_size,
-+						  pdata->rx_q_count);
-+
-+	for (i = 0; i < pdata->rx_q_count; i++)
-+		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_RQOMR, RQS, fifo_size);
-+
-+	netdev_notice(pdata->netdev, "%d Rx queues, %d byte fifo per queue\n",
-+		      pdata->rx_q_count, ((fifo_size + 1) * 256));
-+}
-+
-+static void xgbe_config_queue_mapping(struct xgbe_prv_data *pdata)
-+{
-+	unsigned int qptc, qptc_extra, queue;
-+	unsigned int prio_queues;
-+	unsigned int ppq, ppq_extra, prio;
-+	unsigned int mask;
-+	unsigned int i, j, reg, reg_val;
-+
-+	/* Map the MTL Tx Queues to Traffic Classes
-+	 *   Note: Tx Queues >= Traffic Classes
-+	 */
-+	qptc = pdata->tx_q_count / pdata->hw_feat.tc_cnt;
-+	qptc_extra = pdata->tx_q_count % pdata->hw_feat.tc_cnt;
-+
-+	for (i = 0, queue = 0; i < pdata->hw_feat.tc_cnt; i++) {
-+		for (j = 0; j < qptc; j++) {
-+			DBGPR("  TXq%u mapped to TC%u\n", queue, i);
-+			XGMAC_MTL_IOWRITE_BITS(pdata, queue, MTL_Q_TQOMR,
-+					       Q2TCMAP, i);
-+			pdata->q2tc_map[queue++] = i;
-+		}
-+
-+		if (i < qptc_extra) {
-+			DBGPR("  TXq%u mapped to TC%u\n", queue, i);
-+			XGMAC_MTL_IOWRITE_BITS(pdata, queue, MTL_Q_TQOMR,
-+					       Q2TCMAP, i);
-+			pdata->q2tc_map[queue++] = i;
-+		}
-+	}
-+
-+	/* Map the 8 VLAN priority values to available MTL Rx queues */
-+	prio_queues = min_t(unsigned int, IEEE_8021QAZ_MAX_TCS,
-+			    pdata->rx_q_count);
-+	ppq = IEEE_8021QAZ_MAX_TCS / prio_queues;
-+	ppq_extra = IEEE_8021QAZ_MAX_TCS % prio_queues;
-+
-+	reg = MAC_RQC2R;
-+	reg_val = 0;
-+	for (i = 0, prio = 0; i < prio_queues;) {
-+		mask = 0;
-+		for (j = 0; j < ppq; j++) {
-+			DBGPR("  PRIO%u mapped to RXq%u\n", prio, i);
-+			mask |= (1 << prio);
-+			pdata->prio2q_map[prio++] = i;
-+		}
-+
-+		if (i < ppq_extra) {
-+			DBGPR("  PRIO%u mapped to RXq%u\n", prio, i);
-+			mask |= (1 << prio);
-+			pdata->prio2q_map[prio++] = i;
-+		}
-+
-+		reg_val |= (mask << ((i++ % MAC_RQC2_Q_PER_REG) << 3));
-+
-+		if ((i % MAC_RQC2_Q_PER_REG) && (i != prio_queues))
-+			continue;
-+
-+		XGMAC_IOWRITE(pdata, reg, reg_val);
-+		reg += MAC_RQC2_INC;
-+		reg_val = 0;
-+	}
-+
-+	/* Select dynamic mapping of MTL Rx queue to DMA Rx channel */
-+	reg = MTL_RQDCM0R;
-+	reg_val = 0;
-+	for (i = 0; i < pdata->rx_q_count;) {
-+		reg_val |= (0x80 << ((i++ % MTL_RQDCM_Q_PER_REG) << 3));
-+
-+		if ((i % MTL_RQDCM_Q_PER_REG) && (i != pdata->rx_q_count))
-+			continue;
-+
-+		XGMAC_IOWRITE(pdata, reg, reg_val);
-+
-+		reg += MTL_RQDCM_INC;
-+		reg_val = 0;
-+	}
-+}
-+
-+static void xgbe_config_flow_control_threshold(struct xgbe_prv_data *pdata)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < pdata->rx_q_count; i++) {
-+		/* Activate flow control when less than 4k left in fifo */
-+		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_RQOMR, RFA, 2);
-+
-+		/* De-activate flow control when more than 6k left in fifo */
-+		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_RQOMR, RFD, 4);
-+	}
-+}
-+
-+static void xgbe_config_mac_address(struct xgbe_prv_data *pdata)
-+{
-+	xgbe_set_mac_address(pdata, pdata->netdev->dev_addr);
-+
-+	/* Filtering is done using perfect filtering and hash filtering */
-+	if (pdata->hw_feat.hash_table_size) {
-+		XGMAC_IOWRITE_BITS(pdata, MAC_PFR, HPF, 1);
-+		XGMAC_IOWRITE_BITS(pdata, MAC_PFR, HUC, 1);
-+		XGMAC_IOWRITE_BITS(pdata, MAC_PFR, HMC, 1);
-+	}
-+}
-+
-+static void xgbe_config_jumbo_enable(struct xgbe_prv_data *pdata)
-+{
-+	unsigned int val;
-+
-+	val = (pdata->netdev->mtu > XGMAC_STD_PACKET_MTU) ? 1 : 0;
-+
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RCR, JE, val);
-+}
-+
-+static void xgbe_config_mac_speed(struct xgbe_prv_data *pdata)
-+{
-+	switch (pdata->phy_speed) {
-+	case SPEED_10000:
-+		xgbe_set_xgmii_speed(pdata);
-+		break;
-+
-+	case SPEED_2500:
-+		xgbe_set_gmii_2500_speed(pdata);
-+		break;
-+
-+	case SPEED_1000:
-+		xgbe_set_gmii_speed(pdata);
-+		break;
-+	}
-+}
-+
-+static void xgbe_config_checksum_offload(struct xgbe_prv_data *pdata)
-+{
-+	if (pdata->netdev->features & NETIF_F_RXCSUM)
-+		xgbe_enable_rx_csum(pdata);
-+	else
-+		xgbe_disable_rx_csum(pdata);
-+}
-+
-+static void xgbe_config_vlan_support(struct xgbe_prv_data *pdata)
-+{
-+	/* Indicate that VLAN Tx CTAGs come from context descriptors */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_VLANIR, CSVL, 0);
-+	XGMAC_IOWRITE_BITS(pdata, MAC_VLANIR, VLTI, 1);
-+
-+	/* Set the current VLAN Hash Table register value */
-+	xgbe_update_vlan_hash_table(pdata);
-+
-+	if (pdata->netdev->features & NETIF_F_HW_VLAN_CTAG_FILTER)
-+		xgbe_enable_rx_vlan_filtering(pdata);
-+	else
-+		xgbe_disable_rx_vlan_filtering(pdata);
-+
-+	if (pdata->netdev->features & NETIF_F_HW_VLAN_CTAG_RX)
-+		xgbe_enable_rx_vlan_stripping(pdata);
-+	else
-+		xgbe_disable_rx_vlan_stripping(pdata);
-+}
-+
-+static u64 xgbe_mmc_read(struct xgbe_prv_data *pdata, unsigned int reg_lo)
-+{
-+	bool read_hi;
-+	u64 val;
-+
-+	switch (reg_lo) {
-+	/* These registers are always 64 bit */
-+	case MMC_TXOCTETCOUNT_GB_LO:
-+	case MMC_TXOCTETCOUNT_G_LO:
-+	case MMC_RXOCTETCOUNT_GB_LO:
-+	case MMC_RXOCTETCOUNT_G_LO:
-+		read_hi = true;
-+		break;
-+
-+	default:
-+		read_hi = false;
-+	};
-+
-+	val = XGMAC_IOREAD(pdata, reg_lo);
-+
-+	if (read_hi)
-+		val |= ((u64)XGMAC_IOREAD(pdata, reg_lo + 4) << 32);
-+
-+	return val;
-+}
-+
-+static void xgbe_tx_mmc_int(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_mmc_stats *stats = &pdata->mmc_stats;
-+	unsigned int mmc_isr = XGMAC_IOREAD(pdata, MMC_TISR);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXOCTETCOUNT_GB))
-+		stats->txoctetcount_gb +=
-+			xgbe_mmc_read(pdata, MMC_TXOCTETCOUNT_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXFRAMECOUNT_GB))
-+		stats->txframecount_gb +=
-+			xgbe_mmc_read(pdata, MMC_TXFRAMECOUNT_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXBROADCASTFRAMES_G))
-+		stats->txbroadcastframes_g +=
-+			xgbe_mmc_read(pdata, MMC_TXBROADCASTFRAMES_G_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXMULTICASTFRAMES_G))
-+		stats->txmulticastframes_g +=
-+			xgbe_mmc_read(pdata, MMC_TXMULTICASTFRAMES_G_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TX64OCTETS_GB))
-+		stats->tx64octets_gb +=
-+			xgbe_mmc_read(pdata, MMC_TX64OCTETS_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TX65TO127OCTETS_GB))
-+		stats->tx65to127octets_gb +=
-+			xgbe_mmc_read(pdata, MMC_TX65TO127OCTETS_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TX128TO255OCTETS_GB))
-+		stats->tx128to255octets_gb +=
-+			xgbe_mmc_read(pdata, MMC_TX128TO255OCTETS_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TX256TO511OCTETS_GB))
-+		stats->tx256to511octets_gb +=
-+			xgbe_mmc_read(pdata, MMC_TX256TO511OCTETS_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TX512TO1023OCTETS_GB))
-+		stats->tx512to1023octets_gb +=
-+			xgbe_mmc_read(pdata, MMC_TX512TO1023OCTETS_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TX1024TOMAXOCTETS_GB))
-+		stats->tx1024tomaxoctets_gb +=
-+			xgbe_mmc_read(pdata, MMC_TX1024TOMAXOCTETS_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXUNICASTFRAMES_GB))
-+		stats->txunicastframes_gb +=
-+			xgbe_mmc_read(pdata, MMC_TXUNICASTFRAMES_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXMULTICASTFRAMES_GB))
-+		stats->txmulticastframes_gb +=
-+			xgbe_mmc_read(pdata, MMC_TXMULTICASTFRAMES_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXBROADCASTFRAMES_GB))
-+		stats->txbroadcastframes_g +=
-+			xgbe_mmc_read(pdata, MMC_TXBROADCASTFRAMES_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXUNDERFLOWERROR))
-+		stats->txunderflowerror +=
-+			xgbe_mmc_read(pdata, MMC_TXUNDERFLOWERROR_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXOCTETCOUNT_G))
-+		stats->txoctetcount_g +=
-+			xgbe_mmc_read(pdata, MMC_TXOCTETCOUNT_G_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXFRAMECOUNT_G))
-+		stats->txframecount_g +=
-+			xgbe_mmc_read(pdata, MMC_TXFRAMECOUNT_G_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXPAUSEFRAMES))
-+		stats->txpauseframes +=
-+			xgbe_mmc_read(pdata, MMC_TXPAUSEFRAMES_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXVLANFRAMES_G))
-+		stats->txvlanframes_g +=
-+			xgbe_mmc_read(pdata, MMC_TXVLANFRAMES_G_LO);
-+}
-+
-+static void xgbe_rx_mmc_int(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_mmc_stats *stats = &pdata->mmc_stats;
-+	unsigned int mmc_isr = XGMAC_IOREAD(pdata, MMC_RISR);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXFRAMECOUNT_GB))
-+		stats->rxframecount_gb +=
-+			xgbe_mmc_read(pdata, MMC_RXFRAMECOUNT_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXOCTETCOUNT_GB))
-+		stats->rxoctetcount_gb +=
-+			xgbe_mmc_read(pdata, MMC_RXOCTETCOUNT_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXOCTETCOUNT_G))
-+		stats->rxoctetcount_g +=
-+			xgbe_mmc_read(pdata, MMC_RXOCTETCOUNT_G_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXBROADCASTFRAMES_G))
-+		stats->rxbroadcastframes_g +=
-+			xgbe_mmc_read(pdata, MMC_RXBROADCASTFRAMES_G_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXMULTICASTFRAMES_G))
-+		stats->rxmulticastframes_g +=
-+			xgbe_mmc_read(pdata, MMC_RXMULTICASTFRAMES_G_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXCRCERROR))
-+		stats->rxcrcerror +=
-+			xgbe_mmc_read(pdata, MMC_RXCRCERROR_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXRUNTERROR))
-+		stats->rxrunterror +=
-+			xgbe_mmc_read(pdata, MMC_RXRUNTERROR);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXJABBERERROR))
-+		stats->rxjabbererror +=
-+			xgbe_mmc_read(pdata, MMC_RXJABBERERROR);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXUNDERSIZE_G))
-+		stats->rxundersize_g +=
-+			xgbe_mmc_read(pdata, MMC_RXUNDERSIZE_G);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXOVERSIZE_G))
-+		stats->rxoversize_g +=
-+			xgbe_mmc_read(pdata, MMC_RXOVERSIZE_G);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RX64OCTETS_GB))
-+		stats->rx64octets_gb +=
-+			xgbe_mmc_read(pdata, MMC_RX64OCTETS_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RX65TO127OCTETS_GB))
-+		stats->rx65to127octets_gb +=
-+			xgbe_mmc_read(pdata, MMC_RX65TO127OCTETS_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RX128TO255OCTETS_GB))
-+		stats->rx128to255octets_gb +=
-+			xgbe_mmc_read(pdata, MMC_RX128TO255OCTETS_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RX256TO511OCTETS_GB))
-+		stats->rx256to511octets_gb +=
-+			xgbe_mmc_read(pdata, MMC_RX256TO511OCTETS_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RX512TO1023OCTETS_GB))
-+		stats->rx512to1023octets_gb +=
-+			xgbe_mmc_read(pdata, MMC_RX512TO1023OCTETS_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RX1024TOMAXOCTETS_GB))
-+		stats->rx1024tomaxoctets_gb +=
-+			xgbe_mmc_read(pdata, MMC_RX1024TOMAXOCTETS_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXUNICASTFRAMES_G))
-+		stats->rxunicastframes_g +=
-+			xgbe_mmc_read(pdata, MMC_RXUNICASTFRAMES_G_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXLENGTHERROR))
-+		stats->rxlengtherror +=
-+			xgbe_mmc_read(pdata, MMC_RXLENGTHERROR_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXOUTOFRANGETYPE))
-+		stats->rxoutofrangetype +=
-+			xgbe_mmc_read(pdata, MMC_RXOUTOFRANGETYPE_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXPAUSEFRAMES))
-+		stats->rxpauseframes +=
-+			xgbe_mmc_read(pdata, MMC_RXPAUSEFRAMES_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXFIFOOVERFLOW))
-+		stats->rxfifooverflow +=
-+			xgbe_mmc_read(pdata, MMC_RXFIFOOVERFLOW_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXVLANFRAMES_GB))
-+		stats->rxvlanframes_gb +=
-+			xgbe_mmc_read(pdata, MMC_RXVLANFRAMES_GB_LO);
-+
-+	if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXWATCHDOGERROR))
-+		stats->rxwatchdogerror +=
-+			xgbe_mmc_read(pdata, MMC_RXWATCHDOGERROR);
-+}
-+
-+static void xgbe_read_mmc_stats(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_mmc_stats *stats = &pdata->mmc_stats;
-+
-+	/* Freeze counters */
-+	XGMAC_IOWRITE_BITS(pdata, MMC_CR, MCF, 1);
-+
-+	stats->txoctetcount_gb +=
-+		xgbe_mmc_read(pdata, MMC_TXOCTETCOUNT_GB_LO);
-+
-+	stats->txframecount_gb +=
-+		xgbe_mmc_read(pdata, MMC_TXFRAMECOUNT_GB_LO);
-+
-+	stats->txbroadcastframes_g +=
-+		xgbe_mmc_read(pdata, MMC_TXBROADCASTFRAMES_G_LO);
-+
-+	stats->txmulticastframes_g +=
-+		xgbe_mmc_read(pdata, MMC_TXMULTICASTFRAMES_G_LO);
-+
-+	stats->tx64octets_gb +=
-+		xgbe_mmc_read(pdata, MMC_TX64OCTETS_GB_LO);
-+
-+	stats->tx65to127octets_gb +=
-+		xgbe_mmc_read(pdata, MMC_TX65TO127OCTETS_GB_LO);
-+
-+	stats->tx128to255octets_gb +=
-+		xgbe_mmc_read(pdata, MMC_TX128TO255OCTETS_GB_LO);
-+
-+	stats->tx256to511octets_gb +=
-+		xgbe_mmc_read(pdata, MMC_TX256TO511OCTETS_GB_LO);
-+
-+	stats->tx512to1023octets_gb +=
-+		xgbe_mmc_read(pdata, MMC_TX512TO1023OCTETS_GB_LO);
-+
-+	stats->tx1024tomaxoctets_gb +=
-+		xgbe_mmc_read(pdata, MMC_TX1024TOMAXOCTETS_GB_LO);
-+
-+	stats->txunicastframes_gb +=
-+		xgbe_mmc_read(pdata, MMC_TXUNICASTFRAMES_GB_LO);
-+
-+	stats->txmulticastframes_gb +=
-+		xgbe_mmc_read(pdata, MMC_TXMULTICASTFRAMES_GB_LO);
-+
-+	stats->txbroadcastframes_g +=
-+		xgbe_mmc_read(pdata, MMC_TXBROADCASTFRAMES_GB_LO);
-+
-+	stats->txunderflowerror +=
-+		xgbe_mmc_read(pdata, MMC_TXUNDERFLOWERROR_LO);
-+
-+	stats->txoctetcount_g +=
-+		xgbe_mmc_read(pdata, MMC_TXOCTETCOUNT_G_LO);
-+
-+	stats->txframecount_g +=
-+		xgbe_mmc_read(pdata, MMC_TXFRAMECOUNT_G_LO);
-+
-+	stats->txpauseframes +=
-+		xgbe_mmc_read(pdata, MMC_TXPAUSEFRAMES_LO);
-+
-+	stats->txvlanframes_g +=
-+		xgbe_mmc_read(pdata, MMC_TXVLANFRAMES_G_LO);
-+
-+	stats->rxframecount_gb +=
-+		xgbe_mmc_read(pdata, MMC_RXFRAMECOUNT_GB_LO);
-+
-+	stats->rxoctetcount_gb +=
-+		xgbe_mmc_read(pdata, MMC_RXOCTETCOUNT_GB_LO);
-+
-+	stats->rxoctetcount_g +=
-+		xgbe_mmc_read(pdata, MMC_RXOCTETCOUNT_G_LO);
-+
-+	stats->rxbroadcastframes_g +=
-+		xgbe_mmc_read(pdata, MMC_RXBROADCASTFRAMES_G_LO);
-+
-+	stats->rxmulticastframes_g +=
-+		xgbe_mmc_read(pdata, MMC_RXMULTICASTFRAMES_G_LO);
-+
-+	stats->rxcrcerror +=
-+		xgbe_mmc_read(pdata, MMC_RXCRCERROR_LO);
-+
-+	stats->rxrunterror +=
-+		xgbe_mmc_read(pdata, MMC_RXRUNTERROR);
-+
-+	stats->rxjabbererror +=
-+		xgbe_mmc_read(pdata, MMC_RXJABBERERROR);
-+
-+	stats->rxundersize_g +=
-+		xgbe_mmc_read(pdata, MMC_RXUNDERSIZE_G);
-+
-+	stats->rxoversize_g +=
-+		xgbe_mmc_read(pdata, MMC_RXOVERSIZE_G);
-+
-+	stats->rx64octets_gb +=
-+		xgbe_mmc_read(pdata, MMC_RX64OCTETS_GB_LO);
-+
-+	stats->rx65to127octets_gb +=
-+		xgbe_mmc_read(pdata, MMC_RX65TO127OCTETS_GB_LO);
-+
-+	stats->rx128to255octets_gb +=
-+		xgbe_mmc_read(pdata, MMC_RX128TO255OCTETS_GB_LO);
-+
-+	stats->rx256to511octets_gb +=
-+		xgbe_mmc_read(pdata, MMC_RX256TO511OCTETS_GB_LO);
-+
-+	stats->rx512to1023octets_gb +=
-+		xgbe_mmc_read(pdata, MMC_RX512TO1023OCTETS_GB_LO);
-+
-+	stats->rx1024tomaxoctets_gb +=
-+		xgbe_mmc_read(pdata, MMC_RX1024TOMAXOCTETS_GB_LO);
-+
-+	stats->rxunicastframes_g +=
-+		xgbe_mmc_read(pdata, MMC_RXUNICASTFRAMES_G_LO);
-+
-+	stats->rxlengtherror +=
-+		xgbe_mmc_read(pdata, MMC_RXLENGTHERROR_LO);
-+
-+	stats->rxoutofrangetype +=
-+		xgbe_mmc_read(pdata, MMC_RXOUTOFRANGETYPE_LO);
-+
-+	stats->rxpauseframes +=
-+		xgbe_mmc_read(pdata, MMC_RXPAUSEFRAMES_LO);
-+
-+	stats->rxfifooverflow +=
-+		xgbe_mmc_read(pdata, MMC_RXFIFOOVERFLOW_LO);
-+
-+	stats->rxvlanframes_gb +=
-+		xgbe_mmc_read(pdata, MMC_RXVLANFRAMES_GB_LO);
-+
-+	stats->rxwatchdogerror +=
-+		xgbe_mmc_read(pdata, MMC_RXWATCHDOGERROR);
-+
-+	/* Un-freeze counters */
-+	XGMAC_IOWRITE_BITS(pdata, MMC_CR, MCF, 0);
-+}
-+
-+static void xgbe_config_mmc(struct xgbe_prv_data *pdata)
-+{
-+	/* Set counters to reset on read */
-+	XGMAC_IOWRITE_BITS(pdata, MMC_CR, ROR, 1);
-+
-+	/* Reset the counters */
-+	XGMAC_IOWRITE_BITS(pdata, MMC_CR, CR, 1);
-+}
-+
-+static void xgbe_prepare_tx_stop(struct xgbe_prv_data *pdata,
-+				 struct xgbe_channel *channel)
-+{
-+	unsigned int tx_dsr, tx_pos, tx_qidx;
-+	unsigned int tx_status;
-+	unsigned long tx_timeout;
-+
-+	/* Calculate the status register to read and the position within */
-+	if (channel->queue_index < DMA_DSRX_FIRST_QUEUE) {
-+		tx_dsr = DMA_DSR0;
-+		tx_pos = (channel->queue_index * DMA_DSR_Q_WIDTH) +
-+			 DMA_DSR0_TPS_START;
-+	} else {
-+		tx_qidx = channel->queue_index - DMA_DSRX_FIRST_QUEUE;
-+
-+		tx_dsr = DMA_DSR1 + ((tx_qidx / DMA_DSRX_QPR) * DMA_DSRX_INC);
-+		tx_pos = ((tx_qidx % DMA_DSRX_QPR) * DMA_DSR_Q_WIDTH) +
-+			 DMA_DSRX_TPS_START;
-+	}
-+
-+	/* The Tx engine cannot be stopped if it is actively processing
-+	 * descriptors. Wait for the Tx engine to enter the stopped or
-+	 * suspended state.  Don't wait forever though...
-+	 */
-+	tx_timeout = jiffies + (XGBE_DMA_STOP_TIMEOUT * HZ);
-+	while (time_before(jiffies, tx_timeout)) {
-+		tx_status = XGMAC_IOREAD(pdata, tx_dsr);
-+		tx_status = GET_BITS(tx_status, tx_pos, DMA_DSR_TPS_WIDTH);
-+		if ((tx_status == DMA_TPS_STOPPED) ||
-+		    (tx_status == DMA_TPS_SUSPENDED))
-+			break;
-+
-+		usleep_range(500, 1000);
-+	}
-+
-+	if (!time_before(jiffies, tx_timeout))
-+		netdev_info(pdata->netdev,
-+			    "timed out waiting for Tx DMA channel %u to stop\n",
-+			    channel->queue_index);
-+}
-+
-+static void xgbe_enable_tx(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	/* Enable each Tx DMA channel */
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->tx_ring)
-+			break;
-+
-+		XGMAC_DMA_IOWRITE_BITS(channel, DMA_CH_TCR, ST, 1);
-+	}
-+
-+	/* Enable each Tx queue */
-+	for (i = 0; i < pdata->tx_q_count; i++)
-+		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_TQOMR, TXQEN,
-+				       MTL_Q_ENABLED);
-+
-+	/* Enable MAC Tx */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_TCR, TE, 1);
-+}
-+
-+static void xgbe_disable_tx(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	/* Prepare for Tx DMA channel stop */
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->tx_ring)
-+			break;
-+
-+		xgbe_prepare_tx_stop(pdata, channel);
-+	}
-+
-+	/* Disable MAC Tx */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_TCR, TE, 0);
-+
-+	/* Disable each Tx queue */
-+	for (i = 0; i < pdata->tx_q_count; i++)
-+		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_TQOMR, TXQEN, 0);
-+
-+	/* Disable each Tx DMA channel */
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->tx_ring)
-+			break;
-+
-+		XGMAC_DMA_IOWRITE_BITS(channel, DMA_CH_TCR, ST, 0);
-+	}
-+
-+	/*TODO: Poll to be sure the channels have stopped?
-+	while (count--) {
-+		if (XGMAC_IOREAD_BITS(pdata, DMA_DSR0, TPS) == 6)
-+			break;
-+		mdelay(1);
-+	}
-+	*/
-+}
-+
-+static void xgbe_enable_rx(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int reg_val, i;
-+
-+	/* Enable each Rx DMA channel */
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->rx_ring)
-+			break;
-+
-+		XGMAC_DMA_IOWRITE_BITS(channel, DMA_CH_RCR, SR, 1);
-+	}
-+
-+	/* Enable each Rx queue */
-+	reg_val = 0;
-+	for (i = 0; i < pdata->rx_q_count; i++)
-+		reg_val |= (0x02 << (i << 1));
-+	XGMAC_IOWRITE(pdata, MAC_RQC0R, reg_val);
-+
-+	/* Enable MAC Rx */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RCR, DCRCC, 1);
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RCR, CST, 1);
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RCR, ACS, 1);
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RCR, RE, 1);
-+}
-+
-+static void xgbe_disable_rx(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	/* Disable MAC Rx */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RCR, DCRCC, 0);
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RCR, CST, 0);
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RCR, ACS, 0);
-+	XGMAC_IOWRITE_BITS(pdata, MAC_RCR, RE, 0);
-+
-+	/* Disable each Rx queue */
-+	XGMAC_IOWRITE(pdata, MAC_RQC0R, 0);
-+
-+	/* Disable each Rx DMA channel */
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->rx_ring)
-+			break;
-+
-+		XGMAC_DMA_IOWRITE_BITS(channel, DMA_CH_RCR, SR, 0);
-+	}
-+
-+	/*TODO: Poll to be sure the channels have stopped?
-+	while (count--) {
-+		dma_sr0 = XGMAC_IOREAD_BITS(pdata, DMA_DSR0, RPS);
-+		if (dma_sr0 == 3 || dma_sr0 == 4)
-+			break;
-+		mdelay(1);
-+	}
-+	*/
-+}
-+
-+static void xgbe_powerup_tx(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	/* Enable each Tx DMA channel */
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->tx_ring)
-+			break;
-+
-+		XGMAC_DMA_IOWRITE_BITS(channel, DMA_CH_TCR, ST, 1);
-+	}
-+
-+	/* Enable MAC Tx */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_TCR, TE, 1);
-+}
-+
-+static void xgbe_powerdown_tx(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	/* Prepare for Tx DMA channel stop */
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->tx_ring)
-+			break;
-+
-+		xgbe_prepare_tx_stop(pdata, channel);
-+	}
-+
-+	/* Disable MAC Tx */
-+	XGMAC_IOWRITE_BITS(pdata, MAC_TCR, TE, 0);
-+
-+	/* Disable each Tx DMA channel */
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->tx_ring)
-+			break;
-+
-+		XGMAC_DMA_IOWRITE_BITS(channel, DMA_CH_TCR, ST, 0);
-+	}
-+
-+	/*TODO: Poll to be sure the channels have stopped?
-+	while (count--) {
-+		if (XGMAC_IOREAD_BITS(pdata, DMA_DSR0, TPS) == 6)
-+			break;
-+		mdelay(1);
-+	}
-+	*/
-+}
-+
-+static void xgbe_powerup_rx(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	/* Enable each Rx DMA channel */
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->rx_ring)
-+			break;
-+
-+		XGMAC_DMA_IOWRITE_BITS(channel, DMA_CH_RCR, SR, 1);
-+	}
-+}
-+
-+static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	/* Disable each Rx DMA channel */
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->rx_ring)
-+			break;
-+
-+		XGMAC_DMA_IOWRITE_BITS(channel, DMA_CH_RCR, SR, 0);
-+	}
-+
-+	/*TODO: Poll to be sure the channels have stopped?
-+	while (count--) {
-+		dma_sr0 = XGMAC_IOREAD_BITS(pdata, DMA_DSR0, RPS);
-+		if (dma_sr0 == 3 || dma_sr0 == 4)
-+			break;
-+		mdelay(1);
-+	}
-+	*/
-+}
-+
-+static int xgbe_init(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_desc_if *desc_if = &pdata->desc_if;
-+	int ret;
-+
-+	DBGPR("-->xgbe_init\n");
-+
-+	/* Flush Tx queues */
-+	ret = xgbe_flush_tx_queues(pdata);
-+	if (ret)
-+		return ret;
-+
-+	/*
-+	 * Initialize DMA related features
-+	 */
-+	xgbe_config_dma_bus(pdata);
-+	xgbe_config_dma_cache(pdata);
-+	xgbe_config_osp_mode(pdata);
-+	xgbe_config_pblx8(pdata);
-+	xgbe_config_tx_pbl_val(pdata);
-+	xgbe_config_rx_pbl_val(pdata);
-+	xgbe_config_rx_coalesce(pdata);
-+	xgbe_config_tx_coalesce(pdata);
-+	xgbe_config_rx_buffer_size(pdata);
-+	xgbe_config_tso_mode(pdata);
-+	xgbe_config_sph_mode(pdata);
-+	xgbe_config_rss(pdata);
-+	desc_if->wrapper_tx_desc_init(pdata);
-+	desc_if->wrapper_rx_desc_init(pdata);
-+	xgbe_enable_dma_interrupts(pdata);
-+
-+	/*
-+	 * Initialize MTL related features
-+	 */
-+	xgbe_config_mtl_mode(pdata);
-+	xgbe_config_queue_mapping(pdata);
-+	xgbe_config_tsf_mode(pdata, pdata->tx_sf_mode);
-+	xgbe_config_rsf_mode(pdata, pdata->rx_sf_mode);
-+	xgbe_config_tx_threshold(pdata, pdata->tx_threshold);
-+	xgbe_config_rx_threshold(pdata, pdata->rx_threshold);
-+	xgbe_config_tx_fifo_size(pdata);
-+	xgbe_config_rx_fifo_size(pdata);
-+	xgbe_config_flow_control_threshold(pdata);
-+	/*TODO: Error Packet and undersized good Packet forwarding enable
-+		(FEP and FUP)
-+	 */
-+	xgbe_config_dcb_tc(pdata);
-+	xgbe_config_dcb_pfc(pdata);
-+	xgbe_enable_mtl_interrupts(pdata);
-+
-+	/*
-+	 * Initialize MAC related features
-+	 */
-+	xgbe_config_mac_address(pdata);
-+	xgbe_config_jumbo_enable(pdata);
-+	xgbe_config_flow_control(pdata);
-+	xgbe_config_mac_speed(pdata);
-+	xgbe_config_checksum_offload(pdata);
-+	xgbe_config_vlan_support(pdata);
-+	xgbe_config_mmc(pdata);
-+	xgbe_enable_mac_interrupts(pdata);
-+
-+	DBGPR("<--xgbe_init\n");
-+
-+	return 0;
-+}
-+
-+void xgbe_a0_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
-+{
-+	DBGPR("-->xgbe_a0_init_function_ptrs\n");
-+
-+	hw_if->tx_complete = xgbe_tx_complete;
-+
-+	hw_if->set_promiscuous_mode = xgbe_set_promiscuous_mode;
-+	hw_if->set_all_multicast_mode = xgbe_set_all_multicast_mode;
-+	hw_if->add_mac_addresses = xgbe_add_mac_addresses;
-+	hw_if->set_mac_address = xgbe_set_mac_address;
-+
-+	hw_if->enable_rx_csum = xgbe_enable_rx_csum;
-+	hw_if->disable_rx_csum = xgbe_disable_rx_csum;
-+
-+	hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
-+	hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
-+	hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
-+	hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
-+	hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
-+
-+	hw_if->read_mmd_regs = xgbe_read_mmd_regs;
-+	hw_if->write_mmd_regs = xgbe_write_mmd_regs;
-+
-+	hw_if->set_gmii_speed = xgbe_set_gmii_speed;
-+	hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
-+	hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
-+
-+	hw_if->enable_tx = xgbe_enable_tx;
-+	hw_if->disable_tx = xgbe_disable_tx;
-+	hw_if->enable_rx = xgbe_enable_rx;
-+	hw_if->disable_rx = xgbe_disable_rx;
-+
-+	hw_if->powerup_tx = xgbe_powerup_tx;
-+	hw_if->powerdown_tx = xgbe_powerdown_tx;
-+	hw_if->powerup_rx = xgbe_powerup_rx;
-+	hw_if->powerdown_rx = xgbe_powerdown_rx;
-+
-+	hw_if->dev_xmit = xgbe_dev_xmit;
-+	hw_if->dev_read = xgbe_dev_read;
-+	hw_if->enable_int = xgbe_enable_int;
-+	hw_if->disable_int = xgbe_disable_int;
-+	hw_if->init = xgbe_init;
-+	hw_if->exit = xgbe_exit;
-+
-+	/* Descriptor related Sequences have to be initialized here */
-+	hw_if->tx_desc_init = xgbe_tx_desc_init;
-+	hw_if->rx_desc_init = xgbe_rx_desc_init;
-+	hw_if->tx_desc_reset = xgbe_tx_desc_reset;
-+	hw_if->rx_desc_reset = xgbe_rx_desc_reset;
-+	hw_if->is_last_desc = xgbe_is_last_desc;
-+	hw_if->is_context_desc = xgbe_is_context_desc;
-+	hw_if->tx_start_xmit = xgbe_tx_start_xmit;
-+
-+	/* For FLOW ctrl */
-+	hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
-+	hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
-+
-+	/* For RX coalescing */
-+	hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
-+	hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
-+	hw_if->usec_to_riwt = xgbe_usec_to_riwt;
-+	hw_if->riwt_to_usec = xgbe_riwt_to_usec;
-+
-+	/* For RX and TX threshold config */
-+	hw_if->config_rx_threshold = xgbe_config_rx_threshold;
-+	hw_if->config_tx_threshold = xgbe_config_tx_threshold;
-+
-+	/* For RX and TX Store and Forward Mode config */
-+	hw_if->config_rsf_mode = xgbe_config_rsf_mode;
-+	hw_if->config_tsf_mode = xgbe_config_tsf_mode;
-+
-+	/* For TX DMA Operating on Second Frame config */
-+	hw_if->config_osp_mode = xgbe_config_osp_mode;
-+
-+	/* For RX and TX PBL config */
-+	hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
-+	hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
-+	hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
-+	hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
-+	hw_if->config_pblx8 = xgbe_config_pblx8;
-+
-+	/* For MMC statistics support */
-+	hw_if->tx_mmc_int = xgbe_tx_mmc_int;
-+	hw_if->rx_mmc_int = xgbe_rx_mmc_int;
-+	hw_if->read_mmc_stats = xgbe_read_mmc_stats;
-+
-+	/* For PTP config */
-+	hw_if->config_tstamp = xgbe_config_tstamp;
-+	hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
-+	hw_if->set_tstamp_time = xgbe_set_tstamp_time;
-+	hw_if->get_tstamp_time = xgbe_get_tstamp_time;
-+	hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
-+
-+	/* For Data Center Bridging config */
-+	hw_if->config_dcb_tc = xgbe_config_dcb_tc;
-+	hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
-+
-+	/* For Receive Side Scaling */
-+	hw_if->enable_rss = xgbe_enable_rss;
-+	hw_if->disable_rss = xgbe_disable_rss;
-+	hw_if->set_rss_hash_key = xgbe_set_rss_hash_key;
-+	hw_if->set_rss_lookup_table = xgbe_set_rss_lookup_table;
-+
-+	DBGPR("<--xgbe_a0_init_function_ptrs\n");
-+}
-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
-index 0000000..acaeaf5
---- /dev/null
-+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-drv.c
-@@ -0,0 +1,2204 @@
-+/*
-+ * AMD 10Gb Ethernet driver
-+ *
-+ * This file is available to you under your choice of the following two
-+ * licenses:
-+ *
-+ * License 1: GPLv2
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ *
-+ * This file is free software; you may copy, redistribute and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 2 of the License, or (at
-+ * your option) any later version.
-+ *
-+ * This file is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ *
-+ * License 2: Modified BSD
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above copyright
-+ *       notice, this list of conditions and the following disclaimer in the
-+ *       documentation and/or other materials provided with the distribution.
-+ *     * Neither the name of Advanced Micro Devices, Inc. nor the
-+ *       names of its contributors may be used to endorse or promote products
-+ *       derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <linux/platform_device.h>
-+#include <linux/spinlock.h>
-+#include <linux/tcp.h>
-+#include <linux/if_vlan.h>
-+#include <net/busy_poll.h>
-+#include <linux/clk.h>
-+#include <linux/if_ether.h>
-+#include <linux/net_tstamp.h>
-+#include <linux/phy.h>
-+
-+#include "xgbe.h"
-+#include "xgbe-common.h"
-+
-+static int xgbe_one_poll(struct napi_struct *, int);
-+static int xgbe_all_poll(struct napi_struct *, int);
-+static void xgbe_set_rx_mode(struct net_device *);
-+
-+static int xgbe_alloc_channels(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel_mem, *channel;
-+	struct xgbe_ring *tx_ring, *rx_ring;
-+	unsigned int count, i;
-+	int ret = -ENOMEM;
-+
-+	count = max_t(unsigned int, pdata->tx_ring_count, pdata->rx_ring_count);
-+
-+	channel_mem = kcalloc(count, sizeof(struct xgbe_channel), GFP_KERNEL);
-+	if (!channel_mem)
-+		goto err_channel;
-+
-+	tx_ring = kcalloc(pdata->tx_ring_count, sizeof(struct xgbe_ring),
-+			  GFP_KERNEL);
-+	if (!tx_ring)
-+		goto err_tx_ring;
-+
-+	rx_ring = kcalloc(pdata->rx_ring_count, sizeof(struct xgbe_ring),
-+			  GFP_KERNEL);
-+	if (!rx_ring)
-+		goto err_rx_ring;
-+
-+	for (i = 0, channel = channel_mem; i < count; i++, channel++) {
-+		snprintf(channel->name, sizeof(channel->name), "channel-%d", i);
-+		channel->pdata = pdata;
-+		channel->queue_index = i;
-+		channel->dma_regs = pdata->xgmac_regs + DMA_CH_BASE +
-+				    (DMA_CH_INC * i);
-+
-+		if (pdata->per_channel_irq) {
-+			/* Get the DMA interrupt (offset 1) */
-+			ret = platform_get_irq(pdata->pdev, i + 1);
-+			if (ret < 0) {
-+				netdev_err(pdata->netdev,
-+					   "platform_get_irq %u failed\n",
-+					   i + 1);
-+				goto err_irq;
-+			}
-+
-+			channel->dma_irq = ret;
-+		}
-+
-+		if (i < pdata->tx_ring_count) {
-+			spin_lock_init(&tx_ring->lock);
-+			channel->tx_ring = tx_ring++;
-+		}
-+
-+		if (i < pdata->rx_ring_count) {
-+			spin_lock_init(&rx_ring->lock);
-+			channel->rx_ring = rx_ring++;
-+		}
-+
-+		DBGPR("  %s: queue=%u, dma_regs=%p, dma_irq=%d, tx=%p, rx=%p\n",
-+		      channel->name, channel->queue_index, channel->dma_regs,
-+		      channel->dma_irq, channel->tx_ring, channel->rx_ring);
-+	}
-+
-+	pdata->channel = channel_mem;
-+	pdata->channel_count = count;
-+
-+	return 0;
-+
-+err_irq:
-+	kfree(rx_ring);
-+
-+err_rx_ring:
-+	kfree(tx_ring);
-+
-+err_tx_ring:
-+	kfree(channel_mem);
-+
-+err_channel:
-+	return ret;
-+}
-+
-+static void xgbe_free_channels(struct xgbe_prv_data *pdata)
-+{
-+	if (!pdata->channel)
-+		return;
-+
-+	kfree(pdata->channel->rx_ring);
-+	kfree(pdata->channel->tx_ring);
-+	kfree(pdata->channel);
-+
-+	pdata->channel = NULL;
-+	pdata->channel_count = 0;
-+}
-+
-+static inline unsigned int xgbe_tx_avail_desc(struct xgbe_ring *ring)
-+{
-+	return (ring->rdesc_count - (ring->cur - ring->dirty));
-+}
-+
-+static inline unsigned int xgbe_rx_dirty_desc(struct xgbe_ring *ring)
-+{
-+	return (ring->cur - ring->dirty);
-+}
-+
-+static int xgbe_maybe_stop_tx_queue(struct xgbe_channel *channel,
-+				    struct xgbe_ring *ring, unsigned int count)
-+{
-+	struct xgbe_prv_data *pdata = channel->pdata;
-+
-+	if (count > xgbe_tx_avail_desc(ring)) {
-+		DBGPR("  Tx queue stopped, not enough descriptors available\n");
-+		netif_stop_subqueue(pdata->netdev, channel->queue_index);
-+		ring->tx.queue_stopped = 1;
-+
-+		/* If we haven't notified the hardware because of xmit_more
-+		 * support, tell it now
-+		 */
-+		if (ring->tx.xmit_more)
-+			pdata->hw_if.tx_start_xmit(channel, ring);
-+
-+		return NETDEV_TX_BUSY;
-+	}
-+
-+	return 0;
-+}
-+
-+static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
-+{
-+	unsigned int rx_buf_size;
-+
-+	if (mtu > XGMAC_JUMBO_PACKET_MTU) {
-+		netdev_alert(netdev, "MTU exceeds maximum supported value\n");
-+		return -EINVAL;
-+	}
-+
-+	rx_buf_size = mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;
-+	rx_buf_size = clamp_val(rx_buf_size, XGBE_RX_MIN_BUF_SIZE, PAGE_SIZE);
-+
-+	rx_buf_size = (rx_buf_size + XGBE_RX_BUF_ALIGN - 1) &
-+		      ~(XGBE_RX_BUF_ALIGN - 1);
-+
-+	return rx_buf_size;
-+}
-+
-+static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	struct xgbe_channel *channel;
-+	enum xgbe_int int_id;
-+	unsigned int i;
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (channel->tx_ring && channel->rx_ring)
-+			int_id = XGMAC_INT_DMA_CH_SR_TI_RI;
-+		else if (channel->tx_ring)
-+			int_id = XGMAC_INT_DMA_CH_SR_TI;
-+		else if (channel->rx_ring)
-+			int_id = XGMAC_INT_DMA_CH_SR_RI;
-+		else
-+			continue;
-+
-+		hw_if->enable_int(channel, int_id);
-+	}
-+}
-+
-+static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	struct xgbe_channel *channel;
-+	enum xgbe_int int_id;
-+	unsigned int i;
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (channel->tx_ring && channel->rx_ring)
-+			int_id = XGMAC_INT_DMA_CH_SR_TI_RI;
-+		else if (channel->tx_ring)
-+			int_id = XGMAC_INT_DMA_CH_SR_TI;
-+		else if (channel->rx_ring)
-+			int_id = XGMAC_INT_DMA_CH_SR_RI;
-+		else
-+			continue;
-+
-+		hw_if->disable_int(channel, int_id);
-+	}
-+}
-+
-+static irqreturn_t xgbe_isr(int irq, void *data)
-+{
-+	struct xgbe_prv_data *pdata = data;
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	struct xgbe_channel *channel;
-+	unsigned int dma_isr, dma_ch_isr;
-+	unsigned int mac_isr, mac_tssr;
-+	unsigned int i;
-+
-+	/* The DMA interrupt status register also reports MAC and MTL
-+	 * interrupts. So for polling mode, we just need to check for
-+	 * this register to be non-zero
-+	 */
-+	dma_isr = XGMAC_IOREAD(pdata, DMA_ISR);
-+	if (!dma_isr)
-+		goto isr_done;
-+
-+	DBGPR("  DMA_ISR = %08x\n", dma_isr);
-+
-+	for (i = 0; i < pdata->channel_count; i++) {
-+		if (!(dma_isr & (1 << i)))
-+			continue;
-+
-+		channel = pdata->channel + i;
-+
-+		dma_ch_isr = XGMAC_DMA_IOREAD(channel, DMA_CH_SR);
-+		DBGPR("  DMA_CH%u_ISR = %08x\n", i, dma_ch_isr);
-+
-+		/* If we get a TI or RI interrupt that means per channel DMA
-+		 * interrupts are not enabled, so we use the private data napi
-+		 * structure, not the per channel napi structure
-+		 */
-+		if (XGMAC_GET_BITS(dma_ch_isr, DMA_CH_SR, TI) ||
-+		    XGMAC_GET_BITS(dma_ch_isr, DMA_CH_SR, RI)) {
-+			if (napi_schedule_prep(&pdata->napi)) {
-+				/* Disable Tx and Rx interrupts */
-+				xgbe_disable_rx_tx_ints(pdata);
-+
-+				/* Turn on polling */
-+				__napi_schedule(&pdata->napi);
-+			}
-+		}
-+
-+		/* Restart the device on a Fatal Bus Error */
-+		if (XGMAC_GET_BITS(dma_ch_isr, DMA_CH_SR, FBE))
-+			schedule_work(&pdata->restart_work);
-+
-+		/* Clear all interrupt signals */
-+		XGMAC_DMA_IOWRITE(channel, DMA_CH_SR, dma_ch_isr);
-+	}
-+
-+	if (XGMAC_GET_BITS(dma_isr, DMA_ISR, MACIS)) {
-+		mac_isr = XGMAC_IOREAD(pdata, MAC_ISR);
-+
-+		if (XGMAC_GET_BITS(mac_isr, MAC_ISR, MMCTXIS))
-+			hw_if->tx_mmc_int(pdata);
-+
-+		if (XGMAC_GET_BITS(mac_isr, MAC_ISR, MMCRXIS))
-+			hw_if->rx_mmc_int(pdata);
-+
-+		if (XGMAC_GET_BITS(mac_isr, MAC_ISR, TSIS)) {
-+			mac_tssr = XGMAC_IOREAD(pdata, MAC_TSSR);
-+
-+			if (XGMAC_GET_BITS(mac_tssr, MAC_TSSR, TXTSC)) {
-+				/* Read Tx Timestamp to clear interrupt */
-+				pdata->tx_tstamp =
-+					hw_if->get_tx_tstamp(pdata);
-+				schedule_work(&pdata->tx_tstamp_work);
-+			}
-+		}
-+	}
-+
-+	DBGPR("  DMA_ISR = %08x\n", XGMAC_IOREAD(pdata, DMA_ISR));
-+
-+isr_done:
-+	return IRQ_HANDLED;
-+}
-+
-+static irqreturn_t xgbe_dma_isr(int irq, void *data)
-+{
-+	struct xgbe_channel *channel = data;
-+
-+	/* Per channel DMA interrupts are enabled, so we use the per
-+	 * channel napi structure and not the private data napi structure
-+	 */
-+	if (napi_schedule_prep(&channel->napi)) {
-+		/* Disable Tx and Rx interrupts */
-+		disable_irq_nosync(channel->dma_irq);
-+
-+		/* Turn on polling */
-+		__napi_schedule(&channel->napi);
-+	}
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static enum hrtimer_restart xgbe_tx_timer(struct hrtimer *timer)
-+{
-+	struct xgbe_channel *channel = container_of(timer,
-+						    struct xgbe_channel,
-+						    tx_timer);
-+	struct xgbe_prv_data *pdata = channel->pdata;
-+	struct napi_struct *napi;
-+
-+	DBGPR("-->xgbe_tx_timer\n");
-+
-+	napi = (pdata->per_channel_irq) ? &channel->napi : &pdata->napi;
-+
-+	if (napi_schedule_prep(napi)) {
-+		/* Disable Tx and Rx interrupts */
-+		if (pdata->per_channel_irq)
-+			disable_irq(channel->dma_irq);
-+		else
-+			xgbe_disable_rx_tx_ints(pdata);
-+
-+		/* Turn on polling */
-+		__napi_schedule(napi);
-+	}
-+
-+	channel->tx_timer_active = 0;
-+
-+	DBGPR("<--xgbe_tx_timer\n");
-+
-+	return HRTIMER_NORESTART;
-+}
-+
-+static void xgbe_init_tx_timers(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	DBGPR("-->xgbe_init_tx_timers\n");
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->tx_ring)
-+			break;
-+
-+		DBGPR("  %s adding tx timer\n", channel->name);
-+		hrtimer_init(&channel->tx_timer, CLOCK_MONOTONIC,
-+			     HRTIMER_MODE_REL);
-+		channel->tx_timer.function = xgbe_tx_timer;
-+	}
-+
-+	DBGPR("<--xgbe_init_tx_timers\n");
-+}
-+
-+static void xgbe_stop_tx_timers(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	DBGPR("-->xgbe_stop_tx_timers\n");
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->tx_ring)
-+			break;
-+
-+		DBGPR("  %s deleting tx timer\n", channel->name);
-+		channel->tx_timer_active = 0;
-+		hrtimer_cancel(&channel->tx_timer);
-+	}
-+
-+	DBGPR("<--xgbe_stop_tx_timers\n");
-+}
-+
-+void xgbe_a0_get_all_hw_features(struct xgbe_prv_data *pdata)
-+{
-+	unsigned int mac_hfr0, mac_hfr1, mac_hfr2;
-+	struct xgbe_hw_features *hw_feat = &pdata->hw_feat;
-+
-+	DBGPR("-->xgbe_a0_get_all_hw_features\n");
-+
-+	mac_hfr0 = XGMAC_IOREAD(pdata, MAC_HWF0R);
-+	mac_hfr1 = XGMAC_IOREAD(pdata, MAC_HWF1R);
-+	mac_hfr2 = XGMAC_IOREAD(pdata, MAC_HWF2R);
-+
-+	memset(hw_feat, 0, sizeof(*hw_feat));
-+
-+	hw_feat->version = XGMAC_IOREAD(pdata, MAC_VR);
-+
-+	/* Hardware feature register 0 */
-+	hw_feat->gmii        = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R, GMIISEL);
-+	hw_feat->vlhash      = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R, VLHASH);
-+	hw_feat->sma         = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R, SMASEL);
-+	hw_feat->rwk         = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R, RWKSEL);
-+	hw_feat->mgk         = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R, MGKSEL);
-+	hw_feat->mmc         = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R, MMCSEL);
-+	hw_feat->aoe         = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R, ARPOFFSEL);
-+	hw_feat->ts          = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R, TSSEL);
-+	hw_feat->eee         = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R, EEESEL);
-+	hw_feat->tx_coe      = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R, TXCOESEL);
-+	hw_feat->rx_coe      = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R, RXCOESEL);
-+	hw_feat->addn_mac    = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R,
-+					      ADDMACADRSEL);
-+	hw_feat->ts_src      = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R, TSSTSSEL);
-+	hw_feat->sa_vlan_ins = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R, SAVLANINS);
-+
-+	/* Hardware feature register 1 */
-+	hw_feat->rx_fifo_size  = XGMAC_GET_BITS(mac_hfr1, MAC_HWF1R,
-+						RXFIFOSIZE);
-+	hw_feat->tx_fifo_size  = XGMAC_GET_BITS(mac_hfr1, MAC_HWF1R,
-+						TXFIFOSIZE);
-+	hw_feat->dcb           = XGMAC_GET_BITS(mac_hfr1, MAC_HWF1R, DCBEN);
-+	hw_feat->sph           = XGMAC_GET_BITS(mac_hfr1, MAC_HWF1R, SPHEN);
-+	hw_feat->tso           = XGMAC_GET_BITS(mac_hfr1, MAC_HWF1R, TSOEN);
-+	hw_feat->dma_debug     = XGMAC_GET_BITS(mac_hfr1, MAC_HWF1R, DBGMEMA);
-+	hw_feat->tc_cnt	       = XGMAC_GET_BITS(mac_hfr1, MAC_HWF1R, NUMTC);
-+	hw_feat->hash_table_size = XGMAC_GET_BITS(mac_hfr1, MAC_HWF1R,
-+						  HASHTBLSZ);
-+	hw_feat->l3l4_filter_num = XGMAC_GET_BITS(mac_hfr1, MAC_HWF1R,
-+						  L3L4FNUM);
-+
-+	/* Hardware feature register 2 */
-+	hw_feat->rx_q_cnt     = XGMAC_GET_BITS(mac_hfr2, MAC_HWF2R, RXQCNT);
-+	hw_feat->tx_q_cnt     = XGMAC_GET_BITS(mac_hfr2, MAC_HWF2R, TXQCNT);
-+	hw_feat->rx_ch_cnt    = XGMAC_GET_BITS(mac_hfr2, MAC_HWF2R, RXCHCNT);
-+	hw_feat->tx_ch_cnt    = XGMAC_GET_BITS(mac_hfr2, MAC_HWF2R, TXCHCNT);
-+	hw_feat->pps_out_num  = XGMAC_GET_BITS(mac_hfr2, MAC_HWF2R, PPSOUTNUM);
-+	hw_feat->aux_snap_num = XGMAC_GET_BITS(mac_hfr2, MAC_HWF2R, AUXSNAPNUM);
-+
-+	/* Translate the Hash Table size into actual number */
-+	switch (hw_feat->hash_table_size) {
-+	case 0:
-+		break;
-+	case 1:
-+		hw_feat->hash_table_size = 64;
-+		break;
-+	case 2:
-+		hw_feat->hash_table_size = 128;
-+		break;
-+	case 3:
-+		hw_feat->hash_table_size = 256;
-+		break;
-+	}
-+
-+	/* The Queue and Channel counts are zero based so increment them
-+	 * to get the actual number
-+	 */
-+	hw_feat->rx_q_cnt++;
-+	hw_feat->tx_q_cnt++;
-+	hw_feat->rx_ch_cnt++;
-+	hw_feat->tx_ch_cnt++;
-+
-+#define XGBE_TC_CNT		2
-+	hw_feat->tc_cnt = XGBE_TC_CNT;
-+
-+	DBGPR("<--xgbe_a0_get_all_hw_features\n");
-+}
-+
-+static void xgbe_napi_enable(struct xgbe_prv_data *pdata, unsigned int add)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	if (pdata->per_channel_irq) {
-+		channel = pdata->channel;
-+		for (i = 0; i < pdata->channel_count; i++, channel++) {
-+			if (add)
-+				netif_napi_add(pdata->netdev, &channel->napi,
-+					       xgbe_one_poll, NAPI_POLL_WEIGHT);
-+
-+			napi_enable(&channel->napi);
-+		}
-+	} else {
-+		if (add)
-+			netif_napi_add(pdata->netdev, &pdata->napi,
-+				       xgbe_all_poll, NAPI_POLL_WEIGHT);
-+
-+		napi_enable(&pdata->napi);
-+	}
-+}
-+
-+static void xgbe_napi_disable(struct xgbe_prv_data *pdata, unsigned int del)
-+{
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	if (pdata->per_channel_irq) {
-+		channel = pdata->channel;
-+		for (i = 0; i < pdata->channel_count; i++, channel++) {
-+			napi_disable(&channel->napi);
-+
-+			if (del)
-+				netif_napi_del(&channel->napi);
-+		}
-+	} else {
-+		napi_disable(&pdata->napi);
-+
-+		if (del)
-+			netif_napi_del(&pdata->napi);
-+	}
-+}
-+
-+void xgbe_a0_init_tx_coalesce(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+
-+	DBGPR("-->xgbe_a0_init_tx_coalesce\n");
-+
-+	pdata->tx_usecs = XGMAC_INIT_DMA_TX_USECS;
-+	pdata->tx_frames = XGMAC_INIT_DMA_TX_FRAMES;
-+
-+	hw_if->config_tx_coalesce(pdata);
-+
-+	DBGPR("<--xgbe_a0_init_tx_coalesce\n");
-+}
-+
-+void xgbe_a0_init_rx_coalesce(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+
-+	DBGPR("-->xgbe_a0_init_rx_coalesce\n");
-+
-+	pdata->rx_riwt = hw_if->usec_to_riwt(pdata, XGMAC_INIT_DMA_RX_USECS);
-+	pdata->rx_frames = XGMAC_INIT_DMA_RX_FRAMES;
-+
-+	hw_if->config_rx_coalesce(pdata);
-+
-+	DBGPR("<--xgbe_a0_init_rx_coalesce\n");
-+}
-+
-+static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_desc_if *desc_if = &pdata->desc_if;
-+	struct xgbe_channel *channel;
-+	struct xgbe_ring *ring;
-+	struct xgbe_ring_data *rdata;
-+	unsigned int i, j;
-+
-+	DBGPR("-->xgbe_free_tx_data\n");
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		ring = channel->tx_ring;
-+		if (!ring)
-+			break;
-+
-+		for (j = 0; j < ring->rdesc_count; j++) {
-+			rdata = XGBE_GET_DESC_DATA(ring, j);
-+			desc_if->unmap_rdata(pdata, rdata);
-+		}
-+	}
-+
-+	DBGPR("<--xgbe_free_tx_data\n");
-+}
-+
-+static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_desc_if *desc_if = &pdata->desc_if;
-+	struct xgbe_channel *channel;
-+	struct xgbe_ring *ring;
-+	struct xgbe_ring_data *rdata;
-+	unsigned int i, j;
-+
-+	DBGPR("-->xgbe_free_rx_data\n");
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		ring = channel->rx_ring;
-+		if (!ring)
-+			break;
-+
-+		for (j = 0; j < ring->rdesc_count; j++) {
-+			rdata = XGBE_GET_DESC_DATA(ring, j);
-+			desc_if->unmap_rdata(pdata, rdata);
-+		}
-+	}
-+
-+	DBGPR("<--xgbe_free_rx_data\n");
-+}
-+
-+static void xgbe_adjust_link(struct net_device *netdev)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	struct phy_device *phydev = pdata->phydev;
-+	int new_state = 0;
-+
-+	if (!phydev)
-+		return;
-+
-+	if (phydev->link) {
-+		/* Flow control support */
-+		if (pdata->pause_autoneg) {
-+			if (phydev->pause || phydev->asym_pause) {
-+				pdata->tx_pause = 1;
-+				pdata->rx_pause = 1;
-+			} else {
-+				pdata->tx_pause = 0;
-+				pdata->rx_pause = 0;
-+			}
-+		}
-+
-+		if (pdata->tx_pause != pdata->phy_tx_pause) {
-+			hw_if->config_tx_flow_control(pdata);
-+			pdata->phy_tx_pause = pdata->tx_pause;
-+		}
-+
-+		if (pdata->rx_pause != pdata->phy_rx_pause) {
-+			hw_if->config_rx_flow_control(pdata);
-+			pdata->phy_rx_pause = pdata->rx_pause;
-+		}
-+
-+		/* Speed support */
-+		if (phydev->speed != pdata->phy_speed) {
-+			new_state = 1;
-+
-+			switch (phydev->speed) {
-+			case SPEED_10000:
-+				hw_if->set_xgmii_speed(pdata);
-+				break;
-+
-+			case SPEED_2500:
-+				hw_if->set_gmii_2500_speed(pdata);
-+				break;
-+
-+			case SPEED_1000:
-+				hw_if->set_gmii_speed(pdata);
-+				break;
-+			}
-+			pdata->phy_speed = phydev->speed;
-+		}
-+
-+		if (phydev->link != pdata->phy_link) {
-+			new_state = 1;
-+			pdata->phy_link = 1;
-+		}
-+	} else if (pdata->phy_link) {
-+		new_state = 1;
-+		pdata->phy_link = 0;
-+		pdata->phy_speed = SPEED_UNKNOWN;
-+	}
-+
-+	if (new_state)
-+		phy_print_status(phydev);
-+}
-+
-+static int xgbe_phy_init(struct xgbe_prv_data *pdata)
-+{
-+	struct net_device *netdev = pdata->netdev;
-+	struct phy_device *phydev = pdata->phydev;
-+	int ret;
-+
-+	pdata->phy_link = -1;
-+	pdata->phy_speed = SPEED_UNKNOWN;
-+	pdata->phy_tx_pause = pdata->tx_pause;
-+	pdata->phy_rx_pause = pdata->rx_pause;
-+
-+	ret = phy_connect_direct(netdev, phydev, &xgbe_adjust_link,
-+				 pdata->phy_mode);
-+	if (ret) {
-+		netdev_err(netdev, "phy_connect_direct failed\n");
-+		return ret;
-+	}
-+
-+	if (!phydev->drv || (phydev->drv->phy_id == 0)) {
-+		netdev_err(netdev, "phy_id not valid\n");
-+		ret = -ENODEV;
-+		goto err_phy_connect;
-+	}
-+	DBGPR("  phy_connect_direct succeeded for PHY %s, link=%d\n",
-+	      dev_name(&phydev->dev), phydev->link);
-+
-+	return 0;
-+
-+err_phy_connect:
-+	phy_disconnect(phydev);
-+
-+	return ret;
-+}
-+
-+static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
-+{
-+	if (!pdata->phydev)
-+		return;
-+
-+	phy_disconnect(pdata->phydev);
-+}
-+
-+int xgbe_a0_powerdown(struct net_device *netdev, unsigned int caller)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	unsigned long flags;
-+
-+	DBGPR("-->xgbe_a0_powerdown\n");
-+
-+	if (!netif_running(netdev) ||
-+	    (caller == XGMAC_IOCTL_CONTEXT && pdata->power_down)) {
-+		netdev_alert(netdev, "Device is already powered down\n");
-+		DBGPR("<--xgbe_a0_powerdown\n");
-+		return -EINVAL;
-+	}
-+
-+	phy_stop(pdata->phydev);
-+
-+	spin_lock_irqsave(&pdata->lock, flags);
-+
-+	if (caller == XGMAC_DRIVER_CONTEXT)
-+		netif_device_detach(netdev);
-+
-+	netif_tx_stop_all_queues(netdev);
-+	xgbe_napi_disable(pdata, 0);
-+
-+	/* Powerdown Tx/Rx */
-+	hw_if->powerdown_tx(pdata);
-+	hw_if->powerdown_rx(pdata);
-+
-+	pdata->power_down = 1;
-+
-+	spin_unlock_irqrestore(&pdata->lock, flags);
-+
-+	DBGPR("<--xgbe_a0_powerdown\n");
-+
-+	return 0;
-+}
-+
-+int xgbe_a0_powerup(struct net_device *netdev, unsigned int caller)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	unsigned long flags;
-+
-+	DBGPR("-->xgbe_a0_powerup\n");
-+
-+	if (!netif_running(netdev) ||
-+	    (caller == XGMAC_IOCTL_CONTEXT && !pdata->power_down)) {
-+		netdev_alert(netdev, "Device is already powered up\n");
-+		DBGPR("<--xgbe_a0_powerup\n");
-+		return -EINVAL;
-+	}
-+
-+	spin_lock_irqsave(&pdata->lock, flags);
-+
-+	pdata->power_down = 0;
-+
-+	phy_start(pdata->phydev);
-+
-+	/* Enable Tx/Rx */
-+	hw_if->powerup_tx(pdata);
-+	hw_if->powerup_rx(pdata);
-+
-+	if (caller == XGMAC_DRIVER_CONTEXT)
-+		netif_device_attach(netdev);
-+
-+	xgbe_napi_enable(pdata, 0);
-+	netif_tx_start_all_queues(netdev);
-+
-+	spin_unlock_irqrestore(&pdata->lock, flags);
-+
-+	DBGPR("<--xgbe_a0_powerup\n");
-+
-+	return 0;
-+}
-+
-+static int xgbe_start(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	struct net_device *netdev = pdata->netdev;
-+
-+	DBGPR("-->xgbe_start\n");
-+
-+	xgbe_set_rx_mode(netdev);
-+
-+	hw_if->init(pdata);
-+
-+	phy_start(pdata->phydev);
-+
-+	hw_if->enable_tx(pdata);
-+	hw_if->enable_rx(pdata);
-+
-+	xgbe_init_tx_timers(pdata);
-+
-+	xgbe_napi_enable(pdata, 1);
-+	netif_tx_start_all_queues(netdev);
-+
-+	DBGPR("<--xgbe_start\n");
-+
-+	return 0;
-+}
-+
-+static void xgbe_stop(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	struct xgbe_channel *channel;
-+	struct net_device *netdev = pdata->netdev;
-+	struct netdev_queue *txq;
-+	unsigned int i;
-+
-+	DBGPR("-->xgbe_stop\n");
-+
-+	phy_stop(pdata->phydev);
-+
-+	netif_tx_stop_all_queues(netdev);
-+	xgbe_napi_disable(pdata, 1);
-+
-+	xgbe_stop_tx_timers(pdata);
-+
-+	hw_if->disable_tx(pdata);
-+	hw_if->disable_rx(pdata);
-+
-+	channel = pdata->channel;
-+	for (i = 0; i < pdata->channel_count; i++, channel++) {
-+		if (!channel->tx_ring)
-+			continue;
-+
-+		txq = netdev_get_tx_queue(netdev, channel->queue_index);
-+		netdev_tx_reset_queue(txq);
-+	}
-+
-+	DBGPR("<--xgbe_stop\n");
-+}
-+
-+static void xgbe_restart_dev(struct xgbe_prv_data *pdata)
-+{
-+	struct xgbe_channel *channel;
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	unsigned int i;
-+
-+	DBGPR("-->xgbe_restart_dev\n");
-+
-+	/* If not running, "restart" will happen on open */
-+	if (!netif_running(pdata->netdev))
-+		return;
-+
-+	xgbe_stop(pdata);
-+	synchronize_irq(pdata->dev_irq);
-+	if (pdata->per_channel_irq) {
-+		channel = pdata->channel;
-+		for (i = 0; i < pdata->channel_count; i++, channel++)
-+			synchronize_irq(channel->dma_irq);
-+	}
-+
-+	xgbe_free_tx_data(pdata);
-+	xgbe_free_rx_data(pdata);
-+
-+	/* Issue software reset to device */
-+	hw_if->exit(pdata);
-+
-+	xgbe_start(pdata);
-+
-+	DBGPR("<--xgbe_restart_dev\n");
-+}
-+
-+static void xgbe_restart(struct work_struct *work)
-+{
-+	struct xgbe_prv_data *pdata = container_of(work,
-+						   struct xgbe_prv_data,
-+						   restart_work);
-+
-+	rtnl_lock();
-+
-+	xgbe_restart_dev(pdata);
-+
-+	rtnl_unlock();
-+}
-+
-+static void xgbe_tx_tstamp(struct work_struct *work)
-+{
-+	struct xgbe_prv_data *pdata = container_of(work,
-+						   struct xgbe_prv_data,
-+						   tx_tstamp_work);
-+	struct skb_shared_hwtstamps hwtstamps;
-+	u64 nsec;
-+	unsigned long flags;
-+
-+	if (pdata->tx_tstamp) {
-+		nsec = timecounter_cyc2time(&pdata->tstamp_tc,
-+					    pdata->tx_tstamp);
-+
-+		memset(&hwtstamps, 0, sizeof(hwtstamps));
-+		hwtstamps.hwtstamp = ns_to_ktime(nsec);
-+		skb_tstamp_tx(pdata->tx_tstamp_skb, &hwtstamps);
-+	}
-+
-+	dev_kfree_skb_any(pdata->tx_tstamp_skb);
-+
-+	spin_lock_irqsave(&pdata->tstamp_lock, flags);
-+	pdata->tx_tstamp_skb = NULL;
-+	spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
-+}
-+
-+static int xgbe_get_hwtstamp_settings(struct xgbe_prv_data *pdata,
-+				      struct ifreq *ifreq)
-+{
-+	if (copy_to_user(ifreq->ifr_data, &pdata->tstamp_config,
-+			 sizeof(pdata->tstamp_config)))
-+		return -EFAULT;
-+
-+	return 0;
-+}
-+
-+static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
-+				      struct ifreq *ifreq)
-+{
-+	struct hwtstamp_config config;
-+	unsigned int mac_tscr;
-+
-+	if (copy_from_user(&config, ifreq->ifr_data, sizeof(config)))
-+		return -EFAULT;
-+
-+	if (config.flags)
-+		return -EINVAL;
-+
-+	mac_tscr = 0;
-+
-+	switch (config.tx_type) {
-+	case HWTSTAMP_TX_OFF:
-+		break;
-+
-+	case HWTSTAMP_TX_ON:
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);
-+		break;
-+
-+	default:
-+		return -ERANGE;
-+	}
-+
-+	switch (config.rx_filter) {
-+	case HWTSTAMP_FILTER_NONE:
-+		break;
-+
-+	case HWTSTAMP_FILTER_ALL:
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENALL, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);
-+		break;
-+
-+	/* PTP v2, UDP, any kind of event packet */
-+	case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);
-+	/* PTP v1, UDP, any kind of event packet */
-+	case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, SNAPTYPSEL, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);
-+		break;
-+
-+	/* PTP v2, UDP, Sync packet */
-+	case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);
-+	/* PTP v1, UDP, Sync packet */
-+	case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSEVNTENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);
-+		break;
-+
-+	/* PTP v2, UDP, Delay_req packet */
-+	case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);
-+	/* PTP v1, UDP, Delay_req packet */
-+	case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSEVNTENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSMSTRENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);
-+		break;
-+
-+	/* 802.AS1, Ethernet, any kind of event packet */
-+	case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, AV8021ASMEN, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, SNAPTYPSEL, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);
-+		break;
-+
-+	/* 802.AS1, Ethernet, Sync packet */
-+	case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, AV8021ASMEN, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSEVNTENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);
-+		break;
-+
-+	/* 802.AS1, Ethernet, Delay_req packet */
-+	case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, AV8021ASMEN, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSMSTRENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSEVNTENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);
-+		break;
-+
-+	/* PTP v2/802.AS1, any layer, any kind of event packet */
-+	case HWTSTAMP_FILTER_PTP_V2_EVENT:
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, SNAPTYPSEL, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);
-+		break;
-+
-+	/* PTP v2/802.AS1, any layer, Sync packet */
-+	case HWTSTAMP_FILTER_PTP_V2_SYNC:
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSEVNTENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);
-+		break;
-+
-+	/* PTP v2/802.AS1, any layer, Delay_req packet */
-+	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSMSTRENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSEVNTENA, 1);
-+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);
-+		break;
-+
-+	default:
-+		return -ERANGE;
-+	}
-+
-+	pdata->hw_if.config_tstamp(pdata, mac_tscr);
-+
-+	memcpy(&pdata->tstamp_config, &config, sizeof(config));
-+
-+	return 0;
-+}
-+
-+static void xgbe_prep_tx_tstamp(struct xgbe_prv_data *pdata,
-+				struct sk_buff *skb,
-+				struct xgbe_packet_data *packet)
-+{
-+	unsigned long flags;
-+
-+	if (XGMAC_GET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES, PTP)) {
-+		spin_lock_irqsave(&pdata->tstamp_lock, flags);
-+		if (pdata->tx_tstamp_skb) {
-+			/* Another timestamp in progress, ignore this one */
-+			XGMAC_SET_BITS(packet->attributes,
-+				       TX_PACKET_ATTRIBUTES, PTP, 0);
-+		} else {
-+			pdata->tx_tstamp_skb = skb_get(skb);
-+			skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
-+		}
-+		spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
-+	}
-+
-+	if (!XGMAC_GET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES, PTP))
-+		skb_tx_timestamp(skb);
-+}
-+
-+static void xgbe_prep_vlan(struct sk_buff *skb, struct xgbe_packet_data *packet)
-+{
-+	if (skb_vlan_tag_present(skb))
-+		packet->vlan_ctag = skb_vlan_tag_get(skb);
-+}
-+
-+static int xgbe_prep_tso(struct sk_buff *skb, struct xgbe_packet_data *packet)
-+{
-+	int ret;
-+
-+	if (!XGMAC_GET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES,
-+			    TSO_ENABLE))
-+		return 0;
-+
-+	ret = skb_cow_head(skb, 0);
-+	if (ret)
-+		return ret;
-+
-+	packet->header_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
-+	packet->tcp_header_len = tcp_hdrlen(skb);
-+	packet->tcp_payload_len = skb->len - packet->header_len;
-+	packet->mss = skb_shinfo(skb)->gso_size;
-+	DBGPR("  packet->header_len=%u\n", packet->header_len);
-+	DBGPR("  packet->tcp_header_len=%u, packet->tcp_payload_len=%u\n",
-+	      packet->tcp_header_len, packet->tcp_payload_len);
-+	DBGPR("  packet->mss=%u\n", packet->mss);
-+
-+	/* Update the number of packets that will ultimately be transmitted
-+	 * along with the extra bytes for each extra packet
-+	 */
-+	packet->tx_packets = skb_shinfo(skb)->gso_segs;
-+	packet->tx_bytes += (packet->tx_packets - 1) * packet->header_len;
-+
-+	return 0;
-+}
-+
-+static int xgbe_is_tso(struct sk_buff *skb)
-+{
-+	if (skb->ip_summed != CHECKSUM_PARTIAL)
-+		return 0;
-+
-+	if (!skb_is_gso(skb))
-+		return 0;
-+
-+	DBGPR("  TSO packet to be processed\n");
-+
-+	return 1;
-+}
-+
-+static void xgbe_packet_info(struct xgbe_prv_data *pdata,
-+			     struct xgbe_ring *ring, struct sk_buff *skb,
-+			     struct xgbe_packet_data *packet)
-+{
-+	struct skb_frag_struct *frag;
-+	unsigned int context_desc;
-+	unsigned int len;
-+	unsigned int i;
-+
-+	packet->skb = skb;
-+
-+	context_desc = 0;
-+	packet->rdesc_count = 0;
-+
-+	packet->tx_packets = 1;
-+	packet->tx_bytes = skb->len;
-+
-+	if (xgbe_is_tso(skb)) {
-+		/* TSO requires an extra descriptor if mss is different */
-+		if (skb_shinfo(skb)->gso_size != ring->tx.cur_mss) {
-+			context_desc = 1;
-+			packet->rdesc_count++;
-+		}
-+
-+		/* TSO requires an extra descriptor for TSO header */
-+		packet->rdesc_count++;
-+
-+		XGMAC_SET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES,
-+			       TSO_ENABLE, 1);
-+		XGMAC_SET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES,
-+			       CSUM_ENABLE, 1);
-+	} else if (skb->ip_summed == CHECKSUM_PARTIAL)
-+		XGMAC_SET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES,
-+			       CSUM_ENABLE, 1);
-+
-+	if (skb_vlan_tag_present(skb)) {
-+		/* VLAN requires an extra descriptor if tag is different */
-+		if (skb_vlan_tag_get(skb) != ring->tx.cur_vlan_ctag)
-+			/* We can share with the TSO context descriptor */
-+			if (!context_desc) {
-+				context_desc = 1;
-+				packet->rdesc_count++;
-+			}
-+
-+		XGMAC_SET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES,
-+			       VLAN_CTAG, 1);
-+	}
-+
-+	if ((skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) &&
-+	    (pdata->tstamp_config.tx_type == HWTSTAMP_TX_ON))
-+		XGMAC_SET_BITS(packet->attributes, TX_PACKET_ATTRIBUTES,
-+			       PTP, 1);
-+
-+	for (len = skb_headlen(skb); len;) {
-+		packet->rdesc_count++;
-+		len -= min_t(unsigned int, len, XGBE_TX_MAX_BUF_SIZE);
-+	}
-+
-+	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-+		frag = &skb_shinfo(skb)->frags[i];
-+		for (len = skb_frag_size(frag); len; ) {
-+			packet->rdesc_count++;
-+			len -= min_t(unsigned int, len, XGBE_TX_MAX_BUF_SIZE);
-+		}
-+	}
-+}
-+
-+static int xgbe_open(struct net_device *netdev)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	struct xgbe_desc_if *desc_if = &pdata->desc_if;
-+	struct xgbe_channel *channel = NULL;
-+	unsigned int i = 0;
-+	int ret;
-+
-+	DBGPR("-->xgbe_open\n");
-+
-+	/* Initialize the phy */
-+	ret = xgbe_phy_init(pdata);
-+	if (ret)
-+		return ret;
-+
-+	/* Enable the clocks */
-+	ret = clk_prepare_enable(pdata->sysclk);
-+	if (ret) {
-+		netdev_alert(netdev, "dma clk_prepare_enable failed\n");
-+		goto err_phy_init;
-+	}
-+
-+	ret = clk_prepare_enable(pdata->ptpclk);
-+	if (ret) {
-+		netdev_alert(netdev, "ptp clk_prepare_enable failed\n");
-+		goto err_sysclk;
-+	}
-+
-+	/* Calculate the Rx buffer size before allocating rings */
-+	ret = xgbe_calc_rx_buf_size(netdev, netdev->mtu);
-+	if (ret < 0)
-+		goto err_ptpclk;
-+	pdata->rx_buf_size = ret;
-+
-+	/* Allocate the channel and ring structures */
-+	ret = xgbe_alloc_channels(pdata);
-+	if (ret)
-+		goto err_ptpclk;
-+
-+	/* Allocate the ring descriptors and buffers */
-+	ret = desc_if->alloc_ring_resources(pdata);
-+	if (ret)
-+		goto err_channels;
-+
-+	/* Initialize the device restart and Tx timestamp work struct */
-+	INIT_WORK(&pdata->restart_work, xgbe_restart);
-+	INIT_WORK(&pdata->tx_tstamp_work, xgbe_tx_tstamp);
-+
-+	/* Request interrupts */
-+	ret = devm_request_irq(pdata->dev, pdata->dev_irq, xgbe_isr, 0,
-+			       netdev->name, pdata);
-+	if (ret) {
-+		netdev_alert(netdev, "error requesting irq %d\n",
-+			     pdata->dev_irq);
-+		goto err_rings;
-+	}
-+
-+	if (pdata->per_channel_irq) {
-+		channel = pdata->channel;
-+		for (i = 0; i < pdata->channel_count; i++, channel++) {
-+			snprintf(channel->dma_irq_name,
-+				 sizeof(channel->dma_irq_name) - 1,
-+				 "%s-TxRx-%u", netdev_name(netdev),
-+				 channel->queue_index);
-+
-+			ret = devm_request_irq(pdata->dev, channel->dma_irq,
-+					       xgbe_dma_isr, 0,
-+					       channel->dma_irq_name, channel);
-+			if (ret) {
-+				netdev_alert(netdev,
-+					     "error requesting irq %d\n",
-+					     channel->dma_irq);
-+				goto err_irq;
-+			}
-+		}
-+	}
-+
-+	ret = xgbe_start(pdata);
-+	if (ret)
-+		goto err_start;
-+
-+	DBGPR("<--xgbe_open\n");
-+
-+	return 0;
-+
-+err_start:
-+	hw_if->exit(pdata);
-+
-+err_irq:
-+	if (pdata->per_channel_irq) {
-+		/* Using an unsigned int, 'i' will go to UINT_MAX and exit */
-+		for (i--, channel--; i < pdata->channel_count; i--, channel--)
-+			devm_free_irq(pdata->dev, channel->dma_irq, channel);
-+	}
-+
-+	devm_free_irq(pdata->dev, pdata->dev_irq, pdata);
-+
-+err_rings:
-+	desc_if->free_ring_resources(pdata);
-+
-+err_channels:
-+	xgbe_free_channels(pdata);
-+
-+err_ptpclk:
-+	clk_disable_unprepare(pdata->ptpclk);
-+
-+err_sysclk:
-+	clk_disable_unprepare(pdata->sysclk);
-+
-+err_phy_init:
-+	xgbe_phy_exit(pdata);
-+
-+	return ret;
-+}
-+
-+static int xgbe_close(struct net_device *netdev)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	struct xgbe_desc_if *desc_if = &pdata->desc_if;
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	DBGPR("-->xgbe_close\n");
-+
-+	/* Stop the device */
-+	xgbe_stop(pdata);
-+
-+	/* Issue software reset to device */
-+	hw_if->exit(pdata);
-+
-+	/* Free the ring descriptors and buffers */
-+	desc_if->free_ring_resources(pdata);
-+
-+	/* Release the interrupts */
-+	devm_free_irq(pdata->dev, pdata->dev_irq, pdata);
-+	if (pdata->per_channel_irq) {
-+		channel = pdata->channel;
-+		for (i = 0; i < pdata->channel_count; i++, channel++)
-+			devm_free_irq(pdata->dev, channel->dma_irq, channel);
-+	}
-+
-+	/* Free the channel and ring structures */
-+	xgbe_free_channels(pdata);
-+
-+	/* Disable the clocks */
-+	clk_disable_unprepare(pdata->ptpclk);
-+	clk_disable_unprepare(pdata->sysclk);
-+
-+	/* Release the phy */
-+	xgbe_phy_exit(pdata);
-+
-+	DBGPR("<--xgbe_close\n");
-+
-+	return 0;
-+}
-+
-+static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	struct xgbe_desc_if *desc_if = &pdata->desc_if;
-+	struct xgbe_channel *channel;
-+	struct xgbe_ring *ring;
-+	struct xgbe_packet_data *packet;
-+	struct netdev_queue *txq;
-+	int ret;
-+
-+	DBGPR("-->xgbe_xmit: skb->len = %d\n", skb->len);
-+
-+	channel = pdata->channel + skb->queue_mapping;
-+	txq = netdev_get_tx_queue(netdev, channel->queue_index);
-+	ring = channel->tx_ring;
-+	packet = &ring->packet_data;
-+
-+	ret = NETDEV_TX_OK;
-+
-+	if (skb->len == 0) {
-+		netdev_err(netdev, "empty skb received from stack\n");
-+		dev_kfree_skb_any(skb);
-+		goto tx_netdev_return;
-+	}
-+
-+	/* Calculate preliminary packet info */
-+	memset(packet, 0, sizeof(*packet));
-+	xgbe_packet_info(pdata, ring, skb, packet);
-+
-+	/* Check that there are enough descriptors available */
-+	ret = xgbe_maybe_stop_tx_queue(channel, ring, packet->rdesc_count);
-+	if (ret)
-+		goto tx_netdev_return;
-+
-+	ret = xgbe_prep_tso(skb, packet);
-+	if (ret) {
-+		netdev_err(netdev, "error processing TSO packet\n");
-+		dev_kfree_skb_any(skb);
-+		goto tx_netdev_return;
-+	}
-+	xgbe_prep_vlan(skb, packet);
-+
-+	if (!desc_if->map_tx_skb(channel, skb)) {
-+		dev_kfree_skb_any(skb);
-+		goto tx_netdev_return;
-+	}
-+
-+	xgbe_prep_tx_tstamp(pdata, skb, packet);
-+
-+	/* Report on the actual number of bytes (to be) sent */
-+	netdev_tx_sent_queue(txq, packet->tx_bytes);
-+
-+	/* Configure required descriptor fields for transmission */
-+	hw_if->dev_xmit(channel);
-+
-+#ifdef XGMAC_ENABLE_TX_PKT_DUMP
-+	xgbe_a0_print_pkt(netdev, skb, true);
-+#endif
-+
-+	/* Stop the queue in advance if there may not be enough descriptors */
-+	xgbe_maybe_stop_tx_queue(channel, ring, XGBE_TX_MAX_DESCS);
-+
-+	ret = NETDEV_TX_OK;
-+
-+tx_netdev_return:
-+	return ret;
-+}
-+
-+static void xgbe_set_rx_mode(struct net_device *netdev)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	unsigned int pr_mode, am_mode;
-+
-+	DBGPR("-->xgbe_set_rx_mode\n");
-+
-+	pr_mode = ((netdev->flags & IFF_PROMISC) != 0);
-+	am_mode = ((netdev->flags & IFF_ALLMULTI) != 0);
-+
-+	hw_if->set_promiscuous_mode(pdata, pr_mode);
-+	hw_if->set_all_multicast_mode(pdata, am_mode);
-+
-+	hw_if->add_mac_addresses(pdata);
-+
-+	DBGPR("<--xgbe_set_rx_mode\n");
-+}
-+
-+static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	struct sockaddr *saddr = addr;
-+
-+	DBGPR("-->xgbe_set_mac_address\n");
-+
-+	if (!is_valid_ether_addr(saddr->sa_data))
-+		return -EADDRNOTAVAIL;
-+
-+	memcpy(netdev->dev_addr, saddr->sa_data, netdev->addr_len);
-+
-+	hw_if->set_mac_address(pdata, netdev->dev_addr);
-+
-+	DBGPR("<--xgbe_set_mac_address\n");
-+
-+	return 0;
-+}
-+
-+static int xgbe_ioctl(struct net_device *netdev, struct ifreq *ifreq, int cmd)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	int ret;
-+
-+	switch (cmd) {
-+	case SIOCGHWTSTAMP:
-+		ret = xgbe_get_hwtstamp_settings(pdata, ifreq);
-+		break;
-+
-+	case SIOCSHWTSTAMP:
-+		ret = xgbe_set_hwtstamp_settings(pdata, ifreq);
-+		break;
-+
-+	default:
-+		ret = -EOPNOTSUPP;
-+	}
-+
-+	return ret;
-+}
-+
-+static int xgbe_change_mtu(struct net_device *netdev, int mtu)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	int ret;
-+
-+	DBGPR("-->xgbe_change_mtu\n");
-+
-+	ret = xgbe_calc_rx_buf_size(netdev, mtu);
-+	if (ret < 0)
-+		return ret;
-+
-+	pdata->rx_buf_size = ret;
-+	netdev->mtu = mtu;
-+
-+	xgbe_restart_dev(pdata);
-+
-+	DBGPR("<--xgbe_change_mtu\n");
-+
-+	return 0;
-+}
-+
-+static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
-+						  struct rtnl_link_stats64 *s)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	struct xgbe_mmc_stats *pstats = &pdata->mmc_stats;
-+
-+	DBGPR("-->%s\n", __func__);
-+
-+	pdata->hw_if.read_mmc_stats(pdata);
-+
-+	s->rx_packets = pstats->rxframecount_gb;
-+	s->rx_bytes = pstats->rxoctetcount_gb;
-+	s->rx_errors = pstats->rxframecount_gb -
-+		       pstats->rxbroadcastframes_g -
-+		       pstats->rxmulticastframes_g -
-+		       pstats->rxunicastframes_g;
-+	s->multicast = pstats->rxmulticastframes_g;
-+	s->rx_length_errors = pstats->rxlengtherror;
-+	s->rx_crc_errors = pstats->rxcrcerror;
-+	s->rx_fifo_errors = pstats->rxfifooverflow;
-+
-+	s->tx_packets = pstats->txframecount_gb;
-+	s->tx_bytes = pstats->txoctetcount_gb;
-+	s->tx_errors = pstats->txframecount_gb - pstats->txframecount_g;
-+	s->tx_dropped = netdev->stats.tx_dropped;
-+
-+	DBGPR("<--%s\n", __func__);
-+
-+	return s;
-+}
-+
-+static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
-+				u16 vid)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+
-+	DBGPR("-->%s\n", __func__);
-+
-+	set_bit(vid, pdata->active_vlans);
-+	hw_if->update_vlan_hash_table(pdata);
-+
-+	DBGPR("<--%s\n", __func__);
-+
-+	return 0;
-+}
-+
-+static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
-+				 u16 vid)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+
-+	DBGPR("-->%s\n", __func__);
-+
-+	clear_bit(vid, pdata->active_vlans);
-+	hw_if->update_vlan_hash_table(pdata);
-+
-+	DBGPR("<--%s\n", __func__);
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_NET_POLL_CONTROLLER
-+static void xgbe_poll_controller(struct net_device *netdev)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	struct xgbe_channel *channel;
-+	unsigned int i;
-+
-+	DBGPR("-->xgbe_poll_controller\n");
-+
-+	if (pdata->per_channel_irq) {
-+		channel = pdata->channel;
-+		for (i = 0; i < pdata->channel_count; i++, channel++)
-+			xgbe_dma_isr(channel->dma_irq, channel);
-+	} else {
-+		disable_irq(pdata->dev_irq);
-+		xgbe_isr(pdata->dev_irq, pdata);
-+		enable_irq(pdata->dev_irq);
-+	}
-+
-+	DBGPR("<--xgbe_poll_controller\n");
-+}
-+#endif /* End CONFIG_NET_POLL_CONTROLLER */
-+
-+static int xgbe_setup_tc(struct net_device *netdev, u8 tc)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	unsigned int offset, queue;
-+	u8 i;
-+
-+	if (tc && (tc != pdata->hw_feat.tc_cnt))
-+		return -EINVAL;
-+
-+	if (tc) {
-+		netdev_set_num_tc(netdev, tc);
-+		for (i = 0, queue = 0, offset = 0; i < tc; i++) {
-+			while ((queue < pdata->tx_q_count) &&
-+			       (pdata->q2tc_map[queue] == i))
-+				queue++;
-+
-+			DBGPR("  TC%u using TXq%u-%u\n", i, offset, queue - 1);
-+			netdev_set_tc_queue(netdev, i, queue - offset, offset);
-+			offset = queue;
-+		}
-+	} else {
-+		netdev_reset_tc(netdev);
-+	}
-+
-+	return 0;
-+}
-+
-+static int xgbe_set_features(struct net_device *netdev,
-+			     netdev_features_t features)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	netdev_features_t rxhash, rxcsum, rxvlan, rxvlan_filter;
-+	int ret = 0;
-+
-+	rxhash = pdata->netdev_features & NETIF_F_RXHASH;
-+	rxcsum = pdata->netdev_features & NETIF_F_RXCSUM;
-+	rxvlan = pdata->netdev_features & NETIF_F_HW_VLAN_CTAG_RX;
-+	rxvlan_filter = pdata->netdev_features & NETIF_F_HW_VLAN_CTAG_FILTER;
-+
-+	if ((features & NETIF_F_RXHASH) && !rxhash)
-+		ret = hw_if->enable_rss(pdata);
-+	else if (!(features & NETIF_F_RXHASH) && rxhash)
-+		ret = hw_if->disable_rss(pdata);
-+	if (ret)
-+		return ret;
-+
-+	if ((features & NETIF_F_RXCSUM) && !rxcsum)
-+		hw_if->enable_rx_csum(pdata);
-+	else if (!(features & NETIF_F_RXCSUM) && rxcsum)
-+		hw_if->disable_rx_csum(pdata);
-+
-+	if ((features & NETIF_F_HW_VLAN_CTAG_RX) && !rxvlan)
-+		hw_if->enable_rx_vlan_stripping(pdata);
-+	else if (!(features & NETIF_F_HW_VLAN_CTAG_RX) && rxvlan)
-+		hw_if->disable_rx_vlan_stripping(pdata);
-+
-+	if ((features & NETIF_F_HW_VLAN_CTAG_FILTER) && !rxvlan_filter)
-+		hw_if->enable_rx_vlan_filtering(pdata);
-+	else if (!(features & NETIF_F_HW_VLAN_CTAG_FILTER) && rxvlan_filter)
-+		hw_if->disable_rx_vlan_filtering(pdata);
-+
-+	pdata->netdev_features = features;
-+
-+	DBGPR("<--xgbe_set_features\n");
-+
-+	return 0;
-+}
-+
-+static const struct net_device_ops xgbe_netdev_ops = {
-+	.ndo_open		= xgbe_open,
-+	.ndo_stop		= xgbe_close,
-+	.ndo_start_xmit		= xgbe_xmit,
-+	.ndo_set_rx_mode	= xgbe_set_rx_mode,
-+	.ndo_set_mac_address	= xgbe_set_mac_address,
-+	.ndo_validate_addr	= eth_validate_addr,
-+	.ndo_do_ioctl		= xgbe_ioctl,
-+	.ndo_change_mtu		= xgbe_change_mtu,
-+	.ndo_get_stats64	= xgbe_get_stats64,
-+	.ndo_vlan_rx_add_vid	= xgbe_vlan_rx_add_vid,
-+	.ndo_vlan_rx_kill_vid	= xgbe_vlan_rx_kill_vid,
-+#ifdef CONFIG_NET_POLL_CONTROLLER
-+	.ndo_poll_controller	= xgbe_poll_controller,
-+#endif
-+	.ndo_setup_tc		= xgbe_setup_tc,
-+	.ndo_set_features	= xgbe_set_features,
-+};
-+
-+struct net_device_ops *xgbe_a0_get_netdev_ops(void)
-+{
-+	return (struct net_device_ops *)&xgbe_netdev_ops;
-+}
-+
-+static void xgbe_rx_refresh(struct xgbe_channel *channel)
-+{
-+	struct xgbe_prv_data *pdata = channel->pdata;
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	struct xgbe_desc_if *desc_if = &pdata->desc_if;
-+	struct xgbe_ring *ring = channel->rx_ring;
-+	struct xgbe_ring_data *rdata;
-+
-+	while (ring->dirty != ring->cur) {
-+		rdata = XGBE_GET_DESC_DATA(ring, ring->dirty);
-+
-+		/* Reset rdata values */
-+		desc_if->unmap_rdata(pdata, rdata);
-+
-+		if (desc_if->map_rx_buffer(pdata, ring, rdata))
-+			break;
-+
-+		hw_if->rx_desc_reset(rdata);
-+
-+		ring->dirty++;
-+	}
-+
-+	/* Update the Rx Tail Pointer Register with address of
-+	 * the last cleaned entry */
-+	rdata = XGBE_GET_DESC_DATA(ring, ring->dirty - 1);
-+	XGMAC_DMA_IOWRITE(channel, DMA_CH_RDTR_LO,
-+			  lower_32_bits(rdata->rdesc_dma));
-+}
-+
-+static struct sk_buff *xgbe_create_skb(struct xgbe_prv_data *pdata,
-+				       struct xgbe_ring_data *rdata,
-+				       unsigned int *len)
-+{
-+	struct net_device *netdev = pdata->netdev;
-+	struct sk_buff *skb;
-+	u8 *packet;
-+	unsigned int copy_len;
-+
-+	skb = netdev_alloc_skb_ip_align(netdev, rdata->rx.hdr.dma_len);
-+	if (!skb)
-+		return NULL;
-+
-+	packet = page_address(rdata->rx.hdr.pa.pages) +
-+		 rdata->rx.hdr.pa.pages_offset;
-+	copy_len = (rdata->rx.hdr_len) ? rdata->rx.hdr_len : *len;
-+	copy_len = min(rdata->rx.hdr.dma_len, copy_len);
-+	skb_copy_to_linear_data(skb, packet, copy_len);
-+	skb_put(skb, copy_len);
-+
-+	*len -= copy_len;
-+
-+	return skb;
-+}
-+
-+static int xgbe_tx_poll(struct xgbe_channel *channel)
-+{
-+	struct xgbe_prv_data *pdata = channel->pdata;
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	struct xgbe_desc_if *desc_if = &pdata->desc_if;
-+	struct xgbe_ring *ring = channel->tx_ring;
-+	struct xgbe_ring_data *rdata;
-+	struct xgbe_ring_desc *rdesc;
-+	struct net_device *netdev = pdata->netdev;
-+	struct netdev_queue *txq;
-+	int processed = 0;
-+	unsigned int tx_packets = 0, tx_bytes = 0;
-+
-+	DBGPR("-->xgbe_tx_poll\n");
-+
-+	/* Nothing to do if there isn't a Tx ring for this channel */
-+	if (!ring)
-+		return 0;
-+
-+	txq = netdev_get_tx_queue(netdev, channel->queue_index);
-+
-+	while ((processed < XGBE_TX_DESC_MAX_PROC) &&
-+	       (ring->dirty != ring->cur)) {
-+		rdata = XGBE_GET_DESC_DATA(ring, ring->dirty);
-+		rdesc = rdata->rdesc;
-+
-+		if (!hw_if->tx_complete(rdesc))
-+			break;
-+
-+		/* Make sure descriptor fields are read after reading the OWN
-+		 * bit */
-+		rmb();
-+
-+#ifdef XGMAC_ENABLE_TX_DESC_DUMP
-+		xgbe_a0_dump_tx_desc(ring, ring->dirty, 1, 0);
-+#endif
-+
-+		if (hw_if->is_last_desc(rdesc)) {
-+			tx_packets += rdata->tx.packets;
-+			tx_bytes += rdata->tx.bytes;
-+		}
-+
-+		/* Free the SKB and reset the descriptor for re-use */
-+		desc_if->unmap_rdata(pdata, rdata);
-+		hw_if->tx_desc_reset(rdata);
-+
-+		processed++;
-+		ring->dirty++;
-+	}
-+
-+	if (!processed)
-+		return 0;
-+
-+	netdev_tx_completed_queue(txq, tx_packets, tx_bytes);
-+
-+	if ((ring->tx.queue_stopped == 1) &&
-+	    (xgbe_tx_avail_desc(ring) > XGBE_TX_DESC_MIN_FREE)) {
-+		ring->tx.queue_stopped = 0;
-+		netif_tx_wake_queue(txq);
-+	}
-+
-+	DBGPR("<--xgbe_tx_poll: processed=%d\n", processed);
-+
-+	return processed;
-+}
-+
-+static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
-+{
-+	struct xgbe_prv_data *pdata = channel->pdata;
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	struct xgbe_ring *ring = channel->rx_ring;
-+	struct xgbe_ring_data *rdata;
-+	struct xgbe_packet_data *packet;
-+	struct net_device *netdev = pdata->netdev;
-+	struct napi_struct *napi;
-+	struct sk_buff *skb;
-+	struct skb_shared_hwtstamps *hwtstamps;
-+	unsigned int incomplete, error, context_next, context;
-+	unsigned int len, put_len, max_len;
-+	unsigned int received = 0;
-+	int packet_count = 0;
-+
-+	DBGPR("-->xgbe_rx_poll: budget=%d\n", budget);
-+
-+	/* Nothing to do if there isn't a Rx ring for this channel */
-+	if (!ring)
-+		return 0;
-+
-+	napi = (pdata->per_channel_irq) ? &channel->napi : &pdata->napi;
-+
-+	rdata = XGBE_GET_DESC_DATA(ring, ring->cur);
-+	packet = &ring->packet_data;
-+	while (packet_count < budget) {
-+		DBGPR("  cur = %d\n", ring->cur);
-+
-+		/* First time in loop see if we need to restore state */
-+		if (!received && rdata->state_saved) {
-+			incomplete = rdata->state.incomplete;
-+			context_next = rdata->state.context_next;
-+			skb = rdata->state.skb;
-+			error = rdata->state.error;
-+			len = rdata->state.len;
-+		} else {
-+			memset(packet, 0, sizeof(*packet));
-+			incomplete = 0;
-+			context_next = 0;
-+			skb = NULL;
-+			error = 0;
-+			len = 0;
-+		}
-+
-+read_again:
-+		rdata = XGBE_GET_DESC_DATA(ring, ring->cur);
-+
-+		if (xgbe_rx_dirty_desc(ring) > (XGBE_RX_DESC_CNT >> 3))
-+			xgbe_rx_refresh(channel);
-+
-+		if (hw_if->dev_read(channel))
-+			break;
-+
-+		received++;
-+		ring->cur++;
-+
-+		incomplete = XGMAC_GET_BITS(packet->attributes,
-+					    RX_PACKET_ATTRIBUTES,
-+					    INCOMPLETE);
-+		context_next = XGMAC_GET_BITS(packet->attributes,
-+					      RX_PACKET_ATTRIBUTES,
-+					      CONTEXT_NEXT);
-+		context = XGMAC_GET_BITS(packet->attributes,
-+					 RX_PACKET_ATTRIBUTES,
-+					 CONTEXT);
-+
-+		/* Earlier error, just drain the remaining data */
-+		if ((incomplete || context_next) && error)
-+			goto read_again;
-+
-+		if (error || packet->errors) {
-+			if (packet->errors)
-+				DBGPR("Error in received packet\n");
-+			dev_kfree_skb(skb);
-+			goto next_packet;
-+		}
-+
-+		if (!context) {
-+			put_len = rdata->rx.len - len;
-+			len += put_len;
-+
-+			if (!skb) {
-+				dma_sync_single_for_cpu(pdata->dev,
-+							rdata->rx.hdr.dma,
-+							rdata->rx.hdr.dma_len,
-+							DMA_FROM_DEVICE);
-+
-+				skb = xgbe_create_skb(pdata, rdata, &put_len);
-+				if (!skb) {
-+					error = 1;
-+					goto skip_data;
-+				}
-+			}
-+
-+			if (put_len) {
-+				dma_sync_single_for_cpu(pdata->dev,
-+							rdata->rx.buf.dma,
-+							rdata->rx.buf.dma_len,
-+							DMA_FROM_DEVICE);
-+
-+				skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
-+						rdata->rx.buf.pa.pages,
-+						rdata->rx.buf.pa.pages_offset,
-+						put_len, rdata->rx.buf.dma_len);
-+				rdata->rx.buf.pa.pages = NULL;
-+			}
-+		}
-+
-+skip_data:
-+		if (incomplete || context_next)
-+			goto read_again;
-+
-+		if (!skb)
-+			goto next_packet;
-+
-+		/* Be sure we don't exceed the configured MTU */
-+		max_len = netdev->mtu + ETH_HLEN;
-+		if (!(netdev->features & NETIF_F_HW_VLAN_CTAG_RX) &&
-+		    (skb->protocol == htons(ETH_P_8021Q)))
-+			max_len += VLAN_HLEN;
-+
-+		if (skb->len > max_len) {
-+			DBGPR("packet length exceeds configured MTU\n");
-+			dev_kfree_skb(skb);
-+			goto next_packet;
-+		}
-+
-+#ifdef XGMAC_ENABLE_RX_PKT_DUMP
-+		xgbe_a0_print_pkt(netdev, skb, false);
-+#endif
-+
-+		skb_checksum_none_assert(skb);
-+		if (XGMAC_GET_BITS(packet->attributes,
-+				   RX_PACKET_ATTRIBUTES, CSUM_DONE))
-+			skb->ip_summed = CHECKSUM_UNNECESSARY;
-+
-+		if (XGMAC_GET_BITS(packet->attributes,
-+				   RX_PACKET_ATTRIBUTES, VLAN_CTAG))
-+			__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
-+					       packet->vlan_ctag);
-+
-+		if (XGMAC_GET_BITS(packet->attributes,
-+				   RX_PACKET_ATTRIBUTES, RX_TSTAMP)) {
-+			u64 nsec;
-+
-+			nsec = timecounter_cyc2time(&pdata->tstamp_tc,
-+						    packet->rx_tstamp);
-+			hwtstamps = skb_hwtstamps(skb);
-+			hwtstamps->hwtstamp = ns_to_ktime(nsec);
-+		}
-+
-+		if (XGMAC_GET_BITS(packet->attributes,
-+				   RX_PACKET_ATTRIBUTES, RSS_HASH))
-+			skb_set_hash(skb, packet->rss_hash,
-+				     packet->rss_hash_type);
-+
-+		skb->dev = netdev;
-+		skb->protocol = eth_type_trans(skb, netdev);
-+		skb_record_rx_queue(skb, channel->queue_index);
-+		skb_mark_napi_id(skb, napi);
-+
-+		netdev->last_rx = jiffies;
-+		napi_gro_receive(napi, skb);
-+
-+next_packet:
-+		packet_count++;
-+	}
-+
-+	/* Check if we need to save state before leaving */
-+	if (received && (incomplete || context_next)) {
-+		rdata = XGBE_GET_DESC_DATA(ring, ring->cur);
-+		rdata->state_saved = 1;
-+		rdata->state.incomplete = incomplete;
-+		rdata->state.context_next = context_next;
-+		rdata->state.skb = skb;
-+		rdata->state.len = len;
-+		rdata->state.error = error;
-+	}
-+
-+	DBGPR("<--xgbe_rx_poll: packet_count = %d\n", packet_count);
-+
-+	return packet_count;
-+}
-+
-+static int xgbe_one_poll(struct napi_struct *napi, int budget)
-+{
-+	struct xgbe_channel *channel = container_of(napi, struct xgbe_channel,
-+						    napi);
-+	int processed = 0;
-+
-+	DBGPR("-->xgbe_one_poll: budget=%d\n", budget);
-+
-+	/* Cleanup Tx ring first */
-+	xgbe_tx_poll(channel);
-+
-+	/* Process Rx ring next */
-+	processed = xgbe_rx_poll(channel, budget);
-+
-+	/* If we processed everything, we are done */
-+	if (processed < budget) {
-+		/* Turn off polling */
-+		napi_complete(napi);
-+
-+		/* Enable Tx and Rx interrupts */
-+		enable_irq(channel->dma_irq);
-+	}
-+
-+	DBGPR("<--xgbe_one_poll: received = %d\n", processed);
-+
-+	return processed;
-+}
-+
-+static int xgbe_all_poll(struct napi_struct *napi, int budget)
-+{
-+	struct xgbe_prv_data *pdata = container_of(napi, struct xgbe_prv_data,
-+						   napi);
-+	struct xgbe_channel *channel;
-+	int ring_budget;
-+	int processed, last_processed;
-+	unsigned int i;
-+
-+	DBGPR("-->xgbe_all_poll: budget=%d\n", budget);
-+
-+	processed = 0;
-+	ring_budget = budget / pdata->rx_ring_count;
-+	do {
-+		last_processed = processed;
-+
-+		channel = pdata->channel;
-+		for (i = 0; i < pdata->channel_count; i++, channel++) {
-+			/* Cleanup Tx ring first */
-+			xgbe_tx_poll(channel);
-+
-+			/* Process Rx ring next */
-+			if (ring_budget > (budget - processed))
-+				ring_budget = budget - processed;
-+			processed += xgbe_rx_poll(channel, ring_budget);
-+		}
-+	} while ((processed < budget) && (processed != last_processed));
-+
-+	/* If we processed everything, we are done */
-+	if (processed < budget) {
-+		/* Turn off polling */
-+		napi_complete(napi);
-+
-+		/* Enable Tx and Rx interrupts */
-+		xgbe_enable_rx_tx_ints(pdata);
-+	}
-+
-+	DBGPR("<--xgbe_all_poll: received = %d\n", processed);
-+
-+	return processed;
-+}
-+
-+void xgbe_a0_dump_tx_desc(struct xgbe_ring *ring, unsigned int idx,
-+		       unsigned int count, unsigned int flag)
-+{
-+	struct xgbe_ring_data *rdata;
-+	struct xgbe_ring_desc *rdesc;
-+
-+	while (count--) {
-+		rdata = XGBE_GET_DESC_DATA(ring, idx);
-+		rdesc = rdata->rdesc;
-+		pr_alert("TX_NORMAL_DESC[%d %s] = %08x:%08x:%08x:%08x\n", idx,
-+			 (flag == 1) ? "QUEUED FOR TX" : "TX BY DEVICE",
-+			 le32_to_cpu(rdesc->desc0), le32_to_cpu(rdesc->desc1),
-+			 le32_to_cpu(rdesc->desc2), le32_to_cpu(rdesc->desc3));
-+		idx++;
-+	}
-+}
-+
-+void xgbe_a0_dump_rx_desc(struct xgbe_ring *ring, struct xgbe_ring_desc *desc,
-+		       unsigned int idx)
-+{
-+	pr_alert("RX_NORMAL_DESC[%d RX BY DEVICE] = %08x:%08x:%08x:%08x\n", idx,
-+		 le32_to_cpu(desc->desc0), le32_to_cpu(desc->desc1),
-+		 le32_to_cpu(desc->desc2), le32_to_cpu(desc->desc3));
-+}
-+
-+void xgbe_a0_print_pkt(struct net_device *netdev, struct sk_buff *skb, bool tx_rx)
-+{
-+	struct ethhdr *eth = (struct ethhdr *)skb->data;
-+	unsigned char *buf = skb->data;
-+	unsigned char buffer[128];
-+	unsigned int i, j;
-+
-+	netdev_alert(netdev, "\n************** SKB dump ****************\n");
-+
-+	netdev_alert(netdev, "%s packet of %d bytes\n",
-+		     (tx_rx ? "TX" : "RX"), skb->len);
-+
-+	netdev_alert(netdev, "Dst MAC addr: %pM\n", eth->h_dest);
-+	netdev_alert(netdev, "Src MAC addr: %pM\n", eth->h_source);
-+	netdev_alert(netdev, "Protocol: 0x%04hx\n", ntohs(eth->h_proto));
-+
-+	for (i = 0, j = 0; i < skb->len;) {
-+		j += snprintf(buffer + j, sizeof(buffer) - j, "%02hhx",
-+			      buf[i++]);
-+
-+		if ((i % 32) == 0) {
-+			netdev_alert(netdev, "  0x%04x: %s\n", i - 32, buffer);
-+			j = 0;
-+		} else if ((i % 16) == 0) {
-+			buffer[j++] = ' ';
-+			buffer[j++] = ' ';
-+		} else if ((i % 4) == 0) {
-+			buffer[j++] = ' ';
-+		}
-+	}
-+	if (i % 32)
-+		netdev_alert(netdev, "  0x%04x: %s\n", i - (i % 32), buffer);
-+
-+	netdev_alert(netdev, "\n************** SKB dump ****************\n");
-+}
-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
-index 0000000..165ff1c
---- /dev/null
-+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-ethtool.c
-@@ -0,0 +1,616 @@
-+/*
-+ * AMD 10Gb Ethernet driver
-+ *
-+ * This file is available to you under your choice of the following two
-+ * licenses:
-+ *
-+ * License 1: GPLv2
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ *
-+ * This file is free software; you may copy, redistribute and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 2 of the License, or (at
-+ * your option) any later version.
-+ *
-+ * This file is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ *
-+ * License 2: Modified BSD
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above copyright
-+ *       notice, this list of conditions and the following disclaimer in the
-+ *       documentation and/or other materials provided with the distribution.
-+ *     * Neither the name of Advanced Micro Devices, Inc. nor the
-+ *       names of its contributors may be used to endorse or promote products
-+ *       derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <linux/spinlock.h>
-+#include <linux/phy.h>
-+#include <linux/net_tstamp.h>
-+
-+#include "xgbe.h"
-+#include "xgbe-common.h"
-+
-+struct xgbe_stats {
-+	char stat_string[ETH_GSTRING_LEN];
-+	int stat_size;
-+	int stat_offset;
-+};
-+
-+#define XGMAC_MMC_STAT(_string, _var)				\
-+	{ _string,						\
-+	  FIELD_SIZEOF(struct xgbe_mmc_stats, _var),		\
-+	  offsetof(struct xgbe_prv_data, mmc_stats._var),	\
-+	}
-+
-+static const struct xgbe_stats xgbe_gstring_stats[] = {
-+	XGMAC_MMC_STAT("tx_bytes", txoctetcount_gb),
-+	XGMAC_MMC_STAT("tx_packets", txframecount_gb),
-+	XGMAC_MMC_STAT("tx_unicast_packets", txunicastframes_gb),
-+	XGMAC_MMC_STAT("tx_broadcast_packets", txbroadcastframes_gb),
-+	XGMAC_MMC_STAT("tx_multicast_packets", txmulticastframes_gb),
-+	XGMAC_MMC_STAT("tx_vlan_packets", txvlanframes_g),
-+	XGMAC_MMC_STAT("tx_64_byte_packets", tx64octets_gb),
-+	XGMAC_MMC_STAT("tx_65_to_127_byte_packets", tx65to127octets_gb),
-+	XGMAC_MMC_STAT("tx_128_to_255_byte_packets", tx128to255octets_gb),
-+	XGMAC_MMC_STAT("tx_256_to_511_byte_packets", tx256to511octets_gb),
-+	XGMAC_MMC_STAT("tx_512_to_1023_byte_packets", tx512to1023octets_gb),
-+	XGMAC_MMC_STAT("tx_1024_to_max_byte_packets", tx1024tomaxoctets_gb),
-+	XGMAC_MMC_STAT("tx_underflow_errors", txunderflowerror),
-+	XGMAC_MMC_STAT("tx_pause_frames", txpauseframes),
-+
-+	XGMAC_MMC_STAT("rx_bytes", rxoctetcount_gb),
-+	XGMAC_MMC_STAT("rx_packets", rxframecount_gb),
-+	XGMAC_MMC_STAT("rx_unicast_packets", rxunicastframes_g),
-+	XGMAC_MMC_STAT("rx_broadcast_packets", rxbroadcastframes_g),
-+	XGMAC_MMC_STAT("rx_multicast_packets", rxmulticastframes_g),
-+	XGMAC_MMC_STAT("rx_vlan_packets", rxvlanframes_gb),
-+	XGMAC_MMC_STAT("rx_64_byte_packets", rx64octets_gb),
-+	XGMAC_MMC_STAT("rx_65_to_127_byte_packets", rx65to127octets_gb),
-+	XGMAC_MMC_STAT("rx_128_to_255_byte_packets", rx128to255octets_gb),
-+	XGMAC_MMC_STAT("rx_256_to_511_byte_packets", rx256to511octets_gb),
-+	XGMAC_MMC_STAT("rx_512_to_1023_byte_packets", rx512to1023octets_gb),
-+	XGMAC_MMC_STAT("rx_1024_to_max_byte_packets", rx1024tomaxoctets_gb),
-+	XGMAC_MMC_STAT("rx_undersize_packets", rxundersize_g),
-+	XGMAC_MMC_STAT("rx_oversize_packets", rxoversize_g),
-+	XGMAC_MMC_STAT("rx_crc_errors", rxcrcerror),
-+	XGMAC_MMC_STAT("rx_crc_errors_small_packets", rxrunterror),
-+	XGMAC_MMC_STAT("rx_crc_errors_giant_packets", rxjabbererror),
-+	XGMAC_MMC_STAT("rx_length_errors", rxlengtherror),
-+	XGMAC_MMC_STAT("rx_out_of_range_errors", rxoutofrangetype),
-+	XGMAC_MMC_STAT("rx_fifo_overflow_errors", rxfifooverflow),
-+	XGMAC_MMC_STAT("rx_watchdog_errors", rxwatchdogerror),
-+	XGMAC_MMC_STAT("rx_pause_frames", rxpauseframes),
-+};
-+
-+#define XGBE_STATS_COUNT	ARRAY_SIZE(xgbe_gstring_stats)
-+
-+static void xgbe_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
-+{
-+	int i;
-+
-+	DBGPR("-->%s\n", __func__);
-+
-+	switch (stringset) {
-+	case ETH_SS_STATS:
-+		for (i = 0; i < XGBE_STATS_COUNT; i++) {
-+			memcpy(data, xgbe_gstring_stats[i].stat_string,
-+			       ETH_GSTRING_LEN);
-+			data += ETH_GSTRING_LEN;
-+		}
-+		break;
-+	}
-+
-+	DBGPR("<--%s\n", __func__);
-+}
-+
-+static void xgbe_get_ethtool_stats(struct net_device *netdev,
-+				   struct ethtool_stats *stats, u64 *data)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	u8 *stat;
-+	int i;
-+
-+	DBGPR("-->%s\n", __func__);
-+
-+	pdata->hw_if.read_mmc_stats(pdata);
-+	for (i = 0; i < XGBE_STATS_COUNT; i++) {
-+		stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
-+		*data++ = *(u64 *)stat;
-+	}
-+
-+	DBGPR("<--%s\n", __func__);
-+}
-+
-+static int xgbe_get_sset_count(struct net_device *netdev, int stringset)
-+{
-+	int ret;
-+
-+	DBGPR("-->%s\n", __func__);
-+
-+	switch (stringset) {
-+	case ETH_SS_STATS:
-+		ret = XGBE_STATS_COUNT;
-+		break;
-+
-+	default:
-+		ret = -EOPNOTSUPP;
-+	}
-+
-+	DBGPR("<--%s\n", __func__);
-+
-+	return ret;
-+}
-+
-+static void xgbe_get_pauseparam(struct net_device *netdev,
-+				struct ethtool_pauseparam *pause)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+
-+	DBGPR("-->xgbe_get_pauseparam\n");
-+
-+	pause->autoneg = pdata->pause_autoneg;
-+	pause->tx_pause = pdata->tx_pause;
-+	pause->rx_pause = pdata->rx_pause;
-+
-+	DBGPR("<--xgbe_get_pauseparam\n");
-+}
-+
-+static int xgbe_set_pauseparam(struct net_device *netdev,
-+			       struct ethtool_pauseparam *pause)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	struct phy_device *phydev = pdata->phydev;
-+	int ret = 0;
-+
-+	DBGPR("-->xgbe_set_pauseparam\n");
-+
-+	DBGPR("  autoneg = %d, tx_pause = %d, rx_pause = %d\n",
-+	      pause->autoneg, pause->tx_pause, pause->rx_pause);
-+
-+	pdata->pause_autoneg = pause->autoneg;
-+	if (pause->autoneg) {
-+		phydev->advertising |= ADVERTISED_Pause;
-+		phydev->advertising |= ADVERTISED_Asym_Pause;
-+
-+	} else {
-+		phydev->advertising &= ~ADVERTISED_Pause;
-+		phydev->advertising &= ~ADVERTISED_Asym_Pause;
-+
-+		pdata->tx_pause = pause->tx_pause;
-+		pdata->rx_pause = pause->rx_pause;
-+	}
-+
-+	if (netif_running(netdev))
-+		ret = phy_start_aneg(phydev);
-+
-+	DBGPR("<--xgbe_set_pauseparam\n");
-+
-+	return ret;
-+}
-+
-+static int xgbe_get_settings(struct net_device *netdev,
-+			     struct ethtool_cmd *cmd)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	int ret;
-+
-+	DBGPR("-->xgbe_get_settings\n");
-+
-+	if (!pdata->phydev)
-+		return -ENODEV;
-+
-+	ret = phy_ethtool_gset(pdata->phydev, cmd);
-+	cmd->transceiver = XCVR_EXTERNAL;
-+
-+	DBGPR("<--xgbe_get_settings\n");
-+
-+	return ret;
-+}
-+
-+static int xgbe_set_settings(struct net_device *netdev,
-+			     struct ethtool_cmd *cmd)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	struct phy_device *phydev = pdata->phydev;
-+	u32 speed;
-+	int ret;
-+
-+	DBGPR("-->xgbe_set_settings\n");
-+
-+	if (!pdata->phydev)
-+		return -ENODEV;
-+
-+	speed = ethtool_cmd_speed(cmd);
-+
-+	if (cmd->phy_address != phydev->addr)
-+		return -EINVAL;
-+
-+	if ((cmd->autoneg != AUTONEG_ENABLE) &&
-+	    (cmd->autoneg != AUTONEG_DISABLE))
-+		return -EINVAL;
-+
-+	if (cmd->autoneg == AUTONEG_DISABLE) {
-+		switch (speed) {
-+		case SPEED_10000:
-+		case SPEED_2500:
-+		case SPEED_1000:
-+			break;
-+		default:
-+			return -EINVAL;
-+		}
-+
-+		if (cmd->duplex != DUPLEX_FULL)
-+			return -EINVAL;
-+	}
-+
-+	cmd->advertising &= phydev->supported;
-+	if ((cmd->autoneg == AUTONEG_ENABLE) && !cmd->advertising)
-+		return -EINVAL;
-+
-+	ret = 0;
-+	phydev->autoneg = cmd->autoneg;
-+	phydev->speed = speed;
-+	phydev->duplex = cmd->duplex;
-+	phydev->advertising = cmd->advertising;
-+
-+	if (cmd->autoneg == AUTONEG_ENABLE)
-+		phydev->advertising |= ADVERTISED_Autoneg;
-+	else
-+		phydev->advertising &= ~ADVERTISED_Autoneg;
-+
-+	if (netif_running(netdev))
-+		ret = phy_start_aneg(phydev);
-+
-+	DBGPR("<--xgbe_set_settings\n");
-+
-+	return ret;
-+}
-+
-+static void xgbe_get_drvinfo(struct net_device *netdev,
-+			     struct ethtool_drvinfo *drvinfo)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	struct xgbe_hw_features *hw_feat = &pdata->hw_feat;
-+
-+	strlcpy(drvinfo->driver, XGBE_DRV_NAME, sizeof(drvinfo->driver));
-+	strlcpy(drvinfo->version, XGBE_DRV_VERSION, sizeof(drvinfo->version));
-+	strlcpy(drvinfo->bus_info, dev_name(pdata->dev),
-+		sizeof(drvinfo->bus_info));
-+	snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "%d.%d.%d",
-+		 XGMAC_GET_BITS(hw_feat->version, MAC_VR, USERVER),
-+		 XGMAC_GET_BITS(hw_feat->version, MAC_VR, DEVID),
-+		 XGMAC_GET_BITS(hw_feat->version, MAC_VR, SNPSVER));
-+	drvinfo->n_stats = XGBE_STATS_COUNT;
-+}
-+
-+static int xgbe_get_coalesce(struct net_device *netdev,
-+			     struct ethtool_coalesce *ec)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	unsigned int riwt;
-+
-+	DBGPR("-->xgbe_get_coalesce\n");
-+
-+	memset(ec, 0, sizeof(struct ethtool_coalesce));
-+
-+	riwt = pdata->rx_riwt;
-+	ec->rx_coalesce_usecs = hw_if->riwt_to_usec(pdata, riwt);
-+	ec->rx_max_coalesced_frames = pdata->rx_frames;
-+
-+	ec->tx_coalesce_usecs = pdata->tx_usecs;
-+	ec->tx_max_coalesced_frames = pdata->tx_frames;
-+
-+	DBGPR("<--xgbe_get_coalesce\n");
-+
-+	return 0;
-+}
-+
-+static int xgbe_set_coalesce(struct net_device *netdev,
-+			     struct ethtool_coalesce *ec)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	unsigned int rx_frames, rx_riwt, rx_usecs;
-+	unsigned int tx_frames, tx_usecs;
-+
-+	DBGPR("-->xgbe_set_coalesce\n");
-+
-+	/* Check for not supported parameters  */
-+	if ((ec->rx_coalesce_usecs_irq) ||
-+	    (ec->rx_max_coalesced_frames_irq) ||
-+	    (ec->tx_coalesce_usecs_irq) ||
-+	    (ec->tx_max_coalesced_frames_irq) ||
-+	    (ec->stats_block_coalesce_usecs) ||
-+	    (ec->use_adaptive_rx_coalesce) ||
-+	    (ec->use_adaptive_tx_coalesce) ||
-+	    (ec->pkt_rate_low) ||
-+	    (ec->rx_coalesce_usecs_low) ||
-+	    (ec->rx_max_coalesced_frames_low) ||
-+	    (ec->tx_coalesce_usecs_low) ||
-+	    (ec->tx_max_coalesced_frames_low) ||
-+	    (ec->pkt_rate_high) ||
-+	    (ec->rx_coalesce_usecs_high) ||
-+	    (ec->rx_max_coalesced_frames_high) ||
-+	    (ec->tx_coalesce_usecs_high) ||
-+	    (ec->tx_max_coalesced_frames_high) ||
-+	    (ec->rate_sample_interval))
-+		return -EOPNOTSUPP;
-+
-+	/* Can only change rx-frames when interface is down (see
-+	 * rx_descriptor_init in xgbe-dev.c)
-+	 */
-+	rx_frames = pdata->rx_frames;
-+	if (rx_frames != ec->rx_max_coalesced_frames && netif_running(netdev)) {
-+		netdev_alert(netdev,
-+			     "interface must be down to change rx-frames\n");
-+		return -EINVAL;
-+	}
-+
-+	rx_riwt = hw_if->usec_to_riwt(pdata, ec->rx_coalesce_usecs);
-+	rx_frames = ec->rx_max_coalesced_frames;
-+
-+	/* Use smallest possible value if conversion resulted in zero */
-+	if (ec->rx_coalesce_usecs && !rx_riwt)
-+		rx_riwt = 1;
-+
-+	/* Check the bounds of values for Rx */
-+	if (rx_riwt > XGMAC_MAX_DMA_RIWT) {
-+		rx_usecs = hw_if->riwt_to_usec(pdata, XGMAC_MAX_DMA_RIWT);
-+		netdev_alert(netdev, "rx-usec is limited to %d usecs\n",
-+			     rx_usecs);
-+		return -EINVAL;
-+	}
-+	if (rx_frames > pdata->rx_desc_count) {
-+		netdev_alert(netdev, "rx-frames is limited to %d frames\n",
-+			     pdata->rx_desc_count);
-+		return -EINVAL;
-+	}
-+
-+	tx_usecs = ec->tx_coalesce_usecs;
-+	tx_frames = ec->tx_max_coalesced_frames;
-+
-+	/* Check the bounds of values for Tx */
-+	if (tx_frames > pdata->tx_desc_count) {
-+		netdev_alert(netdev, "tx-frames is limited to %d frames\n",
-+			     pdata->tx_desc_count);
-+		return -EINVAL;
-+	}
-+
-+	pdata->rx_riwt = rx_riwt;
-+	pdata->rx_frames = rx_frames;
-+	hw_if->config_rx_coalesce(pdata);
-+
-+	pdata->tx_usecs = tx_usecs;
-+	pdata->tx_frames = tx_frames;
-+	hw_if->config_tx_coalesce(pdata);
-+
-+	DBGPR("<--xgbe_set_coalesce\n");
-+
-+	return 0;
-+}
-+
-+static int xgbe_get_rxnfc(struct net_device *netdev,
-+			  struct ethtool_rxnfc *rxnfc, u32 *rule_locs)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+
-+	switch (rxnfc->cmd) {
-+	case ETHTOOL_GRXRINGS:
-+		rxnfc->data = pdata->rx_ring_count;
-+		break;
-+	default:
-+		return -EOPNOTSUPP;
-+	}
-+
-+	return 0;
-+}
-+
-+static u32 xgbe_get_rxfh_key_size(struct net_device *netdev)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+
-+	return sizeof(pdata->rss_key);
-+}
-+
-+static u32 xgbe_get_rxfh_indir_size(struct net_device *netdev)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+
-+	return ARRAY_SIZE(pdata->rss_table);
-+}
-+
-+static int xgbe_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,
-+			 u8 *hfunc)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	unsigned int i;
-+
-+	if (indir) {
-+		for (i = 0; i < ARRAY_SIZE(pdata->rss_table); i++)
-+			indir[i] = XGMAC_GET_BITS(pdata->rss_table[i],
-+						  MAC_RSSDR, DMCH);
-+	}
-+
-+	if (key)
-+		memcpy(key, pdata->rss_key, sizeof(pdata->rss_key));
-+
-+	if (hfunc)
-+		*hfunc = ETH_RSS_HASH_TOP;
-+
-+	return 0;
-+}
-+
-+static int xgbe_set_rxfh(struct net_device *netdev, const u32 *indir,
-+			 const u8 *key, const u8 hfunc)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	unsigned int ret;
-+
-+	if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)
-+		return -EOPNOTSUPP;
-+
-+	if (indir) {
-+		ret = hw_if->set_rss_lookup_table(pdata, indir);
-+		if (ret)
-+			return ret;
-+	}
-+
-+	if (key) {
-+		ret = hw_if->set_rss_hash_key(pdata, key);
-+		if (ret)
-+			return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static int xgbe_get_ts_info(struct net_device *netdev,
-+			    struct ethtool_ts_info *ts_info)
-+{
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+
-+	ts_info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
-+				   SOF_TIMESTAMPING_RX_SOFTWARE |
-+				   SOF_TIMESTAMPING_SOFTWARE |
-+				   SOF_TIMESTAMPING_TX_HARDWARE |
-+				   SOF_TIMESTAMPING_RX_HARDWARE |
-+				   SOF_TIMESTAMPING_RAW_HARDWARE;
-+
-+	if (pdata->ptp_clock)
-+		ts_info->phc_index = ptp_clock_index(pdata->ptp_clock);
-+	else
-+		ts_info->phc_index = -1;
-+
-+	ts_info->tx_types = (1 << HWTSTAMP_TX_OFF) | (1 << HWTSTAMP_TX_ON);
-+	ts_info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) |
-+			      (1 << HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |
-+			      (1 << HWTSTAMP_FILTER_PTP_V1_L4_SYNC) |
-+			      (1 << HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ) |
-+			      (1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT) |
-+			      (1 << HWTSTAMP_FILTER_PTP_V2_L4_SYNC) |
-+			      (1 << HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ) |
-+			      (1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |
-+			      (1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |
-+			      (1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ) |
-+			      (1 << HWTSTAMP_FILTER_ALL);
-+
-+	return 0;
-+}
-+
-+static const struct ethtool_ops xgbe_ethtool_ops = {
-+	.get_settings = xgbe_get_settings,
-+	.set_settings = xgbe_set_settings,
-+	.get_drvinfo = xgbe_get_drvinfo,
-+	.get_link = ethtool_op_get_link,
-+	.get_coalesce = xgbe_get_coalesce,
-+	.set_coalesce = xgbe_set_coalesce,
-+	.get_pauseparam = xgbe_get_pauseparam,
-+	.set_pauseparam = xgbe_set_pauseparam,
-+	.get_strings = xgbe_get_strings,
-+	.get_ethtool_stats = xgbe_get_ethtool_stats,
-+	.get_sset_count = xgbe_get_sset_count,
-+	.get_rxnfc = xgbe_get_rxnfc,
-+	.get_rxfh_key_size = xgbe_get_rxfh_key_size,
-+	.get_rxfh_indir_size = xgbe_get_rxfh_indir_size,
-+	.get_rxfh = xgbe_get_rxfh,
-+	.set_rxfh = xgbe_set_rxfh,
-+	.get_ts_info = xgbe_get_ts_info,
-+};
-+
-+struct ethtool_ops *xgbe_a0_get_ethtool_ops(void)
-+{
-+	return (struct ethtool_ops *)&xgbe_ethtool_ops;
-+}
-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
-index 0000000..a85fb49
---- /dev/null
-+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-main.c
-@@ -0,0 +1,643 @@
-+/*
-+ * AMD 10Gb Ethernet driver
-+ *
-+ * This file is available to you under your choice of the following two
-+ * licenses:
-+ *
-+ * License 1: GPLv2
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ *
-+ * This file is free software; you may copy, redistribute and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 2 of the License, or (at
-+ * your option) any later version.
-+ *
-+ * This file is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ *
-+ * License 2: Modified BSD
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above copyright
-+ *       notice, this list of conditions and the following disclaimer in the
-+ *       documentation and/or other materials provided with the distribution.
-+ *     * Neither the name of Advanced Micro Devices, Inc. nor the
-+ *       names of its contributors may be used to endorse or promote products
-+ *       derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/device.h>
-+#include <linux/platform_device.h>
-+#include <linux/spinlock.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/io.h>
-+#include <linux/of.h>
-+#include <linux/of_net.h>
-+#include <linux/of_address.h>
-+#include <linux/clk.h>
-+#include <linux/property.h>
-+#include <linux/acpi.h>
-+
-+#include "xgbe.h"
-+#include "xgbe-common.h"
-+
-+MODULE_AUTHOR("Tom Lendacky <thomas.lendacky@amd.com>");
-+MODULE_LICENSE("Dual BSD/GPL");
-+MODULE_VERSION(XGBE_DRV_VERSION);
-+MODULE_DESCRIPTION(XGBE_DRV_DESC);
-+
-+unsigned int speed = 0;
-+module_param(speed, uint, 0444);
-+MODULE_PARM_DESC(speed, " Select operating speed (1=1GbE, 2=2.5GbE, 10=10GbE, any other value implies auto-negotiation");
-+
-+static void xgbe_default_config(struct xgbe_prv_data *pdata)
-+{
-+	DBGPR("-->xgbe_default_config\n");
-+
-+	pdata->pblx8 = DMA_PBL_X8_ENABLE;
-+	pdata->tx_sf_mode = MTL_TSF_ENABLE;
-+	pdata->tx_threshold = MTL_TX_THRESHOLD_64;
-+	pdata->tx_pbl = DMA_PBL_16;
-+	pdata->tx_osp_mode = DMA_OSP_ENABLE;
-+	pdata->rx_sf_mode = MTL_RSF_DISABLE;
-+	pdata->rx_threshold = MTL_RX_THRESHOLD_64;
-+	pdata->rx_pbl = DMA_PBL_16;
-+	pdata->pause_autoneg = 1;
-+	pdata->tx_pause = 1;
-+	pdata->rx_pause = 1;
-+	pdata->phy_speed = SPEED_UNKNOWN;
-+	pdata->power_down = 0;
-+
-+	if (speed == 10) {
-+		pdata->default_autoneg = AUTONEG_DISABLE;
-+		pdata->default_speed = SPEED_10000;
-+	} else if (speed == 2) {
-+		pdata->default_autoneg = AUTONEG_DISABLE;
-+		pdata->default_speed = SPEED_2500;
-+	} else if (speed == 1) {
-+		pdata->default_autoneg = AUTONEG_DISABLE;
-+		pdata->default_speed = SPEED_1000;
-+	} else {
-+		pdata->default_autoneg = AUTONEG_ENABLE;
-+		pdata->default_speed = SPEED_10000;
-+	}
-+
-+	DBGPR("<--xgbe_default_config\n");
-+}
-+
-+static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
-+{
-+	xgbe_a0_init_function_ptrs_dev(&pdata->hw_if);
-+	xgbe_a0_init_function_ptrs_desc(&pdata->desc_if);
-+}
-+
-+#ifdef CONFIG_ACPI
-+static int xgbe_acpi_support(struct xgbe_prv_data *pdata)
-+{
-+	struct acpi_device *adev = pdata->adev;
-+	struct device *dev = pdata->dev;
-+	u32 property;
-+	acpi_handle handle;
-+	acpi_status status;
-+	unsigned long long data;
-+	int cca;
-+	int ret;
-+
-+	/* Obtain the system clock setting */
-+	ret = device_property_read_u32(dev, XGBE_ACPI_DMA_FREQ, &property);
-+	if (ret) {
-+		dev_err(dev, "unable to obtain %s property\n",
-+			XGBE_ACPI_DMA_FREQ);
-+		return ret;
-+	}
-+	pdata->sysclk_rate = property;
-+
-+	/* Obtain the PTP clock setting */
-+	ret = device_property_read_u32(dev, XGBE_ACPI_PTP_FREQ, &property);
-+	if (ret) {
-+		dev_err(dev, "unable to obtain %s property\n",
-+			XGBE_ACPI_PTP_FREQ);
-+		return ret;
-+	}
-+	pdata->ptpclk_rate = property;
-+
-+	/* Retrieve the device cache coherency value */
-+	handle = adev->handle;
-+	do {
-+		status = acpi_evaluate_integer(handle, "_CCA", NULL, &data);
-+		if (!ACPI_FAILURE(status)) {
-+			cca = data;
-+			break;
-+		}
-+
-+		status = acpi_get_parent(handle, &handle);
-+	} while (!ACPI_FAILURE(status));
-+
-+	if (ACPI_FAILURE(status)) {
-+		dev_err(dev, "error obtaining acpi coherency value\n");
-+		return -EINVAL;
-+	}
-+	pdata->coherent = !!cca;
-+
-+	return 0;
-+}
-+#else   /* CONFIG_ACPI */
-+static int xgbe_acpi_support(struct xgbe_prv_data *pdata)
-+{
-+	return -EINVAL;
-+}
-+#endif  /* CONFIG_ACPI */
-+
-+#ifdef CONFIG_OF
-+static int xgbe_of_support(struct xgbe_prv_data *pdata)
-+{
-+	struct device *dev = pdata->dev;
-+
-+	/* Obtain the system clock setting */
-+	pdata->sysclk = devm_clk_get(dev, XGBE_DMA_CLOCK);
-+	if (IS_ERR(pdata->sysclk)) {
-+		dev_err(dev, "dma devm_clk_get failed\n");
-+		return PTR_ERR(pdata->sysclk);
-+	}
-+	pdata->sysclk_rate = clk_get_rate(pdata->sysclk);
-+
-+	/* Obtain the PTP clock setting */
-+	pdata->ptpclk = devm_clk_get(dev, XGBE_PTP_CLOCK);
-+	if (IS_ERR(pdata->ptpclk)) {
-+		dev_err(dev, "ptp devm_clk_get failed\n");
-+		return PTR_ERR(pdata->ptpclk);
-+	}
-+	pdata->ptpclk_rate = clk_get_rate(pdata->ptpclk);
-+
-+	/* Retrieve the device cache coherency value */
-+	pdata->coherent = of_dma_is_coherent(dev->of_node);
-+
-+	return 0;
-+}
-+#else   /* CONFIG_OF */
-+static int xgbe_of_support(struct xgbe_prv_data *pdata)
-+{
-+	return -EINVAL;
-+}
-+#endif  /*CONFIG_OF */
-+
-+static int xgbe_probe(struct platform_device *pdev)
-+{
-+	struct xgbe_prv_data *pdata;
-+	struct xgbe_hw_if *hw_if;
-+	struct xgbe_desc_if *desc_if;
-+	struct net_device *netdev;
-+	struct device *dev = &pdev->dev;
-+	struct resource *res;
-+	const char *phy_mode;
-+	unsigned int i;
-+	int ret;
-+
-+	DBGPR("--> xgbe_probe\n");
-+
-+	netdev = alloc_etherdev_mq(sizeof(struct xgbe_prv_data),
-+				   XGBE_MAX_DMA_CHANNELS);
-+	if (!netdev) {
-+		dev_err(dev, "alloc_etherdev failed\n");
-+		ret = -ENOMEM;
-+		goto err_alloc;
-+	}
-+	SET_NETDEV_DEV(netdev, dev);
-+	pdata = netdev_priv(netdev);
-+	pdata->netdev = netdev;
-+	pdata->pdev = pdev;
-+	pdata->adev = ACPI_COMPANION(dev);
-+	pdata->dev = dev;
-+	platform_set_drvdata(pdev, netdev);
-+
-+	spin_lock_init(&pdata->lock);
-+	mutex_init(&pdata->xpcs_mutex);
-+	mutex_init(&pdata->rss_mutex);
-+	spin_lock_init(&pdata->tstamp_lock);
-+
-+	/* Check if we should use ACPI or DT */
-+	pdata->use_acpi = (!pdata->adev || acpi_disabled) ? 0 : 1;
-+
-+	/* Set and validate the number of descriptors for a ring */
-+	BUILD_BUG_ON_NOT_POWER_OF_2(XGBE_TX_DESC_CNT);
-+	pdata->tx_desc_count = XGBE_TX_DESC_CNT;
-+	if (pdata->tx_desc_count & (pdata->tx_desc_count - 1)) {
-+		dev_err(dev, "tx descriptor count (%d) is not valid\n",
-+			pdata->tx_desc_count);
-+		ret = -EINVAL;
-+		goto err_io;
-+	}
-+	BUILD_BUG_ON_NOT_POWER_OF_2(XGBE_RX_DESC_CNT);
-+	pdata->rx_desc_count = XGBE_RX_DESC_CNT;
-+	if (pdata->rx_desc_count & (pdata->rx_desc_count - 1)) {
-+		dev_err(dev, "rx descriptor count (%d) is not valid\n",
-+			pdata->rx_desc_count);
-+		ret = -EINVAL;
-+		goto err_io;
-+	}
-+
-+	/* Obtain the mmio areas for the device */
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	pdata->xgmac_regs = devm_ioremap_resource(dev, res);
-+	if (IS_ERR(pdata->xgmac_regs)) {
-+		dev_err(dev, "xgmac ioremap failed\n");
-+		ret = PTR_ERR(pdata->xgmac_regs);
-+		goto err_io;
-+	}
-+	DBGPR("  xgmac_regs = %p\n", pdata->xgmac_regs);
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-+	pdata->xpcs_regs = devm_ioremap_resource(dev, res);
-+	if (IS_ERR(pdata->xpcs_regs)) {
-+		dev_err(dev, "xpcs ioremap failed\n");
-+		ret = PTR_ERR(pdata->xpcs_regs);
-+		goto err_io;
-+	}
-+	DBGPR("  xpcs_regs  = %p\n", pdata->xpcs_regs);
-+
-+	/* Retrieve the MAC address */
-+	ret = device_property_read_u8_array(dev, XGBE_MAC_ADDR_PROPERTY,
-+					    pdata->mac_addr,
-+					    sizeof(pdata->mac_addr));
-+	if (ret || !is_valid_ether_addr(pdata->mac_addr)) {
-+		dev_err(dev, "invalid %s property\n", XGBE_MAC_ADDR_PROPERTY);
-+		if (!ret)
-+			ret = -EINVAL;
-+		goto err_io;
-+	}
-+
-+	/* Retrieve the PHY mode - it must be "xgmii" */
-+	ret = device_property_read_string(dev, XGBE_PHY_MODE_PROPERTY,
-+					  &phy_mode);
-+	if (ret || strcmp(phy_mode, phy_modes(PHY_INTERFACE_MODE_XGMII))) {
-+		dev_err(dev, "invalid %s property\n", XGBE_PHY_MODE_PROPERTY);
-+		if (!ret)
-+			ret = -EINVAL;
-+		goto err_io;
-+	}
-+	pdata->phy_mode = PHY_INTERFACE_MODE_XGMII;
-+
-+	/* Check for per channel interrupt support */
-+	if (device_property_present(dev, XGBE_DMA_IRQS_PROPERTY))
-+		pdata->per_channel_irq = 1;
-+
-+	/* Obtain device settings unique to ACPI/OF */
-+	if (pdata->use_acpi)
-+		ret = xgbe_acpi_support(pdata);
-+	else
-+		ret = xgbe_of_support(pdata);
-+	if (ret)
-+		goto err_io;
-+
-+	/* Set the DMA coherency values */
-+	if (pdata->coherent) {
-+		pdata->axdomain = XGBE_DMA_OS_AXDOMAIN;
-+		pdata->arcache = XGBE_DMA_OS_ARCACHE;
-+		pdata->awcache = XGBE_DMA_OS_AWCACHE;
-+	} else {
-+		pdata->axdomain = XGBE_DMA_SYS_AXDOMAIN;
-+		pdata->arcache = XGBE_DMA_SYS_ARCACHE;
-+		pdata->awcache = XGBE_DMA_SYS_AWCACHE;
-+	}
-+
-+	/* Set the DMA mask */
-+	if (!dev->dma_mask)
-+		dev->dma_mask = &dev->coherent_dma_mask;
-+	ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(40));
-+	if (ret) {
-+		dev_err(dev, "dma_set_mask_and_coherent failed\n");
-+		goto err_io;
-+	}
-+
-+	/* Get the device interrupt */
-+	ret = platform_get_irq(pdev, 0);
-+	if (ret < 0) {
-+		dev_err(dev, "platform_get_irq 0 failed\n");
-+		goto err_io;
-+	}
-+	pdata->dev_irq = ret;
-+
-+	netdev->irq = pdata->dev_irq;
-+	netdev->base_addr = (unsigned long)pdata->xgmac_regs;
-+	memcpy(netdev->dev_addr, pdata->mac_addr, netdev->addr_len);
-+
-+	/* Set all the function pointers */
-+	xgbe_init_all_fptrs(pdata);
-+	hw_if = &pdata->hw_if;
-+	desc_if = &pdata->desc_if;
-+
-+	/* Issue software reset to device */
-+	hw_if->exit(pdata);
-+
-+	/* Populate the hardware features */
-+	xgbe_a0_get_all_hw_features(pdata);
-+
-+	/* Set default configuration data */
-+	xgbe_default_config(pdata);
-+
-+	/* Calculate the number of Tx and Rx rings to be created
-+	 *  -Tx (DMA) Channels map 1-to-1 to Tx Queues so set
-+	 *   the number of Tx queues to the number of Tx channels
-+	 *   enabled
-+	 *  -Rx (DMA) Channels do not map 1-to-1 so use the actual
-+	 *   number of Rx queues
-+	 */
-+	pdata->tx_ring_count = min_t(unsigned int, num_online_cpus(),
-+				     pdata->hw_feat.tx_ch_cnt);
-+	pdata->tx_q_count = pdata->tx_ring_count;
-+	ret = netif_set_real_num_tx_queues(netdev, pdata->tx_ring_count);
-+	if (ret) {
-+		dev_err(dev, "error setting real tx queue count\n");
-+		goto err_io;
-+	}
-+
-+	pdata->rx_ring_count = min_t(unsigned int,
-+				     netif_get_num_default_rss_queues(),
-+				     pdata->hw_feat.rx_ch_cnt);
-+	pdata->rx_q_count = pdata->hw_feat.rx_q_cnt;
-+	ret = netif_set_real_num_rx_queues(netdev, pdata->rx_ring_count);
-+	if (ret) {
-+		dev_err(dev, "error setting real rx queue count\n");
-+		goto err_io;
-+	}
-+
-+	/* Initialize RSS hash key and lookup table */
-+	netdev_rss_key_fill(pdata->rss_key, sizeof(pdata->rss_key));
-+
-+	for (i = 0; i < XGBE_RSS_MAX_TABLE_SIZE; i++)
-+		XGMAC_SET_BITS(pdata->rss_table[i], MAC_RSSDR, DMCH,
-+			       i % pdata->rx_ring_count);
-+
-+	XGMAC_SET_BITS(pdata->rss_options, MAC_RSSCR, IP2TE, 1);
-+	XGMAC_SET_BITS(pdata->rss_options, MAC_RSSCR, TCP4TE, 1);
-+	XGMAC_SET_BITS(pdata->rss_options, MAC_RSSCR, UDP4TE, 1);
-+
-+	/* Prepare to regsiter with MDIO */
-+	pdata->mii_bus_id = kasprintf(GFP_KERNEL, "%s", pdev->name);
-+	if (!pdata->mii_bus_id) {
-+		dev_err(dev, "failed to allocate mii bus id\n");
-+		ret = -ENOMEM;
-+		goto err_io;
-+	}
-+	ret = xgbe_a0_mdio_register(pdata);
-+	if (ret)
-+		goto err_bus_id;
-+
-+	/* Set device operations */
-+	netdev->netdev_ops = xgbe_a0_get_netdev_ops();
-+	netdev->ethtool_ops = xgbe_a0_get_ethtool_ops();
-+#ifdef CONFIG_AMD_XGBE_DCB
-+	netdev->dcbnl_ops = xgbe_a0_get_dcbnl_ops();
-+#endif
-+
-+	/* Set device features */
-+	netdev->hw_features = NETIF_F_SG |
-+			      NETIF_F_IP_CSUM |
-+			      NETIF_F_IPV6_CSUM |
-+			      NETIF_F_RXCSUM |
-+			      NETIF_F_TSO |
-+			      NETIF_F_TSO6 |
-+			      NETIF_F_GRO |
-+			      NETIF_F_HW_VLAN_CTAG_RX |
-+			      NETIF_F_HW_VLAN_CTAG_TX |
-+			      NETIF_F_HW_VLAN_CTAG_FILTER;
-+
-+	if (pdata->hw_feat.rss)
-+		netdev->hw_features |= NETIF_F_RXHASH;
-+
-+	netdev->vlan_features |= NETIF_F_SG |
-+				 NETIF_F_IP_CSUM |
-+				 NETIF_F_IPV6_CSUM |
-+				 NETIF_F_TSO |
-+				 NETIF_F_TSO6;
-+
-+	netdev->features |= netdev->hw_features;
-+	pdata->netdev_features = netdev->features;
-+
-+	netdev->priv_flags |= IFF_UNICAST_FLT;
-+
-+	xgbe_a0_init_rx_coalesce(pdata);
-+	xgbe_a0_init_tx_coalesce(pdata);
-+
-+	netif_carrier_off(netdev);
-+	ret = register_netdev(netdev);
-+	if (ret) {
-+		dev_err(dev, "net device registration failed\n");
-+		goto err_reg_netdev;
-+	}
-+
-+	xgbe_a0_ptp_register(pdata);
-+
-+	xgbe_a0_debugfs_init(pdata);
-+
-+	netdev_notice(netdev, "net device enabled\n");
-+
-+	DBGPR("<-- xgbe_probe\n");
-+
-+	return 0;
-+
-+err_reg_netdev:
-+	xgbe_a0_mdio_unregister(pdata);
-+
-+err_bus_id:
-+	kfree(pdata->mii_bus_id);
-+
-+err_io:
-+	free_netdev(netdev);
-+
-+err_alloc:
-+	dev_notice(dev, "net device not enabled\n");
-+
-+	return ret;
-+}
-+
-+static int xgbe_remove(struct platform_device *pdev)
-+{
-+	struct net_device *netdev = platform_get_drvdata(pdev);
-+	struct xgbe_prv_data *pdata = netdev_priv(netdev);
-+
-+	DBGPR("-->xgbe_remove\n");
-+
-+	xgbe_a0_debugfs_exit(pdata);
-+
-+	xgbe_a0_ptp_unregister(pdata);
-+
-+	unregister_netdev(netdev);
-+
-+	xgbe_a0_mdio_unregister(pdata);
-+
-+	kfree(pdata->mii_bus_id);
-+
-+	free_netdev(netdev);
-+
-+	DBGPR("<--xgbe_remove\n");
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int xgbe_suspend(struct device *dev)
-+{
-+	struct net_device *netdev = dev_get_drvdata(dev);
-+	int ret;
-+
-+	DBGPR("-->xgbe_suspend\n");
-+
-+	if (!netif_running(netdev)) {
-+		DBGPR("<--xgbe_dev_suspend\n");
-+		return -EINVAL;
-+	}
-+
-+	ret = xgbe_a0_powerdown(netdev, XGMAC_DRIVER_CONTEXT);
-+
-+	DBGPR("<--xgbe_suspend\n");
-+
-+	return ret;
-+}
-+
-+static int xgbe_resume(struct device *dev)
-+{
-+	struct net_device *netdev = dev_get_drvdata(dev);
-+	int ret;
-+
-+	DBGPR("-->xgbe_resume\n");
-+
-+	if (!netif_running(netdev)) {
-+		DBGPR("<--xgbe_dev_resume\n");
-+		return -EINVAL;
-+	}
-+
-+	ret = xgbe_a0_powerup(netdev, XGMAC_DRIVER_CONTEXT);
-+
-+	DBGPR("<--xgbe_resume\n");
-+
-+	return ret;
-+}
-+#endif /* CONFIG_PM */
-+
-+#ifdef CONFIG_ACPI
-+static const struct acpi_device_id xgbe_a0_acpi_match[] = {
-+	{ "AMDI8000", 0 },
-+	{},
-+};
-+
-+MODULE_DEVICE_TABLE(acpi, xgbe_a0_acpi_match);
-+#endif
-+
-+#ifdef CONFIG_OF
-+static const struct of_device_id xgbe_a0_of_match[] = {
-+	{ .compatible = "amd,xgbe-seattle-v0a", },
-+	{},
-+};
-+
-+MODULE_DEVICE_TABLE(of, xgbe_a0_of_match);
-+#endif
-+
-+static SIMPLE_DEV_PM_OPS(xgbe_pm_ops, xgbe_suspend, xgbe_resume);
-+
-+static struct platform_driver xgbe_a0_driver = {
-+	.driver = {
-+		.name = "amd-xgbe-a0",
-+#ifdef CONFIG_ACPI
-+		.acpi_match_table = xgbe_a0_acpi_match,
-+#endif
-+#ifdef CONFIG_OF
-+		.of_match_table = xgbe_a0_of_match,
-+#endif
-+		.pm = &xgbe_pm_ops,
-+	},
-+	.probe = xgbe_probe,
-+	.remove = xgbe_remove,
-+};
-+
-+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
-new file mode 100644
-index 0000000..b84d048
---- /dev/null
-+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-mdio.c
-@@ -0,0 +1,312 @@
-+/*
-+ * AMD 10Gb Ethernet driver
-+ *
-+ * This file is available to you under your choice of the following two
-+ * licenses:
-+ *
-+ * License 1: GPLv2
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ *
-+ * This file is free software; you may copy, redistribute and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 2 of the License, or (at
-+ * your option) any later version.
-+ *
-+ * This file is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ *
-+ * License 2: Modified BSD
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above copyright
-+ *       notice, this list of conditions and the following disclaimer in the
-+ *       documentation and/or other materials provided with the distribution.
-+ *     * Neither the name of Advanced Micro Devices, Inc. nor the
-+ *       names of its contributors may be used to endorse or promote products
-+ *       derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kmod.h>
-+#include <linux/mdio.h>
-+#include <linux/phy.h>
-+#include <linux/of.h>
-+
-+#include "xgbe.h"
-+#include "xgbe-common.h"
-+
-+static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
-+{
-+	struct xgbe_prv_data *pdata = mii->priv;
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	int mmd_data;
-+
-+	DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
-+		   prtad, mmd_reg);
-+
-+	mmd_data = hw_if->read_mmd_regs(pdata, prtad, mmd_reg);
-+
-+	DBGPR_MDIO("<--xgbe_mdio_read: mmd_data=%#x\n", mmd_data);
-+
-+	return mmd_data;
-+}
-+
-+static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
-+			   u16 mmd_val)
-+{
-+	struct xgbe_prv_data *pdata = mii->priv;
-+	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	int mmd_data = mmd_val;
-+
-+	DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
-+		   prtad, mmd_reg, mmd_data);
-+
-+	hw_if->write_mmd_regs(pdata, prtad, mmd_reg, mmd_data);
-+
-+	DBGPR_MDIO("<--xgbe_mdio_write\n");
-+
-+	return 0;
-+}
-+
-+void xgbe_a0_dump_phy_registers(struct xgbe_prv_data *pdata)
-+{
-+	struct device *dev = pdata->dev;
-+	struct phy_device *phydev = pdata->mii->phy_map[XGBE_PRTAD];
-+	int i;
-+
-+	dev_alert(dev, "\n************* PHY Reg dump **********************\n");
-+
-+	dev_alert(dev, "PCS Control Reg (%#04x) = %#04x\n", MDIO_CTRL1,
-+		  XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_CTRL1));
-+	dev_alert(dev, "PCS Status Reg (%#04x) = %#04x\n", MDIO_STAT1,
-+		  XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_STAT1));
-+	dev_alert(dev, "Phy Id (PHYS ID 1 %#04x)= %#04x\n", MDIO_DEVID1,
-+		  XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_DEVID1));
-+	dev_alert(dev, "Phy Id (PHYS ID 2 %#04x)= %#04x\n", MDIO_DEVID2,
-+		  XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_DEVID2));
-+	dev_alert(dev, "Devices in Package (%#04x)= %#04x\n", MDIO_DEVS1,
-+		  XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_DEVS1));
-+	dev_alert(dev, "Devices in Package (%#04x)= %#04x\n", MDIO_DEVS2,
-+		  XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_DEVS2));
-+
-+	dev_alert(dev, "Auto-Neg Control Reg (%#04x) = %#04x\n", MDIO_CTRL1,
-+		  XMDIO_READ(pdata, MDIO_MMD_AN, MDIO_CTRL1));
-+	dev_alert(dev, "Auto-Neg Status Reg (%#04x) = %#04x\n", MDIO_STAT1,
-+		  XMDIO_READ(pdata, MDIO_MMD_AN, MDIO_STAT1));
-+	dev_alert(dev, "Auto-Neg Ad Reg 1 (%#04x) = %#04x\n",
-+		  MDIO_AN_ADVERTISE,
-+		  XMDIO_READ(pdata, MDIO_MMD_AN, MDIO_AN_ADVERTISE));
-+	dev_alert(dev, "Auto-Neg Ad Reg 2 (%#04x) = %#04x\n",
-+		  MDIO_AN_ADVERTISE + 1,
-+		  XMDIO_READ(pdata, MDIO_MMD_AN, MDIO_AN_ADVERTISE + 1));
-+	dev_alert(dev, "Auto-Neg Ad Reg 3 (%#04x) = %#04x\n",
-+		  MDIO_AN_ADVERTISE + 2,
-+		  XMDIO_READ(pdata, MDIO_MMD_AN, MDIO_AN_ADVERTISE + 2));
-+	dev_alert(dev, "Auto-Neg Completion Reg (%#04x) = %#04x\n",
-+		  MDIO_AN_COMP_STAT,
-+		  XMDIO_READ(pdata, MDIO_MMD_AN, MDIO_AN_COMP_STAT));
-+
-+	dev_alert(dev, "MMD Device Mask = %#x\n",
-+		  phydev->c45_ids.devices_in_package);
-+	for (i = 0; i < ARRAY_SIZE(phydev->c45_ids.device_ids); i++)
-+		dev_alert(dev, "  MMD %d: ID = %#08x\n", i,
-+			  phydev->c45_ids.device_ids[i]);
-+
-+	dev_alert(dev, "\n*************************************************\n");
-+}
-+
-+int xgbe_a0_mdio_register(struct xgbe_prv_data *pdata)
-+{
-+	struct mii_bus *mii;
-+	struct phy_device *phydev;
-+	int ret = 0;
-+
-+	DBGPR("-->xgbe_a0_mdio_register\n");
-+
-+	mii = mdiobus_alloc();
-+	if (!mii) {
-+		dev_err(pdata->dev, "mdiobus_alloc failed\n");
-+		return -ENOMEM;
-+	}
-+
-+	/* Register on the MDIO bus (don't probe any PHYs) */
-+	mii->name = XGBE_PHY_NAME;
-+	mii->read = xgbe_mdio_read;
-+	mii->write = xgbe_mdio_write;
-+	snprintf(mii->id, sizeof(mii->id), "%s", pdata->mii_bus_id);
-+	mii->priv = pdata;
-+	mii->phy_mask = ~0;
-+	mii->parent = pdata->dev;
-+	ret = mdiobus_register(mii);
-+	if (ret) {
-+		dev_err(pdata->dev, "mdiobus_register failed\n");
-+		goto err_mdiobus_alloc;
-+	}
-+	DBGPR("  mdiobus_register succeeded for %s\n", pdata->mii_bus_id);
-+
-+	/* Probe the PCS using Clause 45 */
-+	phydev = get_phy_device(mii, XGBE_PRTAD, true);
-+	if (IS_ERR(phydev) || !phydev ||
-+	    !phydev->c45_ids.device_ids[MDIO_MMD_PCS]) {
-+		dev_err(pdata->dev, "get_phy_device failed\n");
-+		ret = phydev ? PTR_ERR(phydev) : -ENOLINK;
-+		goto err_mdiobus_register;
-+	}
-+	request_module(MDIO_MODULE_PREFIX MDIO_ID_FMT,
-+		       MDIO_ID_ARGS(phydev->c45_ids.device_ids[MDIO_MMD_PCS]));
-+
-+	ret = phy_device_register(phydev);
-+	if (ret) {
-+		dev_err(pdata->dev, "phy_device_register failed\n");
-+		goto err_phy_device;
-+	}
-+	if (!phydev->dev.driver) {
-+		dev_err(pdata->dev, "phy driver probe failed\n");
-+		ret = -EIO;
-+		goto err_phy_device;
-+	}
-+
-+	/* Add a reference to the PHY driver so it can't be unloaded */
-+	pdata->phy_module = phydev->dev.driver->owner;
-+	if (!try_module_get(pdata->phy_module)) {
-+		dev_err(pdata->dev, "try_module_get failed\n");
-+		ret = -EIO;
-+		goto err_phy_device;
-+	}
-+
-+	pdata->mii = mii;
-+	pdata->mdio_mmd = MDIO_MMD_PCS;
-+
-+	phydev->autoneg = pdata->default_autoneg;
-+	if (phydev->autoneg == AUTONEG_DISABLE) {
-+		phydev->speed = pdata->default_speed;
-+		phydev->duplex = DUPLEX_FULL;
-+
-+		phydev->advertising &= ~ADVERTISED_Autoneg;
-+	}
-+
-+	pdata->phydev = phydev;
-+
-+	DBGPHY_REGS(pdata);
-+
-+	DBGPR("<--xgbe_a0_mdio_register\n");
-+
-+	return 0;
-+
-+err_phy_device:
-+	phy_device_free(phydev);
-+
-+err_mdiobus_register:
-+	mdiobus_unregister(mii);
-+
-+err_mdiobus_alloc:
-+	mdiobus_free(mii);
-+
-+	return ret;
-+}
-+
-+void xgbe_a0_mdio_unregister(struct xgbe_prv_data *pdata)
-+{
-+	DBGPR("-->xgbe_a0_mdio_unregister\n");
-+
-+	pdata->phydev = NULL;
-+
-+	module_put(pdata->phy_module);
-+	pdata->phy_module = NULL;
-+
-+	mdiobus_unregister(pdata->mii);
-+	pdata->mii->priv = NULL;
-+
-+	mdiobus_free(pdata->mii);
-+	pdata->mii = NULL;
-+
-+	DBGPR("<--xgbe_a0_mdio_unregister\n");
-+}
-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
-index 0000000..c53c7b2
---- /dev/null
-+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe-ptp.c
-@@ -0,0 +1,284 @@
-+/*
-+ * AMD 10Gb Ethernet driver
-+ *
-+ * This file is available to you under your choice of the following two
-+ * licenses:
-+ *
-+ * License 1: GPLv2
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ *
-+ * This file is free software; you may copy, redistribute and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 2 of the License, or (at
-+ * your option) any later version.
-+ *
-+ * This file is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ *
-+ * License 2: Modified BSD
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above copyright
-+ *       notice, this list of conditions and the following disclaimer in the
-+ *       documentation and/or other materials provided with the distribution.
-+ *     * Neither the name of Advanced Micro Devices, Inc. nor the
-+ *       names of its contributors may be used to endorse or promote products
-+ *       derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/clocksource.h>
-+#include <linux/ptp_clock_kernel.h>
-+#include <linux/net_tstamp.h>
-+
-+#include "xgbe.h"
-+#include "xgbe-common.h"
-+
-+static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
-+{
-+	struct xgbe_prv_data *pdata = container_of(cc,
-+						   struct xgbe_prv_data,
-+						   tstamp_cc);
-+	u64 nsec;
-+
-+	nsec = pdata->hw_if.get_tstamp_time(pdata);
-+
-+	return nsec;
-+}
-+
-+static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
-+{
-+	struct xgbe_prv_data *pdata = container_of(info,
-+						   struct xgbe_prv_data,
-+						   ptp_clock_info);
-+	unsigned long flags;
-+	u64 adjust;
-+	u32 addend, diff;
-+	unsigned int neg_adjust = 0;
-+
-+	if (delta < 0) {
-+		neg_adjust = 1;
-+		delta = -delta;
-+	}
-+
-+	adjust = pdata->tstamp_addend;
-+	adjust *= delta;
-+	diff = div_u64(adjust, 1000000000UL);
-+
-+	addend = (neg_adjust) ? pdata->tstamp_addend - diff :
-+				pdata->tstamp_addend + diff;
-+
-+	spin_lock_irqsave(&pdata->tstamp_lock, flags);
-+
-+	pdata->hw_if.update_tstamp_addend(pdata, addend);
-+
-+	spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
-+
-+	return 0;
-+}
-+
-+static int xgbe_adjtime(struct ptp_clock_info *info, s64 delta)
-+{
-+	struct xgbe_prv_data *pdata = container_of(info,
-+						   struct xgbe_prv_data,
-+						   ptp_clock_info);
-+	unsigned long flags;
-+	u64 nsec;
-+
-+	spin_lock_irqsave(&pdata->tstamp_lock, flags);
-+
-+	nsec = timecounter_read(&pdata->tstamp_tc);
-+
-+	nsec += delta;
-+	timecounter_init(&pdata->tstamp_tc, &pdata->tstamp_cc, nsec);
-+
-+	spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
-+
-+	return 0;
-+}
-+
-+static int xgbe_gettime(struct ptp_clock_info *info, struct timespec *ts)
-+{
-+	struct xgbe_prv_data *pdata = container_of(info,
-+						   struct xgbe_prv_data,
-+						   ptp_clock_info);
-+	unsigned long flags;
-+	u64 nsec;
-+
-+	spin_lock_irqsave(&pdata->tstamp_lock, flags);
-+
-+	nsec = timecounter_read(&pdata->tstamp_tc);
-+
-+	spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
-+
-+	*ts = ns_to_timespec(nsec);
-+
-+	return 0;
-+}
-+
-+static int xgbe_settime(struct ptp_clock_info *info, const struct timespec *ts)
-+{
-+	struct xgbe_prv_data *pdata = container_of(info,
-+						   struct xgbe_prv_data,
-+						   ptp_clock_info);
-+	unsigned long flags;
-+	u64 nsec;
-+
-+	nsec = timespec_to_ns(ts);
-+
-+	spin_lock_irqsave(&pdata->tstamp_lock, flags);
-+
-+	timecounter_init(&pdata->tstamp_tc, &pdata->tstamp_cc, nsec);
-+
-+	spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
-+
-+	return 0;
-+}
-+
-+static int xgbe_enable(struct ptp_clock_info *info,
-+		       struct ptp_clock_request *request, int on)
-+{
-+	return -EOPNOTSUPP;
-+}
-+
-+void xgbe_a0_ptp_register(struct xgbe_prv_data *pdata)
-+{
-+	struct ptp_clock_info *info = &pdata->ptp_clock_info;
-+	struct ptp_clock *clock;
-+	struct cyclecounter *cc = &pdata->tstamp_cc;
-+	u64 dividend;
-+
-+	snprintf(info->name, sizeof(info->name), "%s",
-+		 netdev_name(pdata->netdev));
-+	info->owner = THIS_MODULE;
-+	info->max_adj = pdata->ptpclk_rate;
-+	info->adjfreq = xgbe_adjfreq;
-+	info->adjtime = xgbe_adjtime;
-+	info->gettime = xgbe_gettime;
-+	info->settime = xgbe_settime;
-+	info->enable = xgbe_enable;
-+
-+	clock = ptp_clock_register(info, pdata->dev);
-+	if (IS_ERR(clock)) {
-+		dev_err(pdata->dev, "ptp_clock_register failed\n");
-+		return;
-+	}
-+
-+	pdata->ptp_clock = clock;
-+
-+	/* Calculate the addend:
-+	 *   addend = 2^32 / (PTP ref clock / 50Mhz)
-+	 *          = (2^32 * 50Mhz) / PTP ref clock
-+	 */
-+	dividend = 50000000;
-+	dividend <<= 32;
-+	pdata->tstamp_addend = div_u64(dividend, pdata->ptpclk_rate);
-+
-+	/* Setup the timecounter */
-+	cc->read = xgbe_cc_read;
-+	cc->mask = CLOCKSOURCE_MASK(64);
-+	cc->mult = 1;
-+	cc->shift = 0;
-+
-+	timecounter_init(&pdata->tstamp_tc, &pdata->tstamp_cc,
-+			 ktime_to_ns(ktime_get_real()));
-+
-+	/* Disable all timestamping to start */
-+	XGMAC_IOWRITE(pdata, MAC_TCR, 0);
-+	pdata->tstamp_config.tx_type = HWTSTAMP_TX_OFF;
-+	pdata->tstamp_config.rx_filter = HWTSTAMP_FILTER_NONE;
-+}
-+
-+void xgbe_a0_ptp_unregister(struct xgbe_prv_data *pdata)
-+{
-+	if (pdata->ptp_clock)
-+		ptp_clock_unregister(pdata->ptp_clock);
-+}
-diff --git a/drivers/net/ethernet/amd/xgbe-a0/xgbe.h b/drivers/net/ethernet/amd/xgbe-a0/xgbe.h
-new file mode 100644
-index 0000000..dd8500d
---- /dev/null
-+++ b/drivers/net/ethernet/amd/xgbe-a0/xgbe.h
-@@ -0,0 +1,868 @@
-+/*
-+ * AMD 10Gb Ethernet driver
-+ *
-+ * This file is available to you under your choice of the following two
-+ * licenses:
-+ *
-+ * License 1: GPLv2
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ *
-+ * This file is free software; you may copy, redistribute and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 2 of the License, or (at
-+ * your option) any later version.
-+ *
-+ * This file is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ *
-+ * License 2: Modified BSD
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above copyright
-+ *       notice, this list of conditions and the following disclaimer in the
-+ *       documentation and/or other materials provided with the distribution.
-+ *     * Neither the name of Advanced Micro Devices, Inc. nor the
-+ *       names of its contributors may be used to endorse or promote products
-+ *       derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * This file incorporates work covered by the following copyright and
-+ * permission notice:
-+ *     The Synopsys DWC ETHER XGMAC Software Driver and documentation
-+ *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,
-+ *     Inc. unless otherwise expressly agreed to in writing between Synopsys
-+ *     and you.
-+ *
-+ *     The Software IS NOT an item of Licensed Software or Licensed Product
-+ *     under any End User Software License Agreement or Agreement for Licensed
-+ *     Product with Synopsys or any supplement thereto.  Permission is hereby
-+ *     granted, free of charge, to any person obtaining a copy of this software
-+ *     annotated with this license and the Software, to deal in the Software
-+ *     without restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+ *     of the Software, and to permit persons to whom the Software is furnished
-+ *     to do so, subject to the following conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be included
-+ *     in all copies or substantial portions of the Software.
-+ *
-+ *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS
-+ *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ *     THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#ifndef __XGBE_H__
-+#define __XGBE_H__
-+
-+#include <linux/dma-mapping.h>
-+#include <linux/netdevice.h>
-+#include <linux/workqueue.h>
-+#include <linux/phy.h>
-+#include <linux/if_vlan.h>
-+#include <linux/bitops.h>
-+#include <linux/ptp_clock_kernel.h>
-+#include <linux/clocksource.h>
-+#include <linux/net_tstamp.h>
-+#include <net/dcbnl.h>
-+
-+#define XGBE_DRV_NAME		"amd-xgbe"
-+#define XGBE_DRV_VERSION	"0.0.0-a"
-+#define XGBE_DRV_DESC		"AMD 10 Gigabit Ethernet Driver"
-+
-+/* Descriptor related defines */
-+#define XGBE_TX_DESC_CNT	512
-+#define XGBE_TX_DESC_MIN_FREE	(XGBE_TX_DESC_CNT >> 3)
-+#define XGBE_TX_DESC_MAX_PROC	(XGBE_TX_DESC_CNT >> 1)
-+#define XGBE_RX_DESC_CNT	512
-+
-+#define XGBE_TX_MAX_BUF_SIZE	(0x3fff & ~(64 - 1))
-+
-+/* Descriptors required for maximum contigous TSO/GSO packet */
-+#define XGBE_TX_MAX_SPLIT	((GSO_MAX_SIZE / XGBE_TX_MAX_BUF_SIZE) + 1)
-+
-+/* Maximum possible descriptors needed for an SKB:
-+ * - Maximum number of SKB frags
-+ * - Maximum descriptors for contiguous TSO/GSO packet
-+ * - Possible context descriptor
-+ * - Possible TSO header descriptor
-+ */
-+#define XGBE_TX_MAX_DESCS	(MAX_SKB_FRAGS + XGBE_TX_MAX_SPLIT + 2)
-+
-+#define XGBE_RX_MIN_BUF_SIZE	(ETH_FRAME_LEN + ETH_FCS_LEN + VLAN_HLEN)
-+#define XGBE_RX_BUF_ALIGN	64
-+#define XGBE_SKB_ALLOC_SIZE	256
-+#define XGBE_SPH_HDSMS_SIZE	2	/* Keep in sync with SKB_ALLOC_SIZE */
-+
-+#define XGBE_MAX_DMA_CHANNELS	16
-+#define XGBE_MAX_QUEUES		16
-+#define XGBE_DMA_STOP_TIMEOUT	5
-+
-+/* DMA cache settings - Outer sharable, write-back, write-allocate */
-+#define XGBE_DMA_OS_AXDOMAIN	0x2
-+#define XGBE_DMA_OS_ARCACHE	0xb
-+#define XGBE_DMA_OS_AWCACHE	0xf
-+
-+/* DMA cache settings - System, no caches used */
-+#define XGBE_DMA_SYS_AXDOMAIN	0x3
-+#define XGBE_DMA_SYS_ARCACHE	0x0
-+#define XGBE_DMA_SYS_AWCACHE	0x0
-+
-+#define XGBE_DMA_INTERRUPT_MASK	0x31c7
-+
-+#define XGMAC_MIN_PACKET	60
-+#define XGMAC_STD_PACKET_MTU	1500
-+#define XGMAC_MAX_STD_PACKET	1518
-+#define XGMAC_JUMBO_PACKET_MTU	9000
-+#define XGMAC_MAX_JUMBO_PACKET	9018
-+
-+/* MDIO bus phy name */
-+#define XGBE_PHY_NAME		"amd_xgbe_phy_a0"
-+#define XGBE_PRTAD		0
-+
-+/* Common property names */
-+#define XGBE_MAC_ADDR_PROPERTY	"mac-address"
-+#define XGBE_PHY_MODE_PROPERTY	"phy-mode"
-+#define XGBE_DMA_IRQS_PROPERTY	"amd,per-channel-interrupt"
-+
-+/* Device-tree clock names */
-+#define XGBE_DMA_CLOCK		"dma_clk"
-+#define XGBE_PTP_CLOCK		"ptp_clk"
-+
-+/* ACPI property names */
-+#define XGBE_ACPI_DMA_FREQ	"amd,dma-freq"
-+#define XGBE_ACPI_PTP_FREQ	"amd,ptp-freq"
-+
-+/* Timestamp support - values based on 50MHz PTP clock
-+ *   50MHz => 20 nsec
-+ */
-+#define XGBE_TSTAMP_SSINC	20
-+#define XGBE_TSTAMP_SNSINC	0
-+
-+/* Driver PMT macros */
-+#define XGMAC_DRIVER_CONTEXT	1
-+#define XGMAC_IOCTL_CONTEXT	2
-+
-+#define XGBE_FIFO_MAX		81920
-+#define XGBE_FIFO_SIZE_B(x)	(x)
-+#define XGBE_FIFO_SIZE_KB(x)	(x * 1024)
-+
-+#define XGBE_TC_MIN_QUANTUM	10
-+
-+/* Helper macro for descriptor handling
-+ *  Always use XGBE_GET_DESC_DATA to access the descriptor data
-+ *  since the index is free-running and needs to be and-ed
-+ *  with the descriptor count value of the ring to index to
-+ *  the proper descriptor data.
-+ */
-+#define XGBE_GET_DESC_DATA(_ring, _idx)				\
-+	((_ring)->rdata +					\
-+	 ((_idx) & ((_ring)->rdesc_count - 1)))
-+
-+/* Default coalescing parameters */
-+#define XGMAC_INIT_DMA_TX_USECS		50
-+#define XGMAC_INIT_DMA_TX_FRAMES	25
-+
-+#define XGMAC_MAX_DMA_RIWT		0xff
-+#define XGMAC_INIT_DMA_RX_USECS		30
-+#define XGMAC_INIT_DMA_RX_FRAMES	25
-+
-+/* Flow control queue count */
-+#define XGMAC_MAX_FLOW_CONTROL_QUEUES	8
-+
-+/* Maximum MAC address hash table size (256 bits = 8 bytes) */
-+#define XGBE_MAC_HASH_TABLE_SIZE	8
-+
-+/* Receive Side Scaling */
-+#define XGBE_RSS_HASH_KEY_SIZE		40
-+#define XGBE_RSS_MAX_TABLE_SIZE		256
-+#define XGBE_RSS_LOOKUP_TABLE_TYPE	0
-+#define XGBE_RSS_HASH_KEY_TYPE		1
-+
-+struct xgbe_prv_data;
-+
-+struct xgbe_packet_data {
-+	struct sk_buff *skb;
-+
-+	unsigned int attributes;
-+
-+	unsigned int errors;
-+
-+	unsigned int rdesc_count;
-+	unsigned int length;
-+
-+	unsigned int header_len;
-+	unsigned int tcp_header_len;
-+	unsigned int tcp_payload_len;
-+	unsigned short mss;
-+
-+	unsigned short vlan_ctag;
-+
-+	u64 rx_tstamp;
-+
-+	u32 rss_hash;
-+	enum pkt_hash_types rss_hash_type;
-+
-+	unsigned int tx_packets;
-+	unsigned int tx_bytes;
-+};
-+
-+/* Common Rx and Tx descriptor mapping */
-+struct xgbe_ring_desc {
-+	__le32 desc0;
-+	__le32 desc1;
-+	__le32 desc2;
-+	__le32 desc3;
-+};
-+
-+/* Page allocation related values */
-+struct xgbe_page_alloc {
-+	struct page *pages;
-+	unsigned int pages_len;
-+	unsigned int pages_offset;
-+
-+	dma_addr_t pages_dma;
-+};
-+
-+/* Ring entry buffer data */
-+struct xgbe_buffer_data {
-+	struct xgbe_page_alloc pa;
-+	struct xgbe_page_alloc pa_unmap;
-+
-+	dma_addr_t dma;
-+	unsigned int dma_len;
-+};
-+
-+/* Tx-related ring data */
-+struct xgbe_tx_ring_data {
-+	unsigned int packets;		/* BQL packet count */
-+	unsigned int bytes;		/* BQL byte count */
-+};
-+
-+/* Rx-related ring data */
-+struct xgbe_rx_ring_data {
-+	struct xgbe_buffer_data hdr;	/* Header locations */
-+	struct xgbe_buffer_data buf;	/* Payload locations */
-+
-+	unsigned short hdr_len;		/* Length of received header */
-+	unsigned short len;		/* Length of received packet */
-+};
-+
-+/* Structure used to hold information related to the descriptor
-+ * and the packet associated with the descriptor (always use
-+ * use the XGBE_GET_DESC_DATA macro to access this data from the ring)
-+ */
-+struct xgbe_ring_data {
-+	struct xgbe_ring_desc *rdesc;	/* Virtual address of descriptor */
-+	dma_addr_t rdesc_dma;		/* DMA address of descriptor */
-+
-+	struct sk_buff *skb;		/* Virtual address of SKB */
-+	dma_addr_t skb_dma;		/* DMA address of SKB data */
-+	unsigned int skb_dma_len;	/* Length of SKB DMA area */
-+
-+	struct xgbe_tx_ring_data tx;	/* Tx-related data */
-+	struct xgbe_rx_ring_data rx;	/* Rx-related data */
-+
-+	unsigned int interrupt;		/* Interrupt indicator */
-+
-+	unsigned int mapped_as_page;
-+
-+	/* Incomplete receive save location.  If the budget is exhausted
-+	 * or the last descriptor (last normal descriptor or a following
-+	 * context descriptor) has not been DMA'd yet the current state
-+	 * of the receive processing needs to be saved.
-+	 */
-+	unsigned int state_saved;
-+	struct {
-+		unsigned int incomplete;
-+		unsigned int context_next;
-+		struct sk_buff *skb;
-+		unsigned int len;
-+		unsigned int error;
-+	} state;
-+};
-+
-+struct xgbe_ring {
-+	/* Ring lock - used just for TX rings at the moment */
-+	spinlock_t lock;
-+
-+	/* Per packet related information */
-+	struct xgbe_packet_data packet_data;
-+
-+	/* Virtual/DMA addresses and count of allocated descriptor memory */
-+	struct xgbe_ring_desc *rdesc;
-+	dma_addr_t rdesc_dma;
-+	unsigned int rdesc_count;
-+
-+	/* Array of descriptor data corresponding the descriptor memory
-+	 * (always use the XGBE_GET_DESC_DATA macro to access this data)
-+	 */
-+	struct xgbe_ring_data *rdata;
-+
-+	/* Page allocation for RX buffers */
-+	struct xgbe_page_alloc rx_hdr_pa;
-+	struct xgbe_page_alloc rx_buf_pa;
-+
-+	/* Ring index values
-+	 *  cur   - Tx: index of descriptor to be used for current transfer
-+	 *          Rx: index of descriptor to check for packet availability
-+	 *  dirty - Tx: index of descriptor to check for transfer complete
-+	 *          Rx: index of descriptor to check for buffer reallocation
-+	 */
-+	unsigned int cur;
-+	unsigned int dirty;
-+
-+	/* Coalesce frame count used for interrupt bit setting */
-+	unsigned int coalesce_count;
-+
-+	union {
-+		struct {
-+			unsigned int queue_stopped;
-+			unsigned int xmit_more;
-+			unsigned short cur_mss;
-+			unsigned short cur_vlan_ctag;
-+		} tx;
-+	};
-+} ____cacheline_aligned;
-+
-+/* Structure used to describe the descriptor rings associated with
-+ * a DMA channel.
-+ */
-+struct xgbe_channel {
-+	char name[16];
-+
-+	/* Address of private data area for device */
-+	struct xgbe_prv_data *pdata;
-+
-+	/* Queue index and base address of queue's DMA registers */
-+	unsigned int queue_index;
-+	void __iomem *dma_regs;
-+
-+	/* Per channel interrupt irq number */
-+	int dma_irq;
-+	char dma_irq_name[IFNAMSIZ + 32];
-+
-+	/* Netdev related settings */
-+	struct napi_struct napi;
-+
-+	unsigned int saved_ier;
-+
-+	unsigned int tx_timer_active;
-+	struct hrtimer tx_timer;
-+
-+	struct xgbe_ring *tx_ring;
-+	struct xgbe_ring *rx_ring;
-+} ____cacheline_aligned;
-+
-+enum xgbe_int {
-+	XGMAC_INT_DMA_CH_SR_TI,
-+	XGMAC_INT_DMA_CH_SR_TPS,
-+	XGMAC_INT_DMA_CH_SR_TBU,
-+	XGMAC_INT_DMA_CH_SR_RI,
-+	XGMAC_INT_DMA_CH_SR_RBU,
-+	XGMAC_INT_DMA_CH_SR_RPS,
-+	XGMAC_INT_DMA_CH_SR_TI_RI,
-+	XGMAC_INT_DMA_CH_SR_FBE,
-+	XGMAC_INT_DMA_ALL,
-+};
-+
-+enum xgbe_int_state {
-+	XGMAC_INT_STATE_SAVE,
-+	XGMAC_INT_STATE_RESTORE,
-+};
-+
-+enum xgbe_mtl_fifo_size {
-+	XGMAC_MTL_FIFO_SIZE_256  = 0x00,
-+	XGMAC_MTL_FIFO_SIZE_512  = 0x01,
-+	XGMAC_MTL_FIFO_SIZE_1K   = 0x03,
-+	XGMAC_MTL_FIFO_SIZE_2K   = 0x07,
-+	XGMAC_MTL_FIFO_SIZE_4K   = 0x0f,
-+	XGMAC_MTL_FIFO_SIZE_8K   = 0x1f,
-+	XGMAC_MTL_FIFO_SIZE_16K  = 0x3f,
-+	XGMAC_MTL_FIFO_SIZE_32K  = 0x7f,
-+	XGMAC_MTL_FIFO_SIZE_64K  = 0xff,
-+	XGMAC_MTL_FIFO_SIZE_128K = 0x1ff,
-+	XGMAC_MTL_FIFO_SIZE_256K = 0x3ff,
-+};
-+
-+struct xgbe_mmc_stats {
-+	/* Tx Stats */
-+	u64 txoctetcount_gb;
-+	u64 txframecount_gb;
-+	u64 txbroadcastframes_g;
-+	u64 txmulticastframes_g;
-+	u64 tx64octets_gb;
-+	u64 tx65to127octets_gb;
-+	u64 tx128to255octets_gb;
-+	u64 tx256to511octets_gb;
-+	u64 tx512to1023octets_gb;
-+	u64 tx1024tomaxoctets_gb;
-+	u64 txunicastframes_gb;
-+	u64 txmulticastframes_gb;
-+	u64 txbroadcastframes_gb;
-+	u64 txunderflowerror;
-+	u64 txoctetcount_g;
-+	u64 txframecount_g;
-+	u64 txpauseframes;
-+	u64 txvlanframes_g;
-+
-+	/* Rx Stats */
-+	u64 rxframecount_gb;
-+	u64 rxoctetcount_gb;
-+	u64 rxoctetcount_g;
-+	u64 rxbroadcastframes_g;
-+	u64 rxmulticastframes_g;
-+	u64 rxcrcerror;
-+	u64 rxrunterror;
-+	u64 rxjabbererror;
-+	u64 rxundersize_g;
-+	u64 rxoversize_g;
-+	u64 rx64octets_gb;
-+	u64 rx65to127octets_gb;
-+	u64 rx128to255octets_gb;
-+	u64 rx256to511octets_gb;
-+	u64 rx512to1023octets_gb;
-+	u64 rx1024tomaxoctets_gb;
-+	u64 rxunicastframes_g;
-+	u64 rxlengtherror;
-+	u64 rxoutofrangetype;
-+	u64 rxpauseframes;
-+	u64 rxfifooverflow;
-+	u64 rxvlanframes_gb;
-+	u64 rxwatchdogerror;
-+};
-+
-+struct xgbe_hw_if {
-+	int (*tx_complete)(struct xgbe_ring_desc *);
-+
-+	int (*set_promiscuous_mode)(struct xgbe_prv_data *, unsigned int);
-+	int (*set_all_multicast_mode)(struct xgbe_prv_data *, unsigned int);
-+	int (*add_mac_addresses)(struct xgbe_prv_data *);
-+	int (*set_mac_address)(struct xgbe_prv_data *, u8 *addr);
-+
-+	int (*enable_rx_csum)(struct xgbe_prv_data *);
-+	int (*disable_rx_csum)(struct xgbe_prv_data *);
-+
-+	int (*enable_rx_vlan_stripping)(struct xgbe_prv_data *);
-+	int (*disable_rx_vlan_stripping)(struct xgbe_prv_data *);
-+	int (*enable_rx_vlan_filtering)(struct xgbe_prv_data *);
-+	int (*disable_rx_vlan_filtering)(struct xgbe_prv_data *);
-+	int (*update_vlan_hash_table)(struct xgbe_prv_data *);
-+
-+	int (*read_mmd_regs)(struct xgbe_prv_data *, int, int);
-+	void (*write_mmd_regs)(struct xgbe_prv_data *, int, int, int);
-+	int (*set_gmii_speed)(struct xgbe_prv_data *);
-+	int (*set_gmii_2500_speed)(struct xgbe_prv_data *);
-+	int (*set_xgmii_speed)(struct xgbe_prv_data *);
-+
-+	void (*enable_tx)(struct xgbe_prv_data *);
-+	void (*disable_tx)(struct xgbe_prv_data *);
-+	void (*enable_rx)(struct xgbe_prv_data *);
-+	void (*disable_rx)(struct xgbe_prv_data *);
-+
-+	void (*powerup_tx)(struct xgbe_prv_data *);
-+	void (*powerdown_tx)(struct xgbe_prv_data *);
-+	void (*powerup_rx)(struct xgbe_prv_data *);
-+	void (*powerdown_rx)(struct xgbe_prv_data *);
-+
-+	int (*init)(struct xgbe_prv_data *);
-+	int (*exit)(struct xgbe_prv_data *);
-+
-+	int (*enable_int)(struct xgbe_channel *, enum xgbe_int);
-+	int (*disable_int)(struct xgbe_channel *, enum xgbe_int);
-+	void (*dev_xmit)(struct xgbe_channel *);
-+	int (*dev_read)(struct xgbe_channel *);
-+	void (*tx_desc_init)(struct xgbe_channel *);
-+	void (*rx_desc_init)(struct xgbe_channel *);
-+	void (*rx_desc_reset)(struct xgbe_ring_data *);
-+	void (*tx_desc_reset)(struct xgbe_ring_data *);
-+	int (*is_last_desc)(struct xgbe_ring_desc *);
-+	int (*is_context_desc)(struct xgbe_ring_desc *);
-+	void (*tx_start_xmit)(struct xgbe_channel *, struct xgbe_ring *);
-+
-+	/* For FLOW ctrl */
-+	int (*config_tx_flow_control)(struct xgbe_prv_data *);
-+	int (*config_rx_flow_control)(struct xgbe_prv_data *);
-+
-+	/* For RX coalescing */
-+	int (*config_rx_coalesce)(struct xgbe_prv_data *);
-+	int (*config_tx_coalesce)(struct xgbe_prv_data *);
-+	unsigned int (*usec_to_riwt)(struct xgbe_prv_data *, unsigned int);
-+	unsigned int (*riwt_to_usec)(struct xgbe_prv_data *, unsigned int);
-+
-+	/* For RX and TX threshold config */
-+	int (*config_rx_threshold)(struct xgbe_prv_data *, unsigned int);
-+	int (*config_tx_threshold)(struct xgbe_prv_data *, unsigned int);
-+
-+	/* For RX and TX Store and Forward Mode config */
-+	int (*config_rsf_mode)(struct xgbe_prv_data *, unsigned int);
-+	int (*config_tsf_mode)(struct xgbe_prv_data *, unsigned int);
-+
-+	/* For TX DMA Operate on Second Frame config */
-+	int (*config_osp_mode)(struct xgbe_prv_data *);
-+
-+	/* For RX and TX PBL config */
-+	int (*config_rx_pbl_val)(struct xgbe_prv_data *);
-+	int (*get_rx_pbl_val)(struct xgbe_prv_data *);
-+	int (*config_tx_pbl_val)(struct xgbe_prv_data *);
-+	int (*get_tx_pbl_val)(struct xgbe_prv_data *);
-+	int (*config_pblx8)(struct xgbe_prv_data *);
-+
-+	/* For MMC statistics */
-+	void (*rx_mmc_int)(struct xgbe_prv_data *);
-+	void (*tx_mmc_int)(struct xgbe_prv_data *);
-+	void (*read_mmc_stats)(struct xgbe_prv_data *);
-+
-+	/* For Timestamp config */
-+	int (*config_tstamp)(struct xgbe_prv_data *, unsigned int);
-+	void (*update_tstamp_addend)(struct xgbe_prv_data *, unsigned int);
-+	void (*set_tstamp_time)(struct xgbe_prv_data *, unsigned int sec,
-+				unsigned int nsec);
-+	u64 (*get_tstamp_time)(struct xgbe_prv_data *);
-+	u64 (*get_tx_tstamp)(struct xgbe_prv_data *);
-+
-+	/* For Data Center Bridging config */
-+	void (*config_dcb_tc)(struct xgbe_prv_data *);
-+	void (*config_dcb_pfc)(struct xgbe_prv_data *);
-+
-+	/* For Receive Side Scaling */
-+	int (*enable_rss)(struct xgbe_prv_data *);
-+	int (*disable_rss)(struct xgbe_prv_data *);
-+	int (*set_rss_hash_key)(struct xgbe_prv_data *, const u8 *);
-+	int (*set_rss_lookup_table)(struct xgbe_prv_data *, const u32 *);
-+};
-+
-+struct xgbe_desc_if {
-+	int (*alloc_ring_resources)(struct xgbe_prv_data *);
-+	void (*free_ring_resources)(struct xgbe_prv_data *);
-+	int (*map_tx_skb)(struct xgbe_channel *, struct sk_buff *);
-+	int (*map_rx_buffer)(struct xgbe_prv_data *, struct xgbe_ring *,
-+			     struct xgbe_ring_data *);
-+	void (*unmap_rdata)(struct xgbe_prv_data *, struct xgbe_ring_data *);
-+	void (*wrapper_tx_desc_init)(struct xgbe_prv_data *);
-+	void (*wrapper_rx_desc_init)(struct xgbe_prv_data *);
-+};
-+
-+/* This structure contains flags that indicate what hardware features
-+ * or configurations are present in the device.
-+ */
-+struct xgbe_hw_features {
-+	/* HW Version */
-+	unsigned int version;
-+
-+	/* HW Feature Register0 */
-+	unsigned int gmii;		/* 1000 Mbps support */
-+	unsigned int vlhash;		/* VLAN Hash Filter */
-+	unsigned int sma;		/* SMA(MDIO) Interface */
-+	unsigned int rwk;		/* PMT remote wake-up packet */
-+	unsigned int mgk;		/* PMT magic packet */
-+	unsigned int mmc;		/* RMON module */
-+	unsigned int aoe;		/* ARP Offload */
-+	unsigned int ts;		/* IEEE 1588-2008 Adavanced Timestamp */
-+	unsigned int eee;		/* Energy Efficient Ethernet */
-+	unsigned int tx_coe;		/* Tx Checksum Offload */
-+	unsigned int rx_coe;		/* Rx Checksum Offload */
-+	unsigned int addn_mac;		/* Additional MAC Addresses */
-+	unsigned int ts_src;		/* Timestamp Source */
-+	unsigned int sa_vlan_ins;	/* Source Address or VLAN Insertion */
-+
-+	/* HW Feature Register1 */
-+	unsigned int rx_fifo_size;	/* MTL Receive FIFO Size */
-+	unsigned int tx_fifo_size;	/* MTL Transmit FIFO Size */
-+	unsigned int adv_ts_hi;		/* Advance Timestamping High Word */
-+	unsigned int dcb;		/* DCB Feature */
-+	unsigned int sph;		/* Split Header Feature */
-+	unsigned int tso;		/* TCP Segmentation Offload */
-+	unsigned int dma_debug;		/* DMA Debug Registers */
-+	unsigned int rss;		/* Receive Side Scaling */
-+	unsigned int tc_cnt;		/* Number of Traffic Classes */
-+	unsigned int hash_table_size;	/* Hash Table Size */
-+	unsigned int l3l4_filter_num;	/* Number of L3-L4 Filters */
-+
-+	/* HW Feature Register2 */
-+	unsigned int rx_q_cnt;		/* Number of MTL Receive Queues */
-+	unsigned int tx_q_cnt;		/* Number of MTL Transmit Queues */
-+	unsigned int rx_ch_cnt;		/* Number of DMA Receive Channels */
-+	unsigned int tx_ch_cnt;		/* Number of DMA Transmit Channels */
-+	unsigned int pps_out_num;	/* Number of PPS outputs */
-+	unsigned int aux_snap_num;	/* Number of Aux snapshot inputs */
-+};
-+
-+struct xgbe_prv_data {
-+	struct net_device *netdev;
-+	struct platform_device *pdev;
-+	struct acpi_device *adev;
-+	struct device *dev;
-+
-+	/* ACPI or DT flag */
-+	unsigned int use_acpi;
-+
-+	/* XGMAC/XPCS related mmio registers */
-+	void __iomem *xgmac_regs;	/* XGMAC CSRs */
-+	void __iomem *xpcs_regs;	/* XPCS MMD registers */
-+
-+	/* Overall device lock */
-+	spinlock_t lock;
-+
-+	/* XPCS indirect addressing mutex */
-+	struct mutex xpcs_mutex;
-+
-+	/* RSS addressing mutex */
-+	struct mutex rss_mutex;
-+
-+	int dev_irq;
-+	unsigned int per_channel_irq;
-+
-+	struct xgbe_hw_if hw_if;
-+	struct xgbe_desc_if desc_if;
-+
-+	/* AXI DMA settings */
-+	unsigned int coherent;
-+	unsigned int axdomain;
-+	unsigned int arcache;
-+	unsigned int awcache;
-+
-+	/* Rings for Tx/Rx on a DMA channel */
-+	struct xgbe_channel *channel;
-+	unsigned int channel_count;
-+	unsigned int tx_ring_count;
-+	unsigned int tx_desc_count;
-+	unsigned int rx_ring_count;
-+	unsigned int rx_desc_count;
-+
-+	unsigned int tx_q_count;
-+	unsigned int rx_q_count;
-+
-+	/* Tx/Rx common settings */
-+	unsigned int pblx8;
-+
-+	/* Tx settings */
-+	unsigned int tx_sf_mode;
-+	unsigned int tx_threshold;
-+	unsigned int tx_pbl;
-+	unsigned int tx_osp_mode;
-+
-+	/* Rx settings */
-+	unsigned int rx_sf_mode;
-+	unsigned int rx_threshold;
-+	unsigned int rx_pbl;
-+
-+	/* Tx coalescing settings */
-+	unsigned int tx_usecs;
-+	unsigned int tx_frames;
-+
-+	/* Rx coalescing settings */
-+	unsigned int rx_riwt;
-+	unsigned int rx_frames;
-+
-+	/* Current Rx buffer size */
-+	unsigned int rx_buf_size;
-+
-+	/* Flow control settings */
-+	unsigned int pause_autoneg;
-+	unsigned int tx_pause;
-+	unsigned int rx_pause;
-+
-+	/* Receive Side Scaling settings */
-+	u8 rss_key[XGBE_RSS_HASH_KEY_SIZE];
-+	u32 rss_table[XGBE_RSS_MAX_TABLE_SIZE];
-+	u32 rss_options;
-+
-+	/* MDIO settings */
-+	struct module *phy_module;
-+	char *mii_bus_id;
-+	struct mii_bus *mii;
-+	int mdio_mmd;
-+	struct phy_device *phydev;
-+	int default_autoneg;
-+	int default_speed;
-+
-+	/* Current PHY settings */
-+	phy_interface_t phy_mode;
-+	int phy_link;
-+	int phy_speed;
-+	unsigned int phy_tx_pause;
-+	unsigned int phy_rx_pause;
-+
-+	/* Netdev related settings */
-+	unsigned char mac_addr[ETH_ALEN];
-+	netdev_features_t netdev_features;
-+	struct napi_struct napi;
-+	struct xgbe_mmc_stats mmc_stats;
-+
-+	/* Filtering support */
-+	unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
-+
-+	/* Device clocks */
-+	struct clk *sysclk;
-+	unsigned long sysclk_rate;
-+	struct clk *ptpclk;
-+	unsigned long ptpclk_rate;
-+
-+	/* Timestamp support */
-+	spinlock_t tstamp_lock;
-+	struct ptp_clock_info ptp_clock_info;
-+	struct ptp_clock *ptp_clock;
-+	struct hwtstamp_config tstamp_config;
-+	struct cyclecounter tstamp_cc;
-+	struct timecounter tstamp_tc;
-+	unsigned int tstamp_addend;
-+	struct work_struct tx_tstamp_work;
-+	struct sk_buff *tx_tstamp_skb;
-+	u64 tx_tstamp;
-+
-+	/* DCB support */
-+	struct ieee_ets *ets;
-+	struct ieee_pfc *pfc;
-+	unsigned int q2tc_map[XGBE_MAX_QUEUES];
-+	unsigned int prio2q_map[IEEE_8021QAZ_MAX_TCS];
-+
-+	/* Hardware features of the device */
-+	struct xgbe_hw_features hw_feat;
-+
-+	/* Device restart work structure */
-+	struct work_struct restart_work;
-+
-+	/* Keeps track of power mode */
-+	unsigned int power_down;
-+
-+#ifdef CONFIG_DEBUG_FS
-+	struct dentry *xgbe_debugfs;
-+
-+	unsigned int debugfs_xgmac_reg;
-+
-+	unsigned int debugfs_xpcs_mmd;
-+	unsigned int debugfs_xpcs_reg;
-+#endif
-+};
-+
-+/* Function prototypes*/
-+
-+void xgbe_a0_init_function_ptrs_dev(struct xgbe_hw_if *);
-+void xgbe_a0_init_function_ptrs_desc(struct xgbe_desc_if *);
-+struct net_device_ops *xgbe_a0_get_netdev_ops(void);
-+struct ethtool_ops *xgbe_a0_get_ethtool_ops(void);
-+#ifdef CONFIG_AMD_XGBE_DCB
-+const struct dcbnl_rtnl_ops *xgbe_a0_get_dcbnl_ops(void);
-+#endif
-+
-+int xgbe_a0_mdio_register(struct xgbe_prv_data *);
-+void xgbe_a0_mdio_unregister(struct xgbe_prv_data *);
-+void xgbe_a0_dump_phy_registers(struct xgbe_prv_data *);
-+void xgbe_a0_ptp_register(struct xgbe_prv_data *);
-+void xgbe_a0_ptp_unregister(struct xgbe_prv_data *);
-+void xgbe_a0_dump_tx_desc(struct xgbe_ring *, unsigned int, unsigned int,
-+		       unsigned int);
-+void xgbe_a0_dump_rx_desc(struct xgbe_ring *, struct xgbe_ring_desc *,
-+		       unsigned int);
-+void xgbe_a0_print_pkt(struct net_device *, struct sk_buff *, bool);
-+void xgbe_a0_get_all_hw_features(struct xgbe_prv_data *);
-+int xgbe_a0_powerup(struct net_device *, unsigned int);
-+int xgbe_a0_powerdown(struct net_device *, unsigned int);
-+void xgbe_a0_init_rx_coalesce(struct xgbe_prv_data *);
-+void xgbe_a0_init_tx_coalesce(struct xgbe_prv_data *);
-+
-+#ifdef CONFIG_DEBUG_FS
-+void xgbe_a0_debugfs_init(struct xgbe_prv_data *);
-+void xgbe_a0_debugfs_exit(struct xgbe_prv_data *);
-+#else
-+static inline void xgbe_a0_debugfs_init(struct xgbe_prv_data *pdata) {}
-+static inline void xgbe_a0_debugfs_exit(struct xgbe_prv_data *pdata) {}
-+#endif /* CONFIG_DEBUG_FS */
-+
-+/* NOTE: Uncomment for TX and RX DESCRIPTOR DUMP in KERNEL LOG */
-+#if 0
-+#define XGMAC_ENABLE_TX_DESC_DUMP
-+#define XGMAC_ENABLE_RX_DESC_DUMP
-+#endif
-+
-+/* NOTE: Uncomment for TX and RX PACKET DUMP in KERNEL LOG */
-+#if 0
-+#define XGMAC_ENABLE_TX_PKT_DUMP
-+#define XGMAC_ENABLE_RX_PKT_DUMP
-+#endif
-+
-+/* NOTE: Uncomment for function trace log messages in KERNEL LOG */
-+#if 0
-+#define YDEBUG
-+#define YDEBUG_MDIO
-+#endif
-+
-+/* For debug prints */
-+#ifdef YDEBUG
-+#define DBGPR(x...) pr_alert(x)
-+#define DBGPHY_REGS(x...) xgbe_a0_dump_phy_registers(x)
-+#else
-+#define DBGPR(x...) do { } while (0)
-+#define DBGPHY_REGS(x...) do { } while (0)
-+#endif
-+
-+#ifdef YDEBUG_MDIO
-+#define DBGPR_MDIO(x...) pr_alert(x)
-+#else
-+#define DBGPR_MDIO(x...) do { } while (0)
-+#endif
-+
-+#endif
-diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
-index 869d97f..29aad5e 100644
---- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
-+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
-@@ -593,12 +593,10 @@ static int xgene_enet_reset(struct xgene_enet_pdata *pdata)
- 	if (!xgene_ring_mgr_init(pdata))
- 		return -ENODEV;
- 
--	if (pdata->clk) {
--		clk_prepare_enable(pdata->clk);
--		clk_disable_unprepare(pdata->clk);
--		clk_prepare_enable(pdata->clk);
--		xgene_enet_ecc_init(pdata);
--	}
-+	clk_prepare_enable(pdata->clk);
-+	clk_disable_unprepare(pdata->clk);
-+	clk_prepare_enable(pdata->clk);
-+	xgene_enet_ecc_init(pdata);
- 	xgene_enet_config_ring_if_assoc(pdata);
- 
- 	/* Enable auto-incr for scanning */
-@@ -676,7 +674,7 @@ static int xgene_enet_phy_connect(struct net_device *ndev)
- 
- 	phy_dev = pdata->phy_dev;
- 
--	if (!phy_dev ||
-+	if (phy_dev == NULL ||
- 	    phy_connect_direct(ndev, phy_dev, &xgene_enet_adjust_link,
- 			       pdata->phy_mode)) {
- 		netdev_err(ndev, "Could not connect to PHY\n");
-@@ -692,37 +690,23 @@ static int xgene_enet_phy_connect(struct net_device *ndev)
- 	return 0;
- }
- 
--static int xgene_mdiobus_register(struct xgene_enet_pdata *pdata,
--				  struct mii_bus *mdio)
-+#ifdef CONFIG_ACPI
-+static int xgene_acpi_mdiobus_register(struct xgene_enet_pdata *pdata,
-+	struct mii_bus *mdio)
- {
- 	struct device *dev = &pdata->pdev->dev;
--	struct net_device *ndev = pdata->ndev;
- 	struct phy_device *phy;
--	struct device_node *child_np;
--	struct device_node *mdio_np = NULL;
--	int ret;
-+	int i, ret;
- 	u32 phy_id;
- 
--	if (dev->of_node) {
--		for_each_child_of_node(dev->of_node, child_np) {
--			if (of_device_is_compatible(child_np,
--						    "apm,xgene-mdio")) {
--				mdio_np = child_np;
--				break;
--			}
--		}
--
--		if (!mdio_np) {
--			netdev_dbg(ndev, "No mdio node in the dts\n");
--			return -ENXIO;
--		}
--
--		return of_mdiobus_register(mdio, mdio_np);
--	}
--
- 	/* Mask out all PHYs from auto probing. */
- 	mdio->phy_mask = ~0;
- 
-+	/* Clear all the IRQ properties */
-+	if (mdio->irq)
-+		for (i = 0; i < PHY_MAX_ADDR; i++)
-+			mdio->irq[i] = PHY_POLL;
-+
- 	/* Register the MDIO bus */
- 	ret = mdiobus_register(mdio);
- 	if (ret)
-@@ -730,8 +714,6 @@ static int xgene_mdiobus_register(struct xgene_enet_pdata *pdata,
- 
- 	ret = device_property_read_u32(dev, "phy-channel", &phy_id);
- 	if (ret)
--		ret = device_property_read_u32(dev, "phy-addr", &phy_id);
--	if (ret)
- 		return -EINVAL;
- 
- 	phy = get_phy_device(mdio, phy_id, true);
-@@ -746,13 +728,31 @@ static int xgene_mdiobus_register(struct xgene_enet_pdata *pdata,
- 
- 	return ret;
- }
-+#else
-+#define xgene_acpi_mdiobus_register(a, b) -1
-+#endif
- 
- int xgene_enet_mdio_config(struct xgene_enet_pdata *pdata)
- {
- 	struct net_device *ndev = pdata->ndev;
-+	struct device *dev = &pdata->pdev->dev;
-+	struct device_node *child_np;
-+	struct device_node *mdio_np = NULL;
- 	struct mii_bus *mdio_bus;
- 	int ret;
- 
-+	for_each_child_of_node(dev->of_node, child_np) {
-+		if (of_device_is_compatible(child_np, "apm,xgene-mdio")) {
-+			mdio_np = child_np;
-+			break;
-+		}
-+	}
-+
-+	if (dev->of_node && !mdio_np) {
-+		netdev_dbg(ndev, "No mdio node in the dts\n");
-+		return -ENXIO;
-+	}
-+
- 	mdio_bus = mdiobus_alloc();
- 	if (!mdio_bus)
- 		return -ENOMEM;
-@@ -766,7 +766,10 @@ int xgene_enet_mdio_config(struct xgene_enet_pdata *pdata)
- 	mdio_bus->priv = pdata;
- 	mdio_bus->parent = &ndev->dev;
- 
--	ret = xgene_mdiobus_register(pdata, mdio_bus);
-+	if (dev->of_node)
-+		ret = of_mdiobus_register(mdio_bus, mdio_np);
-+	else
-+		ret = xgene_acpi_mdiobus_register(pdata, mdio_bus);
- 	if (ret) {
- 		netdev_err(ndev, "Failed to register MDIO bus\n");
- 		mdiobus_free(mdio_bus);
-diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
-index 44b1537..a4a53a7 100644
---- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
-+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
-@@ -24,10 +24,6 @@
- #include "xgene_enet_sgmac.h"
- #include "xgene_enet_xgmac.h"
- 
--#define RES_ENET_CSR	0
--#define RES_RING_CSR	1
--#define RES_RING_CMD	2
--
- static void xgene_enet_init_bufpool(struct xgene_enet_desc_ring *buf_pool)
- {
- 	struct xgene_enet_raw_desc16 *raw_desc;
-@@ -752,40 +748,41 @@ static const struct net_device_ops xgene_ndev_ops = {
- 	.ndo_set_mac_address = xgene_enet_set_mac_address,
- };
- 
--static int xgene_get_mac_address(struct device *dev,
--				 unsigned char *addr)
-+#ifdef CONFIG_ACPI
-+static int acpi_get_mac_address(struct device *dev,
-+				unsigned char *addr)
- {
- 	int ret;
- 
--	ret = device_property_read_u8_array(dev, "local-mac-address", addr, 6);
--	if (ret)
--		ret = device_property_read_u8_array(dev, "mac-address",
--						    addr, 6);
-+	ret = device_property_read_u8_array(dev, "mac-address", addr, 6);
- 	if (ret)
--		return -ENODEV;
-+		return 0;
- 
--	return ETH_ALEN;
-+	return 6;
- }
- 
--static int xgene_get_phy_mode(struct device *dev)
-+static int acpi_get_phy_mode(struct device *dev)
- {
--	int i, ret;
-+	int i, ret, phy_mode;
- 	char *modestr;
- 
--	ret = device_property_read_string(dev, "phy-connection-type",
--					  (const char **)&modestr);
--	if (ret)
--		ret = device_property_read_string(dev, "phy-mode",
--						  (const char **)&modestr);
-+	ret = device_property_read_string(dev, "phy-mode", &modestr);
- 	if (ret)
--		return -ENODEV;
-+		return -1;
- 
-+	phy_mode = -1;
- 	for (i = 0; i < PHY_INTERFACE_MODE_MAX; i++) {
--		if (!strcasecmp(modestr, phy_modes(i)))
--			return i;
-+		if (!strcasecmp(modestr, phy_modes(i))) {
-+			phy_mode = i;
-+			break;
-+		}
- 	}
--	return -ENODEV;
-+	return phy_mode;
- }
-+#else
-+#define acpi_get_mac_address(a, b, c) 0
-+#define acpi_get_phy_mode(a) -1
-+#endif
- 
- static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
- {
-@@ -794,45 +791,38 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
- 	struct device *dev;
- 	struct resource *res;
- 	void __iomem *base_addr;
-+	const char *mac;
- 	int ret;
- 
- 	pdev = pdata->pdev;
- 	dev = &pdev->dev;
- 	ndev = pdata->ndev;
- 
--	res = platform_get_resource(pdev, IORESOURCE_MEM, RES_ENET_CSR);
--	if (!res) {
--		dev_err(dev, "Resource enet_csr not defined\n");
--		return -ENODEV;
--	}
--	pdata->base_addr = devm_ioremap(dev, res->start, resource_size(res));
--	if (!pdata->base_addr) {
-+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "enet_csr");
-+	if (!res)
-+		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	pdata->base_addr = devm_ioremap_resource(dev, res);
-+	if (IS_ERR(pdata->base_addr)) {
- 		dev_err(dev, "Unable to retrieve ENET Port CSR region\n");
--		return -ENOMEM;
-+		return PTR_ERR(pdata->base_addr);
- 	}
- 
--	res = platform_get_resource(pdev, IORESOURCE_MEM, RES_RING_CSR);
--	if (!res) {
--		dev_err(dev, "Resource ring_csr not defined\n");
--		return -ENODEV;
--	}
--	pdata->ring_csr_addr = devm_ioremap(dev, res->start,
--							resource_size(res));
--	if (!pdata->ring_csr_addr) {
-+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ring_csr");
-+	if (!res)
-+		res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-+	pdata->ring_csr_addr = devm_ioremap_resource(dev, res);
-+	if (IS_ERR(pdata->ring_csr_addr)) {
- 		dev_err(dev, "Unable to retrieve ENET Ring CSR region\n");
--		return -ENOMEM;
-+		return PTR_ERR(pdata->ring_csr_addr);
- 	}
- 
--	res = platform_get_resource(pdev, IORESOURCE_MEM, RES_RING_CMD);
--	if (!res) {
--		dev_err(dev, "Resource ring_cmd not defined\n");
--		return -ENODEV;
--	}
--	pdata->ring_cmd_addr = devm_ioremap(dev, res->start,
--							resource_size(res));
--	if (!pdata->ring_cmd_addr) {
-+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ring_cmd");
-+	if (!res)
-+		res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
-+	pdata->ring_cmd_addr = devm_ioremap_resource(dev, res);
-+	if (IS_ERR(pdata->ring_cmd_addr)) {
- 		dev_err(dev, "Unable to retrieve ENET Ring command region\n");
--		return -ENOMEM;
-+		return PTR_ERR(pdata->ring_cmd_addr);
- 	}
- 
- 	ret = platform_get_irq(pdev, 0);
-@@ -843,12 +833,16 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
- 	}
- 	pdata->rx_irq = ret;
- 
--	if (xgene_get_mac_address(dev, ndev->dev_addr) != ETH_ALEN)
-+	mac = of_get_mac_address(dev->of_node);
-+	if (mac)
-+		memcpy(ndev->dev_addr, mac, ndev->addr_len);
-+	else if (!acpi_get_mac_address(dev, ndev->dev_addr))
- 		eth_hw_addr_random(ndev);
--
- 	memcpy(ndev->perm_addr, ndev->dev_addr, ndev->addr_len);
- 
--	pdata->phy_mode = xgene_get_phy_mode(dev);
-+	pdata->phy_mode = of_get_phy_mode(pdev->dev.of_node);
-+	if (pdata->phy_mode < 0)
-+		pdata->phy_mode = acpi_get_phy_mode(dev);
- 	if (pdata->phy_mode < 0) {
- 		dev_err(dev, "Unable to get phy-connection-type\n");
- 		return pdata->phy_mode;
-@@ -862,7 +856,10 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
- 
- 	pdata->clk = devm_clk_get(&pdev->dev, NULL);
- 	if (IS_ERR(pdata->clk)) {
--		/* Firmware may have set up the clock already. */
-+		/*
-+		 * Not necessarily an error. Firmware may have
-+		 * set up the clock already.
-+		 */
- 		pdata->clk = NULL;
- 	}
- 
-@@ -913,7 +910,7 @@ static int xgene_enet_init_hw(struct xgene_enet_pdata *pdata)
- 	pdata->port_ops->cle_bypass(pdata, dst_ring_num, buf_pool->id);
- 	pdata->mac_ops->init(pdata);
- 
--	return ret;
-+	return 0;
- }
- 
- static void xgene_enet_setup_ops(struct xgene_enet_pdata *pdata)
-@@ -1033,20 +1033,20 @@ MODULE_DEVICE_TABLE(acpi, xgene_enet_acpi_match);
- #endif
- 
- #ifdef CONFIG_OF
--static struct of_device_id xgene_enet_of_match[] = {
-+static struct of_device_id xgene_enet_match[] = {
- 	{.compatible = "apm,xgene-enet",},
- 	{.compatible = "apm,xgene1-sgenet",},
- 	{.compatible = "apm,xgene1-xgenet",},
- 	{},
- };
- 
--MODULE_DEVICE_TABLE(of, xgene_enet_of_match);
-+MODULE_DEVICE_TABLE(of, xgene_enet_match);
- #endif
- 
- static struct platform_driver xgene_enet_driver = {
- 	.driver = {
- 		   .name = "xgene-enet",
--		   .of_match_table = of_match_ptr(xgene_enet_of_match),
-+		   .of_match_table = xgene_enet_match,
- 		   .acpi_match_table = ACPI_PTR(xgene_enet_acpi_match),
- 	},
- 	.probe = xgene_enet_probe,
-diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
-index c2d465c..0e06cad 100644
---- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
-+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
-@@ -22,10 +22,7 @@
- #ifndef __XGENE_ENET_MAIN_H__
- #define __XGENE_ENET_MAIN_H__
- 
--#include <linux/acpi.h>
- #include <linux/clk.h>
--#include <linux/efi.h>
--#include <linux/io.h>
- #include <linux/of_platform.h>
- #include <linux/of_net.h>
- #include <linux/of_mdio.h>
-@@ -34,6 +31,7 @@
- #include <linux/prefetch.h>
- #include <linux/if_vlan.h>
- #include <linux/phy.h>
-+#include <linux/acpi.h>
- #include "xgene_enet_hw.h"
- 
- #define XGENE_DRV_VERSION	"v1.0"
-diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
-index 88a55f9..944b177 100644
---- a/drivers/net/ethernet/smsc/smc91x.c
-+++ b/drivers/net/ethernet/smsc/smc91x.c
-@@ -82,6 +82,7 @@ static const char version[] =
- #include <linux/of.h>
- #include <linux/of_device.h>
- #include <linux/of_gpio.h>
-+#include <linux/acpi.h>
- 
- #include <linux/netdevice.h>
- #include <linux/etherdevice.h>
-@@ -2467,6 +2468,14 @@ static struct dev_pm_ops smc_drv_pm_ops = {
- 	.resume		= smc_drv_resume,
- };
- 
-+#ifdef CONFIG_ACPI
-+static const struct acpi_device_id smc91x_acpi_match[] = {
-+	{ "LNRO0003", },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(acpi, smc91x_acpi_match);
-+#endif
-+
- static struct platform_driver smc_driver = {
- 	.probe		= smc_drv_probe,
- 	.remove		= smc_drv_remove,
-@@ -2474,6 +2483,7 @@ static struct platform_driver smc_driver = {
- 		.name	= CARDNAME,
- 		.pm	= &smc_drv_pm_ops,
- 		.of_match_table = of_match_ptr(smc91x_match),
-+		.acpi_match_table = ACPI_PTR(smc91x_acpi_match),
- 	},
- };
- 
-diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
-index 501ea76..92e7644 100644
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -34,4 +34,5 @@ obj-$(CONFIG_MDIO_BUS_MUX_MMIOREG) += mdio-mux-mmioreg.o
- obj-$(CONFIG_MDIO_SUN4I)	+= mdio-sun4i.o
- obj-$(CONFIG_MDIO_MOXART)	+= mdio-moxart.o
- obj-$(CONFIG_AMD_XGBE_PHY)	+= amd-xgbe-phy.o
-+obj-$(CONFIG_AMD_XGBE_PHY)	+= amd-xgbe-phy-a0.o
- obj-$(CONFIG_MDIO_BCM_UNIMAC)	+= mdio-bcm-unimac.o
-diff --git a/drivers/net/phy/amd-xgbe-phy-a0.c b/drivers/net/phy/amd-xgbe-phy-a0.c
-new file mode 100644
-index 0000000..ab6414a
---- /dev/null
-+++ b/drivers/net/phy/amd-xgbe-phy-a0.c
-@@ -0,0 +1,1829 @@
-+/*
-+ * AMD 10Gb Ethernet PHY driver
-+ *
-+ * This file is available to you under your choice of the following two
-+ * licenses:
-+ *
-+ * License 1: GPLv2
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ *
-+ * This file is free software; you may copy, redistribute and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 2 of the License, or (at
-+ * your option) any later version.
-+ *
-+ * This file is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ *
-+ * License 2: Modified BSD
-+ *
-+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above copyright
-+ *       notice, this list of conditions and the following disclaimer in the
-+ *       documentation and/or other materials provided with the distribution.
-+ *     * Neither the name of Advanced Micro Devices, Inc. nor the
-+ *       names of its contributors may be used to endorse or promote products
-+ *       derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/device.h>
-+#include <linux/platform_device.h>
-+#include <linux/string.h>
-+#include <linux/errno.h>
-+#include <linux/unistd.h>
-+#include <linux/slab.h>
-+#include <linux/interrupt.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/workqueue.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/skbuff.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/mii.h>
-+#include <linux/ethtool.h>
-+#include <linux/phy.h>
-+#include <linux/mdio.h>
-+#include <linux/io.h>
-+#include <linux/of.h>
-+#include <linux/of_platform.h>
-+#include <linux/of_device.h>
-+#include <linux/uaccess.h>
-+#include <linux/bitops.h>
-+#include <linux/property.h>
-+#include <linux/acpi.h>
-+#include <linux/irq.h>
-+
-+MODULE_AUTHOR("Tom Lendacky <thomas.lendacky@amd.com>");
-+MODULE_LICENSE("Dual BSD/GPL");
-+MODULE_VERSION("0.0.0-a");
-+MODULE_DESCRIPTION("AMD 10GbE (amd-xgbe) PHY driver");
-+
-+#define XGBE_PHY_ID	0x7996ced0
-+#define XGBE_PHY_MASK	0xfffffff0
-+
-+#define XGBE_PHY_SERDES_RETRY		32
-+#define XGBE_PHY_CHANNEL_PROPERTY	"amd,serdes-channel"
-+#define XGBE_PHY_SPEEDSET_PROPERTY	"amd,speed-set"
-+#define XGBE_PHY_BLWC_PROPERTY		"amd,serdes-blwc"
-+#define XGBE_PHY_CDR_RATE_PROPERTY	"amd,serdes-cdr-rate"
-+#define XGBE_PHY_PQ_SKEW_PROPERTY	"amd,serdes-pq-skew"
-+#define XGBE_PHY_TX_AMP_PROPERTY	"amd,serdes-tx-amp"
-+
-+#define XGBE_PHY_SPEEDS			3
-+#define XGBE_PHY_SPEED_1000		0
-+#define XGBE_PHY_SPEED_2500		1
-+#define XGBE_PHY_SPEED_10000		2
-+
-+#define XGBE_AN_INT_CMPLT		0x01
-+#define XGBE_AN_INC_LINK		0x02
-+#define XGBE_AN_PG_RCV			0x04
-+#define XGBE_AN_INT_MASK		0x07
-+
-+#define XNP_MCF_NULL_MESSAGE		0x001
-+#define XNP_ACK_PROCESSED		BIT(12)
-+#define XNP_MP_FORMATTED		BIT(13)
-+#define XNP_NP_EXCHANGE			BIT(15)
-+
-+#define XGBE_PHY_RATECHANGE_COUNT	500
-+
-+#define XGBE_PHY_KR_TRAINING_START	0x01
-+#define XGBE_PHY_KR_TRAINING_ENABLE	0x02
-+
-+#define XGBE_PHY_FEC_ENABLE		0x01
-+#define XGBE_PHY_FEC_FORWARD		0x02
-+#define XGBE_PHY_FEC_MASK		0x03
-+
-+#ifndef MDIO_PMA_10GBR_PMD_CTRL
-+#define MDIO_PMA_10GBR_PMD_CTRL		0x0096
-+#endif
-+
-+#ifndef MDIO_PMA_10GBR_FEC_ABILITY
-+#define MDIO_PMA_10GBR_FEC_ABILITY	0x00aa
-+#endif
-+
-+#ifndef MDIO_PMA_10GBR_FEC_CTRL
-+#define MDIO_PMA_10GBR_FEC_CTRL		0x00ab
-+#endif
-+
-+#ifndef MDIO_AN_XNP
-+#define MDIO_AN_XNP			0x0016
-+#endif
-+
-+#ifndef MDIO_AN_LPX
-+#define MDIO_AN_LPX			0x0019
-+#endif
-+
-+#ifndef MDIO_AN_INTMASK
-+#define MDIO_AN_INTMASK			0x8001
-+#endif
-+
-+#ifndef MDIO_AN_INT
-+#define MDIO_AN_INT			0x8002
-+#endif
-+
-+#ifndef MDIO_AN_KR_CTRL
-+#define MDIO_AN_KR_CTRL			0x8003
-+#endif
-+
-+#ifndef MDIO_CTRL1_SPEED1G
-+#define MDIO_CTRL1_SPEED1G		(MDIO_CTRL1_SPEED10G & ~BMCR_SPEED100)
-+#endif
-+
-+#ifndef MDIO_KR_CTRL_PDETECT
-+#define MDIO_KR_CTRL_PDETECT		0x01
-+#endif
-+
-+#define GET_BITS(_var, _index, _width)					\
-+	(((_var) >> (_index)) & ((0x1 << (_width)) - 1))
-+
-+#define SET_BITS(_var, _index, _width, _val)				\
-+do {									\
-+	(_var) &= ~(((0x1 << (_width)) - 1) << (_index));		\
-+	(_var) |= (((_val) & ((0x1 << (_width)) - 1)) << (_index));	\
-+} while (0)
-+
-+#define XCMU_IOREAD(_priv, _reg)					\
-+	ioread16((_priv)->cmu_regs + _reg)
-+
-+#define XCMU_IOWRITE(_priv, _reg, _val)					\
-+	iowrite16((_val), (_priv)->cmu_regs + _reg)
-+
-+#define XRXTX_IOREAD(_priv, _reg)					\
-+	ioread16((_priv)->rxtx_regs + _reg)
-+
-+#define XRXTX_IOREAD_BITS(_priv, _reg, _field)				\
-+	GET_BITS(XRXTX_IOREAD((_priv), _reg),				\
-+		 _reg##_##_field##_INDEX,				\
-+		 _reg##_##_field##_WIDTH)
-+
-+#define XRXTX_IOWRITE(_priv, _reg, _val)				\
-+	iowrite16((_val), (_priv)->rxtx_regs + _reg)
-+
-+#define XRXTX_IOWRITE_BITS(_priv, _reg, _field, _val)			\
-+do {									\
-+	u16 reg_val = XRXTX_IOREAD((_priv), _reg);			\
-+	SET_BITS(reg_val,						\
-+		 _reg##_##_field##_INDEX,				\
-+		 _reg##_##_field##_WIDTH, (_val));			\
-+	XRXTX_IOWRITE((_priv), _reg, reg_val);				\
-+} while (0)
-+
-+/* SerDes CMU register offsets */
-+#define CMU_REG15			0x003c
-+#define CMU_REG16			0x0040
-+
-+/* SerDes CMU register entry bit positions and sizes */
-+#define CMU_REG16_TX_RATE_CHANGE_BASE	15
-+#define CMU_REG16_RX_RATE_CHANGE_BASE	14
-+#define CMU_REG16_RATE_CHANGE_DECR	2
-+
-+/* SerDes RxTx register offsets */
-+#define RXTX_REG2			0x0008
-+#define RXTX_REG3			0x000c
-+#define RXTX_REG5			0x0014
-+#define RXTX_REG6			0x0018
-+#define RXTX_REG20			0x0050
-+#define RXTX_REG53			0x00d4
-+#define RXTX_REG114			0x01c8
-+#define RXTX_REG115			0x01cc
-+#define RXTX_REG142			0x0238
-+
-+/* SerDes RxTx register entry bit positions and sizes */
-+#define RXTX_REG2_RESETB_INDEX			15
-+#define RXTX_REG2_RESETB_WIDTH			1
-+#define RXTX_REG3_TX_DATA_RATE_INDEX		14
-+#define RXTX_REG3_TX_DATA_RATE_WIDTH		2
-+#define RXTX_REG3_TX_WORD_MODE_INDEX		11
-+#define RXTX_REG3_TX_WORD_MODE_WIDTH		3
-+#define RXTX_REG5_TXAMP_CNTL_INDEX		7
-+#define RXTX_REG5_TXAMP_CNTL_WIDTH		4
-+#define RXTX_REG6_RX_DATA_RATE_INDEX		9
-+#define RXTX_REG6_RX_DATA_RATE_WIDTH		2
-+#define RXTX_REG6_RX_WORD_MODE_INDEX		11
-+#define RXTX_REG6_RX_WORD_MODE_WIDTH		3
-+#define RXTX_REG20_BLWC_ENA_INDEX		2
-+#define RXTX_REG20_BLWC_ENA_WIDTH		1
-+#define RXTX_REG53_RX_PLLSELECT_INDEX		15
-+#define RXTX_REG53_RX_PLLSELECT_WIDTH		1
-+#define RXTX_REG53_TX_PLLSELECT_INDEX		14
-+#define RXTX_REG53_TX_PLLSELECT_WIDTH		1
-+#define RXTX_REG53_PI_SPD_SEL_CDR_INDEX		10
-+#define RXTX_REG53_PI_SPD_SEL_CDR_WIDTH		4
-+#define RXTX_REG114_PQ_REG_INDEX		9
-+#define RXTX_REG114_PQ_REG_WIDTH		7
-+#define RXTX_REG115_FORCE_LAT_CAL_START_INDEX	2
-+#define RXTX_REG115_FORCE_LAT_CAL_START_WIDTH	1
-+#define RXTX_REG115_FORCE_SUM_CAL_START_INDEX	1
-+#define RXTX_REG115_FORCE_SUM_CAL_START_WIDTH	1
-+#define RXTX_REG142_SUM_CALIB_DONE_INDEX	15
-+#define RXTX_REG142_SUM_CALIB_DONE_WIDTH	1
-+#define RXTX_REG142_SUM_CALIB_ERR_INDEX		14
-+#define RXTX_REG142_SUM_CALIB_ERR_WIDTH		1
-+#define RXTX_REG142_LAT_CALIB_DONE_INDEX	11
-+#define RXTX_REG142_LAT_CALIB_DONE_WIDTH	1
-+
-+#define RXTX_FULL_RATE				0x0
-+#define RXTX_HALF_RATE				0x1
-+#define RXTX_FIFTH_RATE				0x3
-+#define RXTX_66BIT_WORD				0x7
-+#define RXTX_10BIT_WORD				0x1
-+#define RXTX_10G_BLWC				0x0
-+#define RXTX_1G_BLWC				0x1
-+#define RXTX_10G_TX_AMP				0xa
-+#define RXTX_1G_TX_AMP				0xf
-+#define RXTX_10G_CDR				0x7
-+#define RXTX_1G_CDR				0x2
-+#define RXTX_10G_PLL				0x1
-+#define RXTX_1G_PLL				0x0
-+#define RXTX_10G_PQ				0x1e
-+#define RXTX_1G_PQ				0xa
-+
-+DEFINE_SPINLOCK(cmu_lock);
-+
-+static const u32 amd_xgbe_phy_serdes_blwc[] = {
-+	RXTX_1G_BLWC,
-+	RXTX_1G_BLWC,
-+	RXTX_10G_BLWC,
-+};
-+
-+static const u32 amd_xgbe_phy_serdes_cdr_rate[] = {
-+	RXTX_1G_CDR,
-+	RXTX_1G_CDR,
-+	RXTX_10G_CDR,
-+};
-+
-+static const u32 amd_xgbe_phy_serdes_pq_skew[] = {
-+	RXTX_1G_PQ,
-+	RXTX_1G_PQ,
-+	RXTX_10G_PQ,
-+};
-+
-+static const u32 amd_xgbe_phy_serdes_tx_amp[] = {
-+	RXTX_1G_TX_AMP,
-+	RXTX_1G_TX_AMP,
-+	RXTX_10G_TX_AMP,
-+};
-+
-+enum amd_xgbe_phy_an {
-+	AMD_XGBE_AN_READY = 0,
-+	AMD_XGBE_AN_PAGE_RECEIVED,
-+	AMD_XGBE_AN_INCOMPAT_LINK,
-+	AMD_XGBE_AN_COMPLETE,
-+	AMD_XGBE_AN_NO_LINK,
-+	AMD_XGBE_AN_ERROR,
-+};
-+
-+enum amd_xgbe_phy_rx {
-+	AMD_XGBE_RX_BPA = 0,
-+	AMD_XGBE_RX_XNP,
-+	AMD_XGBE_RX_COMPLETE,
-+	AMD_XGBE_RX_ERROR,
-+};
-+
-+enum amd_xgbe_phy_mode {
-+	AMD_XGBE_MODE_KR,
-+	AMD_XGBE_MODE_KX,
-+};
-+
-+enum amd_xgbe_phy_speedset {
-+	AMD_XGBE_PHY_SPEEDSET_1000_10000 = 0,
-+	AMD_XGBE_PHY_SPEEDSET_2500_10000,
-+};
-+
-+struct amd_xgbe_phy_priv {
-+	struct platform_device *pdev;
-+	struct acpi_device *adev;
-+	struct device *dev;
-+
-+	struct phy_device *phydev;
-+
-+	/* SerDes related mmio resources */
-+	struct resource *rxtx_res;
-+	struct resource *cmu_res;
-+
-+	/* SerDes related mmio registers */
-+	void __iomem *rxtx_regs;	/* SerDes Rx/Tx CSRs */
-+	void __iomem *cmu_regs;		/* SerDes CMU CSRs */
-+
-+	int an_irq;
-+	char an_irq_name[IFNAMSIZ + 32];
-+	struct work_struct an_irq_work;
-+	unsigned int an_irq_allocated;
-+
-+	unsigned int serdes_channel;
-+	unsigned int speed_set;
-+
-+	/* Maintain link status for re-starting auto-negotiation */
-+	unsigned int link;
-+
-+	/* SerDes UEFI configurable settings.
-+	 *   Switching between modes/speeds requires new values for some
-+	 *   SerDes settings.  The values can be supplied as device
-+	 *   properties in array format.  The first array entry is for
-+	 *   1GbE, second for 2.5GbE and third for 10GbE
-+	 */
-+	u32 serdes_blwc[XGBE_PHY_SPEEDS];
-+	u32 serdes_cdr_rate[XGBE_PHY_SPEEDS];
-+	u32 serdes_pq_skew[XGBE_PHY_SPEEDS];
-+	u32 serdes_tx_amp[XGBE_PHY_SPEEDS];
-+
-+	/* Auto-negotiation state machine support */
-+	struct mutex an_mutex;
-+	enum amd_xgbe_phy_an an_result;
-+	enum amd_xgbe_phy_an an_state;
-+	enum amd_xgbe_phy_rx kr_state;
-+	enum amd_xgbe_phy_rx kx_state;
-+	struct work_struct an_work;
-+	struct workqueue_struct *an_workqueue;
-+	unsigned int an_supported;
-+	unsigned int parallel_detect;
-+	unsigned int fec_ability;
-+
-+	unsigned int lpm_ctrl;		/* CTRL1 for resume */
-+};
-+
-+static int amd_xgbe_an_enable_kr_training(struct phy_device *phydev)
-+{
-+	int ret;
-+
-+	ret = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PMA_10GBR_PMD_CTRL);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret |= XGBE_PHY_KR_TRAINING_ENABLE;
-+	phy_write_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PMA_10GBR_PMD_CTRL, ret);
-+
-+	return 0;
-+}
-+
-+static int amd_xgbe_an_disable_kr_training(struct phy_device *phydev)
-+{
-+	int ret;
-+
-+	ret = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PMA_10GBR_PMD_CTRL);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret &= ~XGBE_PHY_KR_TRAINING_ENABLE;
-+	phy_write_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PMA_10GBR_PMD_CTRL, ret);
-+
-+	return 0;
-+}
-+
-+static int amd_xgbe_phy_pcs_power_cycle(struct phy_device *phydev)
-+{
-+	int ret;
-+
-+	ret = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret |= MDIO_CTRL1_LPOWER;
-+	phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1, ret);
-+
-+	usleep_range(75, 100);
-+
-+	ret &= ~MDIO_CTRL1_LPOWER;
-+	phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1, ret);
-+
-+	return 0;
-+}
-+
-+static void amd_xgbe_phy_serdes_start_ratechange(struct phy_device *phydev)
-+{
-+	struct amd_xgbe_phy_priv *priv = phydev->priv;
-+	u16 val, mask;
-+
-+	/* Assert Rx and Tx ratechange in CMU_reg16 */
-+	val = XCMU_IOREAD(priv, CMU_REG16);
-+
-+	mask = (1 << (CMU_REG16_TX_RATE_CHANGE_BASE -
-+		      (priv->serdes_channel * CMU_REG16_RATE_CHANGE_DECR))) |
-+	       (1 << (CMU_REG16_RX_RATE_CHANGE_BASE -
-+		      (priv->serdes_channel * CMU_REG16_RATE_CHANGE_DECR)));
-+	val |= mask;
-+
-+	XCMU_IOWRITE(priv, CMU_REG16, val);
-+}
-+
-+static void amd_xgbe_phy_serdes_complete_ratechange(struct phy_device *phydev)
-+{
-+	struct amd_xgbe_phy_priv *priv = phydev->priv;
-+	u16 val, mask;
-+	unsigned int wait;
-+
-+	/* Release Rx and Tx ratechange for proper channel in CMU_reg16 */
-+	val = XCMU_IOREAD(priv, CMU_REG16);
-+
-+	mask = (1 << (CMU_REG16_TX_RATE_CHANGE_BASE -
-+		      (priv->serdes_channel * CMU_REG16_RATE_CHANGE_DECR))) |
-+	       (1 << (CMU_REG16_RX_RATE_CHANGE_BASE -
-+		      (priv->serdes_channel * CMU_REG16_RATE_CHANGE_DECR)));
-+	val &= ~mask;
-+
-+	XCMU_IOWRITE(priv, CMU_REG16, val);
-+
-+	/* Wait for Rx and Tx ready in CMU_reg15 */
-+	mask = (1 << priv->serdes_channel) |
-+	       (1 << (priv->serdes_channel + 8));
-+	wait = XGBE_PHY_RATECHANGE_COUNT;
-+	while (wait--) {
-+		udelay(50);
-+
-+		val = XCMU_IOREAD(priv, CMU_REG15);
-+		if ((val & mask) == mask)
-+			return;
-+	}
-+
-+	netdev_dbg(phydev->attached_dev, "SerDes rx/tx not ready (%#hx)\n",
-+		   val);
-+}
-+
-+static int amd_xgbe_phy_xgmii_mode(struct phy_device *phydev)
-+{
-+	struct amd_xgbe_phy_priv *priv = phydev->priv;
-+	int ret;
-+
-+	/* Disable KR training */
-+	ret = amd_xgbe_an_disable_kr_training(phydev);
-+	if (ret < 0)
-+		return ret;
-+
-+	/* Set PCS to KR/10G speed */
-+	ret = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL2);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret &= ~MDIO_PCS_CTRL2_TYPE;
-+	ret |= MDIO_PCS_CTRL2_10GBR;
-+	phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL2, ret);
-+
-+	ret = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret &= ~MDIO_CTRL1_SPEEDSEL;
-+	ret |= MDIO_CTRL1_SPEED10G;
-+	phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1, ret);
-+
-+	ret = amd_xgbe_phy_pcs_power_cycle(phydev);
-+	if (ret < 0)
-+		return ret;
-+
-+	/* Set SerDes to 10G speed */
-+	spin_lock(&cmu_lock);
-+
-+	amd_xgbe_phy_serdes_start_ratechange(phydev);
-+
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG3, TX_DATA_RATE, RXTX_FULL_RATE);
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG3, TX_WORD_MODE, RXTX_66BIT_WORD);
-+
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG5, TXAMP_CNTL,
-+			   priv->serdes_tx_amp[XGBE_PHY_SPEED_10000]);
-+
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG6, RX_DATA_RATE, RXTX_FULL_RATE);
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG6, RX_WORD_MODE, RXTX_66BIT_WORD);
-+
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG20, BLWC_ENA,
-+			   priv->serdes_blwc[XGBE_PHY_SPEED_10000]);
-+
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG53, RX_PLLSELECT, RXTX_10G_PLL);
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG53, TX_PLLSELECT, RXTX_10G_PLL);
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG53, PI_SPD_SEL_CDR,
-+			   priv->serdes_cdr_rate[XGBE_PHY_SPEED_10000]);
-+
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG114, PQ_REG,
-+			   priv->serdes_pq_skew[XGBE_PHY_SPEED_10000]);
-+
-+	amd_xgbe_phy_serdes_complete_ratechange(phydev);
-+
-+	spin_unlock(&cmu_lock);
-+
-+	return 0;
-+}
-+
-+static int amd_xgbe_phy_gmii_2500_mode(struct phy_device *phydev)
-+{
-+	struct amd_xgbe_phy_priv *priv = phydev->priv;
-+	int ret;
-+
-+	/* Disable KR training */
-+	ret = amd_xgbe_an_disable_kr_training(phydev);
-+	if (ret < 0)
-+		return ret;
-+
-+	/* Set PCS to KX/1G speed */
-+	ret = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL2);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret &= ~MDIO_PCS_CTRL2_TYPE;
-+	ret |= MDIO_PCS_CTRL2_10GBX;
-+	phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL2, ret);
-+
-+	ret = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret &= ~MDIO_CTRL1_SPEEDSEL;
-+	ret |= MDIO_CTRL1_SPEED1G;
-+	phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1, ret);
-+
-+	ret = amd_xgbe_phy_pcs_power_cycle(phydev);
-+	if (ret < 0)
-+		return ret;
-+
-+	/* Set SerDes to 2.5G speed */
-+	spin_lock(&cmu_lock);
-+
-+	amd_xgbe_phy_serdes_start_ratechange(phydev);
-+
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG3, TX_DATA_RATE, RXTX_HALF_RATE);
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG3, TX_WORD_MODE, RXTX_10BIT_WORD);
-+
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG5, TXAMP_CNTL,
-+			   priv->serdes_tx_amp[XGBE_PHY_SPEED_2500]);
-+
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG6, RX_DATA_RATE, RXTX_HALF_RATE);
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG6, RX_WORD_MODE, RXTX_10BIT_WORD);
-+
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG20, BLWC_ENA,
-+			   priv->serdes_blwc[XGBE_PHY_SPEED_2500]);
-+
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG53, RX_PLLSELECT, RXTX_1G_PLL);
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG53, TX_PLLSELECT, RXTX_1G_PLL);
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG53, PI_SPD_SEL_CDR,
-+			   priv->serdes_cdr_rate[XGBE_PHY_SPEED_2500]);
-+
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG114, PQ_REG,
-+			   priv->serdes_pq_skew[XGBE_PHY_SPEED_2500]);
-+
-+	amd_xgbe_phy_serdes_complete_ratechange(phydev);
-+
-+	spin_unlock(&cmu_lock);
-+
-+	return 0;
-+}
-+
-+static int amd_xgbe_phy_gmii_mode(struct phy_device *phydev)
-+{
-+	struct amd_xgbe_phy_priv *priv = phydev->priv;
-+	int ret;
-+
-+	/* Disable KR training */
-+	ret = amd_xgbe_an_disable_kr_training(phydev);
-+	if (ret < 0)
-+		return ret;
-+
-+	/* Set PCS to KX/1G speed */
-+	ret = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL2);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret &= ~MDIO_PCS_CTRL2_TYPE;
-+	ret |= MDIO_PCS_CTRL2_10GBX;
-+	phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL2, ret);
-+
-+	ret = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret &= ~MDIO_CTRL1_SPEEDSEL;
-+	ret |= MDIO_CTRL1_SPEED1G;
-+	phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1, ret);
-+
-+	ret = amd_xgbe_phy_pcs_power_cycle(phydev);
-+	if (ret < 0)
-+		return ret;
-+
-+	/* Set SerDes to 1G speed */
-+	spin_lock(&cmu_lock);
-+
-+	amd_xgbe_phy_serdes_start_ratechange(phydev);
-+
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG3, TX_DATA_RATE, RXTX_FIFTH_RATE);
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG3, TX_WORD_MODE, RXTX_10BIT_WORD);
-+
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG5, TXAMP_CNTL,
-+			   priv->serdes_tx_amp[XGBE_PHY_SPEED_1000]);
-+
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG6, RX_DATA_RATE, RXTX_FIFTH_RATE);
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG6, RX_WORD_MODE, RXTX_10BIT_WORD);
-+
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG20, BLWC_ENA,
-+			   priv->serdes_blwc[XGBE_PHY_SPEED_1000]);
-+
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG53, RX_PLLSELECT, RXTX_1G_PLL);
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG53, TX_PLLSELECT, RXTX_1G_PLL);
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG53, PI_SPD_SEL_CDR,
-+			   priv->serdes_cdr_rate[XGBE_PHY_SPEED_1000]);
-+
-+	XRXTX_IOWRITE_BITS(priv, RXTX_REG114, PQ_REG,
-+			   priv->serdes_pq_skew[XGBE_PHY_SPEED_1000]);
-+
-+	amd_xgbe_phy_serdes_complete_ratechange(phydev);
-+
-+	spin_unlock(&cmu_lock);
-+
-+	return 0;
-+}
-+
-+static int amd_xgbe_phy_cur_mode(struct phy_device *phydev,
-+				 enum amd_xgbe_phy_mode *mode)
-+{
-+	int ret;
-+
-+	ret = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL2);
-+	if (ret < 0)
-+		return ret;
-+
-+	if ((ret & MDIO_PCS_CTRL2_TYPE) == MDIO_PCS_CTRL2_10GBR)
-+		*mode = AMD_XGBE_MODE_KR;
-+	else
-+		*mode = AMD_XGBE_MODE_KX;
-+
-+	return 0;
-+}
-+
-+static bool amd_xgbe_phy_in_kr_mode(struct phy_device *phydev)
-+{
-+	enum amd_xgbe_phy_mode mode;
-+
-+	if (amd_xgbe_phy_cur_mode(phydev, &mode))
-+		return false;
-+
-+	return (mode == AMD_XGBE_MODE_KR);
-+}
-+
-+static int amd_xgbe_phy_switch_mode(struct phy_device *phydev)
-+{
-+	struct amd_xgbe_phy_priv *priv = phydev->priv;
-+	int ret;
-+
-+	/* If we are in KR switch to KX, and vice-versa */
-+	if (amd_xgbe_phy_in_kr_mode(phydev)) {
-+		if (priv->speed_set == AMD_XGBE_PHY_SPEEDSET_1000_10000)
-+			ret = amd_xgbe_phy_gmii_mode(phydev);
-+		else
-+			ret = amd_xgbe_phy_gmii_2500_mode(phydev);
-+	} else {
-+		ret = amd_xgbe_phy_xgmii_mode(phydev);
-+	}
-+
-+	return ret;
-+}
-+
-+static int amd_xgbe_phy_set_mode(struct phy_device *phydev,
-+				 enum amd_xgbe_phy_mode mode)
-+{
-+	enum amd_xgbe_phy_mode cur_mode;
-+	int ret;
-+
-+	ret = amd_xgbe_phy_cur_mode(phydev, &cur_mode);
-+	if (ret)
-+		return ret;
-+
-+	if (mode != cur_mode)
-+		ret = amd_xgbe_phy_switch_mode(phydev);
-+
-+	return ret;
-+}
-+
-+static int amd_xgbe_phy_set_an(struct phy_device *phydev, bool enable,
-+			       bool restart)
-+{
-+	int ret;
-+
-+	ret = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_CTRL1);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret &= ~MDIO_AN_CTRL1_ENABLE;
-+
-+	if (enable)
-+		ret |= MDIO_AN_CTRL1_ENABLE;
-+
-+	if (restart)
-+		ret |= MDIO_AN_CTRL1_RESTART;
-+
-+	phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_CTRL1, ret);
-+
-+	return 0;
-+}
-+
-+static int amd_xgbe_phy_restart_an(struct phy_device *phydev)
-+{
-+	return amd_xgbe_phy_set_an(phydev, true, true);
-+}
-+
-+static int amd_xgbe_phy_disable_an(struct phy_device *phydev)
-+{
-+	return amd_xgbe_phy_set_an(phydev, false, false);
-+}
-+
-+static enum amd_xgbe_phy_an amd_xgbe_an_tx_training(struct phy_device *phydev,
-+						    enum amd_xgbe_phy_rx *state)
-+{
-+	struct amd_xgbe_phy_priv *priv = phydev->priv;
-+	int ad_reg, lp_reg, ret;
-+
-+	*state = AMD_XGBE_RX_COMPLETE;
-+
-+	/* If we're not in KR mode then we're done */
-+	if (!amd_xgbe_phy_in_kr_mode(phydev))
-+		return AMD_XGBE_AN_PAGE_RECEIVED;
-+
-+	/* Enable/Disable FEC */
-+	ad_reg = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE + 2);
-+	if (ad_reg < 0)
-+		return AMD_XGBE_AN_ERROR;
-+
-+	lp_reg = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_LPA + 2);
-+	if (lp_reg < 0)
-+		return AMD_XGBE_AN_ERROR;
-+
-+	ret = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PMA_10GBR_FEC_CTRL);
-+	if (ret < 0)
-+		return AMD_XGBE_AN_ERROR;
-+
-+	ret &= ~XGBE_PHY_FEC_MASK;
-+	if ((ad_reg & 0xc000) && (lp_reg & 0xc000))
-+		ret |= priv->fec_ability;
-+
-+	phy_write_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PMA_10GBR_FEC_CTRL, ret);
-+
-+	/* Start KR training */
-+	ret = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PMA_10GBR_PMD_CTRL);
-+	if (ret < 0)
-+		return AMD_XGBE_AN_ERROR;
-+
-+	if (ret & XGBE_PHY_KR_TRAINING_ENABLE) {
-+		ret |= XGBE_PHY_KR_TRAINING_START;
-+		phy_write_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PMA_10GBR_PMD_CTRL,
-+			      ret);
-+	}
-+
-+	return AMD_XGBE_AN_PAGE_RECEIVED;
-+}
-+
-+static enum amd_xgbe_phy_an amd_xgbe_an_tx_xnp(struct phy_device *phydev,
-+					       enum amd_xgbe_phy_rx *state)
-+{
-+	u16 msg;
-+
-+	*state = AMD_XGBE_RX_XNP;
-+
-+	msg = XNP_MCF_NULL_MESSAGE;
-+	msg |= XNP_MP_FORMATTED;
-+
-+	phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_XNP + 2, 0);
-+	phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_XNP + 1, 0);
-+	phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_XNP, msg);
-+
-+	return AMD_XGBE_AN_PAGE_RECEIVED;
-+}
-+
-+static enum amd_xgbe_phy_an amd_xgbe_an_rx_bpa(struct phy_device *phydev,
-+					       enum amd_xgbe_phy_rx *state)
-+{
-+	unsigned int link_support;
-+	int ret, ad_reg, lp_reg;
-+
-+	/* Read Base Ability register 2 first */
-+	ret = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_LPA + 1);
-+	if (ret < 0)
-+		return AMD_XGBE_AN_ERROR;
-+
-+	/* Check for a supported mode, otherwise restart in a different one */
-+	link_support = amd_xgbe_phy_in_kr_mode(phydev) ? 0x80 : 0x20;
-+	if (!(ret & link_support))
-+		return AMD_XGBE_AN_INCOMPAT_LINK;
-+
-+	/* Check Extended Next Page support */
-+	ad_reg = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE);
-+	if (ad_reg < 0)
-+		return AMD_XGBE_AN_ERROR;
-+
-+	lp_reg = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_LPA);
-+	if (lp_reg < 0)
-+		return AMD_XGBE_AN_ERROR;
-+
-+	return ((ad_reg & XNP_NP_EXCHANGE) || (lp_reg & XNP_NP_EXCHANGE)) ?
-+	       amd_xgbe_an_tx_xnp(phydev, state) :
-+	       amd_xgbe_an_tx_training(phydev, state);
-+}
-+
-+static enum amd_xgbe_phy_an amd_xgbe_an_rx_xnp(struct phy_device *phydev,
-+					       enum amd_xgbe_phy_rx *state)
-+{
-+	int ad_reg, lp_reg;
-+
-+	/* Check Extended Next Page support */
-+	ad_reg = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_XNP);
-+	if (ad_reg < 0)
-+		return AMD_XGBE_AN_ERROR;
-+
-+	lp_reg = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_LPX);
-+	if (lp_reg < 0)
-+		return AMD_XGBE_AN_ERROR;
-+
-+	return ((ad_reg & XNP_NP_EXCHANGE) || (lp_reg & XNP_NP_EXCHANGE)) ?
-+	       amd_xgbe_an_tx_xnp(phydev, state) :
-+	       amd_xgbe_an_tx_training(phydev, state);
-+}
-+
-+static enum amd_xgbe_phy_an amd_xgbe_an_page_received(struct phy_device *phydev)
-+{
-+	struct amd_xgbe_phy_priv *priv = phydev->priv;
-+	enum amd_xgbe_phy_rx *state;
-+	int ret;
-+
-+	state = amd_xgbe_phy_in_kr_mode(phydev) ? &priv->kr_state
-+						: &priv->kx_state;
-+
-+	switch (*state) {
-+	case AMD_XGBE_RX_BPA:
-+		ret = amd_xgbe_an_rx_bpa(phydev, state);
-+		break;
-+
-+	case AMD_XGBE_RX_XNP:
-+		ret = amd_xgbe_an_rx_xnp(phydev, state);
-+		break;
-+
-+	default:
-+		ret = AMD_XGBE_AN_ERROR;
-+	}
-+
-+	return ret;
-+}
-+
-+static enum amd_xgbe_phy_an amd_xgbe_an_incompat_link(struct phy_device *phydev)
-+{
-+	struct amd_xgbe_phy_priv *priv = phydev->priv;
-+	int ret;
-+
-+	/* Be sure we aren't looping trying to negotiate */
-+	if (amd_xgbe_phy_in_kr_mode(phydev)) {
-+		priv->kr_state = AMD_XGBE_RX_ERROR;
-+
-+		if (!(phydev->supported & SUPPORTED_1000baseKX_Full) &&
-+		    !(phydev->supported & SUPPORTED_2500baseX_Full))
-+			return AMD_XGBE_AN_NO_LINK;
-+
-+		if (priv->kx_state != AMD_XGBE_RX_BPA)
-+			return AMD_XGBE_AN_NO_LINK;
-+	} else {
-+		priv->kx_state = AMD_XGBE_RX_ERROR;
-+
-+		if (!(phydev->supported & SUPPORTED_10000baseKR_Full))
-+			return AMD_XGBE_AN_NO_LINK;
-+
-+		if (priv->kr_state != AMD_XGBE_RX_BPA)
-+			return AMD_XGBE_AN_NO_LINK;
-+	}
-+
-+	ret = amd_xgbe_phy_disable_an(phydev);
-+	if (ret)
-+		return AMD_XGBE_AN_ERROR;
-+
-+	ret = amd_xgbe_phy_switch_mode(phydev);
-+	if (ret)
-+		return AMD_XGBE_AN_ERROR;
-+
-+	ret = amd_xgbe_phy_restart_an(phydev);
-+	if (ret)
-+		return AMD_XGBE_AN_ERROR;
-+
-+	return AMD_XGBE_AN_INCOMPAT_LINK;
-+}
-+
-+static irqreturn_t amd_xgbe_an_isr(int irq, void *data)
-+{
-+	struct amd_xgbe_phy_priv *priv = (struct amd_xgbe_phy_priv *)data;
-+
-+	/* Interrupt reason must be read and cleared outside of IRQ context */
-+	disable_irq_nosync(priv->an_irq);
-+
-+	queue_work(priv->an_workqueue, &priv->an_irq_work);
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static void amd_xgbe_an_irq_work(struct work_struct *work)
-+{
-+	struct amd_xgbe_phy_priv *priv = container_of(work,
-+						      struct amd_xgbe_phy_priv,
-+						      an_irq_work);
-+
-+	/* Avoid a race between enabling the IRQ and exiting the work by
-+	 * waiting for the work to finish and then queueing it
-+	 */
-+	flush_work(&priv->an_work);
-+	queue_work(priv->an_workqueue, &priv->an_work);
-+}
-+
-+static void amd_xgbe_an_state_machine(struct work_struct *work)
-+{
-+	struct amd_xgbe_phy_priv *priv = container_of(work,
-+						      struct amd_xgbe_phy_priv,
-+						      an_work);
-+	struct phy_device *phydev = priv->phydev;
-+	enum amd_xgbe_phy_an cur_state = priv->an_state;
-+	int int_reg, int_mask;
-+
-+	mutex_lock(&priv->an_mutex);
-+
-+	/* Read the interrupt */
-+	int_reg = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_INT);
-+	if (!int_reg)
-+		goto out;
-+
-+next_int:
-+	if (int_reg < 0) {
-+		priv->an_state = AMD_XGBE_AN_ERROR;
-+		int_mask = XGBE_AN_INT_MASK;
-+	} else if (int_reg & XGBE_AN_PG_RCV) {
-+		priv->an_state = AMD_XGBE_AN_PAGE_RECEIVED;
-+		int_mask = XGBE_AN_PG_RCV;
-+	} else if (int_reg & XGBE_AN_INC_LINK) {
-+		priv->an_state = AMD_XGBE_AN_INCOMPAT_LINK;
-+		int_mask = XGBE_AN_INC_LINK;
-+	} else if (int_reg & XGBE_AN_INT_CMPLT) {
-+		priv->an_state = AMD_XGBE_AN_COMPLETE;
-+		int_mask = XGBE_AN_INT_CMPLT;
-+	} else {
-+		priv->an_state = AMD_XGBE_AN_ERROR;
-+		int_mask = 0;
-+	}
-+
-+	/* Clear the interrupt to be processed */
-+	int_reg &= ~int_mask;
-+	phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_INT, int_reg);
-+
-+	priv->an_result = priv->an_state;
-+
-+again:
-+	cur_state = priv->an_state;
-+
-+	switch (priv->an_state) {
-+	case AMD_XGBE_AN_READY:
-+		priv->an_supported = 0;
-+		break;
-+
-+	case AMD_XGBE_AN_PAGE_RECEIVED:
-+		priv->an_state = amd_xgbe_an_page_received(phydev);
-+		priv->an_supported++;
-+		break;
-+
-+	case AMD_XGBE_AN_INCOMPAT_LINK:
-+		priv->an_supported = 0;
-+		priv->parallel_detect = 0;
-+		priv->an_state = amd_xgbe_an_incompat_link(phydev);
-+		break;
-+
-+	case AMD_XGBE_AN_COMPLETE:
-+		priv->parallel_detect = priv->an_supported ? 0 : 1;
-+		netdev_dbg(phydev->attached_dev, "%s successful\n",
-+			   priv->an_supported ? "Auto negotiation"
-+					      : "Parallel detection");
-+		break;
-+
-+	case AMD_XGBE_AN_NO_LINK:
-+		break;
-+
-+	default:
-+		priv->an_state = AMD_XGBE_AN_ERROR;
-+	}
-+
-+	if (priv->an_state == AMD_XGBE_AN_NO_LINK) {
-+		/* Disable auto-negotiation for now - it will be
-+		 * re-enabled once a link is established
-+		 */
-+		amd_xgbe_phy_disable_an(phydev);
-+
-+		int_reg = 0;
-+		phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_INT, 0);
-+	} else if (priv->an_state == AMD_XGBE_AN_ERROR) {
-+		netdev_err(phydev->attached_dev,
-+			   "error during auto-negotiation, state=%u\n",
-+			   cur_state);
-+
-+		int_reg = 0;
-+		phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_INT, 0);
-+	}
-+
-+	if (priv->an_state >= AMD_XGBE_AN_COMPLETE) {
-+		priv->an_result = priv->an_state;
-+		priv->an_state = AMD_XGBE_AN_READY;
-+		priv->kr_state = AMD_XGBE_RX_BPA;
-+		priv->kx_state = AMD_XGBE_RX_BPA;
-+	}
-+
-+	if (cur_state != priv->an_state)
-+		goto again;
-+
-+	if (int_reg)
-+		goto next_int;
-+
-+out:
-+	enable_irq(priv->an_irq);
-+
-+	mutex_unlock(&priv->an_mutex);
-+}
-+
-+static int amd_xgbe_an_init(struct phy_device *phydev)
-+{
-+	int ret;
-+
-+	/* Set up Advertisement register 3 first */
-+	ret = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE + 2);
-+	if (ret < 0)
-+		return ret;
-+
-+	if (phydev->supported & SUPPORTED_10000baseR_FEC)
-+		ret |= 0xc000;
-+	else
-+		ret &= ~0xc000;
-+
-+	phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE + 2, ret);
-+
-+	/* Set up Advertisement register 2 next */
-+	ret = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE + 1);
-+	if (ret < 0)
-+		return ret;
-+
-+	if (phydev->supported & SUPPORTED_10000baseKR_Full)
-+		ret |= 0x80;
-+	else
-+		ret &= ~0x80;
-+
-+	if ((phydev->supported & SUPPORTED_1000baseKX_Full) ||
-+	    (phydev->supported & SUPPORTED_2500baseX_Full))
-+		ret |= 0x20;
-+	else
-+		ret &= ~0x20;
-+
-+	phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE + 1, ret);
-+
-+	/* Set up Advertisement register 1 last */
-+	ret = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE);
-+	if (ret < 0)
-+		return ret;
-+
-+	if (phydev->supported & SUPPORTED_Pause)
-+		ret |= 0x400;
-+	else
-+		ret &= ~0x400;
-+
-+	if (phydev->supported & SUPPORTED_Asym_Pause)
-+		ret |= 0x800;
-+	else
-+		ret &= ~0x800;
-+
-+	/* We don't intend to perform XNP */
-+	ret &= ~XNP_NP_EXCHANGE;
-+
-+	phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE, ret);
-+
-+	return 0;
-+}
-+
-+static int amd_xgbe_phy_soft_reset(struct phy_device *phydev)
-+{
-+	int count, ret;
-+
-+	ret = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret |= MDIO_CTRL1_RESET;
-+	phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1, ret);
-+
-+	count = 50;
-+	do {
-+		msleep(20);
-+		ret = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1);
-+		if (ret < 0)
-+			return ret;
-+	} while ((ret & MDIO_CTRL1_RESET) && --count);
-+
-+	if (ret & MDIO_CTRL1_RESET)
-+		return -ETIMEDOUT;
-+
-+	/* Disable auto-negotiation for now */
-+	ret = amd_xgbe_phy_disable_an(phydev);
-+	if (ret < 0)
-+		return ret;
-+
-+	/* Clear auto-negotiation interrupts */
-+	phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_INT, 0);
-+
-+	return 0;
-+}
-+
-+static int amd_xgbe_phy_config_init(struct phy_device *phydev)
-+{
-+	struct amd_xgbe_phy_priv *priv = phydev->priv;
-+	struct net_device *netdev = phydev->attached_dev;
-+	int ret;
-+
-+	if (!priv->an_irq_allocated) {
-+		/* Allocate the auto-negotiation workqueue and interrupt */
-+		snprintf(priv->an_irq_name, sizeof(priv->an_irq_name) - 1,
-+			 "%s-pcs", netdev_name(netdev));
-+
-+		priv->an_workqueue =
-+			create_singlethread_workqueue(priv->an_irq_name);
-+		if (!priv->an_workqueue) {
-+			netdev_err(netdev, "phy workqueue creation failed\n");
-+			return -ENOMEM;
-+		}
-+
-+		ret = devm_request_irq(priv->dev, priv->an_irq,
-+				       amd_xgbe_an_isr, 0, priv->an_irq_name,
-+				       priv);
-+		if (ret) {
-+			netdev_err(netdev, "phy irq request failed\n");
-+			destroy_workqueue(priv->an_workqueue);
-+			return ret;
-+		}
-+
-+		priv->an_irq_allocated = 1;
-+	}
-+
-+	ret = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PMA_10GBR_FEC_ABILITY);
-+	if (ret < 0)
-+		return ret;
-+	priv->fec_ability = ret & XGBE_PHY_FEC_MASK;
-+
-+	/* Initialize supported features */
-+	phydev->supported = SUPPORTED_Autoneg;
-+	phydev->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause;
-+	phydev->supported |= SUPPORTED_Backplane;
-+	phydev->supported |= SUPPORTED_10000baseKR_Full;
-+	switch (priv->speed_set) {
-+	case AMD_XGBE_PHY_SPEEDSET_1000_10000:
-+		phydev->supported |= SUPPORTED_1000baseKX_Full;
-+		break;
-+	case AMD_XGBE_PHY_SPEEDSET_2500_10000:
-+		phydev->supported |= SUPPORTED_2500baseX_Full;
-+		break;
-+	}
-+
-+	if (priv->fec_ability & XGBE_PHY_FEC_ENABLE)
-+		phydev->supported |= SUPPORTED_10000baseR_FEC;
-+
-+	phydev->advertising = phydev->supported;
-+
-+	/* Set initial mode - call the mode setting routines
-+	 * directly to insure we are properly configured
-+	 */
-+	if (phydev->supported & SUPPORTED_10000baseKR_Full)
-+		ret = amd_xgbe_phy_xgmii_mode(phydev);
-+	else if (phydev->supported & SUPPORTED_1000baseKX_Full)
-+		ret = amd_xgbe_phy_gmii_mode(phydev);
-+	else if (phydev->supported & SUPPORTED_2500baseX_Full)
-+		ret = amd_xgbe_phy_gmii_2500_mode(phydev);
-+	else
-+		ret = -EINVAL;
-+	if (ret < 0)
-+		return ret;
-+
-+	/* Set up advertisement registers based on current settings */
-+	ret = amd_xgbe_an_init(phydev);
-+	if (ret)
-+		return ret;
-+
-+	/* Enable auto-negotiation interrupts */
-+	phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_INTMASK, 0x07);
-+
-+	return 0;
-+}
-+
-+static int amd_xgbe_phy_setup_forced(struct phy_device *phydev)
-+{
-+	int ret;
-+
-+	/* Disable auto-negotiation */
-+	ret = amd_xgbe_phy_disable_an(phydev);
-+	if (ret < 0)
-+		return ret;
-+
-+	/* Validate/Set specified speed */
-+	switch (phydev->speed) {
-+	case SPEED_10000:
-+		ret = amd_xgbe_phy_set_mode(phydev, AMD_XGBE_MODE_KR);
-+		break;
-+
-+	case SPEED_2500:
-+	case SPEED_1000:
-+		ret = amd_xgbe_phy_set_mode(phydev, AMD_XGBE_MODE_KX);
-+		break;
-+
-+	default:
-+		ret = -EINVAL;
-+	}
-+
-+	if (ret < 0)
-+		return ret;
-+
-+	/* Validate duplex mode */
-+	if (phydev->duplex != DUPLEX_FULL)
-+		return -EINVAL;
-+
-+	phydev->pause = 0;
-+	phydev->asym_pause = 0;
-+
-+	return 0;
-+}
-+
-+static int __amd_xgbe_phy_config_aneg(struct phy_device *phydev)
-+{
-+	struct amd_xgbe_phy_priv *priv = phydev->priv;
-+	u32 mmd_mask = phydev->c45_ids.devices_in_package;
-+	int ret;
-+
-+	if (phydev->autoneg != AUTONEG_ENABLE)
-+		return amd_xgbe_phy_setup_forced(phydev);
-+
-+	/* Make sure we have the AN MMD present */
-+	if (!(mmd_mask & MDIO_DEVS_AN))
-+		return -EINVAL;
-+
-+	/* Disable auto-negotiation interrupt */
-+	disable_irq(priv->an_irq);
-+
-+	/* Start auto-negotiation in a supported mode */
-+	if (phydev->supported & SUPPORTED_10000baseKR_Full)
-+		ret = amd_xgbe_phy_set_mode(phydev, AMD_XGBE_MODE_KR);
-+	else if ((phydev->supported & SUPPORTED_1000baseKX_Full) ||
-+		 (phydev->supported & SUPPORTED_2500baseX_Full))
-+		ret = amd_xgbe_phy_set_mode(phydev, AMD_XGBE_MODE_KX);
-+	else
-+		ret = -EINVAL;
-+	if (ret < 0) {
-+		enable_irq(priv->an_irq);
-+		return ret;
-+	}
-+
-+	/* Disable and stop any in progress auto-negotiation */
-+	ret = amd_xgbe_phy_disable_an(phydev);
-+	if (ret < 0)
-+		return ret;
-+
-+	/* Clear any auto-negotitation interrupts */
-+	phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_INT, 0);
-+
-+	priv->an_result = AMD_XGBE_AN_READY;
-+	priv->an_state = AMD_XGBE_AN_READY;
-+	priv->kr_state = AMD_XGBE_RX_BPA;
-+	priv->kx_state = AMD_XGBE_RX_BPA;
-+
-+	/* Re-enable auto-negotiation interrupt */
-+	enable_irq(priv->an_irq);
-+
-+	/* Set up advertisement registers based on current settings */
-+	ret = amd_xgbe_an_init(phydev);
-+	if (ret)
-+		return ret;
-+
-+	/* Enable and start auto-negotiation */
-+	ret = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_KR_CTRL);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret |= MDIO_KR_CTRL_PDETECT;
-+	phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_KR_CTRL, ret);
-+
-+	return amd_xgbe_phy_restart_an(phydev);
-+}
-+
-+static int amd_xgbe_phy_config_aneg(struct phy_device *phydev)
-+{
-+	struct amd_xgbe_phy_priv *priv = phydev->priv;
-+	int ret;
-+
-+	mutex_lock(&priv->an_mutex);
-+
-+	ret = __amd_xgbe_phy_config_aneg(phydev);
-+
-+	mutex_unlock(&priv->an_mutex);
-+
-+	return ret;
-+}
-+
-+static int amd_xgbe_phy_aneg_done(struct phy_device *phydev)
-+{
-+	struct amd_xgbe_phy_priv *priv = phydev->priv;
-+
-+	return (priv->an_result == AMD_XGBE_AN_COMPLETE);
-+}
-+
-+static int amd_xgbe_phy_update_link(struct phy_device *phydev)
-+{
-+	struct amd_xgbe_phy_priv *priv = phydev->priv;
-+	unsigned int check_again, autoneg;
-+	int ret;
-+
-+	/* If we're doing auto-negotiation don't report link down */
-+	if (priv->an_state != AMD_XGBE_AN_READY) {
-+		phydev->link = 1;
-+		return 0;
-+	}
-+
-+	/* Since the device can be in the wrong mode when a link is
-+	 * (re-)established (cable connected after the interface is
-+	 * up, etc.), the link status may report no link. If there
-+	 * is no link, try switching modes and checking the status
-+	 * again if auto negotiation is enabled.
-+	 */
-+	check_again = (phydev->autoneg == AUTONEG_ENABLE) ? 1 : 0;
-+again:
-+	/* Link status is latched low, so read once to clear
-+	 * and then read again to get current state
-+	 */
-+	ret = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_STAT1);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_STAT1);
-+	if (ret < 0)
-+		return ret;
-+
-+	phydev->link = (ret & MDIO_STAT1_LSTATUS) ? 1 : 0;
-+
-+	if (!phydev->link) {
-+		if (check_again) {
-+			ret = amd_xgbe_phy_switch_mode(phydev);
-+			if (ret < 0)
-+				return ret;
-+			check_again = 0;
-+			goto again;
-+		}
-+	}
-+
-+	autoneg = (phydev->link && !priv->link) ? 1 : 0;
-+	priv->link = phydev->link;
-+	if (autoneg) {
-+		/* Link is (back) up, re-start auto-negotiation */
-+		ret = amd_xgbe_phy_config_aneg(phydev);
-+		if (ret < 0)
-+			return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static int amd_xgbe_phy_read_status(struct phy_device *phydev)
-+{
-+	struct amd_xgbe_phy_priv *priv = phydev->priv;
-+	u32 mmd_mask = phydev->c45_ids.devices_in_package;
-+	int ret, ad_ret, lp_ret;
-+
-+	ret = amd_xgbe_phy_update_link(phydev);
-+	if (ret)
-+		return ret;
-+
-+	if ((phydev->autoneg == AUTONEG_ENABLE) &&
-+	    !priv->parallel_detect) {
-+		if (!(mmd_mask & MDIO_DEVS_AN))
-+			return -EINVAL;
-+
-+		if (!amd_xgbe_phy_aneg_done(phydev))
-+			return 0;
-+
-+		/* Compare Advertisement and Link Partner register 1 */
-+		ad_ret = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE);
-+		if (ad_ret < 0)
-+			return ad_ret;
-+		lp_ret = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_LPA);
-+		if (lp_ret < 0)
-+			return lp_ret;
-+
-+		ad_ret &= lp_ret;
-+		phydev->pause = (ad_ret & 0x400) ? 1 : 0;
-+		phydev->asym_pause = (ad_ret & 0x800) ? 1 : 0;
-+
-+		/* Compare Advertisement and Link Partner register 2 */
-+		ad_ret = phy_read_mmd(phydev, MDIO_MMD_AN,
-+				      MDIO_AN_ADVERTISE + 1);
-+		if (ad_ret < 0)
-+			return ad_ret;
-+		lp_ret = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_LPA + 1);
-+		if (lp_ret < 0)
-+			return lp_ret;
-+
-+		ad_ret &= lp_ret;
-+		if (ad_ret & 0x80) {
-+			phydev->speed = SPEED_10000;
-+			ret = amd_xgbe_phy_set_mode(phydev, AMD_XGBE_MODE_KR);
-+			if (ret)
-+				return ret;
-+		} else {
-+			switch (priv->speed_set) {
-+			case AMD_XGBE_PHY_SPEEDSET_1000_10000:
-+				phydev->speed = SPEED_1000;
-+				break;
-+
-+			case AMD_XGBE_PHY_SPEEDSET_2500_10000:
-+				phydev->speed = SPEED_2500;
-+				break;
-+			}
-+
-+			ret = amd_xgbe_phy_set_mode(phydev, AMD_XGBE_MODE_KX);
-+			if (ret)
-+				return ret;
-+		}
-+
-+		phydev->duplex = DUPLEX_FULL;
-+	} else {
-+		if (amd_xgbe_phy_in_kr_mode(phydev)) {
-+			phydev->speed = SPEED_10000;
-+		} else {
-+			switch (priv->speed_set) {
-+			case AMD_XGBE_PHY_SPEEDSET_1000_10000:
-+				phydev->speed = SPEED_1000;
-+				break;
-+
-+			case AMD_XGBE_PHY_SPEEDSET_2500_10000:
-+				phydev->speed = SPEED_2500;
-+				break;
-+			}
-+		}
-+		phydev->duplex = DUPLEX_FULL;
-+		phydev->pause = 0;
-+		phydev->asym_pause = 0;
-+	}
-+
-+	return 0;
-+}
-+
-+static int amd_xgbe_phy_suspend(struct phy_device *phydev)
-+{
-+	struct amd_xgbe_phy_priv *priv = phydev->priv;
-+	int ret;
-+
-+	mutex_lock(&phydev->lock);
-+
-+	ret = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1);
-+	if (ret < 0)
-+		goto unlock;
-+
-+	priv->lpm_ctrl = ret;
-+
-+	ret |= MDIO_CTRL1_LPOWER;
-+	phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1, ret);
-+
-+	ret = 0;
-+
-+unlock:
-+	mutex_unlock(&phydev->lock);
-+
-+	return ret;
-+}
-+
-+static int amd_xgbe_phy_resume(struct phy_device *phydev)
-+{
-+	struct amd_xgbe_phy_priv *priv = phydev->priv;
-+
-+	mutex_lock(&phydev->lock);
-+
-+	priv->lpm_ctrl &= ~MDIO_CTRL1_LPOWER;
-+	phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1, priv->lpm_ctrl);
-+
-+	mutex_unlock(&phydev->lock);
-+
-+	return 0;
-+}
-+
-+static unsigned int amd_xgbe_phy_resource_count(struct platform_device *pdev,
-+						unsigned int type)
-+{
-+	unsigned int count;
-+	int i;
-+
-+	for (i = 0, count = 0; i < pdev->num_resources; i++) {
-+		struct resource *r = &pdev->resource[i];
-+
-+		if (type == resource_type(r))
-+			count++;
-+	}
-+
-+	return count;
-+}
-+
-+static int amd_xgbe_phy_probe(struct phy_device *phydev)
-+{
-+	struct amd_xgbe_phy_priv *priv;
-+	struct platform_device *phy_pdev;
-+	struct device *dev, *phy_dev;
-+	unsigned int phy_resnum, phy_irqnum;
-+	int ret;
-+
-+	if (!phydev->bus || !phydev->bus->parent)
-+		return -EINVAL;
-+
-+	dev = phydev->bus->parent;
-+
-+	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
-+	if (!priv)
-+		return -ENOMEM;
-+
-+	priv->pdev = to_platform_device(dev);
-+	priv->adev = ACPI_COMPANION(dev);
-+	priv->dev = dev;
-+	priv->phydev = phydev;
-+	mutex_init(&priv->an_mutex);
-+	INIT_WORK(&priv->an_irq_work, amd_xgbe_an_irq_work);
-+	INIT_WORK(&priv->an_work, amd_xgbe_an_state_machine);
-+
-+	if (!priv->adev || acpi_disabled) {
-+		struct device_node *bus_node;
-+		struct device_node *phy_node;
-+
-+		bus_node = priv->dev->of_node;
-+		phy_node = of_parse_phandle(bus_node, "phy-handle", 0);
-+		if (!phy_node) {
-+			dev_err(dev, "unable to parse phy-handle\n");
-+			ret = -EINVAL;
-+			goto err_priv;
-+		}
-+
-+		phy_pdev = of_find_device_by_node(phy_node);
-+		of_node_put(phy_node);
-+
-+		if (!phy_pdev) {
-+			dev_err(dev, "unable to obtain phy device\n");
-+			ret = -EINVAL;
-+			goto err_priv;
-+		}
-+
-+		phy_resnum = 0;
-+		phy_irqnum = 0;
-+	} else {
-+		/* In ACPI, the XGBE and PHY resources are the grouped
-+		 * together with the PHY resources at the end
-+		 */
-+		phy_pdev = priv->pdev;
-+		phy_resnum = amd_xgbe_phy_resource_count(phy_pdev,
-+							 IORESOURCE_MEM) - 2;
-+		phy_irqnum = amd_xgbe_phy_resource_count(phy_pdev,
-+							 IORESOURCE_IRQ) - 1;
-+	}
-+	phy_dev = &phy_pdev->dev;
-+
-+	/* Get the device mmio areas */
-+	priv->rxtx_res = platform_get_resource(phy_pdev, IORESOURCE_MEM,
-+					       phy_resnum++);
-+	priv->rxtx_regs = devm_ioremap_resource(dev, priv->rxtx_res);
-+	if (IS_ERR(priv->rxtx_regs)) {
-+		dev_err(dev, "rxtx ioremap failed\n");
-+		ret = PTR_ERR(priv->rxtx_regs);
-+		goto err_put;
-+	}
-+
-+	/* All xgbe phy devices share the CMU registers so retrieve
-+	 * the resource and do the ioremap directly rather than
-+	 * the devm_ioremap_resource call
-+	 */
-+	priv->cmu_res = platform_get_resource(phy_pdev, IORESOURCE_MEM,
-+					      phy_resnum++);
-+	if (!priv->cmu_res) {
-+		dev_err(dev, "cmu invalid resource\n");
-+		ret = -EINVAL;
-+		goto err_rxtx;
-+	}
-+	priv->cmu_regs = devm_ioremap_nocache(dev, priv->cmu_res->start,
-+					      resource_size(priv->cmu_res));
-+	if (!priv->cmu_regs) {
-+		dev_err(dev, "cmu ioremap failed\n");
-+		ret = -ENOMEM;
-+		goto err_rxtx;
-+	}
-+
-+	/* Get the auto-negotiation interrupt */
-+	ret = platform_get_irq(phy_pdev, phy_irqnum);
-+	if (ret < 0) {
-+		dev_err(dev, "platform_get_irq failed\n");
-+		goto err_cmu;
-+	}
-+	if (!phy_irqnum) {
-+		struct irq_data *d = irq_get_irq_data(ret);
-+		if (!d) {
-+			dev_err(dev, "unable to set AN interrupt\n");
-+			ret = -EINVAL;
-+			goto err_put;
-+		}
-+
-+#ifdef CONFIG_ACPI
-+		ret = acpi_register_gsi(dev, d->hwirq - 2,
-+					ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_HIGH);
-+#else
-+		ret = -EINVAL;
-+#endif
-+		if (ret < 0) {
-+			dev_err(dev, "unable to set AN interrupt\n");
-+			ret = -EINVAL;
-+			goto err_put;
-+		}
-+	}
-+	priv->an_irq = ret;
-+
-+	/* Get the device serdes channel property */
-+	ret = device_property_read_u32(phy_dev, XGBE_PHY_CHANNEL_PROPERTY,
-+				       &priv->serdes_channel);
-+	if (ret) {
-+		dev_err(dev, "invalid %s property\n",
-+			XGBE_PHY_CHANNEL_PROPERTY);
-+		goto err_cmu;
-+	}
-+
-+	/* Get the device speed set property */
-+	ret = device_property_read_u32(phy_dev, XGBE_PHY_SPEEDSET_PROPERTY,
-+				       &priv->speed_set);
-+	if (ret) {
-+		dev_err(dev, "invalid %s property\n",
-+			XGBE_PHY_SPEEDSET_PROPERTY);
-+		goto err_cmu;
-+	}
-+
-+	switch (priv->speed_set) {
-+	case AMD_XGBE_PHY_SPEEDSET_1000_10000:
-+	case AMD_XGBE_PHY_SPEEDSET_2500_10000:
-+		break;
-+	default:
-+		dev_err(dev, "invalid %s property\n",
-+			XGBE_PHY_SPEEDSET_PROPERTY);
-+		ret = -EINVAL;
-+		goto err_cmu;
-+	}
-+
-+	if (device_property_present(phy_dev, XGBE_PHY_BLWC_PROPERTY)) {
-+		ret = device_property_read_u32_array(phy_dev,
-+						     XGBE_PHY_BLWC_PROPERTY,
-+						     priv->serdes_blwc,
-+						     XGBE_PHY_SPEEDS);
-+		if (ret) {
-+			dev_err(dev, "invalid %s property\n",
-+				XGBE_PHY_BLWC_PROPERTY);
-+			goto err_cmu;
-+		}
-+	} else {
-+		memcpy(priv->serdes_blwc, amd_xgbe_phy_serdes_blwc,
-+		       sizeof(priv->serdes_blwc));
-+	}
-+
-+	if (device_property_present(phy_dev, XGBE_PHY_CDR_RATE_PROPERTY)) {
-+		ret = device_property_read_u32_array(phy_dev,
-+						     XGBE_PHY_CDR_RATE_PROPERTY,
-+						     priv->serdes_cdr_rate,
-+						     XGBE_PHY_SPEEDS);
-+		if (ret) {
-+			dev_err(dev, "invalid %s property\n",
-+				XGBE_PHY_CDR_RATE_PROPERTY);
-+			goto err_cmu;
-+		}
-+	} else {
-+		memcpy(priv->serdes_cdr_rate, amd_xgbe_phy_serdes_cdr_rate,
-+		       sizeof(priv->serdes_cdr_rate));
-+	}
-+
-+	if (device_property_present(phy_dev, XGBE_PHY_PQ_SKEW_PROPERTY)) {
-+		ret = device_property_read_u32_array(phy_dev,
-+						     XGBE_PHY_PQ_SKEW_PROPERTY,
-+						     priv->serdes_pq_skew,
-+						     XGBE_PHY_SPEEDS);
-+		if (ret) {
-+			dev_err(dev, "invalid %s property\n",
-+				XGBE_PHY_PQ_SKEW_PROPERTY);
-+			goto err_cmu;
-+		}
-+	} else {
-+		memcpy(priv->serdes_pq_skew, amd_xgbe_phy_serdes_pq_skew,
-+		       sizeof(priv->serdes_pq_skew));
-+	}
-+
-+	if (device_property_present(phy_dev, XGBE_PHY_TX_AMP_PROPERTY)) {
-+		ret = device_property_read_u32_array(phy_dev,
-+						     XGBE_PHY_TX_AMP_PROPERTY,
-+						     priv->serdes_tx_amp,
-+						     XGBE_PHY_SPEEDS);
-+		if (ret) {
-+			dev_err(dev, "invalid %s property\n",
-+				XGBE_PHY_TX_AMP_PROPERTY);
-+			goto err_cmu;
-+		}
-+	} else {
-+		memcpy(priv->serdes_tx_amp, amd_xgbe_phy_serdes_tx_amp,
-+		       sizeof(priv->serdes_tx_amp));
-+	}
-+
-+	priv->link = 1;
-+
-+	phydev->priv = priv;
-+
-+	if (!priv->adev || acpi_disabled)
-+		platform_device_put(phy_pdev);
-+
-+	return 0;
-+
-+err_cmu:
-+	devm_iounmap(dev, priv->cmu_regs);
-+
-+err_rxtx:
-+	devm_iounmap(dev, priv->rxtx_regs);
-+	devm_release_mem_region(dev, priv->rxtx_res->start,
-+				resource_size(priv->rxtx_res));
-+
-+err_put:
-+	if (!priv->adev || acpi_disabled)
-+		platform_device_put(phy_pdev);
-+
-+err_priv:
-+	devm_kfree(dev, priv);
-+
-+	return ret;
-+}
-+
-+static void amd_xgbe_phy_remove(struct phy_device *phydev)
-+{
-+	struct amd_xgbe_phy_priv *priv = phydev->priv;
-+	struct device *dev = priv->dev;
-+
-+	if (priv->an_irq_allocated) {
-+		devm_free_irq(dev, priv->an_irq, priv);
-+
-+		flush_workqueue(priv->an_workqueue);
-+		destroy_workqueue(priv->an_workqueue);
-+	}
-+
-+	devm_iounmap(dev, priv->cmu_regs);
-+
-+	devm_iounmap(dev, priv->rxtx_regs);
-+	devm_release_mem_region(dev, priv->rxtx_res->start,
-+				resource_size(priv->rxtx_res));
-+
-+	devm_kfree(dev, priv);
-+}
-+
-+static int amd_xgbe_match_phy_device(struct phy_device *phydev)
-+{
-+	return phydev->c45_ids.device_ids[MDIO_MMD_PCS] == XGBE_PHY_ID;
-+}
-+
-+static struct phy_driver amd_xgbe_phy_a0_driver[] = {
-+	{
-+		.phy_id			= XGBE_PHY_ID,
-+		.phy_id_mask		= XGBE_PHY_MASK,
-+		.name			= "AMD XGBE PHY A0",
-+		.features		= 0,
-+		.probe			= amd_xgbe_phy_probe,
-+		.remove			= amd_xgbe_phy_remove,
-+		.soft_reset		= amd_xgbe_phy_soft_reset,
-+		.config_init		= amd_xgbe_phy_config_init,
-+		.suspend		= amd_xgbe_phy_suspend,
-+		.resume			= amd_xgbe_phy_resume,
-+		.config_aneg		= amd_xgbe_phy_config_aneg,
-+		.aneg_done		= amd_xgbe_phy_aneg_done,
-+		.read_status		= amd_xgbe_phy_read_status,
-+		.match_phy_device	= amd_xgbe_match_phy_device,
-+		.driver			= {
-+			.owner = THIS_MODULE,
-+		},
-+	},
-+};
-+
-+module_phy_driver(amd_xgbe_phy_a0_driver);
-+
-+static struct mdio_device_id __maybe_unused amd_xgbe_phy_ids_a0[] = {
-+	{ XGBE_PHY_ID, XGBE_PHY_MASK },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(mdio, amd_xgbe_phy_ids_a0);
-diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c
-index aab5547..967ad80 100644
---- a/drivers/pci/host/pci-xgene.c
-+++ b/drivers/pci/host/pci-xgene.c
-@@ -29,6 +29,8 @@
- #include <linux/pci.h>
- #include <linux/platform_device.h>
- #include <linux/slab.h>
-+#include <linux/acpi.h>
-+#include <linux/mmconfig.h>
- 
- #define PCIECORE_CTLANDSTATUS		0x50
- #define PIM1_1L				0x80
-@@ -468,6 +470,252 @@ static int xgene_pcie_setup(struct xgene_pcie_port *port,
- 	return 0;
- }
- 
-+#ifdef CONFIG_ACPI
-+
-+/* PCIe Configuration Out/In */
-+static inline void xgene_pcie_cfg_out32(void __iomem *addr, int offset, u32 val)
-+{
-+	writel(val, addr + offset);
-+}
-+
-+static inline void xgene_pcie_cfg_out16(void __iomem *addr, int offset, u16 val)
-+{
-+	u32 val32 = readl(addr + (offset & ~0x3));
-+
-+	switch (offset & 0x3) {
-+	case 2:
-+		val32 &= ~0xFFFF0000;
-+		val32 |= (u32)val << 16;
-+		break;
-+	case 0:
-+	default:
-+		val32 &= ~0xFFFF;
-+		val32 |= val;
-+		break;
-+	}
-+	writel(val32, addr + (offset & ~0x3));
-+}
-+
-+static inline void xgene_pcie_cfg_out8(void __iomem *addr, int offset, u8 val)
-+{
-+	u32 val32 = readl(addr + (offset & ~0x3));
-+
-+	switch (offset & 0x3) {
-+	case 0:
-+		val32 &= ~0xFF;
-+		val32 |= val;
-+		break;
-+	case 1:
-+		val32 &= ~0xFF00;
-+		val32 |= (u32)val << 8;
-+		break;
-+	case 2:
-+		val32 &= ~0xFF0000;
-+		val32 |= (u32)val << 16;
-+		break;
-+	case 3:
-+	default:
-+		val32 &= ~0xFF000000;
-+		val32 |= (u32)val << 24;
-+		break;
-+	}
-+	writel(val32, addr + (offset & ~0x3));
-+}
-+
-+static inline void xgene_pcie_cfg_in32(void __iomem *addr, int offset, u32 *val)
-+{
-+	*val = readl(addr + offset);
-+}
-+
-+static inline void xgene_pcie_cfg_in16(void __iomem *addr, int offset, u32 *val)
-+{
-+	*val = readl(addr + (offset & ~0x3));
-+
-+	switch (offset & 0x3) {
-+	case 2:
-+		*val >>= 16;
-+		break;
-+	}
-+
-+	*val &= 0xFFFF;
-+}
-+
-+static inline void xgene_pcie_cfg_in8(void __iomem *addr, int offset, u32 *val)
-+{
-+	*val = readl(addr + (offset & ~0x3));
-+
-+	switch (offset & 0x3) {
-+	case 3:
-+		*val = *val >> 24;
-+		break;
-+	case 2:
-+		*val = *val >> 16;
-+		break;
-+	case 1:
-+		*val = *val >> 8;
-+		break;
-+	}
-+	*val &= 0xFF;
-+}
-+
-+struct xgene_mcfg_info {
-+	void __iomem *csr_base;
-+};
-+
-+/*
-+ * When the address bit [17:16] is 2'b01, the Configuration access will be
-+ * treated as Type 1 and it will be forwarded to external PCIe device.
-+ */
-+static void __iomem *__get_cfg_base(struct pci_mmcfg_region *cfg,
-+				    unsigned int bus)
-+{
-+	if (bus > cfg->start_bus)
-+		return cfg->virt + AXI_EP_CFG_ACCESS;
-+
-+	return cfg->virt;
-+}
-+
-+/*
-+ * For Configuration request, RTDID register is used as Bus Number,
-+ * Device Number and Function number of the header fields.
-+ */
-+static void __set_rtdid_reg(struct pci_mmcfg_region *cfg,
-+			    unsigned int bus, unsigned int devfn)
-+{
-+	struct xgene_mcfg_info *info = cfg->data;
-+	unsigned int b, d, f;
-+	u32 rtdid_val = 0;
-+
-+	b = bus;
-+	d = PCI_SLOT(devfn);
-+	f = PCI_FUNC(devfn);
-+
-+	if (bus != cfg->start_bus)
-+		rtdid_val = (b << 8) | (d << 3) | f;
-+
-+	writel(rtdid_val, info->csr_base + RTDID);
-+	/* read the register back to ensure flush */
-+	readl(info->csr_base + RTDID);
-+}
-+
-+static int xgene_raw_pci_read(struct pci_mmcfg_region *cfg, unsigned int bus,
-+			      unsigned int devfn, int offset, int len, u32 *val)
-+{
-+	void __iomem *addr;
-+
-+	if (bus == cfg->start_bus) {
-+		if (devfn != 0) {
-+			*val = 0xffffffff;
-+			return PCIBIOS_DEVICE_NOT_FOUND;
-+		}
-+
-+		/* see xgene_pcie_hide_rc_bars() above */
-+		if (offset == PCI_BASE_ADDRESS_0 ||
-+		    offset == PCI_BASE_ADDRESS_1) {
-+			*val = 0;
-+			return PCIBIOS_SUCCESSFUL;
-+		}
-+	}
-+
-+	__set_rtdid_reg(cfg, bus, devfn);
-+	addr = __get_cfg_base(cfg, bus);
-+	switch (len) {
-+	case 1:
-+		xgene_pcie_cfg_in8(addr, offset, val);
-+		break;
-+	case 2:
-+		xgene_pcie_cfg_in16(addr, offset, val);
-+		/* FIXME.
-+		 * Something wrong with Configuration Request Retry Status
-+		 * on this hw. Pretend it isn't supported until the problem
-+		 * gets sorted out properly.
-+		 */
-+		if (bus == cfg->start_bus && offset == (0x40 + PCI_EXP_RTCAP))
-+			*val &= ~PCI_EXP_RTCAP_CRSVIS;
-+		break;
-+	default:
-+		xgene_pcie_cfg_in32(addr, offset, val);
-+		break;
-+	}
-+	return PCIBIOS_SUCCESSFUL;
-+}
-+
-+static int xgene_raw_pci_write(struct pci_mmcfg_region *cfg, unsigned int bus,
-+			       unsigned int devfn, int offset, int len, u32 val)
-+{
-+	void __iomem *addr;
-+
-+	if (bus == cfg->start_bus && devfn != 0)
-+		return PCIBIOS_DEVICE_NOT_FOUND;
-+
-+	__set_rtdid_reg(cfg, bus, devfn);
-+	addr = __get_cfg_base(cfg, bus);
-+	switch (len) {
-+	case 1:
-+		xgene_pcie_cfg_out8(addr, offset, (u8)val);
-+		break;
-+	case 2:
-+		xgene_pcie_cfg_out16(addr, offset, (u16)val);
-+		break;
-+	default:
-+		xgene_pcie_cfg_out32(addr, offset, val);
-+		break;
-+	}
-+	return PCIBIOS_SUCCESSFUL;
-+}
-+
-+static acpi_status find_csr_base(struct acpi_resource *acpi_res, void *data)
-+{
-+	struct pci_mmcfg_region *cfg = data;
-+	struct xgene_mcfg_info *info = cfg->data;
-+	struct acpi_resource_fixed_memory32 *fixed32;
-+
-+	if (acpi_res->type == ACPI_RESOURCE_TYPE_FIXED_MEMORY32) {
-+		fixed32 = &acpi_res->data.fixed_memory32;
-+		info->csr_base = ioremap(fixed32->address,
-+					 fixed32->address_length);
-+		return AE_CTRL_TERMINATE;
-+	}
-+	return AE_OK;
-+}
-+
-+static int xgene_mcfg_fixup(struct acpi_pci_root *root,
-+			    struct pci_mmcfg_region *cfg)
-+{
-+	struct acpi_device *device = root->device;
-+	struct xgene_mcfg_info *info;
-+
-+	info = kzalloc(sizeof(*info), GFP_KERNEL);
-+	if (info == NULL)
-+		return -ENOMEM;
-+
-+	cfg->data = info;
-+
-+	acpi_walk_resources(device->handle, METHOD_NAME__CRS,
-+			    find_csr_base, cfg);
-+
-+	if (!info->csr_base) {
-+		kfree(info);
-+		cfg->data = NULL;
-+		return -ENODEV;
-+	}
-+
-+	cfg->read = xgene_raw_pci_read;
-+	cfg->write = xgene_raw_pci_write;
-+
-+	/* actual last bus reachable through this mmconfig */
-+	cfg->end_bus = root->secondary.end;
-+
-+	/* firmware should have done this */
-+	xgene_raw_pci_write(cfg, cfg->start_bus, 0, PCI_PRIMARY_BUS, 4,
-+			    cfg->start_bus | ((cfg->start_bus + 1) << 8) |
-+			    (cfg->end_bus << 16));
-+
-+	return 0;
-+}
-+DECLARE_ACPI_MCFG_FIXUP("APM   ", "XGENE   ", xgene_mcfg_fixup);
-+#endif /* CONFIG_ACPI */
-+
- static int xgene_pcie_probe_bridge(struct platform_device *pdev)
- {
- 	struct device_node *dn = pdev->dev.of_node;
-diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
-index c3e7dfc..1bed857 100644
---- a/drivers/pci/msi.c
-+++ b/drivers/pci/msi.c
-@@ -41,8 +41,7 @@ static struct irq_domain *pci_msi_get_domain(struct pci_dev *dev)
- {
- 	struct irq_domain *domain = NULL;
- 
--	if (dev->bus->msi)
--		domain = dev->bus->msi->domain;
-+	domain = dev_get_msi_domain(&dev->dev);
- 	if (!domain)
- 		domain = arch_get_pci_msi_domain(dev);
- 
-diff --git a/drivers/pci/of.c b/drivers/pci/of.c
-index f092993..75bfb85 100644
---- a/drivers/pci/of.c
-+++ b/drivers/pci/of.c
-@@ -9,6 +9,7 @@
-  * 2 of the License, or (at your option) any later version.
-  */
- 
-+#include <linux/irqdomain.h>
- #include <linux/kernel.h>
- #include <linux/pci.h>
- #include <linux/of.h>
-@@ -59,3 +60,22 @@ struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus)
- 		return of_node_get(bus->bridge->parent->of_node);
- 	return NULL;
- }
-+
-+void pci_set_phb_of_msi_domain(struct pci_bus *bus)
-+{
-+#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
-+	struct device_node *np;
-+
-+	if (!bus->dev.of_node)
-+		return;
-+	/* Start looking for a phandle to an MSI controller. */
-+	np = of_parse_phandle(bus->dev.of_node, "msi-parent", 0);
-+	/*
-+	 * If we don't have an msi-parent property, look for a domain
-+	 * directly attached to the host bridge.
-+	 */
-+	if (!np)
-+		np = bus->dev.of_node;
-+	dev_set_msi_domain(&bus->dev, irq_find_host(np));
-+#endif
-+}
-diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
-index 4890639..04b676b 100644
---- a/drivers/pci/pci-acpi.c
-+++ b/drivers/pci/pci-acpi.c
-@@ -9,9 +9,11 @@
- 
- #include <linux/delay.h>
- #include <linux/init.h>
-+#include <linux/irqdomain.h>
- #include <linux/pci.h>
- #include <linux/pci_hotplug.h>
- #include <linux/module.h>
-+#include <linux/of.h>
- #include <linux/pci-aspm.h>
- #include <linux/pci-acpi.h>
- #include <linux/pm_runtime.h>
-@@ -628,3 +630,37 @@ static int __init acpi_pci_init(void)
- 	return 0;
- }
- arch_initcall(acpi_pci_init);
-+
-+#ifdef CONFIG_PCI_MSI
-+void pci_acpi_set_phb_msi_domain(struct pci_bus *bus) {
-+#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
-+	struct device_node np;
-+
-+	if (acpi_disabled)
-+		return;
-+
-+	np.data = kzalloc(sizeof(unsigned int), GFP_KERNEL);
-+	if (!np.data)
-+		return;
-+
-+	/**
-+	 * Since ACPI 5.1 currently does not define
-+	 * a way to associate MSI frame ID to a device,
-+	 * we can only support single MSI frame.
-+	 * Therefore, the ID 0 is used as a default.
-+	 *
-+	 * Alternatively, we should query the ID from
-+	 * device's DSDT
-+	 *
-+	 * FIXME when ACPI spec is fixed!!!
-+	 */
-+	*((u32 *)(np.data)) = 0;
-+
-+	/**
-+	 * FIXME: This is currently a hack until we have a
-+	 * better way to find MSI domain using msi_frame_id
-+	 */
-+        dev_set_msi_domain(&bus->dev, irq_find_host(&np));
-+#endif
-+}
-+#endif /* CONFIG_PCI_MSI */
-diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
-index 8d2f400..324cdce 100644
---- a/drivers/pci/probe.c
-+++ b/drivers/pci/probe.c
-@@ -10,6 +10,7 @@
- #include <linux/slab.h>
- #include <linux/module.h>
- #include <linux/cpumask.h>
-+#include <linux/pci-acpi.h>
- #include <linux/pci-aspm.h>
- #include <asm-generic/pci-bridge.h>
- #include "pci.h"
-@@ -660,6 +661,22 @@ static void pci_set_bus_speed(struct pci_bus *bus)
- 	}
- }
- 
-+void __weak pcibios_set_phb_msi_domain(struct pci_bus *bus)
-+{
-+	pci_set_phb_of_msi_domain(bus);
-+	pci_acpi_set_phb_msi_domain(bus);
-+}
-+
-+static void pci_set_bus_msi_domain(struct pci_bus *bus)
-+{
-+	struct pci_dev *bridge = bus->self;
-+
-+	if (!bridge)
-+		pcibios_set_phb_msi_domain(bus);
-+	else
-+		dev_set_msi_domain(&bus->dev, dev_get_msi_domain(&bridge->dev));
-+}
-+
- static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent,
- 					   struct pci_dev *bridge, int busnr)
- {
-@@ -713,6 +730,7 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent,
- 	bridge->subordinate = child;
- 
- add_dev:
-+	pci_set_bus_msi_domain(child);
- 	ret = device_register(&child->dev);
- 	WARN_ON(ret < 0);
- 
-@@ -1507,6 +1525,17 @@ static void pci_init_capabilities(struct pci_dev *dev)
- 	pci_enable_acs(dev);
- }
- 
-+static void pci_set_msi_domain(struct pci_dev *dev)
-+{
-+	/*
-+	 * If no domain has been set through the pcibios callback,
-+	 * inherit the default from the bus device.
-+	 */
-+	if (!dev_get_msi_domain(&dev->dev))
-+		dev_set_msi_domain(&dev->dev,
-+				   dev_get_msi_domain(&dev->bus->dev));
-+}
-+
- void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
- {
- 	int ret;
-@@ -1547,6 +1576,9 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
- 	ret = pcibios_add_device(dev);
- 	WARN_ON(ret < 0);
- 
-+	/* Setup MSI irq domain */
-+	pci_set_msi_domain(dev);
-+
- 	/* Notifier could use PCI capabilities */
- 	dev->match_driver = false;
- 	ret = device_add(&dev->dev);
-@@ -1937,6 +1969,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
- 	b->bridge = get_device(&bridge->dev);
- 	device_enable_async_suspend(b->bridge);
- 	pci_set_bus_of_node(b);
-+	pci_set_bus_msi_domain(b);
- 
- 	if (!parent)
- 		set_dev_node(b->bridge, pcibus_to_node(b));
-diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
-index b24aa01..50fe279 100644
---- a/drivers/tty/Kconfig
-+++ b/drivers/tty/Kconfig
-@@ -419,4 +419,10 @@ config DA_CONSOLE
- 	help
- 	  This enables a console on a Dash channel.
- 
-+config SBSAUART_TTY
-+	tristate "SBSA UART TTY Driver"
-+	help
-+	  Console and system TTY driver for the SBSA UART which is defined
-+	  in the Server Base System Architecure document for ARM64 servers.
-+
- endif # TTY
-diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
-index 58ad1c0..c3211c0 100644
---- a/drivers/tty/Makefile
-+++ b/drivers/tty/Makefile
-@@ -29,5 +29,6 @@ obj-$(CONFIG_SYNCLINK)		+= synclink.o
- obj-$(CONFIG_PPC_EPAPR_HV_BYTECHAN) += ehv_bytechan.o
- obj-$(CONFIG_GOLDFISH_TTY)	+= goldfish.o
- obj-$(CONFIG_DA_TTY)		+= metag_da.o
-+obj-$(CONFIG_SBSAUART_TTY)	+= sbsauart.o
- 
- obj-y += ipwireless/
-diff --git a/drivers/tty/sbsauart.c b/drivers/tty/sbsauart.c
-new file mode 100644
-index 0000000..0f44624
---- /dev/null
-+++ b/drivers/tty/sbsauart.c
-@@ -0,0 +1,358 @@
-+/*
-+ * SBSA (Server Base System Architecture) Compatible UART driver
-+ *
-+ * Copyright (C) 2014 Linaro Ltd
-+ *
-+ * Author: Graeme Gregory <graeme.gregory@linaro.org>
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ */
-+
-+#include <linux/acpi.h>
-+#include <linux/amba/serial.h>
-+#include <linux/console.h>
-+#include <linux/delay.h>
-+#include <linux/interrupt.h>
-+#include <linux/io.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/slab.h>
-+#include <linux/serial_core.h>
-+#include <linux/tty.h>
-+#include <linux/tty_flip.h>
-+
-+struct sbsa_tty {
-+	struct tty_port port;
-+	spinlock_t lock;
-+	void __iomem *base;
-+	u32 irq;
-+	int opencount;
-+	struct console console;
-+};
-+
-+static struct tty_driver *sbsa_tty_driver;
-+static struct sbsa_tty *sbsa_tty;
-+
-+#define SBSAUART_CHAR_MASK	0xFF
-+
-+static void sbsa_raw_putc(struct uart_port *port, int c)
-+{
-+	while (readw(port->membase + UART01x_FR) & UART01x_FR_TXFF)
-+		;
-+	writew(c & 0xFF, port->membase + UART01x_DR);
-+}
-+
-+static void sbsa_uart_early_write(struct console *con, const char *buf,
-+				  unsigned count)
-+{
-+	struct earlycon_device *dev = con->data;
-+
-+	uart_console_write(&dev->port, buf, count, sbsa_raw_putc);
-+}
-+
-+static int __init sbsa_uart_early_console_setup(struct earlycon_device *device,
-+						const char *opt)
-+{
-+	if (!device->port.membase)
-+		return -ENODEV;
-+
-+	device->con->write = sbsa_uart_early_write;
-+	return 0;
-+}
-+EARLYCON_DECLARE(sbsauart, sbsa_uart_early_console_setup);
-+
-+static void sbsa_tty_do_write(const char *buf, unsigned count)
-+{
-+	unsigned long irq_flags;
-+	struct sbsa_tty *qtty = sbsa_tty;
-+	void __iomem *base = qtty->base;
-+	unsigned n;
-+
-+	spin_lock_irqsave(&qtty->lock, irq_flags);
-+	for (n = 0; n < count; n++) {
-+		while (readw(base + UART01x_FR) & UART01x_FR_TXFF)
-+			;
-+		writew(buf[n], base + UART01x_DR);
-+	}
-+	spin_unlock_irqrestore(&qtty->lock, irq_flags);
-+}
-+
-+static void sbsauart_fifo_to_tty(struct sbsa_tty *qtty)
-+{
-+	void __iomem *base = qtty->base;
-+	unsigned int flag, max_count = 32;
-+	u16 status, ch;
-+
-+	while (max_count--) {
-+		status = readw(base + UART01x_FR);
-+		if (status & UART01x_FR_RXFE)
-+			break;
-+
-+		/* Take chars from the FIFO and update status */
-+		ch = readw(base + UART01x_DR);
-+		flag = TTY_NORMAL;
-+
-+		if (ch & UART011_DR_BE)
-+			flag = TTY_BREAK;
-+		else if (ch & UART011_DR_PE)
-+			flag = TTY_PARITY;
-+		else if (ch & UART011_DR_FE)
-+			flag = TTY_FRAME;
-+		else if (ch & UART011_DR_OE)
-+			flag = TTY_OVERRUN;
-+
-+		ch &= SBSAUART_CHAR_MASK;
-+
-+		tty_insert_flip_char(&qtty->port, ch, flag);
-+	}
-+
-+	tty_schedule_flip(&qtty->port);
-+
-+	/* Clear the RX IRQ */
-+	writew(UART011_RXIC | UART011_RXIC, base + UART011_ICR);
-+}
-+
-+static irqreturn_t sbsa_tty_interrupt(int irq, void *dev_id)
-+{
-+	struct sbsa_tty *qtty = sbsa_tty;
-+	unsigned long irq_flags;
-+
-+	spin_lock_irqsave(&qtty->lock, irq_flags);
-+	sbsauart_fifo_to_tty(qtty);
-+	spin_unlock_irqrestore(&qtty->lock, irq_flags);
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static int sbsa_tty_open(struct tty_struct *tty, struct file *filp)
-+{
-+	struct sbsa_tty *qtty = sbsa_tty;
-+
-+	return tty_port_open(&qtty->port, tty, filp);
-+}
-+
-+static void sbsa_tty_close(struct tty_struct *tty, struct file *filp)
-+{
-+	tty_port_close(tty->port, tty, filp);
-+}
-+
-+static void sbsa_tty_hangup(struct tty_struct *tty)
-+{
-+	tty_port_hangup(tty->port);
-+}
-+
-+static int sbsa_tty_write(struct tty_struct *tty, const unsigned char *buf,
-+								int count)
-+{
-+	sbsa_tty_do_write(buf, count);
-+	return count;
-+}
-+
-+static int sbsa_tty_write_room(struct tty_struct *tty)
-+{
-+	return 32;
-+}
-+
-+static void sbsa_tty_console_write(struct console *co, const char *b,
-+								unsigned count)
-+{
-+	sbsa_tty_do_write(b, count);
-+
-+	if (b[count - 1] == '\n')
-+		sbsa_tty_do_write("\r", 1);
-+}
-+
-+static struct tty_driver *sbsa_tty_console_device(struct console *c,
-+								int *index)
-+{
-+	*index = c->index;
-+	return sbsa_tty_driver;
-+}
-+
-+static int sbsa_tty_console_setup(struct console *co, char *options)
-+{
-+	if ((unsigned)co->index > 0)
-+		return -ENODEV;
-+	if (sbsa_tty->base == NULL)
-+		return -ENODEV;
-+	return 0;
-+}
-+
-+static struct tty_port_operations sbsa_port_ops = {
-+};
-+
-+static const struct tty_operations sbsa_tty_ops = {
-+	.open = sbsa_tty_open,
-+	.close = sbsa_tty_close,
-+	.hangup = sbsa_tty_hangup,
-+	.write = sbsa_tty_write,
-+	.write_room = sbsa_tty_write_room,
-+};
-+
-+static int sbsa_tty_create_driver(void)
-+{
-+	int ret;
-+	struct tty_driver *tty;
-+
-+	sbsa_tty = kzalloc(sizeof(*sbsa_tty), GFP_KERNEL);
-+	if (sbsa_tty == NULL) {
-+		ret = -ENOMEM;
-+		goto err_alloc_sbsa_tty_failed;
-+	}
-+	tty = alloc_tty_driver(1);
-+	if (tty == NULL) {
-+		ret = -ENOMEM;
-+		goto err_alloc_tty_driver_failed;
-+	}
-+	tty->driver_name = "sbsauart";
-+	tty->name = "ttySBSA";
-+	tty->type = TTY_DRIVER_TYPE_SERIAL;
-+	tty->subtype = SERIAL_TYPE_NORMAL;
-+	tty->init_termios = tty_std_termios;
-+	tty->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW |
-+						TTY_DRIVER_DYNAMIC_DEV;
-+	tty_set_operations(tty, &sbsa_tty_ops);
-+	ret = tty_register_driver(tty);
-+	if (ret)
-+		goto err_tty_register_driver_failed;
-+
-+	sbsa_tty_driver = tty;
-+	return 0;
-+
-+err_tty_register_driver_failed:
-+	put_tty_driver(tty);
-+err_alloc_tty_driver_failed:
-+	kfree(sbsa_tty);
-+	sbsa_tty = NULL;
-+err_alloc_sbsa_tty_failed:
-+	return ret;
-+}
-+
-+static void sbsa_tty_delete_driver(void)
-+{
-+	tty_unregister_driver(sbsa_tty_driver);
-+	put_tty_driver(sbsa_tty_driver);
-+	sbsa_tty_driver = NULL;
-+	kfree(sbsa_tty);
-+	sbsa_tty = NULL;
-+}
-+
-+static int sbsa_tty_probe(struct platform_device *pdev)
-+{
-+	struct sbsa_tty *qtty;
-+	int ret = -EINVAL;
-+	int i;
-+	struct resource *r;
-+	struct device *ttydev;
-+	void __iomem *base;
-+	u32 irq;
-+
-+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (r == NULL)
-+		return -EINVAL;
-+
-+	base = ioremap(r->start, r->end - r->start);
-+	if (base == NULL)
-+		pr_err("sbsa_tty: unable to remap base\n");
-+
-+	r = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-+	if (r == NULL)
-+		goto err_unmap;
-+
-+	irq = r->start;
-+
-+	if (pdev->id > 0)
-+		goto err_unmap;
-+
-+	ret = sbsa_tty_create_driver();
-+	if (ret)
-+		goto err_unmap;
-+
-+	qtty = sbsa_tty;
-+	spin_lock_init(&qtty->lock);
-+	tty_port_init(&qtty->port);
-+	qtty->port.ops = &sbsa_port_ops;
-+	qtty->base = base;
-+	qtty->irq = irq;
-+
-+	/* Clear and Mask all IRQs */
-+	writew(0, base + UART011_IMSC);
-+	writew(0xFFFF, base + UART011_ICR);
-+
-+	ret = request_irq(irq, sbsa_tty_interrupt, IRQF_SHARED,
-+						"sbsa_tty", pdev);
-+	if (ret)
-+		goto err_request_irq_failed;
-+
-+	/* Unmask the RX IRQ */
-+	writew(UART011_RXIM | UART011_RTIM, base + UART011_IMSC);
-+
-+	ttydev = tty_port_register_device(&qtty->port, sbsa_tty_driver,
-+							0, &pdev->dev);
-+	if (IS_ERR(ttydev)) {
-+		ret = PTR_ERR(ttydev);
-+		goto err_tty_register_device_failed;
-+	}
-+
-+	strcpy(qtty->console.name, "ttySBSA");
-+	qtty->console.write = sbsa_tty_console_write;
-+	qtty->console.device = sbsa_tty_console_device;
-+	qtty->console.setup = sbsa_tty_console_setup;
-+	qtty->console.flags = CON_PRINTBUFFER;
-+	/* if no console= on cmdline, make this the console device */
-+	if (!console_set_on_cmdline)
-+		qtty->console.flags |= CON_CONSDEV;
-+	qtty->console.index = pdev->id;
-+	register_console(&qtty->console);
-+
-+	return 0;
-+
-+	tty_unregister_device(sbsa_tty_driver, i);
-+err_tty_register_device_failed:
-+	free_irq(irq, pdev);
-+err_request_irq_failed:
-+	sbsa_tty_delete_driver();
-+err_unmap:
-+	iounmap(base);
-+	return ret;
-+}
-+
-+static int sbsa_tty_remove(struct platform_device *pdev)
-+{
-+	struct sbsa_tty *qtty;
-+
-+	qtty = sbsa_tty;
-+	unregister_console(&qtty->console);
-+	tty_unregister_device(sbsa_tty_driver, pdev->id);
-+	iounmap(qtty->base);
-+	qtty->base = 0;
-+	free_irq(qtty->irq, pdev);
-+	sbsa_tty_delete_driver();
-+	return 0;
-+}
-+
-+static const struct acpi_device_id sbsa_acpi_match[] = {
-+	{ "ARMH0011", 0 },
-+	{ }
-+};
-+
-+static struct platform_driver sbsa_tty_platform_driver = {
-+	.probe = sbsa_tty_probe,
-+	.remove = sbsa_tty_remove,
-+	.driver = {
-+		.name = "sbsa_tty",
-+		.acpi_match_table = ACPI_PTR(sbsa_acpi_match),
-+	}
-+};
-+
-+module_platform_driver(sbsa_tty_platform_driver);
-+
-+MODULE_LICENSE("GPL v2");
-diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
-index e601162..3991aa0 100644
---- a/drivers/tty/serial/8250/8250_dw.c
-+++ b/drivers/tty/serial/8250/8250_dw.c
-@@ -361,9 +361,7 @@ static int dw8250_probe_acpi(struct uart_8250_port *up,
- 		return -ENODEV;
- 
- 	if (!p->uartclk)
--		if (device_property_read_u32(p->dev, "clock-frequency",
--					     &p->uartclk))
--			return -EINVAL;
-+		p->uartclk = (unsigned int)id->driver_data;
- 
- 	p->iotype = UPIO_MEM32;
- 	p->serial_in = dw8250_serial_in32;
-@@ -587,7 +585,7 @@ static const struct acpi_device_id dw8250_acpi_match[] = {
- 	{ "INT3435", 0 },
- 	{ "80860F0A", 0 },
- 	{ "8086228A", 0 },
--	{ "APMC0D08", 0},
-+	{ "APMC0D08", 50000000},
- 	{ },
- };
- MODULE_DEVICE_TABLE(acpi, dw8250_acpi_match);
-diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index 8d94c19..04930e2 100644
---- a/drivers/tty/serial/amba-pl011.c
-+++ b/drivers/tty/serial/amba-pl011.c
-@@ -2238,7 +2238,15 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
- 		}
- 	}
- 
-+	/*
-+	 * temp hack to avoid need for console= on cmdline
-+	 * this can go away when we switch completely to acpi
-+	 */
-+	if (amba_reg.cons && !console_set_on_cmdline && uap->port.line == 0)
-+		amba_reg.cons->flags |= CON_CONSDEV;
- 	ret = uart_add_one_port(&amba_reg, &uap->port);
-+	if (amba_reg.cons && !console_set_on_cmdline && uap->port.line == 0)
-+		amba_reg.cons->flags &= ~CON_CONSDEV;
- 	if (ret) {
- 		amba_ports[i] = NULL;
- 		uart_unregister_driver(&amba_reg);
-diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
-index 0e11d61408ff..88ffbeee4d1c 100644
---- a/drivers/usb/host/xhci-plat.c
-+++ b/drivers/usb/host/xhci-plat.c
-@@ -83,14 +83,13 @@ static int xhci_plat_probe(struct platform_device *pdev)
- 	if (irq < 0)
- 		return -ENODEV;
- 
--	/* Initialize dma_mask and coherent_dma_mask to 32-bits */
--	ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
--	if (ret)
--		return ret;
--	if (!pdev->dev.dma_mask)
--		pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
--	else
--		dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
-+	/* Try setting the coherent_dma_mask to 64 bits, then try 32 bits */
-+	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
-+	if (ret) {
-+		ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
-+		if (ret) 
-+			return ret;
-+	}
- 
- 	hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
- 	if (!hcd)
-diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
-index 00d115b..cd9b974 100644
---- a/drivers/virtio/virtio_mmio.c
-+++ b/drivers/virtio/virtio_mmio.c
-@@ -100,8 +100,7 @@
- #include <linux/virtio_config.h>
- #include <linux/virtio_mmio.h>
- #include <linux/virtio_ring.h>
--
--
-+#include <linux/acpi.h>
- 
- /* The alignment to use between consumer and producer parts of vring.
-  * Currently hardcoded to the page size. */
-@@ -635,12 +634,21 @@ static struct of_device_id virtio_mmio_match[] = {
- };
- MODULE_DEVICE_TABLE(of, virtio_mmio_match);
- 
-+#ifdef CONFIG_ACPI
-+static const struct acpi_device_id virtio_mmio_acpi_match[] = {
-+	{ "LNRO0005", },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(acpi, virtio_mmio_acpi_match);
-+#endif
-+
- static struct platform_driver virtio_mmio_driver = {
- 	.probe		= virtio_mmio_probe,
- 	.remove		= virtio_mmio_remove,
- 	.driver		= {
- 		.name	= "virtio-mmio",
- 		.of_match_table	= virtio_mmio_match,
-+		.acpi_match_table = ACPI_PTR(virtio_mmio_acpi_match),
- 	},
- };
- 
-diff --git a/include/acpi/acnames.h b/include/acpi/acnames.h
-index 273de70..b52c0dc 100644
---- a/include/acpi/acnames.h
-+++ b/include/acpi/acnames.h
-@@ -51,6 +51,7 @@
- #define METHOD_NAME__BBN        "_BBN"
- #define METHOD_NAME__CBA        "_CBA"
- #define METHOD_NAME__CID        "_CID"
-+#define METHOD_NAME__CLS        "_CLS"
- #define METHOD_NAME__CRS        "_CRS"
- #define METHOD_NAME__DDN        "_DDN"
- #define METHOD_NAME__HID        "_HID"
-diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
-index 61e32ec..1fec6f5 100644
---- a/include/acpi/acpi_bus.h
-+++ b/include/acpi/acpi_bus.h
-@@ -69,6 +69,8 @@ bool acpi_check_dsm(acpi_handle handle, const u8 *uuid, int rev, u64 funcs);
- union acpi_object *acpi_evaluate_dsm(acpi_handle handle, const u8 *uuid,
- 			int rev, int func, union acpi_object *argv4);
- 
-+acpi_status acpi_check_coherency(acpi_handle handle, int *val);
-+
- static inline union acpi_object *
- acpi_evaluate_dsm_typed(acpi_handle handle, const u8 *uuid, int rev, int func,
- 			union acpi_object *argv4, acpi_object_type type)
-diff --git a/include/acpi/acpi_io.h b/include/acpi/acpi_io.h
-index 444671e..48f504a 100644
---- a/include/acpi/acpi_io.h
-+++ b/include/acpi/acpi_io.h
-@@ -2,12 +2,15 @@
- #define _ACPI_IO_H_
- 
- #include <linux/io.h>
-+#include <asm/acpi.h>
- 
-+#ifndef acpi_os_ioremap
- static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys,
- 					    acpi_size size)
- {
-        return ioremap_cache(phys, size);
- }
-+#endif
- 
- void __iomem *__init_refok
- acpi_os_map_iomem(acpi_physical_address phys, acpi_size size);
-diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
-index ac78910..472d6b8 100644
---- a/include/asm-generic/vmlinux.lds.h
-+++ b/include/asm-generic/vmlinux.lds.h
-@@ -276,6 +276,13 @@
- 		VMLINUX_SYMBOL(__end_pci_fixups_suspend_late) = .;	\
- 	}								\
- 									\
-+	/* ACPI quirks */						\
-+	.acpi_fixup        : AT(ADDR(.acpi_fixup) - LOAD_OFFSET) {	\
-+		VMLINUX_SYMBOL(__start_acpi_mcfg_fixups) = .;		\
-+		*(.acpi_fixup_mcfg)					\
-+		VMLINUX_SYMBOL(__end_acpi_mcfg_fixups) = .;		\
-+	}								\
-+									\
- 	/* Built-in firmware blobs */					\
- 	.builtin_fw        : AT(ADDR(.builtin_fw) - LOAD_OFFSET) {	\
- 		VMLINUX_SYMBOL(__start_builtin_fw) = .;			\
-diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
-index 7c55dd5..d7fcc50 100644
---- a/include/kvm/arm_vgic.h
-+++ b/include/kvm/arm_vgic.h
-@@ -318,17 +318,19 @@ bool vgic_handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *run,
- #define vgic_initialized(k)	(!!((k)->arch.vgic.nr_cpus))
- #define vgic_ready(k)		((k)->arch.vgic.ready)
- 
--int vgic_v2_probe(struct device_node *vgic_node,
--		  const struct vgic_ops **ops,
--		  const struct vgic_params **params);
-+int vgic_v2_dt_probe(struct device_node *vgic_node,
-+		     const struct vgic_ops **ops,
-+		     const struct vgic_params **params);
-+int vgic_v2_acpi_probe(const struct vgic_ops **ops,
-+		       const struct vgic_params **params);
- #ifdef CONFIG_ARM_GIC_V3
--int vgic_v3_probe(struct device_node *vgic_node,
--		  const struct vgic_ops **ops,
--		  const struct vgic_params **params);
-+int vgic_v3_dt_probe(struct device_node *vgic_node,
-+		     const struct vgic_ops **ops,
-+		     const struct vgic_params **params);
- #else
--static inline int vgic_v3_probe(struct device_node *vgic_node,
--				const struct vgic_ops **ops,
--				const struct vgic_params **params)
-+static inline int vgic_v3_dt_probe(struct device_node *vgic_node,
-+				   const struct vgic_ops **ops,
-+				   const struct vgic_params **params)
- {
- 	return -ENODEV;
- }
-diff --git a/include/linux/acpi.h b/include/linux/acpi.h
-index 24c7aa8..23c807d 100644
---- a/include/linux/acpi.h
-+++ b/include/linux/acpi.h
-@@ -73,6 +73,7 @@ enum acpi_irq_model_id {
- 	ACPI_IRQ_MODEL_IOAPIC,
- 	ACPI_IRQ_MODEL_IOSAPIC,
- 	ACPI_IRQ_MODEL_PLATFORM,
-+	ACPI_IRQ_MODEL_GIC,
- 	ACPI_IRQ_MODEL_COUNT
- };
- 
-@@ -166,6 +167,16 @@ extern u32 acpi_irq_not_handled;
- extern int sbf_port;
- extern unsigned long acpi_realmode_flags;
- 
-+static inline void acpi_irq_init(void)
-+{
-+	/*
-+	 * Hardcode ACPI IRQ chip initialization to GICv2 for now.
-+	 * Proper irqchip infrastructure will be implemented along with
-+	 * incoming  GICv2m|GICv3|ITS bits.
-+	 */
-+	acpi_gic_init();
-+}
-+
- int acpi_register_gsi (struct device *dev, u32 gsi, int triggering, int polarity);
- int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
- int acpi_isa_irq_to_gsi (unsigned isa_irq, u32 *gsi);
-@@ -439,6 +450,10 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
- 
- extern bool acpi_driver_match_device(struct device *dev,
- 				     const struct device_driver *drv);
-+
-+bool acpi_match_device_cls(const struct acpi_device_cls *dev_cls,
-+			   const struct device *dev);
-+
- int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *);
- int acpi_device_modalias(struct device *, char *, int);
- void acpi_walk_dep_device_list(acpi_handle handle);
-@@ -515,6 +530,11 @@ static inline int acpi_table_parse(char *id,
- 	return -ENODEV;
- }
- 
-+static inline void acpi_irq_init(void)
-+{
-+	return;
-+}
-+
- static inline int acpi_nvs_register(__u64 start, __u64 size)
- {
- 	return 0;
-@@ -534,6 +554,12 @@ static inline const struct acpi_device_id *acpi_match_device(
- 	return NULL;
- }
- 
-+static inline bool acpi_match_device_cls(const struct acpi_device_cls *dev_cls,
-+					 const struct device *dev)
-+{
-+	return false;
-+}
-+
- static inline bool acpi_driver_match_device(struct device *dev,
- 					    const struct device_driver *drv)
- {
-diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
-index 9c78d15..2b2e1f8 100644
---- a/include/linux/clocksource.h
-+++ b/include/linux/clocksource.h
-@@ -244,4 +244,10 @@ extern void clocksource_of_init(void);
- static inline void clocksource_of_init(void) {}
- #endif
- 
-+#ifdef CONFIG_ACPI
-+void acpi_generic_timer_init(void);
-+#else
-+static inline void acpi_generic_timer_init(void) { }
-+#endif
-+
- #endif /* _LINUX_CLOCKSOURCE_H */
-diff --git a/include/linux/device.h b/include/linux/device.h
-index 0eb8ee2..4972a5c 100644
---- a/include/linux/device.h
-+++ b/include/linux/device.h
-@@ -237,6 +237,7 @@ struct device_driver {
- 
- 	const struct of_device_id	*of_match_table;
- 	const struct acpi_device_id	*acpi_match_table;
-+	const struct acpi_device_cls	*acpi_match_cls;
- 
- 	int (*probe) (struct device *dev);
- 	int (*remove) (struct device *dev);
-@@ -690,6 +691,7 @@ struct acpi_dev_node {
-  * 		along with subsystem-level and driver-level callbacks.
-  * @pins:	For device pin management.
-  *		See Documentation/pinctrl.txt for details.
-+ * @msi_domain: The generic MSI domain this device is using.
-  * @numa_node:	NUMA node this device is close to.
-  * @dma_mask:	Dma mask (if dma'ble device).
-  * @coherent_dma_mask: Like dma_mask, but for alloc_coherent mapping as not all
-@@ -750,6 +752,9 @@ struct device {
- 	struct dev_pm_info	power;
- 	struct dev_pm_domain	*pm_domain;
- 
-+#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
-+	struct irq_domain	*msi_domain; /* MSI domain device uses */
-+#endif
- #ifdef CONFIG_PINCTRL
- 	struct dev_pin_info	*pins;
- #endif
-@@ -837,6 +842,22 @@ static inline void set_dev_node(struct device *dev, int node)
- }
- #endif
- 
-+static inline struct irq_domain *dev_get_msi_domain(const struct device *dev)
-+{
-+#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
-+	return dev->msi_domain;
-+#else
-+	return NULL;
-+#endif
-+}
-+
-+static inline void dev_set_msi_domain(struct device *dev, struct irq_domain *d)
-+{
-+#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
-+	dev->msi_domain = d;
-+#endif
-+}
-+
- static inline void *dev_get_drvdata(const struct device *dev)
- {
- 	return dev->driver_data;
-diff --git a/include/linux/dmi.h b/include/linux/dmi.h
-index f820f0a..8e1a28d 100644
---- a/include/linux/dmi.h
-+++ b/include/linux/dmi.h
-@@ -109,6 +109,7 @@ extern int dmi_walk(void (*decode)(const struct dmi_header *, void *),
- 	void *private_data);
- extern bool dmi_match(enum dmi_field f, const char *str);
- extern void dmi_memdev_name(u16 handle, const char **bank, const char **device);
-+const u8 *dmi_get_smbios_entry_area(int *size);
- 
- #else
- 
-@@ -140,6 +141,8 @@ static inline void dmi_memdev_name(u16 handle, const char **bank,
- 		const char **device) { }
- static inline const struct dmi_system_id *
- 	dmi_first_match(const struct dmi_system_id *list) { return NULL; }
-+static inline const u8 *dmi_get_smbios_entry_area(int *size)
-+	{ return NULL; }
- 
- #endif
- 
-diff --git a/include/linux/irqchip/arm-gic-acpi.h b/include/linux/irqchip/arm-gic-acpi.h
-new file mode 100644
-index 0000000..cc7753d
---- /dev/null
-+++ b/include/linux/irqchip/arm-gic-acpi.h
-@@ -0,0 +1,31 @@
-+/*
-+ * Copyright (C) 2014, Linaro Ltd.
-+ *	Author: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#ifndef ARM_GIC_ACPI_H_
-+#define ARM_GIC_ACPI_H_
-+
-+#ifdef CONFIG_ACPI
-+
-+/*
-+ * Hard code here, we can not get memory size from MADT (but FDT does),
-+ * Actually no need to do that, because this size can be inferred
-+ * from GIC spec.
-+ */
-+#define ACPI_GICV2_DIST_MEM_SIZE	(SZ_4K)
-+#define ACPI_GIC_CPU_IF_MEM_SIZE	(SZ_8K)
-+
-+struct acpi_table_header;
-+
-+void acpi_gic_init(void);
-+int gic_v2_acpi_init(struct acpi_table_header *table, struct irq_domain **domain);
-+#else
-+static inline void acpi_gic_init(void) { }
-+#endif
-+
-+#endif /* ARM_GIC_ACPI_H_ */
-diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
-index 71d706d..0b45062 100644
---- a/include/linux/irqchip/arm-gic.h
-+++ b/include/linux/irqchip/arm-gic.h
-@@ -55,6 +55,8 @@
- 					(GICD_INT_DEF_PRI << 8) |\
- 					GICD_INT_DEF_PRI)
- 
-+#define GIC_DIST_SOFTINT_NSATT		0x8000
-+
- #define GICH_HCR			0x0
- #define GICH_VTR			0x4
- #define GICH_VMCR			0x8
-@@ -110,6 +112,11 @@ static inline void gic_init(unsigned int nr, int start,
- 
- int gicv2m_of_init(struct device_node *node, struct irq_domain *parent);
- 
-+struct acpi_table_header;
-+
-+int gicv2m_acpi_init(struct acpi_table_header *table,
-+		     struct irq_domain *parent);
-+
- void gic_send_sgi(unsigned int cpu_id, unsigned int irq);
- int gic_get_cpu_id(unsigned int cpu);
- void gic_migrate_target(unsigned int new_cpu_id);
-diff --git a/include/linux/mmconfig.h b/include/linux/mmconfig.h
-new file mode 100644
-index 0000000..4360e9a
---- /dev/null
-+++ b/include/linux/mmconfig.h
-@@ -0,0 +1,86 @@
-+#ifndef __MMCONFIG_H
-+#define __MMCONFIG_H
-+#ifdef __KERNEL__
-+
-+#include <linux/types.h>
-+#include <linux/acpi.h>
-+
-+#ifdef CONFIG_PCI_MMCONFIG
-+/* "PCI MMCONFIG %04x [bus %02x-%02x]" */
-+#define PCI_MMCFG_RESOURCE_NAME_LEN (22 + 4 + 2 + 2)
-+
-+struct acpi_pci_root;
-+struct pci_mmcfg_region;
-+
-+typedef int (*acpi_mcfg_fixup_t)(struct acpi_pci_root *root,
-+				 struct pci_mmcfg_region *cfg);
-+
-+struct pci_mmcfg_region {
-+	struct list_head list;
-+	struct resource res;
-+	int (*read)(struct pci_mmcfg_region *cfg, unsigned int bus,
-+		    unsigned int devfn, int reg, int len, u32 *value);
-+	int (*write)(struct pci_mmcfg_region *cfg, unsigned int bus,
-+		     unsigned int devfn, int reg, int len, u32 value);
-+	acpi_mcfg_fixup_t fixup;
-+	void *data;
-+	u64 address;
-+	char __iomem *virt;
-+	u16 segment;
-+	u8 start_bus;
-+	u8 end_bus;
-+	char name[PCI_MMCFG_RESOURCE_NAME_LEN];
-+};
-+
-+struct acpi_mcfg_fixup {
-+	char oem_id[7];
-+	char oem_table_id[9];
-+	acpi_mcfg_fixup_t hook;
-+};
-+
-+/* Designate a routine to fix up buggy MCFG */
-+#define DECLARE_ACPI_MCFG_FIXUP(oem_id, table_id, hook)	\
-+	static const struct acpi_mcfg_fixup __acpi_fixup_##hook __used	\
-+	__attribute__((__section__(".acpi_fixup_mcfg"), aligned((sizeof(void *))))) \
-+	= { {oem_id}, {table_id}, hook };
-+
-+void pci_mmcfg_early_init(void);
-+void pci_mmcfg_late_init(void);
-+struct pci_mmcfg_region *pci_mmconfig_lookup(int segment, int bus);
-+
-+int pci_parse_mcfg(struct acpi_table_header *header);
-+struct pci_mmcfg_region *pci_mmconfig_alloc(int segment, int start,
-+						   int end, u64 addr);
-+int pci_mmconfig_inject(struct pci_mmcfg_region *cfg);
-+struct pci_mmcfg_region *pci_mmconfig_add(int segment, int start,
-+						 int end, u64 addr);
-+void list_add_sorted(struct pci_mmcfg_region *new);
-+int acpi_mcfg_check_entry(struct acpi_table_mcfg *mcfg,
-+			  struct acpi_mcfg_allocation *cfg);
-+void free_all_mmcfg(void);
-+int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end,
-+		       phys_addr_t addr);
-+int pci_mmconfig_delete(u16 seg, u8 start, u8 end);
-+
-+/* Arch specific calls */
-+int pci_mmcfg_arch_init(void);
-+void pci_mmcfg_arch_free(void);
-+int pci_mmcfg_arch_map(struct pci_mmcfg_region *cfg);
-+void pci_mmcfg_arch_unmap(struct pci_mmcfg_region *cfg);
-+int pci_mmcfg_read(unsigned int seg, unsigned int bus,
-+		   unsigned int devfn, int reg, int len, u32 *value);
-+int pci_mmcfg_write(unsigned int seg, unsigned int bus,
-+		    unsigned int devfn, int reg, int len, u32 value);
-+
-+extern struct list_head pci_mmcfg_list;
-+
-+#define PCI_MMCFG_BUS_OFFSET(bus)      ((bus) << 20)
-+#else /* CONFIG_PCI_MMCONFIG */
-+static inline void pci_mmcfg_late_init(void) { }
-+static inline void pci_mmcfg_early_init(void) { }
-+static inline void *pci_mmconfig_lookup(int segment, int bus)
-+{ return NULL; }
-+#endif /* CONFIG_PCI_MMCONFIG */
-+
-+#endif  /* __KERNEL__ */
-+#endif  /* __MMCONFIG_H */
-diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
-index 2e75ab0..9da3162 100644
---- a/include/linux/mod_devicetable.h
-+++ b/include/linux/mod_devicetable.h
-@@ -191,6 +191,12 @@ struct acpi_device_id {
- 	kernel_ulong_t driver_data;
- };
- 
-+struct acpi_device_cls {
-+	kernel_ulong_t base_class;
-+	kernel_ulong_t sub_class;
-+	kernel_ulong_t prog_interface;
-+};
-+
- #define PNP_ID_LEN	8
- #define PNP_MAX_DEVICES	8
- 
-diff --git a/include/linux/msi.h b/include/linux/msi.h
-index 8ac4a68..01b648f 100644
---- a/include/linux/msi.h
-+++ b/include/linux/msi.h
-@@ -108,9 +108,6 @@ struct msi_controller {
- 	struct device *dev;
- 	struct device_node *of_node;
- 	struct list_head list;
--#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
--	struct irq_domain *domain;
--#endif
- 
- 	int (*setup_irq)(struct msi_controller *chip, struct pci_dev *dev,
- 			 struct msi_desc *desc);
-@@ -188,6 +185,7 @@ struct msi_domain_info {
- 	void			*handler_data;
- 	const char		*handler_name;
- 	void			*data;
-+	u32			acpi_msi_frame_id;
- };
- 
- /* Flags for msi_domain_info */
-diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h
-index 24c7728..3e95ec8 100644
---- a/include/linux/pci-acpi.h
-+++ b/include/linux/pci-acpi.h
-@@ -77,9 +77,12 @@ static inline void acpiphp_remove_slots(struct pci_bus *bus) { }
- static inline void acpiphp_check_host_bridge(struct acpi_device *adev) { }
- #endif
- 
-+void pci_acpi_set_phb_msi_domain(struct pci_bus *bus);
-+
- #else	/* CONFIG_ACPI */
- static inline void acpi_pci_add_bus(struct pci_bus *bus) { }
- static inline void acpi_pci_remove_bus(struct pci_bus *bus) { }
-+static inline void pci_acpi_set_phb_msi_domain(struct pci_bus *bus) { };
- #endif	/* CONFIG_ACPI */
- 
- #ifdef CONFIG_ACPI_APEI
-diff --git a/include/linux/pci.h b/include/linux/pci.h
-index 211e9da..36e5b57 100644
---- a/include/linux/pci.h
-+++ b/include/linux/pci.h
-@@ -1651,19 +1651,12 @@ int pcibios_set_pcie_reset_state(struct pci_dev *dev,
- int pcibios_add_device(struct pci_dev *dev);
- void pcibios_release_device(struct pci_dev *dev);
- void pcibios_penalize_isa_irq(int irq, int active);
-+void pcibios_set_phb_msi_domain(struct pci_bus *bus);
- 
- #ifdef CONFIG_HIBERNATE_CALLBACKS
- extern struct dev_pm_ops pcibios_pm_ops;
- #endif
- 
--#ifdef CONFIG_PCI_MMCONFIG
--void __init pci_mmcfg_early_init(void);
--void __init pci_mmcfg_late_init(void);
--#else
--static inline void pci_mmcfg_early_init(void) { }
--static inline void pci_mmcfg_late_init(void) { }
--#endif
--
- int pci_ext_cfg_avail(void);
- 
- void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar);
-@@ -1838,6 +1831,7 @@ void pci_set_of_node(struct pci_dev *dev);
- void pci_release_of_node(struct pci_dev *dev);
- void pci_set_bus_of_node(struct pci_bus *bus);
- void pci_release_bus_of_node(struct pci_bus *bus);
-+void pci_set_phb_of_msi_domain(struct pci_bus *bus);
- 
- /* Arch may override this (weak) */
- struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus);
-@@ -1858,6 +1852,7 @@ static inline void pci_set_of_node(struct pci_dev *dev) { }
- static inline void pci_release_of_node(struct pci_dev *dev) { }
- static inline void pci_set_bus_of_node(struct pci_bus *bus) { }
- static inline void pci_release_bus_of_node(struct pci_bus *bus) { }
-+static inline void pci_set_phb_of_msi_domain(struct pci_bus *bus) {}
- static inline struct device_node *
- pci_device_to_OF_node(const struct pci_dev *pdev) { return NULL; }
- #endif  /* CONFIG_OF */
-diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
-index 3e18163..2c43e96 100644
---- a/kernel/irq/msi.c
-+++ b/kernel/irq/msi.c
-@@ -9,11 +9,13 @@
-  * This file contains common code to support Message Signalled Interrupt for
-  * PCI compatible and non PCI compatible devices.
-  */
-+#include <linux/acpi.h>
- #include <linux/types.h>
- #include <linux/device.h>
- #include <linux/irq.h>
- #include <linux/irqdomain.h>
- #include <linux/msi.h>
-+#include <linux/of.h>
- 
- /* Temparory solution for building, will be removed later */
- #include <linux/pci.h>
-@@ -124,11 +126,33 @@ static void msi_domain_free(struct irq_domain *domain, unsigned int virq,
- 	irq_domain_free_irqs_top(domain, virq, nr_irqs);
- }
- 
-+/**
-+ * TODO: SURAVEE: This is a hack to match the msi_frame_id
-+ * This is being discussed w/ Marc for better solution.
-+ */
-+static int msi_domain_match(struct irq_domain *d, struct device_node *node)
-+{
-+	struct msi_domain_info *info;
-+
-+	if (acpi_disabled)
-+		return (d->of_node != NULL) && (d->of_node == node);
-+
-+	info = msi_get_domain_info(d);
-+	if (!info || !(node->data))
-+		return 0;
-+
-+	if (info->acpi_msi_frame_id == *((u32 *)(node->data)))
-+		return 1;
-+
-+	return 0;
-+}
-+
- static struct irq_domain_ops msi_domain_ops = {
- 	.alloc		= msi_domain_alloc,
- 	.free		= msi_domain_free,
- 	.activate	= msi_domain_activate,
- 	.deactivate	= msi_domain_deactivate,
-+	.match		= msi_domain_match,
- };
- 
- #ifdef GENERIC_MSI_DOMAIN_OPS
-diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
-index 6e54f35..691e868 100644
---- a/virt/kvm/arm/arch_timer.c
-+++ b/virt/kvm/arm/arch_timer.c
-@@ -21,9 +21,11 @@
- #include <linux/kvm.h>
- #include <linux/kvm_host.h>
- #include <linux/interrupt.h>
-+#include <linux/acpi.h>
- 
- #include <clocksource/arm_arch_timer.h>
- #include <asm/arch_timer.h>
-+#include <asm/acpi.h>
- 
- #include <kvm/arm_vgic.h>
- #include <kvm/arm_arch_timer.h>
-@@ -247,60 +249,91 @@ static const struct of_device_id arch_timer_of_match[] = {
- 	{},
- };
- 
--int kvm_timer_hyp_init(void)
-+static int kvm_timer_ppi_parse_dt(unsigned int *ppi)
- {
- 	struct device_node *np;
--	unsigned int ppi;
--	int err;
--
--	timecounter = arch_timer_get_timecounter();
--	if (!timecounter)
--		return -ENODEV;
- 
- 	np = of_find_matching_node(NULL, arch_timer_of_match);
- 	if (!np) {
--		kvm_err("kvm_arch_timer: can't find DT node\n");
- 		return -ENODEV;
- 	}
- 
--	ppi = irq_of_parse_and_map(np, 2);
--	if (!ppi) {
--		kvm_err("kvm_arch_timer: no virtual timer interrupt\n");
--		err = -EINVAL;
--		goto out;
-+	*ppi = irq_of_parse_and_map(np, 2);
-+	if (*ppi == 0) {
-+		of_node_put(np);
-+		return -EINVAL;
- 	}
- 
--	err = request_percpu_irq(ppi, kvm_arch_timer_handler,
--				 "kvm guest timer", kvm_get_running_vcpus());
--	if (err) {
--		kvm_err("kvm_arch_timer: can't request interrupt %d (%d)\n",
--			ppi, err);
--		goto out;
--	}
-+	return 0;
-+}
- 
--	host_vtimer_irq = ppi;
-+extern int arch_timer_ppi[];
- 
--	err = __register_cpu_notifier(&kvm_timer_cpu_nb);
--	if (err) {
--		kvm_err("Cannot register timer CPU notifier\n");
--		goto out_free;
--	}
-+static int kvm_timer_ppi_parse_acpi(unsigned int *ppi)
- 
--	wqueue = create_singlethread_workqueue("kvm_arch_timer");
--	if (!wqueue) {
--		err = -ENOMEM;
--		goto out_free;
--	}
-+{
-+	/* retrieve VIRT_PPI info */
-+	*ppi = arch_timer_ppi[2];
- 
--	kvm_info("%s IRQ%d\n", np->name, ppi);
--	on_each_cpu(kvm_timer_init_interrupt, NULL, 1);
-+	if (*ppi == 0)
-+		return -EINVAL;
-+	else
-+		return 0;
-+}
-+
-+int kvm_timer_hyp_init(void)
-+{
-+	unsigned int ppi;
-+	int err;
-+
-+        timecounter = arch_timer_get_timecounter();
-+        if (!timecounter)
-+		return -ENODEV;
-+
-+	/* PPI DT parsing */
-+	err = kvm_timer_ppi_parse_dt(&ppi);
- 
--	goto out;
-+	/* if DT parsing fails, try ACPI next */
-+	if (err && !acpi_disabled)
-+		err = kvm_timer_ppi_parse_acpi(&ppi);
-+
-+	if (err) {
-+		kvm_err("kvm_timer_hyp_init: can't find virtual timer info or "
-+			"config virtual timer interrupt\n");
-+		return err;
-+	}
-+
-+	/* configure IRQ handler */
-+	err = request_percpu_irq(ppi, kvm_arch_timer_handler,
-+                                 "kvm guest timer", kvm_get_running_vcpus());
-+        if (err) {
-+                kvm_err("kvm_arch_timer: can't request interrupt %d (%d)\n",
-+                        ppi, err);
-+                goto out;
-+        }
-+
-+        host_vtimer_irq = ppi;
-+
-+        err = __register_cpu_notifier(&kvm_timer_cpu_nb);
-+        if (err) {
-+                kvm_err("Cannot register timer CPU notifier\n");
-+                goto out_free;
-+        }
-+
-+        wqueue = create_singlethread_workqueue("kvm_arch_timer");
-+        if (!wqueue) {
-+                err = -ENOMEM;
-+                goto out_free;
-+        }
-+
-+        kvm_info("timer IRQ%d\n", ppi);
-+        on_each_cpu(kvm_timer_init_interrupt, NULL, 1);
-+
-+        goto out;
- out_free:
--	free_percpu_irq(ppi, kvm_get_running_vcpus());
-+        free_percpu_irq(ppi, kvm_get_running_vcpus());
- out:
--	of_node_put(np);
--	return err;
-+        return err;
- }
- 
- void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu)
-diff --git a/virt/kvm/arm/vgic-v2.c b/virt/kvm/arm/vgic-v2.c
-index a0a7b5d..964363f 100644
---- a/virt/kvm/arm/vgic-v2.c
-+++ b/virt/kvm/arm/vgic-v2.c
-@@ -19,6 +19,7 @@
- #include <linux/kvm.h>
- #include <linux/kvm_host.h>
- #include <linux/interrupt.h>
-+#include <linux/acpi.h>
- #include <linux/io.h>
- #include <linux/of.h>
- #include <linux/of_address.h>
-@@ -26,6 +27,7 @@
- 
- #include <linux/irqchip/arm-gic.h>
- 
-+#include <asm/acpi.h>
- #include <asm/kvm_emulate.h>
- #include <asm/kvm_arm.h>
- #include <asm/kvm_mmu.h>
-@@ -159,7 +161,7 @@ static const struct vgic_ops vgic_v2_ops = {
- static struct vgic_params vgic_v2_params;
- 
- /**
-- * vgic_v2_probe - probe for a GICv2 compatible interrupt controller in DT
-+ * vgic_v2_dt_probe - probe for a GICv2 compatible interrupt controller in DT
-  * @node:	pointer to the DT node
-  * @ops: 	address of a pointer to the GICv2 operations
-  * @params:	address of a pointer to HW-specific parameters
-@@ -168,7 +170,7 @@ static struct vgic_params vgic_v2_params;
-  * in *ops and the HW parameters in *params. Returns an error code
-  * otherwise.
-  */
--int vgic_v2_probe(struct device_node *vgic_node,
-+int vgic_v2_dt_probe(struct device_node *vgic_node,
- 		  const struct vgic_ops **ops,
- 		  const struct vgic_params **params)
- {
-@@ -222,11 +224,22 @@ int vgic_v2_probe(struct device_node *vgic_node,
- 	}
- 
- 	if (!PAGE_ALIGNED(resource_size(&vcpu_res))) {
-+#if 0
- 		kvm_err("GICV size 0x%llx not a multiple of page size 0x%lx\n",
- 			(unsigned long long)resource_size(&vcpu_res),
- 			PAGE_SIZE);
- 		ret = -ENXIO;
- 		goto out_unmap;
-+#else
-+		/*
-+		 * The check fails for arm64 with 64K pagesize and certain firmware.
-+		 * Ignore for now until firmware takes care of the problem.
-+		 */
-+		kvm_info("GICV size 0x%llx not a multiple of page size 0x%lx\n",
-+			(unsigned long long)resource_size(&vcpu_res),
-+			PAGE_SIZE);
-+		kvm_info("Update DT to assign GICV a multiple of kernel page size \n");
-+#endif
- 	}
- 
- 	vgic->can_emulate_gicv2 = true;
-@@ -249,3 +262,72 @@ out:
- 	of_node_put(vgic_node);
- 	return ret;
- }
-+
-+struct acpi_madt_generic_interrupt *vgic_acpi;
-+static void gic_get_acpi_header(struct acpi_subtable_header *header)
-+{
-+	vgic_acpi = (struct acpi_madt_generic_interrupt *)header;
-+}
-+
-+int vgic_v2_acpi_probe(const struct vgic_ops **ops,
-+		       const struct vgic_params **params)
-+{
-+	struct vgic_params *vgic = &vgic_v2_params;
-+	int irq_mode, ret;
-+
-+	/* MADT table */
-+	ret = acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_INTERRUPT,
-+			(acpi_tbl_entry_handler)gic_get_acpi_header, 0);
-+	if (!ret) {
-+		pr_err("Failed to get MADT VGIC CPU entry\n");
-+		ret = -ENODEV;
-+		goto out;
-+	}
-+
-+	/* IRQ trigger mode */
-+	irq_mode = (vgic_acpi->flags & ACPI_MADT_VGIC_IRQ_MODE) ?
-+		ACPI_EDGE_SENSITIVE : ACPI_LEVEL_SENSITIVE;
-+	/* According to GIC-400 manual, all PPIs are active-LOW, level
-+	 *  sensative. We register IRQ as active-low.
-+	 */
-+	vgic->maint_irq = acpi_register_gsi(NULL, vgic_acpi->vgic_interrupt,
-+					    irq_mode, ACPI_ACTIVE_LOW);
-+	if (!vgic->maint_irq) {
-+		pr_err("Cannot register VGIC ACPI maintenance irq\n");
-+		ret = -ENXIO;
-+		goto out;
-+	}
-+
-+	/* GICH resource */
-+	vgic->vctrl_base = ioremap(vgic_acpi->gich_base_address, SZ_8K);
-+	if (!vgic->vctrl_base) {
-+		pr_err("cannot ioremap GICH memory\n");
-+		ret = -ENOMEM;
-+		goto out;
-+	}
-+
-+        vgic->nr_lr = readl_relaxed(vgic->vctrl_base + GICH_VTR);
-+        vgic->nr_lr = (vgic->nr_lr & 0x3f) + 1;
-+
-+        ret = create_hyp_io_mappings(vgic->vctrl_base,
-+                                     vgic->vctrl_base + SZ_8K,
-+                                     vgic_acpi->gich_base_address);
-+        if (ret) {
-+                kvm_err("Cannot map GICH into hyp\n");
-+		goto out;
-+        }
-+
-+	vgic->vcpu_base = vgic_acpi->gicv_base_address;
-+
-+	kvm_info("GICH base=0x%llx, GICV base=0x%llx, IRQ=%d\n",
-+		 (unsigned long long)vgic_acpi->gich_base_address,
-+		 (unsigned long long)vgic_acpi->gicv_base_address,
-+		 vgic->maint_irq);
-+
-+	vgic->type = VGIC_V2;
-+	*ops = &vgic_v2_ops;
-+	*params = vgic;
-+
-+out:
-+	return ret;
-+}
-diff --git a/virt/kvm/arm/vgic-v3.c b/virt/kvm/arm/vgic-v3.c
-index 3a62d8a..6f27fe1 100644
---- a/virt/kvm/arm/vgic-v3.c
-+++ b/virt/kvm/arm/vgic-v3.c
-@@ -203,7 +203,7 @@ static const struct vgic_ops vgic_v3_ops = {
- static struct vgic_params vgic_v3_params;
- 
- /**
-- * vgic_v3_probe - probe for a GICv3 compatible interrupt controller in DT
-+ * vgic_v3_dt_probe - probe for a GICv3 compatible interrupt controller in DT
-  * @node:	pointer to the DT node
-  * @ops: 	address of a pointer to the GICv3 operations
-  * @params:	address of a pointer to HW-specific parameters
-@@ -212,9 +212,9 @@ static struct vgic_params vgic_v3_params;
-  * in *ops and the HW parameters in *params. Returns an error code
-  * otherwise.
-  */
--int vgic_v3_probe(struct device_node *vgic_node,
--		  const struct vgic_ops **ops,
--		  const struct vgic_params **params)
-+int vgic_v3_dt_probe(struct device_node *vgic_node,
-+		     const struct vgic_ops **ops,
-+		     const struct vgic_params **params)
- {
- 	int ret = 0;
- 	u32 gicv_idx;
-diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
-index 0cc6ab6..c3fb126 100644
---- a/virt/kvm/arm/vgic.c
-+++ b/virt/kvm/arm/vgic.c
-@@ -25,9 +25,11 @@
- #include <linux/of_address.h>
- #include <linux/of_irq.h>
- #include <linux/uaccess.h>
-+#include <linux/acpi.h>
- 
- #include <linux/irqchip/arm-gic.h>
- 
-+#include <asm/acpi.h>
- #include <asm/kvm_emulate.h>
- #include <asm/kvm_arm.h>
- #include <asm/kvm_mmu.h>
-@@ -1865,8 +1867,8 @@ static struct notifier_block vgic_cpu_nb = {
- };
- 
- static const struct of_device_id vgic_ids[] = {
--	{ .compatible = "arm,cortex-a15-gic", .data = vgic_v2_probe, },
--	{ .compatible = "arm,gic-v3", .data = vgic_v3_probe, },
-+	{ .compatible = "arm,cortex-a15-gic", .data = vgic_v2_dt_probe, },
-+	{ .compatible = "arm,gic-v3", .data = vgic_v3_dt_probe, },
- 	{},
- };
- 
-@@ -1876,20 +1878,26 @@ int kvm_vgic_hyp_init(void)
- 	const int (*vgic_probe)(struct device_node *,const struct vgic_ops **,
- 				const struct vgic_params **);
- 	struct device_node *vgic_node;
--	int ret;
--
--	vgic_node = of_find_matching_node_and_match(NULL,
--						    vgic_ids, &matched_id);
--	if (!vgic_node) {
--		kvm_err("error: no compatible GIC node found\n");
--		return -ENODEV;
-+	int ret = -ENODEV;
-+
-+	/* probe VGIC */
-+	if ((vgic_node = of_find_matching_node_and_match(NULL,
-+				vgic_ids, &matched_id))) {
-+		/* probe VGIC in DT */
-+		vgic_probe = matched_id->data;
-+		ret = vgic_probe(vgic_node, &vgic_ops, &vgic);
-+	}
-+	else if (!acpi_disabled) {
-+		/* probe VGIC in ACPI */
-+		ret = vgic_v2_acpi_probe(&vgic_ops, &vgic);
- 	}
- 
--	vgic_probe = matched_id->data;
--	ret = vgic_probe(vgic_node, &vgic_ops, &vgic);
--	if (ret)
-+	if (ret) {
-+		kvm_err("error: no compatible GIC info found\n");
- 		return ret;
-+	}
- 
-+	/* configuration */
- 	ret = request_percpu_irq(vgic->maint_irq, vgic_maintenance_handler,
- 				 "vgic", kvm_get_running_vcpus());
- 	if (ret) {
diff --git a/kernel.spec b/kernel.spec
index 59a03c352..99e6a09c9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -6,9 +6,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%global released_kernel 0
-
-%global aarch64patches 1
+%global released_kernel 1
 
 # Sign modules on x86.  Make sure the config files match this setting if more
 # architectures are added.
@@ -42,19 +40,19 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 200
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
 # on top of -- for example, 3.1-rc7-git1 starts with a 3.0 base,
 # which yields a base_sublevel of 0.
-%define base_sublevel 0
+%define base_sublevel 4
 
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 0
+%define stable_update 14
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -65,10 +63,9 @@ Summary: The Linux kernel
 ## The not-released-kernel case ##
 %else
 # The next upstream release sublevel (base_sublevel+1)
-# define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
-%define upstream_sublevel 0
+%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 4
+%define rcrev 0
 # The git snapshot level
 %define gitrev 0
 # Set rpm version accordingly
@@ -153,8 +150,7 @@ Summary: The Linux kernel
 %endif
 
 # The kernel tarball/base version
-# define kversion 4.%{base_sublevel}
-%define kversion 4.%{base_sublevel}-rc%rcrev
+%define kversion 4.%{base_sublevel}
 
 %define make_target bzImage
 
@@ -271,7 +267,7 @@ Summary: The Linux kernel
 %define all_arch_configs kernel-%{version}-ppc64*.config
 %endif
 %ifarch ppc64le
-%define all_arch_configs kernel-%{version}-ppc64le.config
+%define all_arch_configs kernel-%{version}-ppc64le*.config
 %endif
 %endif
 
@@ -328,11 +324,7 @@ Summary: The Linux kernel
 # Which is a BadThing(tm).
 
 # We only build kernel-headers on the following...
-%if 0%{?aarch64patches}
 %define nobuildarches i386 s390
-%else
-%define nobuildarches i386 s390 aarch64
-%endif
 
 %ifarch %nobuildarches
 %define with_up 0
@@ -355,7 +347,7 @@ Summary: The Linux kernel
 # Packages that need to be installed before the kernel is, because the %%post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, systemd >= 203-2
+%define kernel_prereq  fileutils, systemd >= 203-2, /usr/bin/kernel-install
 %define initrd_prereq  dracut >= 027
 
 
@@ -370,8 +362,8 @@ Release: %{pkg_release}
 ExclusiveArch: %{all_x86} x86_64 ppc64 ppc64p7 s390 s390x %{arm} aarch64 ppc64le
 ExclusiveOS: Linux
 %ifnarch %{nobuildarches}
-Requires: kernel-%{?variant:%{variant}-}core-uname-r = %{KVERREL}%{?variant}
-Requires: kernel-%{?variant:%{variant}-}modules-uname-r = %{KVERREL}%{?variant}
+Requires: kernel-core-uname-r = %{KVERREL}%{?variant}
+Requires: kernel-modules-uname-r = %{KVERREL}%{?variant}
 %endif
 
 
@@ -386,7 +378,7 @@ BuildRequires: net-tools, hostname, bc
 BuildRequires: sparse
 %endif
 %if %{with_perf}
-BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) bison flex
+BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) bison flex xz-devel
 BuildRequires: audit-libs-devel
 %ifnarch s390 s390x %{arm}
 BuildRequires: numactl-devel
@@ -401,8 +393,12 @@ BuildRequires: rpm-build, elfutils
 %define debuginfo_args --strict-build-id -r
 %endif
 
+%ifarch %{ix86} x86_64
+# MODULE_SIG is enabled in config-x86-generic and needs these:
+BuildRequires: openssl openssl-devel
+%endif
+
 %if %{signmodules}
-BuildRequires: openssl
 BuildRequires: pesign >= 0.10-4
 %endif
 
@@ -411,8 +407,7 @@ BuildRequires: binutils-%{_build_arch}-linux-gnu, gcc-%{_build_arch}-linux-gnu
 %define cross_opts CROSS_COMPILE=%{_build_arch}-linux-gnu-
 %endif
 
-#Source0: ftp://ftp.kernel.org/pub/linux/kernel/v4.x/linux-%{kversion}.tar.xz
-Source0: ftp://ftp.kernel.org/pub/linux/kernel/v4.x/linux-4.0-rc4.tar.xz
+Source0: ftp://ftp.kernel.org/pub/linux/kernel/v4.x/linux-%{kversion}.tar.xz
 
 Source10: perf-man-%{kversion}.tar.gz
 Source11: x509.genkey
@@ -445,7 +440,7 @@ Source32: config-x86-32-generic
 
 Source40: config-x86_64-generic
 
-Source50: config-powerpc-generic
+Source50: config-powerpc64-generic
 Source53: config-powerpc64
 Source54: config-powerpc64p7
 Source55: config-powerpc64le
@@ -483,8 +478,7 @@ Patch00: %{stable_patch_00}
 # near the top of this spec file.
 %else
 %if 0%{?rcrev}
-### HAX we're using -rc$x tarballs to make transitioning easier
-# Patch00 patch-4.%{upstream_sublevel}-rc%{rcrev}.xz
+Patch00: patch-4.%{upstream_sublevel}-rc%{rcrev}.xz
 %if 0%{?gitrev}
 Patch01: patch-4.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.xz
 %endif
@@ -496,162 +490,177 @@ Patch00: patch-4.%{base_sublevel}-git%{gitrev}.xz
 %endif
 %endif
 
-# we also need compile fixes for -vanilla
-Patch04: compile-fixes.patch
-
 # build tweak for build ID magic, even for -vanilla
 Patch05: kbuild-AFTER_LINK.patch
 
 %if !%{nopatches}
 
 
-# revert upstream patches we get via other methods
-Patch09: upstream-reverts.patch
 # Git trees.
 
 # Standalone patches
 
-Patch450: input-kill-stupid-messages.patch
-Patch452: no-pcspkr-modalias.patch
+Patch451: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
 
-Patch470: die-floppy-die.patch
+Patch454: arm64-avoid-needing-console-to-enable-serial-console.patch
 
-Patch500: Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
+Patch456: arm64-acpi-drop-expert-patch.patch
 
-Patch510: input-silence-i8042-noise.patch
-Patch530: silence-fbcon-logo.patch
+Patch457: ARM-tegra-usb-no-reset.patch
 
-Patch600: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
+Patch460: mfd-wm8994-Ensure-that-the-whole-MFD-is-built-into-a.patch
 
-#rhbz 1126580
-Patch601: Kbuild-Add-an-option-to-enable-GCC-VTA.patch
+Patch463: arm-i.MX6-Utilite-device-dtb.patch
 
-Patch800: crash-driver.patch
+Patch466: input-kill-stupid-messages.patch
 
-# crypto/
+Patch467: die-floppy-die.patch
 
-# secure boot
-Patch1000: Add-secure_modules-call.patch
-Patch1001: PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
-Patch1002: x86-Lock-down-IO-port-access-when-module-security-is.patch
-Patch1003: ACPI-Limit-access-to-custom_method.patch
-Patch1004: asus-wmi-Restrict-debugfs-interface-when-module-load.patch
-Patch1005: Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
-Patch1006: acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
-Patch1007: kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
-Patch1008: x86-Restrict-MSR-access-when-module-loading-is-restr.patch
-Patch1009: Add-option-to-automatically-enforce-module-signature.patch
-Patch1010: efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
-Patch1011: efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
-Patch1012: efi-Add-EFI_SECURE_BOOT-bit.patch
-Patch1013: hibernate-Disable-in-a-signed-modules-environment.patch
+Patch468: no-pcspkr-modalias.patch
 
-Patch1014: Add-EFI-signature-data-types.patch
-Patch1015: Add-an-EFI-signature-blob-parser-and-key-loader.patch
-Patch1016: KEYS-Add-a-system-blacklist-keyring.patch
-Patch1017: MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
-Patch1018: MODSIGN-Support-not-importing-certs-from-db.patch
+Patch470: silence-fbcon-logo.patch
 
-Patch1019: Add-sysrq-option-to-disable-secure-boot-mode.patch
+Patch471: Kbuild-Add-an-option-to-enable-GCC-VTA.patch
 
-# esrt
-Patch1020: efi-Add-esrt-support.patch
+Patch472: crash-driver.patch
 
-# virt + ksm patches
+Patch473: Add-secure_modules-call.patch
 
-# DRM
+Patch474: PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
 
-# nouveau + drm fixes
-# intel drm is all merged upstream
-Patch1826: drm-i915-hush-check-crtc-state.patch
+Patch475: x86-Lock-down-IO-port-access-when-module-security-is.patch
 
-# Quiet boot fixes
+Patch476: ACPI-Limit-access-to-custom_method.patch
 
-# fs fixes
+Patch477: asus-wmi-Restrict-debugfs-interface-when-module-load.patch
 
-# NFSv4
+Patch478: Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
 
-# patches headed upstream
-Patch12016: disable-i8042-check-on-apple-mac.patch
+Patch479: acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
 
-Patch14000: hibernate-freeze-filesystems.patch
+Patch480: kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
 
-Patch14010: lis3-improve-handling-of-null-rate.patch
+Patch481: x86-Restrict-MSR-access-when-module-loading-is-restr.patch
 
-Patch15000: watchdog-Disable-watchdog-on-virtual-machines.patch
+Patch482: Add-option-to-automatically-enforce-module-signature.patch
 
-# PPC
+Patch483: efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
 
-# ARM64
+Patch484: efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
 
-# ARMv7
-Patch21020: ARM-tegra-usb-no-reset.patch
-Patch21021: arm-dts-am335x-boneblack-lcdc-add-panel-info.patch
-Patch21022: arm-dts-am335x-boneblack-add-cpu0-opp-points.patch
-Patch21023: arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
-Patch21024: arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
-Patch21025: arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
-Patch21026: pinctrl-pinctrl-single-must-be-initialized-early.patch
+Patch485: efi-Add-EFI_SECURE_BOOT-bit.patch
 
-Patch21028: arm-i.MX6-Utilite-device-dtb.patch
+Patch486: hibernate-Disable-in-a-signed-modules-environment.patch
 
-Patch21100: arm-highbank-l2-reverts.patch
+Patch487: Add-EFI-signature-data-types.patch
 
-#rhbz 754518
-Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
+Patch488: Add-an-EFI-signature-blob-parser-and-key-loader.patch
 
-# https://fedoraproject.org/wiki/Features/Checkpoint_Restore
-Patch21242: criu-no-expert.patch
+Patch489: KEYS-Add-a-system-blacklist-keyring.patch
 
-#rhbz 892811
-Patch21247: ath9k-rx-dma-stop-check.patch
+Patch490: MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
 
-Patch22000: weird-root-dentry-name-debug.patch
+Patch491: MODSIGN-Support-not-importing-certs-from-db.patch
 
-#rhbz 1094948
-Patch26131: acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch
+Patch492: Add-sysrq-option-to-disable-secure-boot-mode.patch
 
-Patch26137: fifo-nv04-remove-the-loop-from-the-interrupt-handler.patch
+Patch493: drm-i915-hush-check-crtc-state.patch
 
-#CVE-2015-0275 rhbz 1193907 1195178
-Patch26138: ext4-Allocate-entire-range-in-zero-range.patch
+Patch494: disable-i8042-check-on-apple-mac.patch
 
-#rhbz 1190947
-Patch26139: Bluetooth-ath3k-Add-support-Atheros-AR5B195-combo-Mi.patch
+Patch495: lis3-improve-handling-of-null-rate.patch
 
-#rhbz 1196825
-Patch26140: security-yama-Remove-unnecessary-selects-from-Kconfi.patch
+Patch496: watchdog-Disable-watchdog-on-virtual-machines.patch
 
-Patch26141: mfd-rtsx_usb-prevent-DMA-from-stack.patch
+Patch497: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
 
-#rhbz 1200777 1200778
-Patch26150: Input-synaptics-split-synaptics_resolution-query-fir.patch
-Patch26151: Input-synaptics-log-queried-and-quirked-dimension-va.patch
-Patch26152: Input-synaptics-query-min-dimensions-for-fw-v8.1.patch
-Patch26153: Input-synaptics-remove-obsolete-min-max-quirk-for-X2.patch
-Patch26154: Input-synaptics-support-min-max-board-id-in-min_max_.patch
-Patch26155: Input-synaptics-skip-quirks-when-post-2013-dimension.patch
-Patch26156: Input-synaptics-fix-middle-button-on-Lenovo-2015-pro.patch
-Patch26157: Input-synaptics-handle-spurious-release-of-trackstic.patch
-Patch26158: Input-synaptics-do-not-retrieve-the-board-id-on-old-.patch
-Patch26159: Input-synaptics-retrieve-the-extended-capabilities-i.patch
-Patch26160: Input-synaptics-remove-TOPBUTTONPAD-property-for-Len.patch
-Patch26161: Input-synaptics-re-route-tracksticks-buttons-on-the-.patch
-Patch26162: Input-synaptics-remove-X1-Carbon-3rd-gen-from-the-to.patch
-Patch26163: Input-synaptics-remove-X250-from-the-topbuttonpad-li.patch
-Patch26164: Revert-Input-synaptics-use-dmax-in-input_mt_assign_s.patch
+Patch498: criu-no-expert.patch
 
-#CVE-2014-8159 rhbz 1181166 1200950
-Patch26167: IB-core-Prevent-integer-overflow-in-ib_umem_get-addr.patch
+Patch499: ath9k-rx-dma-stop-check.patch
 
-#rhbz 1201532
-Patch26168: HID-multitouch-add-support-of-clickpads.patch
+Patch500: xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch
 
-# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
-Patch30000: kernel-arm64.patch
+Patch501: Input-synaptics-pin-3-touches-when-the-firmware-repo.patch
+
+Patch502: firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch
+
+Patch503: drm-i915-turn-off-wc-mmaps.patch
+
+Patch508: kexec-uefi-copy-secure_boot-flag-in-boot-params.patch
+
+#rhbz 1287819
+Patch570: HID-multitouch-enable-palm-rejection-if-device-imple.patch
+
+#rhbz 1288687
+Patch572: alua_fix.patch
+
+#rhbz 1083853
+Patch610: PNP-Add-Broadwell-to-Intel-MCH-size-workaround.patch
+
+#rhbz 1300955
+Patch640: PNP-Add-Haswell-ULT-to-Intel-MCH-size-workaround.patch
+
+#rhbz 1278942
+Patch643: media-ivtv-avoid-going-past-input-audio-array.patch
+
+#rhbz 1255325
+Patch646: HID-sony-do-not-bail-out-when-the-sixaxis-refuses-th.patch
+
+#Known use after free, possibly rhbz 1310579
+Patch654: 0001-usb-hub-fix-panic-in-usb_reset_and_verify_device.patch
+
+#rhbz 1310252 1313318
+Patch660: 0001-drm-i915-Pretend-cursor-is-always-on-for-ILK-style-W.patch
+
+#CVE-2016-3135 rhbz 1317386 1317387
+Patch664: netfilter-x_tables-check-for-size-overflow.patch
+
+#CVE-2016-3134 rhbz 1317383 1317384
+Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
+
+# CVE-2016-3672 rhbz 1324749 1324750
+Patch690: x86-mm-32-Enable-full-randomization-on-i386-and-X86_.patch
+
+#CVE-2016-3951 rhbz 1324782 1324815
+Patch695: cdc_ncm-do-not-call-usbnet_link_change-from-cdc_ncm_.patch
+
+# Stop splashing crap about broken firmware BGRT
+Patch704: x86-efi-bgrt-Switch-all-pr_err-to-pr_debug-for-inval.patch
+
+#CVE-2016-4482 rhbz 1332931 1332932
+Patch705: USB-usbfs-fix-potential-infoleak-in-devio.patch
+
+#CVE-2016-4569 rhbz 1334643 1334645
+Patch714: ALSA-timer-Fix-leak-in-SNDRV_TIMER_IOCTL_PARAMS.patch
+Patch715: ALSA-timer-Fix-leak-in-events-via-snd_timer_user_cca.patch
+Patch716: ALSA-timer-Fix-leak-in-events-via-snd_timer_user_tin.patch
+
+#CVE-2016-0758 rhbz 1300257 1335386
+Patch717: KEYS-Fix-ASN.1-indefinite-length-object-parsing.patch
+
+#CVE-2016-5243 rhbz 1343338 1343335
+Patch721: tipc-fix-an-infoleak-in-tipc_nl_compat_link_dump.patch
+
+#CVE-2016-5244 rhbz 1343338 1343337
+Patch722: rds-fix-an-infoleak-in-rds_inc_info_copy.txt
+
+#CVE-2016-4470 rhbz 1341716 1346626
+Patch727: KEYS-potential-uninitialized-variable.patch
+
+#rhbz 1338025
+Patch728: hp-wmi-fix-wifi-cannot-be-hard-unblock.patch
+
+#CVE-2016-5829 rhbz 1350509 1350513
+Patch826: HID-hiddev-validate-num_values-for-HIDIOCGUSAGES-HID.patch
+
+#CVE-2016-5728 rhbz 1350811 1350812
+Patch827: misc-mic-Fix-for-double-fetch-security-bug-in-mic_co.patch
+
+#CVE-2016-1237 rhbz 1350845 1350847
+Patch830: posix_acl-Add-set_posix_acl.patch
+Patch831: nfsd-check-permissions-when-setting-ACLs.patch
 
 # END OF PATCH DEFINITIONS
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -669,11 +678,13 @@ The kernel meta package
 Provides: kernel = %{rpmversion}-%{pkg_release}\
 Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\
 Provides: kernel-drm-nouveau = 16\
-Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
+Provides: kernel-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
 Requires(pre): %{kernel_prereq}\
 Requires(pre): %{initrd_prereq}\
-Requires(pre): linux-firmware >= 20130724-29.git31f6b30\
+Requires(pre): linux-firmware >= 20150904-56.git6ebf5d57\
 Requires(preun): systemd >= 200\
+Conflicts: xfsprogs < 4.3.0-1\
+Conflicts: xorg-x11-drv-vmmouse < 13.0.99\
 %{expand:%%{?kernel%{?1:_%{1}}_conflicts:Conflicts: %%{kernel%{?1:_%{1}}_conflicts}}}\
 %{expand:%%{?kernel%{?1:_%{1}}_obsoletes:Obsoletes: %%{kernel%{?1:_%{1}}_obsoletes}}}\
 %{expand:%%{?kernel%{?1:_%{1}}_provides:Provides: %%{kernel%{?1:_%{1}}_provides}}}\
@@ -689,6 +700,10 @@ Summary: Header files for the Linux kernel for use by glibc
 Group: Development/System
 Obsoletes: glibc-kernheaders < 3.0-46
 Provides: glibc-kernheaders = 3.0-46
+%if "0%{?variant}"
+Obsoletes: kernel-headers < %{rpmversion}-%{pkg_release}
+Provides: kernel-headers = %{rpmversion}-%{pkg_release}
+%endif
 %description headers
 Kernel-headers includes the C header files that specify the interface
 between the Linux kernel and userspace libraries and programs.  The
@@ -824,7 +839,7 @@ Group: Development/Debug\
 Requires: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release}\
 Provides: %{name}%{?1:-%{1}}-debuginfo-%{_target_cpu} = %{version}-%{release}\
 AutoReqProv: no\
-%description -n %{name}%{?1:-%{1}}-debuginfo\
+%description %{?1:%{1}-}debuginfo\
 This package provides debug information for package %{name}%{?1:-%{1}}.\
 This is required to use SystemTap with %{name}%{?1:-%{1}}-%{KVERREL}.\
 %{expand:%%global debuginfo_args %{?debuginfo_args} -p '/.*/%%{KVERREL}%{?1:[+]%{1}}/.*|/.*%%{KVERREL}%{?1:\+%{1}}(\.debug)?' -o debuginfo%{?1}.list}\
@@ -841,12 +856,12 @@ Group: System Environment/Kernel\
 Provides: kernel%{?1:-%{1}}-devel-%{_target_cpu} = %{version}-%{release}\
 Provides: kernel-devel-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
 Provides: kernel-devel = %{version}-%{release}%{?1:+%{1}}\
-Provides: kernel-devel-uname-r = %{KVERREL}%{?1:+%{1}}\
+Provides: kernel-devel-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
 Provides: installonlypkg(kernel)\
 AutoReqProv: no\
 Requires(pre): /usr/bin/find\
 Requires: perl\
-%description -n kernel%{?variant}%{?1:-%{1}}-devel\
+%description %{?1:%{1}-}devel\
 This package provides kernel headers and makefiles sufficient to build modules\
 against the %{?2:%{2} }kernel package.\
 %{nil}
@@ -863,12 +878,12 @@ Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}
 Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
 Provides: kernel%{?1:-%{1}}-modules-extra = %{version}-%{release}%{?1:+%{1}}\
 Provides: installonlypkg(kernel-module)\
-Provides: kernel%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{?1:+%{1}}\
-Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
-Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
+Requires: kernel-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
+Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
 AutoReq: no\
 AutoProv: yes\
-%description -n kernel%{?variant}%{?1:-%{1}}-modules-extra\
+%description %{?1:%{1}-}modules-extra\
 This package provides less commonly used kernel modules for the %{?2:%{2} }kernel package.\
 %{nil}
 
@@ -884,11 +899,11 @@ Provides: kernel%{?1:-%{1}}-modules-%{_target_cpu} = %{version}-%{release}\
 Provides: kernel-modules-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
 Provides: kernel-modules = %{version}-%{release}%{?1:+%{1}}\
 Provides: installonlypkg(kernel-module)\
-Provides: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
-Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
+Requires: kernel-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
 AutoReq: no\
 AutoProv: yes\
-%description -n kernel%{?variant}%{?1:-%{1}}-modules\
+%description %{?1:%{1}-}modules\
 This package provides commonly used kernel modules for the %{?2:%{2}-}core kernel package.\
 %{nil}
 
@@ -900,8 +915,8 @@ This package provides commonly used kernel modules for the %{?2:%{2}-}core kerne
 %package %{1}\
 summary: kernel meta-package for the %{1} kernel\
 group: system environment/kernel\
-Requires: kernel-%{1}-%{?variant:%{variant}-}core-uname-r = %{KVERREL}%{?variant}+%{1}\
-Requires: kernel-%{1}-%{?variant:%{variant}-}modules-uname-r = %{KVERREL}%{?variant}+%{1}\
+Requires: kernel-%{1}-core-uname-r = %{KVERREL}%{?variant}+%{1}\
+Requires: kernel-%{1}-modules-uname-r = %{KVERREL}%{?variant}+%{1}\
 %description %{1}\
 The meta-package for the %{1} kernel\
 %{nil}
@@ -915,7 +930,7 @@ The meta-package for the %{1} kernel\
 %package %{?1:%{1}-}core\
 Summary: %{variant_summary}\
 Group: System Environment/Kernel\
-Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?1:+%{1}}\
+Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
 %{expand:%%kernel_reqprovconf}\
 %if %{?1:1} %{!?1:0} \
 %{expand:%%kernel_meta_package %{?1:%{1}}}\
@@ -1145,7 +1160,7 @@ if [ ! -d kernel-%{kversion}%{?dist}/vanilla-%{vanillaversion} ]; then
 # Update vanilla to the latest upstream.
 # (non-released_kernel case only)
 %if 0%{?rcrev}
-#    ApplyPatch patch-4.%{upstream_sublevel}-rc%{rcrev}.xz
+    ApplyPatch patch-4.%{upstream_sublevel}-rc%{rcrev}.xz
 %if 0%{?gitrev}
     ApplyPatch patch-4.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.xz
 %endif
@@ -1206,204 +1221,165 @@ done
 
 ApplyPatch kbuild-AFTER_LINK.patch
 
-#
-# misc small stuff to make things compile
-#
-ApplyOptionalPatch compile-fixes.patch
 
 %if !%{nopatches}
 
-# revert patches from upstream that conflict or that we get via other means
-ApplyOptionalPatch upstream-reverts.patch -R
-
-# Architecture patches
-# x86(-64)
 ApplyPatch lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
 
-# PPC
+ApplyPatch arm64-avoid-needing-console-to-enable-serial-console.patch
 
-# ARM64
+ApplyPatch arm64-acpi-drop-expert-patch.patch
 
-#
-# ARM
-#
 ApplyPatch ARM-tegra-usb-no-reset.patch
 
-ApplyPatch arm-dts-am335x-boneblack-lcdc-add-panel-info.patch
-ApplyPatch arm-dts-am335x-boneblack-add-cpu0-opp-points.patch
-ApplyPatch arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
-ApplyPatch arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
-ApplyPatch arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
-ApplyPatch pinctrl-pinctrl-single-must-be-initialized-early.patch
+ApplyPatch mfd-wm8994-Ensure-that-the-whole-MFD-is-built-into-a.patch
 
 ApplyPatch arm-i.MX6-Utilite-device-dtb.patch
 
-ApplyPatch arm-highbank-l2-reverts.patch
-
-#
-# bugfixes to drivers and filesystems
-#
-
-# ext4
-
-# xfs
-
-# btrfs
-
-# eCryptfs
-
-# NFSv4
-
-# USB
-
-# WMI
-
-# ACPI
-
-#
-# PCI
-#
-
-#
-# SCSI Bits.
-#
-
-# ACPI
-
-ApplyPatch Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
-
-# ALSA
-
-# Networking
-
-# Misc fixes
-# The input layer spews crap no-one cares about.
 ApplyPatch input-kill-stupid-messages.patch
 
-# stop floppy.ko from autoloading during udev...
 ApplyPatch die-floppy-die.patch
 
 ApplyPatch no-pcspkr-modalias.patch
 
-# Silence some useless messages that still get printed with 'quiet'
-ApplyPatch input-silence-i8042-noise.patch
-
-# Make fbcon not show the penguins with 'quiet'
 ApplyPatch silence-fbcon-logo.patch
 
-# Changes to upstream defaults.
-#rhbz 1126580
 ApplyPatch Kbuild-Add-an-option-to-enable-GCC-VTA.patch
 
-# /dev/crash driver.
 ApplyPatch crash-driver.patch
 
-# crypto/
-
-# secure boot
 ApplyPatch Add-secure_modules-call.patch
+
 ApplyPatch PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
+
 ApplyPatch x86-Lock-down-IO-port-access-when-module-security-is.patch
+
 ApplyPatch ACPI-Limit-access-to-custom_method.patch
+
 ApplyPatch asus-wmi-Restrict-debugfs-interface-when-module-load.patch
+
 ApplyPatch Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
+
 ApplyPatch acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
+
 ApplyPatch kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
+
 ApplyPatch x86-Restrict-MSR-access-when-module-loading-is-restr.patch
+
 ApplyPatch Add-option-to-automatically-enforce-module-signature.patch
+
 ApplyPatch efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
+
 ApplyPatch efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
+
 ApplyPatch efi-Add-EFI_SECURE_BOOT-bit.patch
+
 ApplyPatch hibernate-Disable-in-a-signed-modules-environment.patch
 
 ApplyPatch Add-EFI-signature-data-types.patch
+
 ApplyPatch Add-an-EFI-signature-blob-parser-and-key-loader.patch
+
 ApplyPatch KEYS-Add-a-system-blacklist-keyring.patch
+
 ApplyPatch MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
+
 ApplyPatch MODSIGN-Support-not-importing-certs-from-db.patch
 
 ApplyPatch Add-sysrq-option-to-disable-secure-boot-mode.patch
 
-ApplyPatch efi-Add-esrt-support.patch
-
-# Assorted Virt Fixes
-
-# DRM core
-
-# Nouveau DRM
-
-# Intel DRM
 ApplyPatch drm-i915-hush-check-crtc-state.patch
 
-# Radeon DRM
-
-# Patches headed upstream
 ApplyPatch disable-i8042-check-on-apple-mac.patch
 
-# FIXME: REBASE
-#ApplyPatch hibernate-freeze-filesystems.patch
-
 ApplyPatch lis3-improve-handling-of-null-rate.patch
 
-# Disable watchdog on virtual machines.
 ApplyPatch watchdog-Disable-watchdog-on-virtual-machines.patch
 
-#rhbz 754518
 ApplyPatch scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
 
-#pplyPatch weird-root-dentry-name-debug.patch
-
-# https://fedoraproject.org/wiki/Features/Checkpoint_Restore
 ApplyPatch criu-no-expert.patch
 
-#rhbz 892811
 ApplyPatch ath9k-rx-dma-stop-check.patch
 
-#rhbz 1094948
-ApplyPatch acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch
+ApplyPatch xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch
 
-ApplyPatch fifo-nv04-remove-the-loop-from-the-interrupt-handler.patch
+ApplyPatch Input-synaptics-pin-3-touches-when-the-firmware-repo.patch
 
-#CVE-2015-0275 rhbz 1193907 1195178
-ApplyPatch ext4-Allocate-entire-range-in-zero-range.patch
+ApplyPatch firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch
 
-#rhbz 1190947
-ApplyPatch Bluetooth-ath3k-Add-support-Atheros-AR5B195-combo-Mi.patch
+ApplyPatch drm-i915-turn-off-wc-mmaps.patch
 
-#rhbz 1196825
-ApplyPatch security-yama-Remove-unnecessary-selects-from-Kconfi.patch
+ApplyPatch kexec-uefi-copy-secure_boot-flag-in-boot-params.patch
 
-ApplyPatch mfd-rtsx_usb-prevent-DMA-from-stack.patch
+#rhbz 1287819
+ApplyPatch HID-multitouch-enable-palm-rejection-if-device-imple.patch
 
-#rhbz 1200777 1200778
-ApplyPatch Input-synaptics-split-synaptics_resolution-query-fir.patch
-ApplyPatch Input-synaptics-log-queried-and-quirked-dimension-va.patch
-ApplyPatch Input-synaptics-query-min-dimensions-for-fw-v8.1.patch
-ApplyPatch Input-synaptics-remove-obsolete-min-max-quirk-for-X2.patch
-ApplyPatch Input-synaptics-support-min-max-board-id-in-min_max_.patch
-ApplyPatch Input-synaptics-skip-quirks-when-post-2013-dimension.patch
-ApplyPatch Input-synaptics-fix-middle-button-on-Lenovo-2015-pro.patch
-ApplyPatch Input-synaptics-handle-spurious-release-of-trackstic.patch
-ApplyPatch Input-synaptics-do-not-retrieve-the-board-id-on-old-.patch
-ApplyPatch Input-synaptics-retrieve-the-extended-capabilities-i.patch
-ApplyPatch Input-synaptics-remove-TOPBUTTONPAD-property-for-Len.patch
-ApplyPatch Input-synaptics-re-route-tracksticks-buttons-on-the-.patch
-ApplyPatch Input-synaptics-remove-X1-Carbon-3rd-gen-from-the-to.patch
-ApplyPatch Input-synaptics-remove-X250-from-the-topbuttonpad-li.patch
-ApplyPatch Revert-Input-synaptics-use-dmax-in-input_mt_assign_s.patch
+#rhbz 1288687
+ApplyPatch alua_fix.patch
 
-#CVE-2014-8159 rhbz 1181166 1200950
-ApplyPatch IB-core-Prevent-integer-overflow-in-ib_umem_get-addr.patch
+#rhbz 1083853
+ApplyPatch PNP-Add-Broadwell-to-Intel-MCH-size-workaround.patch
 
-#rhbz 1201532
-ApplyPatch HID-multitouch-add-support-of-clickpads.patch
+#rhbz 1300955
+ApplyPatch PNP-Add-Haswell-ULT-to-Intel-MCH-size-workaround.patch
 
-%if 0%{?aarch64patches}
-ApplyPatch kernel-arm64.patch
-%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
-ApplyPatch kernel-arm64.patch -R
-%endif
-%endif
+#rhbz 1278942
+ApplyPatch media-ivtv-avoid-going-past-input-audio-array.patch
+
+#rhbz 1255325
+ApplyPatch HID-sony-do-not-bail-out-when-the-sixaxis-refuses-th.patch
+
+#Known use after free, possibly rhbz 1310579
+ApplyPatch 0001-usb-hub-fix-panic-in-usb_reset_and_verify_device.patch
+
+#rhbz 1310252 1313318
+ApplyPatch 0001-drm-i915-Pretend-cursor-is-always-on-for-ILK-style-W.patch
+
+#CVE-2016-3135 rhbz 1317386 1317387
+ApplyPatch netfilter-x_tables-check-for-size-overflow.patch
+
+#CVE-2016-3134 rhbz 1317383 1317384
+ApplyPatch netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
+
+# CVE-2016-3672 rhbz 1324749 1324750
+ApplyPatch x86-mm-32-Enable-full-randomization-on-i386-and-X86_.patch
+
+#CVE-2016-3951 rhbz 1324782 1324815
+ApplyPatch cdc_ncm-do-not-call-usbnet_link_change-from-cdc_ncm_.patch
+
+#CVE-2016-4482 rhbz 1332931 1332932
+ApplyPatch USB-usbfs-fix-potential-infoleak-in-devio.patch
+
+#CVE-2016-4569 rhbz 1334643 1334645
+ApplyPatch ALSA-timer-Fix-leak-in-SNDRV_TIMER_IOCTL_PARAMS.patch
+ApplyPatch ALSA-timer-Fix-leak-in-events-via-snd_timer_user_cca.patch
+ApplyPatch ALSA-timer-Fix-leak-in-events-via-snd_timer_user_tin.patch
+
+#CVE-2016-0758 rhbz 1300257 1335386
+ApplyPatch KEYS-Fix-ASN.1-indefinite-length-object-parsing.patch
+
+#CVE-2016-5243 rhbz 1343338 1343335
+ApplyPatch tipc-fix-an-infoleak-in-tipc_nl_compat_link_dump.patch
+
+#CVE-2016-5244 rhbz 1343338 1343337
+ApplyPatch rds-fix-an-infoleak-in-rds_inc_info_copy.txt
+
+#CVE-2016-4470 rhbz 1341716 1346626
+ApplyPatch KEYS-potential-uninitialized-variable.patch
+
+#rhbz 1338025
+ApplyPatch hp-wmi-fix-wifi-cannot-be-hard-unblock.patch
+
+#CVE-2016-5829 rhbz 1350509 1350513
+ApplyPatch HID-hiddev-validate-num_values-for-HIDIOCGUSAGES-HID.patch
+
+#CVE-2016-5728 rhbz 1350811 1350812
+ApplyPatch misc-mic-Fix-for-double-fetch-security-bug-in-mic_co.patch
+
+#CVE-2016-1237 rhbz 1350845 1350847
+ApplyPatch posix_acl-Add-set_posix_acl.patch
+ApplyPatch nfsd-check-permissions-when-setting-ACLs.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1524,11 +1500,9 @@ BuildKernel() {
     cp configs/$Config .config
 
     %if %{signmodules}
-    cp %{SOURCE11} .
+    cp %{SOURCE11} certs/.
     %endif
 
-    chmod +x scripts/sign-file
-
     Arch=`head -1 .config | cut -b 3-`
     echo USING ARCH=$Arch
 
@@ -1764,8 +1738,8 @@ BuildKernel() {
 
 %if %{signmodules}
     # Save the signing keys so we can sign the modules in __modsign_install_post
-    cp signing_key.priv signing_key.priv.sign${Flav}
-    cp signing_key.x509 signing_key.x509.sign${Flav}
+    cp certs/signing_key.pem certs/signing_key.pem.sign${Flav}
+    cp certs/signing_key.x509 certs/signing_key.x509.sign${Flav}
 %endif
 
     # Move the devel headers out of the root file system
@@ -1810,7 +1784,7 @@ BuildKernel %make_target %kernel_image
 %endif
 
 %global perf_make \
-  make -s %{?cross_opts} %{?_smp_mflags} -C tools/perf V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix}
+  make -s EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} %{?_smp_mflags} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix}
 %if %{with_perf}
 # perf
 %{perf_make} DESTDIR=$RPM_BUILD_ROOT all
@@ -1860,16 +1834,16 @@ popd
 %define __modsign_install_post \
   if [ "%{signmodules}" -eq "1" ]; then \
     if [ "%{with_pae}" -ne "0" ]; then \
-      %{modsign_cmd} signing_key.priv.sign+%{pae} signing_key.x509.sign+%{pae} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+%{pae}/ \
+      %{modsign_cmd} certs/signing_key.pem.sign+%{pae} certs/signing_key.x509.sign+%{pae} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+%{pae}/ \
     fi \
     if [ "%{with_debug}" -ne "0" ]; then \
-      %{modsign_cmd} signing_key.priv.sign+debug signing_key.x509.sign+debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+debug/ \
+      %{modsign_cmd} certs/signing_key.pem.sign+debug certs/signing_key.x509.sign+debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+debug/ \
     fi \
     if [ "%{with_pae_debug}" -ne "0" ]; then \
-      %{modsign_cmd} signing_key.priv.sign+%{pae}debug signing_key.x509.sign+%{pae}debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+%{pae}debug/ \
+      %{modsign_cmd} certs/signing_key.pem.sign+%{pae}debug certs/signing_key.x509.sign+%{pae}debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+%{pae}debug/ \
     fi \
     if [ "%{with_up}" -ne "0" ]; then \
-      %{modsign_cmd} signing_key.priv.sign signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
+      %{modsign_cmd} certs/signing_key.pem.sign certs/signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
     fi \
   fi \
   if [ "%{zipmodules}" -eq "1" ]; then \
@@ -2130,6 +2104,7 @@ fi
 %dir %{_libdir}/traceevent/plugins
 %{_libdir}/traceevent/plugins/*
 %dir %{_libexecdir}/perf-core
+%{_datadir}/perf-core/*
 %{_libexecdir}/perf-core/*
 %{_mandir}/man[1-8]/perf*
 %{_sysconfdir}/bash_completion.d/perf
@@ -2255,6 +2230,692 @@ fi
 #
 # 
 %changelog
+* Tue Jun 28 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-1237 missing check for permissions setting ACL (rhbz 1350845 1350847)
+- CVE-2016-5728 race condition in mic driver (rhbz 1350811 1350812)
+
+* Mon Jun 27 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-5829 heap overflow in hiddev (rhbz 1350509 1350513)
+
+* Fri Jun 24 2016 Laura Abbott <labbott@fedoraproject.org> - 4.4.14-200
+- Linux v4.4.14
+
+* Wed Jun 15 2016 Laura Abbott <labbott@fedoraproject.org>
+- hp-wmi: fix wifi cannot be hard-unblock (rhbz 1338025)
+
+* Wed Jun 15 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-4470 keys: uninitialized variable crash (rhbz 1341716 1346626)
+
+* Mon Jun 13 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-1583 stack overflow via ecryptfs and /proc (rhbz 1344721 1344722)
+
+* Wed Jun 08 2016 Laura Abbott <labbott@fedoraproject.org> - 4.4.13-200
+- Linux v4.4.13
+
+* Tue Jun 07 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-5244 info leak in rds (rhbz 1343338 1343337)
+- CVE-2016-5243 info leak in tipc (rhbz 1343338 1343335)
+
+* Wed Jun 01 2016 Laura Abbott <labbott@fedoraproject.org> - 4.4.12-200
+- Linux v4.4.12
+
+* Mon May 23 2016 Laura Abbott <labbott@fedoraproject.org> - 4.4.11-200
+- Linux v4.4.11
+- Actually apply one patch
+
+* Mon May 23 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-4951 null ptr deref in tipc_nl_publ_dump (rhbz 1338625 1338626)
+
+* Thu May 19 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-4913 isofs: info leak with malformed NM entries (rhbz 1337528 1337529)
+
+* Mon May 16 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-3713 kvm: out-of-bounds access in set_var_mtrr_msr (rhbz 1332139 1336410)
+
+* Fri May 13 2016 Laura Abbott <labbott@fedoraproject.org> - 4.4.10-200
+- Linux v4.4.10
+
+* Fri May 13 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-0758 pointer corruption in asn1 decoder (rhbz 1300257 1335386)
+
+* Tue May 10 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-4569 info leak in sound module (rhbz 1334643 1334645)
+
+* Mon May 09 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-4557 bpf: Use after free vulnerability via double fdput
+  CVE-2016-4558 bpf: refcnt overflow (rhbz 1334307 1334303 1334311)
+
+* Fri May 06 2016 Laura Abbott <labbott@fedoraproject.org> - 4.4.9-200
+- Linux v4.4.9
+
+* Fri May 06 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Oops in propogate_mnt if first copy is slave (rhbz 1333712 1333713)
+
+* Thu May 05 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-4486 CVE-2016-4485 info leaks (rhbz 1333316 1333309 1333321)
+
+* Wed May 04 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-4482 info leak in devio.c (rhbz 1332931 1332932)
+
+* Fri Apr 29 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add patch to fix i.MX6 graphics
+
+* Thu Apr 28 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Don't splash warnings from broken BGRT firmware implementations
+- Require /usr/bin/kernel-install (rhbz 1331012)
+
+* Tue Apr 26 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Enable IEEE802154_AT86RF230 on more arches (rhbz 1330356)
+
+* Wed Apr 20 2016 Laura Abbott <labbott@fedoraproject.org> - 4.4.8-200
+- Linux v4.4.8
+- Allow antenna selection for rtl8723be (rhbz 1309487)
+
+* Tue Apr 19 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-3955 usbip: buffer overflow by trusting length of incoming packets  (rhbz 1328478 1328479)
+
+* Fri Apr 15 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-3961 xen: hugetlbfs use may crash PV guests (rhbz 1327219 1323956)
+
+* Wed Apr 13 2016 Laura Abbott <labbott@fedoraproject.org>
+- Fix for Skylake pstate issues (rhbz 1309980)
+
+* Tue Apr 12 2016 Laura Abbott <labbott@redhat.com> - 4.4.7-200
+- Linux v4.4.7
+
+* Tue Apr 12 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix Bamboo ONE issues (rhbz 1317116)
+
+* Mon Apr 11 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-3951 usbnet: crash on invalid USB descriptors (rhbz 1324782 1324815)
+- CVE-2015-8839 ext4: data corruption due to punch hole races (rhbz 1323577 1323579)
+
+* Thu Apr 07 2016 Justin M. Forbes <jforbes@fedoraproject.org>
+- Enable Full Randomization on 32bit x86 CVE-2016-3672 (rhbz 1324749 1324750)
+`
+* Thu Mar 31 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Add two more patches for CVE-2016-2184
+
+* Wed Mar 30 2016 Laura Abbott <labbott@redhat.com> - 4.4.6-201
+- Bump and build
+
+* Tue Mar 29 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-3157 xen: priv escalation on 64bit PV domains with io port access (rhbz 1315711 1321948)
+
+* Wed Mar 23 2016 Laura Abbott <labbott@fedoraproject.org>
+- drm/udl: Use unlocked gem unreferencing (rhbz 1295646)
+
+* Tue Mar 22 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-3136 mct_u232: oops on invalid USB descriptors (rhbz 1317007 1317010)
+- CVE-2016-2187 gtco: oops on invalid USB descriptors (rhbz 1317017 1317010)
+
+* Mon Mar 21 2016 Laura Abbott <labbott@fedoraproject.org>
+- uas: Limit qdepth at the scsi-host level (rhbz 1315013)
+- Fix for performance regression caused by thermal (rhbz 1317190)
+- Input: synaptics - handle spurious release of trackstick buttons, again (rhbz 1318079)
+
+* Fri Mar 18 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- ims-pcu: sanity checking on missing interfaces
+- CVE-2016-3140 digi_acceleport: oops on invalid USB descriptors (rhbz 1317010 1316995)
+- CVE-2016-3138 cdc_acm: oops on invalid USB descriptors (rhbz 1317010 1316204)
+- CVE-2016-2185 ati_remote2: oops on invalid USB descriptors (rhbz 1317014 1317471)
+- CVE-2016-2188 iowarrior: oops on invalid USB descriptors (rhbz 1317018 1317467)
+- CVE-2016-2186 powermate: oops on invalid USB descriptors (rhbz 1317015 1317464)
+- CVE-2016-3137 cypress_m8: oops on invalid USB descriptors (rhbz 1317010 1316996)
+- CVE-2016-2184 alsa: panic on invalid USB descriptors (rhbz 1317012 1317470)
+
+* Wed Mar 16 2016 Laura Abbott <labbott@redhat.com> - 4.4.6-200
+- Linux v4.4.6
+
+* Wed Mar 16 2016 Laura Abbott <labbott@redhat.com>
+- Revert patch causing radeon breakage (rhbz 1317300 1317179)
+
+* Wed Mar 16 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-3135 ipv4: DoS when destroying a network interface (rhbz 1318172 1318270)
+
+* Mon Mar 14 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-3134 netfilter: missing bounds check in ipt_entry struct (rhbz 1317383 1317384)
+- CVE-2016-3135 netfilter: size overflow in x_tables (rhbz 1317386 1317387)
+
+* Fri Mar 11 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Add patch for ICP DAS I-756xU devices (rhbz 1316136)
+
+* Thu Mar 10 2016 Laura Abbott <labbott@redhat.com>
+- cdc-acm: fix NULL pointer reference (rhbz 1316719)
+
+* Wed Mar 09 2016 Laura Abbott <labbott@redhat.com> - 4.4.5-200
+- Linux v4.4.5
+- Fix for known arm64 bootup issue
+
+* Fri Mar 04 2016 Laura Abbott <labbott@redhat.com> - 4.4.4-200
+- Require updated XFS utilities
+
+* Thu Mar 03 2016 Laura Abbott <labbott@redhat.com>
+- Linux v4.4.4
+- Switch back to not setting CONFIG_ACPI_REV_OVERRIDE_POSSIBLE
+
+* Thu Mar 03 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Partial SMAP bypass on 64-bit kernels (rhbz 1314253 1314255)
+
+* Wed Mar 02 2016 Laura Abbott <labbott@redhat.com>
+- Fix for flickering on Intel graphics (rhbz 1310252 1313318)
+
+* Wed Mar 02 2016 Laura Abbott <labbott@redhat.com>
+- Re-enable dropped CONFIG_ACPI_REV_OVERRIDE_POSSIBLE (rhbz 1313434)
+
+* Wed Mar 02 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- pipe: limit the per-user amount of pages allocated in pipes (rhbz 1313428 1313433)
+
+* Sat Feb 27 2016 Peter Robinson <pbrobinson@fedoraproject.org> 4.4.3-201
+- Bring missed 4.4 ARMv7 fixes from F-23 kernel
+- Fix deferred nouveau module loading on tegra
+
+* Fri Feb 26 2016 Laura Abbott <labbott@fedoraproject.org> - 4.4.3-200
+- Linux v4.4.3
+
+* Wed Feb 24 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-2550 af_unix: incorrect accounting on in-flight fds (rhbz 1311517 1311518)
+
+* Mon Feb 22 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.3.6-201
+- Revert broken usb patch
+
+* Sat Feb 20 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.3.6-200
+- Linux v4.3.6
+
+* Thu Feb 18 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-8812 cxgb3 use after free (rhbz 1303532 1309548)
+
+* Wed Feb 17 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Backport mgag200 cursor hang fix (rhbz 1305181 1299901)
+
+* Tue Feb 16 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Backport fix for elantech touchpads (rhbz 1306987)
+
+* Mon Feb 15 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-2383 incorrect branch fixups for eBPG allow arbitrary reads (rhbz 1308452 1308453)
+- CVE-2016-2384 double free in usb-audio from invalid USB descriptor (rhbz 1308444 1308445)
+
+* Tue Feb 09 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-0617 fix hugetlbfs inode.c issues (rhbz 1305803 1305804)
+
+* Tue Feb 02 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Backport patch to fix memory leak in rtlwifi USB devices (rhbz 1303270)
+
+* Sun Jan 31 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.3.5-200
+- Linux v4.3.5
+
+* Fri Jan 29 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Backport HID sony patch to fix some gamepads (rhbz 1255235)
+
+* Thu Jan 28 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix issues with ivtv driver on PVR350 devices (rhbz 1278942)
+- Add patches to fix suprious NEWLINK netlink messages (rhbz 1302037)
+
+* Mon Jan 25 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.3.4-200
+- Add patch to fix some Elan touchpads (rhbz 1296677)
+
+* Sat Jan 23 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Linux v4.3.4
+
+* Fri Jan 22 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix backtrace from PNP conflict on Haswell-ULT (rhbz 1300955)
+
+* Thu Jan 21 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-XXXX-XXXX missing null ptr check in nf_nat_redirect_ipv4 (rhbz 1300731 1300732)
+- Fix incorrect country code issue on RTL8812AE devices (rhbz 1279653)
+
+* Wed Jan 20 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-0723 memory disclosure and crash in tty layer (rhbz 1296253 1300224)
+- CVE-2013-4312 file descr passed over unix sockects not properly accounted (rhbz 1297813 1300216)
+
+* Tue Jan 19 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.3.3-200
+- Rebase to 4.3.y
+- Backport nouveau stable fixes (rhbz 1299349)
+- CVE-2016-0728 Keys: reference leak in join_session_keyring (rhbz 1296623 1297475)
+- Add currently queued networking stable patches
+- Add a couple btrfs patches cc'd to stable upstream
+- Add SCSI patches to avoid blacklist false positives (rhbz 1299810)
+
+* Fri Jan 15 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-8767 sctp: DoS during timeout (rhbz 1297389 1298437)
+
+* Tue Jan 12 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-7566 usb: visor: Crash on invalid USB dev descriptors (rhbz 1296466 1297517)
+- Fix backtrace from PNP conflict on Broadwell (rhbz 1083853)
+
+* Thu Jan 07 2016 Josh Boyer <jwboyer@fedorparoject.org>
+- CVE-2015-7513 kvm: divide by zero DoS (rhbz 1284847 1296142)
+
+* Tue Jan 05 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-8709 ptrace: potential priv escalation with userns (rhbz 1295287 1295288)
+
+* Fri Dec 18 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-8575 information leak in sco_sock_bind (rhbz 1292840 1292841)
+
+* Thu Dec 17 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-8569 info leak from getsockname (rhbz 1292045 1292047)
+
+* Tue Dec 15 2015 Justin Forbes <jforbes@fedoraproject.org> - 4.2.8-200
+- Linux v4.2.8
+
+* Tue Dec 15 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-8543 ipv6: DoS via NULL pointer dereference (rhbz 1290475 1290477)
+
+* Mon Dec 14 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-7550 Race between read and revoke keys (rhbz 1291197 1291198)
+- CVE-XXXX-XXXX permission bypass on overlayfs (rhbz 1291329 1291332)
+
+* Fri Dec 11 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2013-7446 unix sockects use after free (rhbz 1282688 1282712)
+
+* Thu Dec 10 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix rfkill issues on ideapad Y700-17ISK (rhbz 1286293)
+
+* Wed Dec 09 2015 Justin Forbes <jforbes@fedoraproject.org> - 4.2.7-200
+- Linux v4.2.7
+
+* Thu Dec 03 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Add patch to fix palm rejection on certain touchpads (rhbz 1287819)
+- Add new PCI ids for wireless, including Lenovo Yoga (rhbz 1275490)
+
+* Tue Dec 01 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-7515 aiptek: crash on invalid device descriptors (rhbz 1285326 1285331)
+- CVE-2015-7833 usbvision: crash on invalid device descriptors (rhbz 1270158 1270160)
+
+* Mon Nov 30 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix crash in add_key (rhbz 1284059)
+- CVE-2015-8374 btrfs: info leak when truncating compressed/inlined extents (rhbz 1286261 1286262)
+
+* Fri Nov 20 2015 Justin M. Forbes <jmforbes@fedoraproject.org>
+- Fix for GRE tunnel running in IPSec (rhbz 1272571)
+- Fix KVM on specific hardware (rhbz 1278688)
+
+* Mon Nov 16 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix ipset netfilter issues (rhbz 1279189)
+
+* Tue Nov 10 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix Yoga 900 rfkill switch issues (rhbz 1275490)
+
+* Tue Nov 10 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 4.2.6-200
+- Linux v4.2.6
+
+* Tue Nov 10 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix incorrect size calculations in megaraid with 64K pages (rhbz 1269300)
+- CVE-2015-8104 kvm: DoS infinite loop in microcode DB exception (rhbz 1278496 1279691)
+- CVE-2015-5307 kvm: DoS infinite loop in microcode AC exception (rhbz 1277172 1279688)
+
+* Thu Nov  5 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Disable Exynos IOMMU as it crashes
+
+* Thu Nov 05 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix backlight regression on older radeon devices (rhbz 1278407)
+
+* Wed Nov  4 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable some IIO sensors (temp/humidity) on ARMv7
+
+* Tue Nov 03 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-7799 slip:crash when using PPP char dev driver (rhbz 1271134 1271135)
+
+* Tue Nov 03 2015 Justin M. Forbes <jforbes@fedoraproject.org>
+- Add xz-devel builreq for perf (rhbz 1167457)
+
+* Mon Nov 02 2015 Laura Abbott <labbott@fedoraproject.org>
+- Add spurious wakeup quirk for LynxPoint-LP controllers (rhbz 1257131)
+
+* Thu Oct 29 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-7099 RDS: race condition on unbound socket null deref (rhbz 1276437 1276438)
+
+* Tue Oct 27 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 4.2.5-201
+- Bump for build
+
+* Tue Oct 27 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- CMA memory patch to fix aarch64 builder lockups
+
+* Mon Oct 26 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 4.2.5-200
+- Linux v4.2.5
+
+* Fri Oct 23 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 4.2.4-200
+- Linux v4.2.4 (rhbz 1272645)
+
+* Tue Oct 20 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Enable IEEE802154_ATUSB (rhbz 1272935)
+
+* Mon Oct 19 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix crash in key garbage collector when using request_key (rhbz 1272172)
+
+* Thu Oct 15 2015 Justin M. Forbes <jforbes@fedoraproject.org>
+- Fix for iscsi target issues (#rhbz 1271812)
+
+* Wed Oct 07 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 4.2.3-200
+- Linux v4.2.3
+- CVE-2015-5156 virtio-net: bug overflow with large fraglist (rhbz 1243852 1266515)
+
+* Mon Oct 05 2015 Laura Abbott <labbott@fedoraproject.org>
+- Make headphone work with with T550 + Dock (rhbz 1268037)
+
+* Mon Oct 05 2015 Laura Abbott <labbott@fedoraproject.org>
+- Stop stack smash for several DVB devices (rhbz 1265978)
+
+* Mon Oct 05 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.10-200
+- Linxu v4.1.10
+- Add patch to fix soft lockups in network stack (rhbz 1266691)
+
+* Fri Oct 02 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-7613 Unauthorized access to IPC via SysV shm (rhbz 1268270 1268273)
+
+* Thu Oct 01 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-2925 Don't allow bind mount escape (rhbz 1209367 1209373)
+
+* Tue Sep 29 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.9-200
+- Linux v4.1.9
+
+* Thu Sep 24 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-5257 Null ptr deref in usb whiteheat driver (rhbz 1265607 1265612)
+
+* Mon Sep 21 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.8-200
+- Linux v4.1.8
+
+* Fri Sep 18 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix oops in 32-bit kernel on 64-bit AMD cpus (rhbz 1263762)
+
+* Tue Sep 15 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-6937 net: rds null pointer (rhbz 1263139 1263140)
+
+* Mon Sep 14 2015 Laura Abbott <labbott@redhat.com> - 4.1.7-200
+- Linux v4.1.7
+
+* Fri Sep 04 2015 Laura Abbott <labbott@redhat.com> - 4.1.6-201
+- Tag and build
+
+* Thu Aug 27 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix vmware driver issues from Thomas Hellström (rhbz 1227193)
+- Add patch from Hans de Goede to fix nv46 based cards (rhbz 1257534)
+- Add patch from Jonathon Jongsma to fix modes in qxl (rhbz 1212201)
+
+* Wed Aug 26 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Disable CRYPTO_DEV_VMX_ENCRYPT on PPC for now to fix Power 8 boot (rhbz 1237089)
+
+* Tue Aug 25 2015 Laura Abbott <labbott@fedoraproject.org>
+- Fix x2apic refactoring breakage (rhbz 1224764)
+
+* Tue Aug 25 2015 Laura Abbott <labbott@fedoraproject.org>
+- Correct the sdhci DMA leak patch to actually compile (oops)
+
+* Tue Aug 25 2015 Laura Abbott <labbott@fedoraproject.org>
+- Fix DMA leak from sdhci (rhbz 1256281)
+
+* Tue Aug 25 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-6666 x86_64 NT flag handling DoS (rhbz 1256746 1256753)
+
+* Fri Aug 21 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Disable EFI_VARS (rhbz 1252137)
+
+* Thu Aug 20 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix incorrect ext4 freezing behavior on non-journaled fs (rhbz 1250717)
+
+* Mon Aug 17 2015 Laura Abbott <labbott@fedoraproject.org> - 4.1.6-200
+- Linux v4.1.6
+- Actually apply the fix for rhbz 1253789
+
+* Mon Aug 17 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix iscsi issue (rhbz 1253789)
+
+* Sat Aug 15 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Patch from Hans de Goede to add yoga 3 rfkill quirk (rhbz 1239050)
+
+* Tue Aug 11 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Drop UACCESS_WITH_MEMCPY on ARMv7 as it's broken (rhbz 1250613)
+
+* Mon Aug 10 2015 Laura Abbott <labbott@fedoraproject.org> - 4.1.5-200
+- Linux v4.1.5
+
+* Mon Aug 10 2015 Laura Abbott <labbott@fedoraproject.org>
+- Fix use after free in HID input (rhbz 1251877 1251880 1250279 1248741)
+
+* Tue Aug 04 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Patch from Nicholas Kudriavtsev for Acer Switch 12 Fn keys (rhbz 1244511)
+
+* Tue Aug  4 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Back port AMD Seattle a0 4.1 NIC driver update
+
+* Mon Aug 03 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.4-200
+- Linux v4.1.4
+- CVE-2015-5697 info leak in md driver (rhbz 1249011 1249013)
+
+* Wed Jul 29 2015 Laura Abbott <labbott@redhat.com> - 4.1.3-201
+- tag and build for CVE fixes
+
+* Mon Jul 27 2015 Laura Abbott <labbott@fedoraproject.org>
+- CVE-2015-3290 CVE-2015-3291 NMI issues (rhbz 1243465 1245927)
+
+* Mon Jul 27 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-1333 add_key memory leak (rhbz 1244171)
+
+* Thu Jul 23 2015 Laura Abbott <labbott@fedoraproject.org>
+- Fix warning from pcmcia (rhbz 1180920 1206724)
+
+* Wed Jul 22 2015 Laura Abbott <labbott@fedoraproject.org> - 4.1.3-200
+- Add patches for Ideapad RF switches (rhbz 1192270)
+
+* Wed Jul 22 2015 Laura Abbott <labbott@fedoraproject.org>
+- Linux v4.1.3
+
+* Wed Jul 15 2015 Laura Abbott <labbott@fedoraproject.org> - 4.1.2-200
+- Linux v4.1.2 rebase
+
+* Fri Jul 10 2015 Laura Abbott <labbott@redhat.com> - 4.0.8-300
+- Linux v4.0.8
+
+* Tue Jul 07 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Drop incorrect patches for now (rhbz 1212230)
+
+* Mon Jun 29 2015 Laura Abbott <labbott@fedoraproject.org> - 4.0.7-300
+- Linux v4.0.7
+
+* Tue Jun 23 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 4.0.6-300
+- Linux v4.0.6
+
+* Thu Jun 18 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Add patch to fix touchpad issues on Razer machines (rhbz 1227891)
+
+* Fri Jun 12 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-XXXX kvm: NULL ptr deref in kvm_apic_has_events (rhbz 1230770 1230774)
+
+* Thu Jun 11 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Backport fixes for synaptic 3 finger tap (rhbz 1212230)
+- Backport btrfs fixes queued for stable (rhbz 1217191)
+
+* Tue Jun 09 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix touchpad for Thinkpad S540 (rhbz 1223051)
+
+* Mon Jun 08 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Linux v4.0.5
+
+* Thu Jun 04 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Backport commit to fix block spew (rhbz 1226621)
+- Add patch to fix SMT guests on POWER7 (rhbz 1227877)
+- Add patch to turn of WC mmaps on i915 from airlied (rhbz 1226743)
+
+* Wed Jun 03 2015 Laura Abbott <labbott@fedoraproject.org>
+- Fix del_timer_sync in mwifiex
+
+* Wed Jun 03 2015 Laura Abbott <labbott@fedoraproject.org>
+- Drop that blasted firwmare warning until we get a real fix (rhbz 1133378)
+
+* Wed Jun 03 2015 Laura Abbott <labbott@fedoraproject.org>
+- Fix auditing of canonical mode (rhbz 1188695)
+
+* Wed Jun 03 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-1420 fhandle race condition (rhbz 1187534 1227417)
+
+* Tue Jun 02 2015 Laura Abbott <labbott@fedoraproject.org>
+- Fix fd_do_rw error (rhbz 1218882)
+
+* Tue Jun 02 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix middle button issues on external Lenovo keyboards (rhbz 1225563)
+
+* Thu May 28 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Add quirk for Mac Pro backlight (rhbz 1217249)
+
+* Thu May 28 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.4-303
+- Add patch to avoid vmmouse being classified as a joystic (rhbz 1214474)
+
+* Wed May 27 2015 Josh Boyer <jwboyer@fedoraproject.org> -4.0.4-302
+- Apply queued fixes for crasher reported by Alex Larsson
+- Enable in-kernel vmmouse driver (rhbz 1214474)
+
+* Tue May 26 2015 Laura Abbott <labbott@fedoraproject.org>
+- Fix signed division error (rhbz 1200353)
+
+* Tue May 26 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Backport patch to fix might_sleep splat (rhbz 1220519)
+
+* Thu May 21 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.4-301
+- Add patch to fix discard on md RAID0 (rhbz 1223332)
+- Add submitted stable fix for i915 flickering on ilk (rhbz 1218688)
+
+* Mon May 18 2015 Laura Abbott <labbott@fedoraproject.org>
+- Re-add the v4l2 query caps patch which was dropped
+
+* Mon May 18 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix incorrect bandwidth on some Chicony webcams
+
+* Mon May 18 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 4.0.4-300
+- Linux v4.0.4
+
+* Fri May 15 2015 Laura Abbott <labbott@fedoraproject.org>
+- Fix DVB oops (rhbz 1220118)
+
+* Thu May 14 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 4.0.3-301
+- Disable i915 verbose state checks
+
+* Thu May 14 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix non-empty dir removal in overlayfs (rhbz 1220915)
+
+* Wed May 13 2015 Laura Abbott <labbott@fedoraproject.org>
+- Fix spew from KVM switch (rhbz 1219343)
+
+* Wed May 13 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 4.0.3-300
+- Linux v4.0.3
+
+* Sat May  9 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARMv7 updates
+
+* Thu May 07 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 4.0.2-300
+- Linux v4.0.2 (rhbz 1182816)
+
+* Tue May 05 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Backport patch to blacklist TRIM on all Samsung 8xx series SSDs (rhbz 1218662)
+- CVE-2015-3636 ping-sockets use-after-free privilege escalation (rhbz 1218074 1218110)
+
+* Thu Apr 30 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix backlight on various Toshiba machines (rhbz 1206036 1215989)
+
+* Wed Apr 29 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 4.0.1-300
+- Linux v4.0.1
+
+* Tue Apr 28 2015 Justin M. Forbes <jforbes@fedoraproject.org>
+- Fix up boot times for live images (rhbz 1210857)
+
+* Mon Apr 27 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Backport NFS DIO fixes from 4.1 (rhbz 1211017 1211013)
+
+* Fri Apr 24 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2015-3339 race condition between chown and execve (rhbz 1214030)
+- Fix iscsi with QNAP devices (rhbz 1208999)
+
+* Wed Apr 22 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Fix RTC on TrimSlice
+- Enable all sound modules for TrimSlice (also needed for other devices)
+
+* Mon Apr 20 2015 Laura Abbott
+- Fix sound issues (rhbz 1188741)
+
+* Fri Apr 17 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Add support for touchpad on Google Pixel 2 (rhbz 1209088)
+- Allow disabling raw mode in logitech-hidpp (rhbz 1210801)
+
+* Wed Apr 15 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Add patch to fix tty closure race (rhbz 1208953)
+
+* Sun Apr 12 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-1
+- Linux v4.0
+
+* Fri Apr 10 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc7.git2.1
+- Linux v4.0-rc7-42-ge5e02de0665e
+
+* Thu Apr 09 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc7.git1.1
+- Linux v4.0-rc7-30-g20624d17963c
+
+* Thu Apr 02 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc6.git2.1
+- Linux v4.0-rc6-101-g0a4812798fae
+
+* Thu Apr 02 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- DoS against IPv6 stacks due to improper handling of RA (rhbz 1203712 1208491)
+
+* Wed Apr 01 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc6.git1.1
+- Linux v4.0-rc6-31-gd4039314d0b1
+- CVE-2015-2150 xen: NMIs triggerable by guests (rhbz 1196266 1200397)
+
+* Tue Mar 31 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Enable MLX4_EN_VXLAN (rhbz 1207728)
+
+* Mon Mar 30 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc6.git0.1
+- Linux v4.0-rc6
+
+* Fri Mar 27 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc5.git4.1
+- Linux v4.0-rc5-96-g3c435c1e472b
+- Fixes hangs due to i915 issues (rhbz 1204050 1206056)
+
+* Thu Mar 26 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc5.git3.1
+- Linux v4.0-rc5-80-g4c4fe4c24782
+
+* Wed Mar 25 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add aarch64 patches to fix mustang usb, seattle eth, and console settings
+
+* Wed Mar 25 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc5.git2.4
+- Add patches to fix a few more i915 hangs/oopses
+
+* Wed Mar 25 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc5.git2.1
+- Linux v4.0-rc5-53-gc875f421097a
+
+* Tue Mar 24 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix ALPS v5 and v7 trackpads (rhbz 1203584)
+
+* Tue Mar 24 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc5.git1.3
+- Linux v4.0-rc5-25-g90a5a895cc8b
+- Add some i915 fixes
+
+* Mon Mar 23 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc5.git0.3
+- Enable CONFIG_SND_BEBOB (rhbz 1204342)
+- Validate iovec range in sys_sendto/sys_recvfrom
+- Revert i915 commit that causes boot hangs on at least some headless machines
+- Linux v4.0-rc5
+
+* Fri Mar 20 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc4.git2.1
+- Linux v4.0-rc4-199-gb314acaccd7e
+- Fix brightness on Lenovo Ideapad Z570 (rhbz 1187004)
+
+* 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>
+- Drop arm64 non upstream patch
+
+* Thu Mar 19 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Add patch to fix high cpu usage on direct_read kernfs files (rhbz 1202362)
+
+* Wed Mar 18 2015 Jarod Wilson <jwilson@fedoraproject.org>
+- Fix kernel-uname-r Requires/Provides variant mismatches
+
+* Tue Mar 17 2015 Kyle McMartin <kmcmarti@redhat.com> - 4.0.0-0.rc4.git0.3
+- Update kernel-arm64.patch, move EDAC to arm-generic, add EDAC_XGENE on arm64.
+- Add PCI_ECAM on generic, since it'll be selected most places anyway.
+
+* Mon Mar 16 2015 Jarod Wilson <jwilson@fedoraproject.org>
+- Fix bad variant usage in kernel dependencies
+
 * Mon Mar 16 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc4.git0.1
 - Linux v4.0-rc4
 - Drop arm64 RCU revert patch.  Should be fixed properly upstream now.
diff --git a/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch b/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
index 9191a5685..a5832ea70 100644
--- a/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
+++ b/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
@@ -1,3 +1,4 @@
+From 6306cad6e5663424c08e5ebdfdcfd799c5537bfe Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Fri, 9 Aug 2013 03:33:56 -0400
 Subject: [PATCH] kexec: Disable at runtime if the kernel enforces module
@@ -13,18 +14,18 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
  1 file changed, 8 insertions(+)
 
 diff --git a/kernel/kexec.c b/kernel/kexec.c
-index 38c25b1f2fd5..f2b5272156ce 100644
+index 4c5edc357923..db431971dbd4 100644
 --- a/kernel/kexec.c
 +++ b/kernel/kexec.c
-@@ -36,6 +36,7 @@
- #include <linux/syscore_ops.h>
- #include <linux/compiler.h>
- #include <linux/hugetlb.h>
+@@ -10,6 +10,7 @@
+ #include <linux/mm.h>
+ #include <linux/file.h>
+ #include <linux/kexec.h>
 +#include <linux/module.h>
- 
- #include <asm/page.h>
- #include <asm/uaccess.h>
-@@ -1247,6 +1248,13 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments,
+ #include <linux/mutex.h>
+ #include <linux/list.h>
+ #include <linux/syscalls.h>
+@@ -133,6 +134,13 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments,
  		return -EPERM;
  
  	/*
@@ -39,5 +40,5 @@ index 38c25b1f2fd5..f2b5272156ce 100644
  	 * This leaves us room for future extensions.
  	 */
 -- 
-2.1.0
+2.4.3
 
diff --git a/kexec-uefi-copy-secure_boot-flag-in-boot-params.patch b/kexec-uefi-copy-secure_boot-flag-in-boot-params.patch
new file mode 100644
index 000000000..e239ea908
--- /dev/null
+++ b/kexec-uefi-copy-secure_boot-flag-in-boot-params.patch
@@ -0,0 +1,30 @@
+From: Dave Young <dyoung@redhat.com>
+
+[PATCH] kexec/uefi: copy secure_boot flag in boot params across kexec reboot
+
+Kexec reboot in case secure boot being enabled does not keep the secure boot
+mode in new kernel, so later one can load unsigned kernel via legacy kexec_load.
+In this state, the system is missing the protections provided by secure boot.
+
+Adding a patch to fix this by retain the secure_boot flag in original kernel.
+
+secure_boot flag in boot_params is set in EFI stub, but kexec bypasses the stub.
+Fixing this issue by copying secure_boot flag across kexec reboot.
+
+Signed-off-by: Dave Young <dyoung@redhat.com>
+---
+ arch/x86/kernel/kexec-bzimage64.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
+index 9642b9b..0539ec7 100644
+--- a/arch/x86/kernel/kexec-bzimage64.c
++++ b/arch/x86/kernel/kexec-bzimage64.c
+@@ -178,6 +178,7 @@ setup_efi_state(struct boot_params *params, unsigned long params_load_addr,
+ 	if (efi_enabled(EFI_OLD_MEMMAP))
+ 		return 0;
+ 
++	params->secure_boot = boot_params.secure_boot;
+ 	ei->efi_loader_signature = current_ei->efi_loader_signature;
+ 	ei->efi_systab = current_ei->efi_systab;
+ 	ei->efi_systab_hi = current_ei->efi_systab_hi;
diff --git a/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch b/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
index b5b95c0b9..5e6d6611e 100644
--- a/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
+++ b/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
@@ -19,10 +19,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/lib/Kconfig b/lib/Kconfig
-index 87da53bb1fef..c767ba0cbab7 100644
+index 3a2ef67db6c7..4af1e7e5a611 100644
 --- a/lib/Kconfig
 +++ b/lib/Kconfig
-@@ -391,7 +391,8 @@ config CHECK_SIGNATURE
+@@ -396,7 +396,8 @@ config CHECK_SIGNATURE
  	bool
  
  config CPUMASK_OFFSTACK
@@ -32,6 +32,3 @@ index 87da53bb1fef..c767ba0cbab7 100644
  	help
  	  Use dynamic allocation for cpumask_var_t, instead of putting
  	  them on the stack.  This is a bit more expensive, but avoids
--- 
-2.1.0
-
diff --git a/lis3-improve-handling-of-null-rate.patch b/lis3-improve-handling-of-null-rate.patch
index 5d25039bb..1dd00b645 100644
--- a/lis3-improve-handling-of-null-rate.patch
+++ b/lis3-improve-handling-of-null-rate.patch
@@ -17,7 +17,7 @@ Signed-off-by: ??ric Piel <eric.piel@tremplin-utc.net>
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
-index 3ef4627f9cb1..2b2d2e8e5eeb 100644
+index fb8705fc3aca..50c2b93c1273 100644
 --- a/drivers/misc/lis3lv02d/lis3lv02d.c
 +++ b/drivers/misc/lis3lv02d/lis3lv02d.c
 @@ -216,7 +216,8 @@ static void lis3lv02d_get_xyz(struct lis3lv02d *lis3, int *x, int *y, int *z)
@@ -73,6 +73,3 @@ index 3ef4627f9cb1..2b2d2e8e5eeb 100644
  	if (err)
  		return err;
  
--- 
-2.1.0
-
diff --git a/media-ivtv-avoid-going-past-input-audio-array.patch b/media-ivtv-avoid-going-past-input-audio-array.patch
new file mode 100644
index 000000000..42009eb71
--- /dev/null
+++ b/media-ivtv-avoid-going-past-input-audio-array.patch
@@ -0,0 +1,29 @@
+From d55ebd07b6c21a1c7e3e74f1b73b3b033cece2b5 Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+Date: Wed, 11 Nov 2015 09:27:42 -0200
+Subject: [PATCH] [media] ivtv: avoid going past input/audio array
+
+As reported by smatch:
+	drivers/media/pci/ivtv/ivtv-driver.c:832 ivtv_init_struct2() error: buffer overflow 'itv->card->video_inputs' 6 <= 6
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+---
+ drivers/media/pci/ivtv/ivtv-driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
+index c2e60b4f292d..2bb10cd9ecfd 100644
+--- a/drivers/media/pci/ivtv/ivtv-driver.c
++++ b/drivers/media/pci/ivtv/ivtv-driver.c
+@@ -826,7 +826,7 @@ static void ivtv_init_struct2(struct ivtv *itv)
+ 				IVTV_CARD_INPUT_VID_TUNER)
+ 			break;
+ 	}
+-	if (i == itv->nof_inputs)
++	if (i >= itv->nof_inputs)
+ 		i = 0;
+ 	itv->active_input = i;
+ 	itv->audio_input = itv->card->video_inputs[i].audio_index;
+-- 
+2.5.0
+
diff --git a/mfd-rtsx_usb-prevent-DMA-from-stack.patch b/mfd-rtsx_usb-prevent-DMA-from-stack.patch
deleted file mode 100644
index 79e1f96af..000000000
--- a/mfd-rtsx_usb-prevent-DMA-from-stack.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From: Roger Tseng <rogerable@realtek.com>
-Date: Fri, 6 Mar 2015 11:36:06 +0800
-Subject: [PATCH] mfd: rtsx_usb: prevent DMA from stack
-
-Functions rtsx_usb_ep0_read_register() and rtsx_usb_get_card_status()
-both use arbitrary buffer addresses from arguments directly for DMA and
-the buffers could be located in stack. This was caught by DMA-API debug
-check.
-
-Fixes this by using double-buffers via kzalloc in both functions to
-guarantee the validity of DMA buffer.
-
-WARNING: CPU: 1 PID: 25 at lib/dma-debug.c:1166 check_for_stack+0x96/0xe0()
-ehci-pci 0000:00:1a.0: DMA-API: device driver maps memory from stack
-[addr=ffff8801199e3cef]
-Modules linked in: rtsx_usb_ms arc4 memstick intel_rapl iosf_mbi
-rtl8192ce snd_hda_codec_hdmi snd_hda_codec_realtek
-snd_hda_codec_generic snd_hda_intel rtl_pci rtl8192c_common
-snd_hda_controller x86_pkg_temp_thermal snd_hda_codec rtlwifi mac80211
-coretemp kvm_intel kvm iTCO_wdt snd_hwdep snd_seq snd_seq_device
-crct10dif_pclmul iTCO_vendor_support sparse_keymap cfg80211
-crc32_pclmul snd_pcm crc32c_intel ghash_clmulni_intel rfkill i2c_i801
-snd_timer shpchp snd serio_raw mei_me lpc_ich soundcore mei tpm_tis
-tpm wmi nfsd auth_rpcgss nfs_acl lockd grace sunrpc i915
-rtsx_usb_sdmmc mmc_core 8021q uas garp stp i2c_algo_bit llc mrp
-drm_kms_helper usb_storage drm rtsx_usb mfd_core r8169 mii video
-CPU: 1 PID: 25 Comm: kworker/1:2 Not tainted 3.20.0-0.rc0.git7.3.fc22.x86_64 #1
-Hardware name: WB WB-B06211/WB-B0621, BIOS EB062IWB V1.0 12/12/2013
-Workqueue: events rtsx_usb_ms_handle_req [rtsx_usb_ms]
- 0000000000000000 000000003d188e66 ffff8801199e3808 ffffffff8187642b
- 0000000000000000 ffff8801199e3860 ffff8801199e3848 ffffffff810ab39a
- ffff8801199e3864 ffff8801199e3cef ffff880119b57098 ffff880119b37320
-Call Trace:
- [<ffffffff8187642b>] dump_stack+0x4c/0x65
- [<ffffffff810ab39a>] warn_slowpath_common+0x8a/0xc0
- [<ffffffff810ab425>] warn_slowpath_fmt+0x55/0x70
- [<ffffffff8187efe6>] ? _raw_spin_unlock_irqrestore+0x36/0x70
- [<ffffffff81453156>] check_for_stack+0x96/0xe0
- [<ffffffff81453934>] debug_dma_map_page+0x104/0x150
- [<ffffffff81613b86>] usb_hcd_map_urb_for_dma+0x646/0x790
- [<ffffffff81614165>] usb_hcd_submit_urb+0x1d5/0xa90
- [<ffffffff81106f8f>] ? mark_held_locks+0x7f/0xc0
- [<ffffffff81106f8f>] ? mark_held_locks+0x7f/0xc0
- [<ffffffff81103a15>] ? lockdep_init_map+0x65/0x5d0
- [<ffffffff81615d7e>] usb_submit_urb+0x42e/0x5f0
- [<ffffffff81616787>] usb_start_wait_urb+0x77/0x190
- [<ffffffff8124f035>] ? __kmalloc+0x205/0x2d0
- [<ffffffff8161697c>] usb_control_msg+0xdc/0x130
- [<ffffffffa0031669>] rtsx_usb_ep0_read_register+0x59/0x70 [rtsx_usb]
- [<ffffffffa00310c1>] ? rtsx_usb_get_rsp+0x41/0x50 [rtsx_usb]
- [<ffffffffa071da4e>] rtsx_usb_ms_handle_req+0x7ce/0x9c5 [rtsx_usb_ms]
-
-Reported-by: Josh Boyer <jwboyer@fedoraproject.org>
-Signed-off-by: Roger Tseng <rogerable@realtek.com>
----
- drivers/mfd/rtsx_usb.c | 30 ++++++++++++++++++++++++------
- 1 file changed, 24 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/mfd/rtsx_usb.c b/drivers/mfd/rtsx_usb.c
-index ede50244f265..dbd907d7170e 100644
---- a/drivers/mfd/rtsx_usb.c
-+++ b/drivers/mfd/rtsx_usb.c
-@@ -196,18 +196,27 @@ EXPORT_SYMBOL_GPL(rtsx_usb_ep0_write_register);
- int rtsx_usb_ep0_read_register(struct rtsx_ucr *ucr, u16 addr, u8 *data)
- {
- 	u16 value;
-+	u8 *buf;
-+	int ret;
- 
- 	if (!data)
- 		return -EINVAL;
--	*data = 0;
-+
-+	buf = kzalloc(sizeof(u8), GFP_KERNEL);
-+	if (!buf)
-+		return -ENOMEM;
- 
- 	addr |= EP0_READ_REG_CMD << EP0_OP_SHIFT;
- 	value = swab16(addr);
- 
--	return usb_control_msg(ucr->pusb_dev,
-+	ret = usb_control_msg(ucr->pusb_dev,
- 			usb_rcvctrlpipe(ucr->pusb_dev, 0), RTSX_USB_REQ_REG_OP,
- 			USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
--			value, 0, data, 1, 100);
-+			value, 0, buf, 1, 100);
-+	*data = *buf;
-+
-+	kfree(buf);
-+	return ret;
- }
- EXPORT_SYMBOL_GPL(rtsx_usb_ep0_read_register);
- 
-@@ -288,18 +297,27 @@ static int rtsx_usb_get_status_with_bulk(struct rtsx_ucr *ucr, u16 *status)
- int rtsx_usb_get_card_status(struct rtsx_ucr *ucr, u16 *status)
- {
- 	int ret;
-+	u16 *buf;
- 
- 	if (!status)
- 		return -EINVAL;
- 
--	if (polling_pipe == 0)
-+	if (polling_pipe == 0) {
-+		buf = kzalloc(sizeof(u16), GFP_KERNEL);
-+		if (!buf)
-+			return -ENOMEM;
-+
- 		ret = usb_control_msg(ucr->pusb_dev,
- 				usb_rcvctrlpipe(ucr->pusb_dev, 0),
- 				RTSX_USB_REQ_POLL,
- 				USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
--				0, 0, status, 2, 100);
--	else
-+				0, 0, buf, 2, 100);
-+		*status = *buf;
-+
-+		kfree(buf);
-+	} else {
- 		ret = rtsx_usb_get_status_with_bulk(ucr, status);
-+	}
- 
- 	/* usb_control_msg may return positive when success */
- 	if (ret < 0)
--- 
-2.1.0
-
diff --git a/mfd-wm8994-Ensure-that-the-whole-MFD-is-built-into-a.patch b/mfd-wm8994-Ensure-that-the-whole-MFD-is-built-into-a.patch
new file mode 100644
index 000000000..dfedd2ab0
--- /dev/null
+++ b/mfd-wm8994-Ensure-that-the-whole-MFD-is-built-into-a.patch
@@ -0,0 +1,28 @@
+From 567a18f57213647e2c31bbdc7f6b8f9991d22fad Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Fri, 13 Nov 2015 19:03:29 +0000
+Subject: [PATCH] mfd: wm8994: Ensure that the whole MFD is built into a single
+ module
+
+Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
+---
+ drivers/mfd/Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
+index a59e3fc..4a767ef 100644
+--- a/drivers/mfd/Makefile
++++ b/drivers/mfd/Makefile
+@@ -61,7 +61,8 @@ wm8350-objs			:= wm8350-core.o wm8350-regmap.o wm8350-gpio.o
+ wm8350-objs			+= wm8350-irq.o
+ obj-$(CONFIG_MFD_WM8350)	+= wm8350.o
+ obj-$(CONFIG_MFD_WM8350_I2C)	+= wm8350-i2c.o
+-obj-$(CONFIG_MFD_WM8994)	+= wm8994-core.o wm8994-irq.o wm8994-regmap.o
++wm8994-objs			:= wm8994-core.o wm8994-irq.o wm8994-regmap.o
++obj-$(CONFIG_MFD_WM8994)	+= wm8994.o
+ 
+ obj-$(CONFIG_TPS6105X)		+= tps6105x.o
+ obj-$(CONFIG_TPS65010)		+= tps65010.o
+-- 
+2.5.0
+
diff --git a/misc-mic-Fix-for-double-fetch-security-bug-in-mic_co.patch b/misc-mic-Fix-for-double-fetch-security-bug-in-mic_co.patch
new file mode 100644
index 000000000..a88dcf108
--- /dev/null
+++ b/misc-mic-Fix-for-double-fetch-security-bug-in-mic_co.patch
@@ -0,0 +1,45 @@
+From d0ddcea59aa9406e9fac5ca1809a77f60a4bc9d9 Mon Sep 17 00:00:00 2001
+From: Josh Boyer <jwboyer@fedoraproject.org>
+Date: Tue, 28 Jun 2016 09:54:56 -0400
+Subject: [PATCH] misc: mic: Fix for double fetch security bug in
+ mic_copy_dp_entry
+
+commit 9bf292bfca94694a721449e3fd752493856710f6 upstream
+
+The MIC driver does two successive reads from user space to read a
+variable length data structure. Kernel memory corruption can result if
+the data structure changes between the two reads. This patch disallows
+the chance of this happening.
+
+[Backported to linux-4.5.y by Josh Boyer]
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=116651
+Reported by: Pengfei Wang <wpengfeinudt@gmail.com>
+Reviewed-by: Sudeep Dutt <sudeep.dutt@intel.com>
+Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
+Cc: stable <stable@vger.kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
+---
+ drivers/misc/mic/host/mic_virtio.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/drivers/misc/mic/host/mic_virtio.c b/drivers/misc/mic/host/mic_virtio.c
+index 58b107a24a8b..7a64f5a619d6 100644
+--- a/drivers/misc/mic/host/mic_virtio.c
++++ b/drivers/misc/mic/host/mic_virtio.c
+@@ -555,6 +555,11 @@ static int mic_copy_dp_entry(struct mic_vdev *mvdev,
+ 			__func__, __LINE__, ret);
+ 		goto exit;
+ 	}
++	/* Ensure desc has not changed between the two reads */
++	if (memcmp(&dd, dd_config, sizeof(dd))) {
++		ret = -EINVAL;
++		goto exit;
++	}
+ 
+ 	vqconfig = mic_vq_config(dd_config);
+ 	for (i = 0; i < dd.num_vq; i++) {
+-- 
+2.5.5
+
diff --git a/net-add-validation-for-the-socket-syscall-protocol-a.patch b/net-add-validation-for-the-socket-syscall-protocol-a.patch
new file mode 100644
index 000000000..ce387ea42
--- /dev/null
+++ b/net-add-validation-for-the-socket-syscall-protocol-a.patch
@@ -0,0 +1,139 @@
+From 4da7dc22c91ad2c3144cb1d0d96e9611bc86da47 Mon Sep 17 00:00:00 2001
+From: Hannes Frederic Sowa <hannes@stressinduktion.org>
+Date: Mon, 14 Dec 2015 22:03:39 +0100
+Subject: [PATCH] net: add validation for the socket syscall protocol argument
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+郭永刚 reported that one could simply crash the kernel as root by
+using a simple program:
+
+	int socket_fd;
+	struct sockaddr_in addr;
+	addr.sin_port = 0;
+	addr.sin_addr.s_addr = INADDR_ANY;
+	addr.sin_family = 10;
+
+	socket_fd = socket(10,3,0x40000000);
+	connect(socket_fd , &addr,16);
+
+AF_INET, AF_INET6 sockets actually only support 8-bit protocol
+identifiers. inet_sock's skc_protocol field thus is sized accordingly,
+thus larger protocol identifiers simply cut off the higher bits and
+store a zero in the protocol fields.
+
+This could lead to e.g. NULL function pointer because as a result of
+the cut off inet_num is zero and we call down to inet_autobind, which
+is NULL for raw sockets.
+
+kernel: Call Trace:
+kernel:  [<ffffffff816db90e>] ? inet_autobind+0x2e/0x70
+kernel:  [<ffffffff816db9a4>] inet_dgram_connect+0x54/0x80
+kernel:  [<ffffffff81645069>] SYSC_connect+0xd9/0x110
+kernel:  [<ffffffff810ac51b>] ? ptrace_notify+0x5b/0x80
+kernel:  [<ffffffff810236d8>] ? syscall_trace_enter_phase2+0x108/0x200
+kernel:  [<ffffffff81645e0e>] SyS_connect+0xe/0x10
+kernel:  [<ffffffff81779515>] tracesys_phase2+0x84/0x89
+
+I found no particular commit which introduced this problem.
+
+CVE: CVE-2015-8543
+Cc: Cong Wang <cwang@twopensource.com>
+Reported-by: 郭永刚 <guoyonggang@360.cn>
+Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ include/net/sock.h     | 1 +
+ net/ax25/af_ax25.c     | 3 +++
+ net/decnet/af_decnet.c | 3 +++
+ net/ipv4/af_inet.c     | 3 +++
+ net/ipv6/af_inet6.c    | 3 +++
+ net/irda/af_irda.c     | 3 +++
+ 6 files changed, 16 insertions(+)
+
+diff --git a/include/net/sock.h b/include/net/sock.h
+index 52d27ee924f4..2fa1fc00e8cb 100644
+--- a/include/net/sock.h
++++ b/include/net/sock.h
+@@ -403,6 +403,7 @@ struct sock {
+ 				sk_no_check_rx : 1,
+ 				sk_userlocks : 4,
+ 				sk_protocol  : 8,
++#define SK_PROTOCOL_MAX U8_MAX
+ 				sk_type      : 16;
+ 	kmemcheck_bitfield_end(flags);
+ 	int			sk_wmem_queued;
+diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
+index ae3a47f9d1d5..fbd0acf80b13 100644
+--- a/net/ax25/af_ax25.c
++++ b/net/ax25/af_ax25.c
+@@ -805,6 +805,9 @@ static int ax25_create(struct net *net, struct socket *sock, int protocol,
+ 	struct sock *sk;
+ 	ax25_cb *ax25;
+ 
++	if (protocol < 0 || protocol > SK_PROTOCOL_MAX)
++		return -EINVAL;
++
+ 	if (!net_eq(net, &init_net))
+ 		return -EAFNOSUPPORT;
+ 
+diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
+index eebf5ac8ce18..13d6b1a6e0fc 100644
+--- a/net/decnet/af_decnet.c
++++ b/net/decnet/af_decnet.c
+@@ -678,6 +678,9 @@ static int dn_create(struct net *net, struct socket *sock, int protocol,
+ {
+ 	struct sock *sk;
+ 
++	if (protocol < 0 || protocol > SK_PROTOCOL_MAX)
++		return -EINVAL;
++
+ 	if (!net_eq(net, &init_net))
+ 		return -EAFNOSUPPORT;
+ 
+diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
+index 11c4ca13ec3b..5c5db6636704 100644
+--- a/net/ipv4/af_inet.c
++++ b/net/ipv4/af_inet.c
+@@ -257,6 +257,9 @@ static int inet_create(struct net *net, struct socket *sock, int protocol,
+ 	int try_loading_module = 0;
+ 	int err;
+ 
++	if (protocol < 0 || protocol >= IPPROTO_MAX)
++		return -EINVAL;
++
+ 	sock->state = SS_UNCONNECTED;
+ 
+ 	/* Look for the requested type/protocol pair. */
+diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
+index 8ec0df75f1c4..9f5137cd604e 100644
+--- a/net/ipv6/af_inet6.c
++++ b/net/ipv6/af_inet6.c
+@@ -109,6 +109,9 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol,
+ 	int try_loading_module = 0;
+ 	int err;
+ 
++	if (protocol < 0 || protocol >= IPPROTO_MAX)
++		return -EINVAL;
++
+ 	/* Look for the requested type/protocol pair. */
+ lookup_protocol:
+ 	err = -ESOCKTNOSUPPORT;
+diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
+index e6aa48b5395c..923abd6b3064 100644
+--- a/net/irda/af_irda.c
++++ b/net/irda/af_irda.c
+@@ -1086,6 +1086,9 @@ static int irda_create(struct net *net, struct socket *sock, int protocol,
+ 	struct sock *sk;
+ 	struct irda_sock *self;
+ 
++	if (protocol < 0 || protocol > SK_PROTOCOL_MAX)
++		return -EINVAL;
++
+ 	if (net != &init_net)
+ 		return -EAFNOSUPPORT;
+ 
+-- 
+2.5.0
+
diff --git a/netfilter-x_tables-check-for-size-overflow.patch b/netfilter-x_tables-check-for-size-overflow.patch
new file mode 100644
index 000000000..81e3d36fa
--- /dev/null
+++ b/netfilter-x_tables-check-for-size-overflow.patch
@@ -0,0 +1,31 @@
+Subject:    [PATCH nf] netfilter: x_tables: check for size overflow
+From:       Florian Westphal <fw () strlen ! de>
+Date:       2016-03-10 0:56:23
+
+Ben Hawkes says:
+ integer overflow in xt_alloc_table_info, which on 32-bit systems can
+ lead to small structure allocation and a copy_from_user based heap
+ corruption.
+
+Reported-by: Ben Hawkes <hawkes@google.com>
+Signed-off-by: Florian Westphal <fw@strlen.de>
+---
+ net/netfilter/x_tables.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
+index c8a0b7d..17a9a9f 100644
+--- a/net/netfilter/x_tables.c
++++ b/net/netfilter/x_tables.c
+@@ -659,6 +659,9 @@ struct xt_table_info *xt_alloc_table_info(unsigned int size)
+ 	struct xt_table_info *info = NULL;
+ 	size_t sz = sizeof(*info) + size;
+ 
++	if (sz < sizeof(*info))
++		return NULL;
++
+ 	/* Pedantry: prevent them from hitting BUG() in vmalloc.c --RR */
+ 	if ((SMP_ALIGN(size) >> PAGE_SHIFT) + 2 > totalram_pages)
+ 		return NULL;
+-- 
+2.4.10
diff --git a/netfilter-x_tables-deal-with-bogus-nextoffset-values.patch b/netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
new file mode 100644
index 000000000..0a45f1e1f
--- /dev/null
+++ b/netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
@@ -0,0 +1,152 @@
+From 36d815b56409ca2fb562bb7aec5b17d08db25d8e Mon Sep 17 00:00:00 2001
+From: Florian Westphal <fw () strlen ! de>
+Date: Thu, 10 Mar 2016 00:56:02 -0800
+Subject: [PATCH] netfilter: x_tables: deal with bogus nextoffset values
+
+Ben Hawkes says:
+
+ In the mark_source_chains function (net/ipv4/netfilter/ip_tables.c) it
+ is possible for a user-supplied ipt_entry structure to have a large
+ next_offset field. This field is not bounds checked prior to writing a
+ counter value at the supplied offset.
+
+Problem is that xt_entry_foreach() macro stops iterating once e->next_offset
+is out of bounds, assuming this is the last entry.
+
+With malformed data thats not necessarily the case so we can
+write outside of allocated area later as we might not have walked the
+entire blob.
+
+Fix this by simplifying mark_source_chains -- it already has to check
+if nextoff is in range to catch invalid jumps, so just do the check
+when we move to a next entry as well.
+
+Signed-off-by: Florian Westphal <fw@strlen.de>
+---
+ net/ipv4/netfilter/arp_tables.c | 16 ++++++++--------
+ net/ipv4/netfilter/ip_tables.c  | 15 ++++++++-------
+ net/ipv6/netfilter/ip6_tables.c | 13 ++++++-------
+ 3 files changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
+index 6e3e0e8..42b87c7 100644
+--- a/net/ipv4/netfilter/arp_tables.c
++++ b/net/ipv4/netfilter/arp_tables.c
+@@ -449,6 +449,10 @@ static int mark_source_chains(const struct xt_table_info *newinfo,
+ 
+ 				/* Move along one */
+ 				size = e->next_offset;
++
++				if (pos + size > newinfo->size - sizeof(*e))
++					return 0;
++
+ 				e = (struct arpt_entry *)
+ 					(entry0 + pos + size);
+ 				if (pos + size >= newinfo->size)
+@@ -461,14 +465,6 @@ static int mark_source_chains(const struct xt_table_info *newinfo,
+ 				if (strcmp(t->target.u.user.name,
+ 					   XT_STANDARD_TARGET) == 0 &&
+ 				    newpos >= 0) {
+-					if (newpos > newinfo->size -
+-						sizeof(struct arpt_entry)) {
+-						duprintf("mark_source_chains: "
+-							"bad verdict (%i)\n",
+-								newpos);
+-						return 0;
+-					}
+-
+ 					/* This a jump; chase it. */
+ 					duprintf("Jump rule %u -> %u\n",
+ 						 pos, newpos);
+@@ -482,6 +478,10 @@ static int mark_source_chains(const struct xt_table_info *newinfo,
+ 					if (newpos >= newinfo->size)
+ 						return 0;
+ 				}
++
++				if (newpos > newinfo->size - sizeof(*e))
++					return 0;
++
+ 				e = (struct arpt_entry *)
+ 					(entry0 + newpos);
+ 				e->counters.pcnt = pos;
+diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
+index a399c54..b08e186 100644
+--- a/net/ipv4/netfilter/ip_tables.c
++++ b/net/ipv4/netfilter/ip_tables.c
+@@ -530,6 +530,10 @@ mark_source_chains(const struct xt_table_info *newinfo,
+ 
+ 				/* Move along one */
+ 				size = e->next_offset;
++
++				if (pos + size > newinfo->size - sizeof(*e))
++					return 0;
++
+ 				e = (struct ipt_entry *)
+ 					(entry0 + pos + size);
+ 				if (pos + size >= newinfo->size)
+@@ -542,13 +546,6 @@ mark_source_chains(const struct xt_table_info *newinfo,
+ 				if (strcmp(t->target.u.user.name,
+ 					   XT_STANDARD_TARGET) == 0 &&
+ 				    newpos >= 0) {
+-					if (newpos > newinfo->size -
+-						sizeof(struct ipt_entry)) {
+-						duprintf("mark_source_chains: "
+-							"bad verdict (%i)\n",
+-								newpos);
+-						return 0;
+-					}
+ 					/* This a jump; chase it. */
+ 					duprintf("Jump rule %u -> %u\n",
+ 						 pos, newpos);
+@@ -562,6 +559,10 @@ mark_source_chains(const struct xt_table_info *newinfo,
+ 					if (newpos >= newinfo->size)
+ 						return 0;
+ 				}
++
++				if (newpos > newinfo->size - sizeof(*e))
++					return 0;
++
+ 				e = (struct ipt_entry *)
+ 					(entry0 + newpos);
+ 				e->counters.pcnt = pos;
+diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
+index 22f39e0..1b6d4e7 100644
+--- a/net/ipv6/netfilter/ip6_tables.c
++++ b/net/ipv6/netfilter/ip6_tables.c
+@@ -542,6 +542,8 @@ mark_source_chains(const struct xt_table_info *newinfo,
+ 
+ 				/* Move along one */
+ 				size = e->next_offset;
++				if (pos + size > newinfo->size - sizeof(*e))
++					return 0;
+ 				e = (struct ip6t_entry *)
+ 					(entry0 + pos + size);
+ 				if (pos + size >= newinfo->size)
+@@ -554,13 +556,6 @@ mark_source_chains(const struct xt_table_info *newinfo,
+ 				if (strcmp(t->target.u.user.name,
+ 					   XT_STANDARD_TARGET) == 0 &&
+ 				    newpos >= 0) {
+-					if (newpos > newinfo->size -
+-						sizeof(struct ip6t_entry)) {
+-						duprintf("mark_source_chains: "
+-							"bad verdict (%i)\n",
+-								newpos);
+-						return 0;
+-					}
+ 					/* This a jump; chase it. */
+ 					duprintf("Jump rule %u -> %u\n",
+ 						 pos, newpos);
+@@ -574,6 +569,10 @@ mark_source_chains(const struct xt_table_info *newinfo,
+ 					if (newpos >= newinfo->size)
+ 						return 0;
+ 				}
++
++				if (newpos > newinfo->size - sizeof(*e))
++					return 0;
++
+ 				e = (struct ip6t_entry *)
+ 					(entry0 + newpos);
+ 				e->counters.pcnt = pos;
+-- 
+2.5.5
+
diff --git a/nfsd-check-permissions-when-setting-ACLs.patch b/nfsd-check-permissions-when-setting-ACLs.patch
new file mode 100644
index 000000000..37ed435e0
--- /dev/null
+++ b/nfsd-check-permissions-when-setting-ACLs.patch
@@ -0,0 +1,154 @@
+From 999653786df6954a31044528ac3f7a5dadca08f4 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Wed, 22 Jun 2016 19:43:35 +0100
+Subject: [PATCH] nfsd: check permissions when setting ACLs
+
+Use set_posix_acl, which includes proper permission checks, instead of
+calling ->set_acl directly.  Without this anyone may be able to grant
+themselves permissions to a file by setting the ACL.
+
+Lock the inode to make the new checks atomic with respect to set_acl.
+(Also, nfsd was the only caller of set_acl not locking the inode, so I
+suspect this may fix other races.)
+
+This also simplifies the code, and ensures our ACLs are checked by
+posix_acl_valid.
+
+The permission checks and the inode locking were lost with commit
+4ac7249e, which changed nfsd to use the set_acl inode operation directly
+instead of going through xattr handlers.
+
+Reported-by: David Sinquin <david@sinquin.eu>
+[agreunba@redhat.com: use set_posix_acl]
+Fixes: 4ac7249e
+Cc: Christoph Hellwig <hch@infradead.org>
+Cc: Al Viro <viro@zeniv.linux.org.uk>
+Cc: stable@vger.kernel.org
+Signed-off-by: J. Bruce Fields <bfields@redhat.com>
+---
+ fs/nfsd/nfs2acl.c | 20 ++++++++++----------
+ fs/nfsd/nfs3acl.c | 16 +++++++---------
+ fs/nfsd/nfs4acl.c | 16 ++++++++--------
+ 3 files changed, 25 insertions(+), 27 deletions(-)
+
+diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
+index 1580ea6fd64d..d08cd88155c7 100644
+--- a/fs/nfsd/nfs2acl.c
++++ b/fs/nfsd/nfs2acl.c
+@@ -104,22 +104,21 @@ static __be32 nfsacld_proc_setacl(struct svc_rqst * rqstp,
+ 		goto out;
+ 
+ 	inode = d_inode(fh->fh_dentry);
+-	if (!IS_POSIXACL(inode) || !inode->i_op->set_acl) {
+-		error = -EOPNOTSUPP;
+-		goto out_errno;
+-	}
+ 
+ 	error = fh_want_write(fh);
+ 	if (error)
+ 		goto out_errno;
+ 
+-	error = inode->i_op->set_acl(inode, argp->acl_access, ACL_TYPE_ACCESS);
++	fh_lock(fh);
++
++	error = set_posix_acl(inode, ACL_TYPE_ACCESS, argp->acl_access);
+ 	if (error)
+-		goto out_drop_write;
+-	error = inode->i_op->set_acl(inode, argp->acl_default,
+-				     ACL_TYPE_DEFAULT);
++		goto out_drop_lock;
++	error = set_posix_acl(inode, ACL_TYPE_DEFAULT, argp->acl_default);
+ 	if (error)
+-		goto out_drop_write;
++		goto out_drop_lock;
++
++	fh_unlock(fh);
+ 
+ 	fh_drop_write(fh);
+ 
+@@ -131,7 +130,8 @@ out:
+ 	posix_acl_release(argp->acl_access);
+ 	posix_acl_release(argp->acl_default);
+ 	return nfserr;
+-out_drop_write:
++out_drop_lock:
++	fh_unlock(fh);
+ 	fh_drop_write(fh);
+ out_errno:
+ 	nfserr = nfserrno(error);
+diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c
+index 01df4cd7c753..0c890347cde3 100644
+--- a/fs/nfsd/nfs3acl.c
++++ b/fs/nfsd/nfs3acl.c
+@@ -95,22 +95,20 @@ static __be32 nfsd3_proc_setacl(struct svc_rqst * rqstp,
+ 		goto out;
+ 
+ 	inode = d_inode(fh->fh_dentry);
+-	if (!IS_POSIXACL(inode) || !inode->i_op->set_acl) {
+-		error = -EOPNOTSUPP;
+-		goto out_errno;
+-	}
+ 
+ 	error = fh_want_write(fh);
+ 	if (error)
+ 		goto out_errno;
+ 
+-	error = inode->i_op->set_acl(inode, argp->acl_access, ACL_TYPE_ACCESS);
++	fh_lock(fh);
++
++	error = set_posix_acl(inode, ACL_TYPE_ACCESS, argp->acl_access);
+ 	if (error)
+-		goto out_drop_write;
+-	error = inode->i_op->set_acl(inode, argp->acl_default,
+-				     ACL_TYPE_DEFAULT);
++		goto out_drop_lock;
++	error = set_posix_acl(inode, ACL_TYPE_DEFAULT, argp->acl_default);
+ 
+-out_drop_write:
++out_drop_lock:
++	fh_unlock(fh);
+ 	fh_drop_write(fh);
+ out_errno:
+ 	nfserr = nfserrno(error);
+diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
+index 6adabd6049b7..71292a0d6f09 100644
+--- a/fs/nfsd/nfs4acl.c
++++ b/fs/nfsd/nfs4acl.c
+@@ -770,9 +770,6 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqstp, struct svc_fh *fhp,
+ 	dentry = fhp->fh_dentry;
+ 	inode = d_inode(dentry);
+ 
+-	if (!inode->i_op->set_acl || !IS_POSIXACL(inode))
+-		return nfserr_attrnotsupp;
+-
+ 	if (S_ISDIR(inode->i_mode))
+ 		flags = NFS4_ACL_DIR;
+ 
+@@ -782,16 +779,19 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqstp, struct svc_fh *fhp,
+ 	if (host_error < 0)
+ 		goto out_nfserr;
+ 
+-	host_error = inode->i_op->set_acl(inode, pacl, ACL_TYPE_ACCESS);
++	fh_lock(fhp);
++
++	host_error = set_posix_acl(inode, ACL_TYPE_ACCESS, pacl);
+ 	if (host_error < 0)
+-		goto out_release;
++		goto out_drop_lock;
+ 
+ 	if (S_ISDIR(inode->i_mode)) {
+-		host_error = inode->i_op->set_acl(inode, dpacl,
+-						  ACL_TYPE_DEFAULT);
++		host_error = set_posix_acl(inode, ACL_TYPE_DEFAULT, dpacl);
+ 	}
+ 
+-out_release:
++out_drop_lock:
++	fh_unlock(fhp);
++
+ 	posix_acl_release(pacl);
+ 	posix_acl_release(dpacl);
+ out_nfserr:
+-- 
+2.5.5
+
diff --git a/no-pcspkr-modalias.patch b/no-pcspkr-modalias.patch
index 28008094d..e43cd97eb 100644
--- a/no-pcspkr-modalias.patch
+++ b/no-pcspkr-modalias.patch
@@ -20,6 +20,3 @@ index 72b1fc3ab910..86907eaa4883 100644
  
  static int pcspkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
  {
--- 
-2.1.0
-
diff --git a/nv46-Change-mc-subdev-oclass-from-nv44-to-nv4c.patch b/nv46-Change-mc-subdev-oclass-from-nv44-to-nv4c.patch
new file mode 100644
index 000000000..a6996faa1
--- /dev/null
+++ b/nv46-Change-mc-subdev-oclass-from-nv44-to-nv4c.patch
@@ -0,0 +1,33 @@
+From 16f4f5f0dc33698b841bce71cbc0dd991935b7e1 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Thu, 23 Jul 2015 17:20:12 +0200
+Subject: [PATCH] nv46: Change mc subdev oclass from nv44 to nv4c
+
+MSI interrupts appear to not work for nv46 based cards. Change the mc
+subdev oclass for these cards from nv44 to nv4c, the nv4c mc code is
+identical to the nv44 mc code except that it does not use msi
+(it does not define a msi_rearm callback).
+
+BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=90435
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+---
+ drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c
+index c6301361d14f..b4ad791b4851 100644
+--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c
++++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c
+@@ -265,7 +265,7 @@ nv40_identify(struct nvkm_device *device)
+ 		device->oclass[NVDEV_SUBDEV_CLK    ] = &nv40_clk_oclass;
+ 		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;
+ 		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;
+-		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;
++		device->oclass[NVDEV_SUBDEV_MC     ] =  nv4c_mc_oclass;
+ 		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;
+ 		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
+ 		device->oclass[NVDEV_SUBDEV_FB     ] =  nv46_fb_oclass;
+-- 
+2.4.3
+
diff --git a/pinctrl-pinctrl-single-must-be-initialized-early.patch b/pinctrl-pinctrl-single-must-be-initialized-early.patch
index 5aa4bd22f..96f268243 100644
--- a/pinctrl-pinctrl-single-must-be-initialized-early.patch
+++ b/pinctrl-pinctrl-single-must-be-initialized-early.patch
@@ -32,6 +32,3 @@ index 69e84427f913..f21cf4291476 100644
  
  MODULE_AUTHOR("Tony Lindgren <tony@atomide.com>");
  MODULE_DESCRIPTION("One-register-per-pin type device tree based pinctrl driver");
--- 
-2.1.0
-
diff --git a/posix_acl-Add-set_posix_acl.patch b/posix_acl-Add-set_posix_acl.patch
new file mode 100644
index 000000000..c067f7b85
--- /dev/null
+++ b/posix_acl-Add-set_posix_acl.patch
@@ -0,0 +1,55 @@
+From c463b51e8ea1ae47a7bb8cc2777eb550ad3273e2 Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruenba@redhat.com>
+Date: Wed, 22 Jun 2016 23:57:25 +0200
+Subject: [PATCH] posix_acl: Add set_posix_acl
+
+Factor out part of posix_acl_xattr_set into a common function that takes
+a posix_acl, which nfsd can also call.
+
+The prototype already exists in include/linux/posix_acl.h.
+
+Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
+Cc: stable@vger.kernel.org
+Cc: Christoph Hellwig <hch@infradead.org>
+Cc: Al Viro <viro@zeniv.linux.org.uk>
+Signed-off-by: J. Bruce Fields <bfields@redhat.com>
+---
+ fs/posix_acl.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/fs/posix_acl.c b/fs/posix_acl.c
+index 711dd5170376..f30caace5b84 100644
+--- a/fs/posix_acl.c
++++ b/fs/posix_acl.c
+@@ -786,6 +786,28 @@ posix_acl_xattr_get(const struct xattr_handler *handler,
+ 	return error;
+ }
+ 
++int
++set_posix_acl(struct inode *inode, int type, struct posix_acl *acl)
++{
++	if (!IS_POSIXACL(inode))
++		return -EOPNOTSUPP;
++	if (!inode->i_op->set_acl)
++		return -EOPNOTSUPP;
++
++	if (type == ACL_TYPE_DEFAULT && !S_ISDIR(inode->i_mode))
++		return acl ? -EACCES : 0;
++	if (!inode_owner_or_capable(inode))
++		return -EPERM;
++
++	if (acl) {
++		int ret = posix_acl_valid(acl);
++		if (ret)
++			return ret;
++	}
++	return inode->i_op->set_acl(inode, acl, type);
++}
++EXPORT_SYMBOL(set_posix_acl);
++
+ static int
+ posix_acl_xattr_set(const struct xattr_handler *handler,
+ 		    struct dentry *dentry, const char *name,
+-- 
+2.5.5
+
diff --git a/pptp-verify-sockaddr_len-in-pptp_bind-and-pptp_conne.patch b/pptp-verify-sockaddr_len-in-pptp_bind-and-pptp_conne.patch
new file mode 100644
index 000000000..b891c5211
--- /dev/null
+++ b/pptp-verify-sockaddr_len-in-pptp_bind-and-pptp_conne.patch
@@ -0,0 +1,39 @@
+From 16c5a158e97d5b1f6c8bf86b006c1349f025d4e0 Mon Sep 17 00:00:00 2001
+From: WANG Cong <xiyou.wangcong@gmail.com>
+Date: Mon, 14 Dec 2015 13:48:36 -0800
+Subject: [PATCH] pptp: verify sockaddr_len in pptp_bind() and pptp_connect()
+
+Reported-by: Dmitry Vyukov <dvyukov@gmail.com>
+Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/ppp/pptp.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c
+index fc69e41d0950..597c53e0a2ec 100644
+--- a/drivers/net/ppp/pptp.c
++++ b/drivers/net/ppp/pptp.c
+@@ -419,6 +419,9 @@ static int pptp_bind(struct socket *sock, struct sockaddr *uservaddr,
+ 	struct pptp_opt *opt = &po->proto.pptp;
+ 	int error = 0;
+ 
++	if (sockaddr_len < sizeof(struct sockaddr_pppox))
++		return -EINVAL;
++
+ 	lock_sock(sk);
+ 
+ 	opt->src_addr = sp->sa_addr.pptp;
+@@ -440,6 +443,9 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr,
+ 	struct flowi4 fl4;
+ 	int error = 0;
+ 
++	if (sockaddr_len < sizeof(struct sockaddr_pppox))
++		return -EINVAL;
++
+ 	if (sp->sa_protocol != PX_PROTO_PPTP)
+ 		return -EINVAL;
+ 
+-- 
+2.5.0
+
diff --git a/rds-fix-an-infoleak-in-rds_inc_info_copy.txt b/rds-fix-an-infoleak-in-rds_inc_info_copy.txt
new file mode 100644
index 000000000..a9b1e49fe
--- /dev/null
+++ b/rds-fix-an-infoleak-in-rds_inc_info_copy.txt
@@ -0,0 +1,31 @@
+From 4116def2337991b39919f3b448326e21c40e0dbb Mon Sep 17 00:00:00 2001
+From: Kangjie Lu <kangjielu@gmail.com>
+Date: Thu, 2 Jun 2016 04:11:20 -0400
+Subject: rds: fix an infoleak in rds_inc_info_copy
+
+The last field "flags" of object "minfo" is not initialized.
+Copying this object out may leak kernel stack data.
+Assign 0 to it to avoid leak.
+
+Signed-off-by: Kangjie Lu <kjlu@gatech.edu>
+Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ net/rds/recv.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/net/rds/recv.c b/net/rds/recv.c
+index c0be1ec..8413f6c 100644
+--- a/net/rds/recv.c
++++ b/net/rds/recv.c
+@@ -561,5 +561,7 @@ void rds_inc_info_copy(struct rds_incoming *inc,
+ 		minfo.fport = inc->i_hdr.h_dport;
+ 	}
+ 
++	minfo.flags = 0;
++
+ 	rds_info_copy(iter, &minfo, sizeof(minfo));
+ }
+-- 
+cgit v0.12
+
diff --git a/regulator-axp20x-module-alias.patch b/regulator-axp20x-module-alias.patch
new file mode 100644
index 000000000..f20c9b3d6
--- /dev/null
+++ b/regulator-axp20x-module-alias.patch
@@ -0,0 +1,26 @@
+From d4ea7d86457a8d0ea40ce77bdeda1fc966cc35ec Mon Sep 17 00:00:00 2001
+From: Ian Campbell <ijc@hellion.org.uk>
+Date: Sat, 1 Aug 2015 18:13:25 +0100
+Subject: regulator: axp20x: Add module alias
+
+This allows the module to be autoloaded.
+
+Together with 07949bf9c63c ("cpufreq: dt: allow driver to boot
+automatically") this is sufficient to allow a modular kernel (such
+as Debian's) to enable cpufreq on a Cubietruck.
+
+Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+
+diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
+index 6468291..01bf347 100644
+--- a/drivers/regulator/axp20x-regulator.c
++++ b/drivers/regulator/axp20x-regulator.c
+@@ -405,3 +405,4 @@ module_platform_driver(axp20x_regulator_driver);
+ MODULE_LICENSE("GPL v2");
+ MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
+ MODULE_DESCRIPTION("Regulator Driver for AXP20X PMIC");
++MODULE_ALIAS("platform:axp20x-regulator");
+-- 
+cgit v0.10.2
+
diff --git a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
index e26dd5a2a..7b9976517 100644
--- a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
+++ b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@@ -1,3 +1,4 @@
+From 7afe9a8d7dca86a8f35250f21f5f0a62ea2fedf7 Mon Sep 17 00:00:00 2001
 From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org>
 Date: Fri, 10 Feb 2012 14:56:13 -0500
 Subject: [PATCH] scsi: sd_revalidate_disk prevent NULL ptr deref
@@ -9,18 +10,19 @@ Upstream-status: Fedora mustard (might be worth dropping...)
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index 6b78476d04bb..d490145a317d 100644
+index 3d22fc3..07aec76 100644
 --- a/drivers/scsi/sd.c
 +++ b/drivers/scsi/sd.c
-@@ -2750,13 +2750,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp)
+@@ -2825,7 +2825,7 @@ static inline u32 logical_to_sectors(struct scsi_device *sdev, u32 blocks)
  static int sd_revalidate_disk(struct gendisk *disk)
  {
  	struct scsi_disk *sdkp = scsi_disk(disk);
 -	struct scsi_device *sdp = sdkp->device;
 +	struct scsi_device *sdp;
+ 	struct request_queue *q = sdkp->disk->queue;
  	unsigned char *buffer;
- 	unsigned int max_xfer;
- 
+ 	unsigned int dev_max, rw_max;
+@@ -2833,6 +2833,11 @@ static int sd_revalidate_disk(struct gendisk *disk)
  	SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp,
  				      "sd_revalidate_disk\n"));
  
@@ -33,5 +35,5 @@ index 6b78476d04bb..d490145a317d 100644
  	 * If the device is offline, don't try and read capacity or any
  	 * of the other niceties.
 -- 
-2.1.0
+2.5.0
 
diff --git a/sctp-Prevent-soft-lockup-when-sctp_accept-is-called-.patch b/sctp-Prevent-soft-lockup-when-sctp_accept-is-called-.patch
new file mode 100644
index 000000000..e9d709c67
--- /dev/null
+++ b/sctp-Prevent-soft-lockup-when-sctp_accept-is-called-.patch
@@ -0,0 +1,194 @@
+From 51d49d5d636dd24c1d729f79037d5d033eda7e65 Mon Sep 17 00:00:00 2001
+From: Karl Heiss <kheiss@gmail.com>
+Date: Thu, 24 Sep 2015 12:15:07 -0400
+Subject: [PATCH] sctp: Prevent soft lockup when sctp_accept() is called during
+ a timeout event
+
+A case can occur when sctp_accept() is called by the user during
+a heartbeat timeout event after the 4-way handshake.  Since
+sctp_assoc_migrate() changes both assoc->base.sk and assoc->ep, the
+bh_sock_lock in sctp_generate_heartbeat_event() will be taken with
+the listening socket but released with the new association socket.
+The result is a deadlock on any future attempts to take the listening
+socket lock.
+
+Note that this race can occur with other SCTP timeouts that take
+the bh_lock_sock() in the event sctp_accept() is called.
+
+ BUG: soft lockup - CPU#9 stuck for 67s! [swapper:0]
+ ...
+ RIP: 0010:[<ffffffff8152d48e>]  [<ffffffff8152d48e>] _spin_lock+0x1e/0x30
+ RSP: 0018:ffff880028323b20  EFLAGS: 00000206
+ RAX: 0000000000000002 RBX: ffff880028323b20 RCX: 0000000000000000
+ RDX: 0000000000000000 RSI: ffff880028323be0 RDI: ffff8804632c4b48
+ RBP: ffffffff8100bb93 R08: 0000000000000000 R09: 0000000000000000
+ R10: ffff880610662280 R11: 0000000000000100 R12: ffff880028323aa0
+ R13: ffff8804383c3880 R14: ffff880028323a90 R15: ffffffff81534225
+ FS:  0000000000000000(0000) GS:ffff880028320000(0000) knlGS:0000000000000000
+ CS:  0010 DS: 0018 ES: 0018 CR0: 000000008005003b
+ CR2: 00000000006df528 CR3: 0000000001a85000 CR4: 00000000000006e0
+ DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
+ DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
+ Process swapper (pid: 0, threadinfo ffff880616b70000, task ffff880616b6cab0)
+ Stack:
+ ffff880028323c40 ffffffffa01c2582 ffff880614cfb020 0000000000000000
+ <d> 0100000000000000 00000014383a6c44 ffff8804383c3880 ffff880614e93c00
+ <d> ffff880614e93c00 0000000000000000 ffff8804632c4b00 ffff8804383c38b8
+ Call Trace:
+ <IRQ>
+ [<ffffffffa01c2582>] ? sctp_rcv+0x492/0xa10 [sctp]
+ [<ffffffff8148c559>] ? nf_iterate+0x69/0xb0
+ [<ffffffff814974a0>] ? ip_local_deliver_finish+0x0/0x2d0
+ [<ffffffff8148c716>] ? nf_hook_slow+0x76/0x120
+ [<ffffffff814974a0>] ? ip_local_deliver_finish+0x0/0x2d0
+ [<ffffffff8149757d>] ? ip_local_deliver_finish+0xdd/0x2d0
+ [<ffffffff81497808>] ? ip_local_deliver+0x98/0xa0
+ [<ffffffff81496ccd>] ? ip_rcv_finish+0x12d/0x440
+ [<ffffffff81497255>] ? ip_rcv+0x275/0x350
+ [<ffffffff8145cfeb>] ? __netif_receive_skb+0x4ab/0x750
+ ...
+
+With lockdep debugging:
+
+ =====================================
+ [ BUG: bad unlock balance detected! ]
+ -------------------------------------
+ CslRx/12087 is trying to release lock (slock-AF_INET) at:
+ [<ffffffffa01bcae0>] sctp_generate_timeout_event+0x40/0xe0 [sctp]
+ but there are no more locks to release!
+
+ other info that might help us debug this:
+ 2 locks held by CslRx/12087:
+ #0:  (&asoc->timers[i]){+.-...}, at: [<ffffffff8108ce1f>] run_timer_softirq+0x16f/0x3e0
+ #1:  (slock-AF_INET){+.-...}, at: [<ffffffffa01bcac3>] sctp_generate_timeout_event+0x23/0xe0 [sctp]
+
+Ensure the socket taken is also the same one that is released by
+saving a copy of the socket before entering the timeout event
+critical section.
+
+Signed-off-by: Karl Heiss <kheiss@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ net/sctp/sm_sideeffect.c | 44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
+index 85e6f03aeb70..61b7b81d29ab 100644
+--- a/net/sctp/sm_sideeffect.c
++++ b/net/sctp/sm_sideeffect.c
+@@ -244,12 +244,13 @@ void sctp_generate_t3_rtx_event(unsigned long peer)
+ 	int error;
+ 	struct sctp_transport *transport = (struct sctp_transport *) peer;
+ 	struct sctp_association *asoc = transport->asoc;
+-	struct net *net = sock_net(asoc->base.sk);
++	struct sock *sk = asoc->base.sk;
++	struct net *net = sock_net(sk);
+ 
+ 	/* Check whether a task is in the sock.  */
+ 
+-	bh_lock_sock(asoc->base.sk);
+-	if (sock_owned_by_user(asoc->base.sk)) {
++	bh_lock_sock(sk);
++	if (sock_owned_by_user(sk)) {
+ 		pr_debug("%s: sock is busy\n", __func__);
+ 
+ 		/* Try again later.  */
+@@ -272,10 +273,10 @@ void sctp_generate_t3_rtx_event(unsigned long peer)
+ 			   transport, GFP_ATOMIC);
+ 
+ 	if (error)
+-		asoc->base.sk->sk_err = -error;
++		sk->sk_err = -error;
+ 
+ out_unlock:
+-	bh_unlock_sock(asoc->base.sk);
++	bh_unlock_sock(sk);
+ 	sctp_transport_put(transport);
+ }
+ 
+@@ -285,11 +286,12 @@ out_unlock:
+ static void sctp_generate_timeout_event(struct sctp_association *asoc,
+ 					sctp_event_timeout_t timeout_type)
+ {
+-	struct net *net = sock_net(asoc->base.sk);
++	struct sock *sk = asoc->base.sk;
++	struct net *net = sock_net(sk);
+ 	int error = 0;
+ 
+-	bh_lock_sock(asoc->base.sk);
+-	if (sock_owned_by_user(asoc->base.sk)) {
++	bh_lock_sock(sk);
++	if (sock_owned_by_user(sk)) {
+ 		pr_debug("%s: sock is busy: timer %d\n", __func__,
+ 			 timeout_type);
+ 
+@@ -312,10 +314,10 @@ static void sctp_generate_timeout_event(struct sctp_association *asoc,
+ 			   (void *)timeout_type, GFP_ATOMIC);
+ 
+ 	if (error)
+-		asoc->base.sk->sk_err = -error;
++		sk->sk_err = -error;
+ 
+ out_unlock:
+-	bh_unlock_sock(asoc->base.sk);
++	bh_unlock_sock(sk);
+ 	sctp_association_put(asoc);
+ }
+ 
+@@ -365,10 +367,11 @@ void sctp_generate_heartbeat_event(unsigned long data)
+ 	int error = 0;
+ 	struct sctp_transport *transport = (struct sctp_transport *) data;
+ 	struct sctp_association *asoc = transport->asoc;
+-	struct net *net = sock_net(asoc->base.sk);
++	struct sock *sk = asoc->base.sk;
++	struct net *net = sock_net(sk);
+ 
+-	bh_lock_sock(asoc->base.sk);
+-	if (sock_owned_by_user(asoc->base.sk)) {
++	bh_lock_sock(sk);
++	if (sock_owned_by_user(sk)) {
+ 		pr_debug("%s: sock is busy\n", __func__);
+ 
+ 		/* Try again later.  */
+@@ -388,11 +391,11 @@ void sctp_generate_heartbeat_event(unsigned long data)
+ 			   asoc->state, asoc->ep, asoc,
+ 			   transport, GFP_ATOMIC);
+ 
+-	 if (error)
+-		 asoc->base.sk->sk_err = -error;
++	if (error)
++		sk->sk_err = -error;
+ 
+ out_unlock:
+-	bh_unlock_sock(asoc->base.sk);
++	bh_unlock_sock(sk);
+ 	sctp_transport_put(transport);
+ }
+ 
+@@ -403,10 +406,11 @@ void sctp_generate_proto_unreach_event(unsigned long data)
+ {
+ 	struct sctp_transport *transport = (struct sctp_transport *) data;
+ 	struct sctp_association *asoc = transport->asoc;
+-	struct net *net = sock_net(asoc->base.sk);
++	struct sock *sk = asoc->base.sk;
++	struct net *net = sock_net(sk);
+ 
+-	bh_lock_sock(asoc->base.sk);
+-	if (sock_owned_by_user(asoc->base.sk)) {
++	bh_lock_sock(sk);
++	if (sock_owned_by_user(sk)) {
+ 		pr_debug("%s: sock is busy\n", __func__);
+ 
+ 		/* Try again later.  */
+@@ -427,7 +431,7 @@ void sctp_generate_proto_unreach_event(unsigned long data)
+ 		   asoc->state, asoc->ep, asoc, transport, GFP_ATOMIC);
+ 
+ out_unlock:
+-	bh_unlock_sock(asoc->base.sk);
++	bh_unlock_sock(sk);
+ 	sctp_association_put(asoc);
+ }
+ 
+-- 
+2.5.0
+
diff --git a/security-yama-Remove-unnecessary-selects-from-Kconfi.patch b/security-yama-Remove-unnecessary-selects-from-Kconfi.patch
deleted file mode 100644
index aa2a0d3c2..000000000
--- a/security-yama-Remove-unnecessary-selects-from-Kconfi.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Stephen Smalley <sds@tycho.nsa.gov>
-Date: Fri, 27 Feb 2015 16:23:59 -0500
-Subject: [PATCH] security/yama: Remove unnecessary selects from Kconfig.
-
-Yama selects SECURITYFS and SECURITY_PATH, but requires neither.
-Remove them.
-
-Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
----
- security/yama/Kconfig | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/security/yama/Kconfig b/security/yama/Kconfig
-index 20ef5143c0c0..3123e1da2fed 100644
---- a/security/yama/Kconfig
-+++ b/security/yama/Kconfig
-@@ -1,8 +1,6 @@
- config SECURITY_YAMA
- 	bool "Yama support"
- 	depends on SECURITY
--	select SECURITYFS
--	select SECURITY_PATH
- 	default n
- 	help
- 	  This selects Yama, which extends DAC support with additional
--- 
-2.1.0
-
diff --git a/silence-fbcon-logo.patch b/silence-fbcon-logo.patch
index bd580c091..9569d2a5b 100644
--- a/silence-fbcon-logo.patch
+++ b/silence-fbcon-logo.patch
@@ -9,7 +9,7 @@ Upstream-status: Fedora mustard
  1 file changed, 17 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
-index b97210671a81..2d12ad82fe75 100644
+index 658c34bb9076..25ab00980e4c 100644
 --- a/drivers/video/console/fbcon.c
 +++ b/drivers/video/console/fbcon.c
 @@ -634,13 +634,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
@@ -35,7 +35,7 @@ index b97210671a81..2d12ad82fe75 100644
  	}
  }
  #endif /* MODULE */
-@@ -3620,6 +3622,14 @@ static int __init fb_console_init(void)
+@@ -3621,6 +3623,14 @@ static int __init fb_console_init(void)
  	return 0;
  }
  
@@ -50,6 +50,3 @@ index b97210671a81..2d12ad82fe75 100644
  fs_initcall(fb_console_init);
  
  #ifdef MODULE
--- 
-2.1.0
-
diff --git a/sources b/sources
index c7536347c..820e00d9d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-0e37c076159538ff882f190d87fe9798  linux-4.0-rc4.tar.xz
-53996d49f76b39851ab26efd8c70fe53  perf-man-4.0-rc4.tar.gz
+9a78fa2eb6c68ca5a40ed5af08142599  linux-4.4.tar.xz
+dcbc8fe378a676d5d0dd208cf524e144  perf-man-4.4.tar.gz
+24bdcde8502d841d58f1e45fc2de217f  patch-4.4.14.xz
diff --git a/tipc-fix-an-infoleak-in-tipc_nl_compat_link_dump.patch b/tipc-fix-an-infoleak-in-tipc_nl_compat_link_dump.patch
new file mode 100644
index 000000000..9cd7c09a3
--- /dev/null
+++ b/tipc-fix-an-infoleak-in-tipc_nl_compat_link_dump.patch
@@ -0,0 +1,32 @@
+From 5d2be1422e02ccd697ccfcd45c85b4a26e6178e2 Mon Sep 17 00:00:00 2001
+From: Kangjie Lu <kangjielu@gmail.com>
+Date: Thu, 2 Jun 2016 04:04:56 -0400
+Subject: tipc: fix an infoleak in tipc_nl_compat_link_dump
+
+link_info.str is a char array of size 60. Memory after the NULL
+byte is not initialized. Sending the whole object out can cause
+a leak.
+
+Signed-off-by: Kangjie Lu <kjlu@gatech.edu>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ net/tipc/netlink_compat.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c
+index f795b1d..3ad9fab 100644
+--- a/net/tipc/netlink_compat.c
++++ b/net/tipc/netlink_compat.c
+@@ -604,7 +604,8 @@ static int tipc_nl_compat_link_dump(struct tipc_nl_compat_msg *msg,
+ 
+ 	link_info.dest = nla_get_flag(link[TIPC_NLA_LINK_DEST]);
+ 	link_info.up = htonl(nla_get_flag(link[TIPC_NLA_LINK_UP]));
+-	strcpy(link_info.str, nla_data(link[TIPC_NLA_LINK_NAME]));
++	nla_strlcpy(link_info.str, nla_data(link[TIPC_NLA_LINK_NAME]),
++		    TIPC_MAX_LINK_NAME);
+ 
+ 	return tipc_add_tlv(msg->rep, TIPC_TLV_LINK_INFO,
+ 			    &link_info, sizeof(link_info));
+-- 
+cgit v0.12
+
diff --git a/upstream-reverts.patch b/upstream-reverts.patch
deleted file mode 100644
index 607602cfc..000000000
--- a/upstream-reverts.patch
+++ /dev/null
@@ -1 +0,0 @@
-nil
diff --git a/vmwgfx-Rework-device-initialization.patch b/vmwgfx-Rework-device-initialization.patch
new file mode 100644
index 000000000..183ba9c28
--- /dev/null
+++ b/vmwgfx-Rework-device-initialization.patch
@@ -0,0 +1,890 @@
+From c1d9b32d8ee2e97e2867fa759eb84d436cca0311 Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Thu, 25 Jun 2015 10:47:43 -0700
+Subject: [PATCH 1/2] vmwgfx: Rework device initialization
+
+This commit reworks device initialization so that we always enable the
+FIFO at driver load, deferring SVGA enable until either first modeset
+or fbdev enable.
+This should always leave the fifo properly enabled for render- and
+control nodes.
+In addition,
+*) We disable the use of VRAM when SVGA is not enabled.
+*) We simplify PM support so that we only throw out resources on hibernate,
+not on suspend, since the device keeps its state on suspend.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Sinclair Yeh <syeh@vmware.com>
+---
+ drivers/gpu/drm/vmwgfx/vmwgfx_context.c |   8 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c     | 337 ++++++++++++++++++--------------
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h     |  19 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c      |   4 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c    |  12 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c     |   1 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_mob.c     |   6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c    |   1 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_shader.c  |   4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_surface.c |  12 +-
+ 10 files changed, 230 insertions(+), 174 deletions(-)
+
+diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
+index 5ac92874404d..a8e370a55e90 100644
+--- a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
+@@ -140,7 +140,7 @@ static void vmw_hw_context_destroy(struct vmw_resource *res)
+ 	cmd->body.cid = cpu_to_le32(res->id);
+ 
+ 	vmw_fifo_commit(dev_priv, sizeof(*cmd));
+-	vmw_3d_resource_dec(dev_priv, false);
++	vmw_fifo_resource_dec(dev_priv);
+ }
+ 
+ static int vmw_gb_context_init(struct vmw_private *dev_priv,
+@@ -220,7 +220,7 @@ static int vmw_context_init(struct vmw_private *dev_priv,
+ 	cmd->body.cid = cpu_to_le32(res->id);
+ 
+ 	vmw_fifo_commit(dev_priv, sizeof(*cmd));
+-	(void) vmw_3d_resource_inc(dev_priv, false);
++	vmw_fifo_resource_inc(dev_priv);
+ 	vmw_resource_activate(res, vmw_hw_context_destroy);
+ 	return 0;
+ 
+@@ -281,7 +281,7 @@ static int vmw_gb_context_create(struct vmw_resource *res)
+ 	cmd->header.size = sizeof(cmd->body);
+ 	cmd->body.cid = res->id;
+ 	vmw_fifo_commit(dev_priv, sizeof(*cmd));
+-	(void) vmw_3d_resource_inc(dev_priv, false);
++	vmw_fifo_resource_inc(dev_priv);
+ 
+ 	return 0;
+ 
+@@ -414,7 +414,7 @@ static int vmw_gb_context_destroy(struct vmw_resource *res)
+ 	if (dev_priv->query_cid == res->id)
+ 		dev_priv->query_cid_valid = false;
+ 	vmw_resource_release_id(res);
+-	vmw_3d_resource_dec(dev_priv, false);
++	vmw_fifo_resource_dec(dev_priv);
+ 
+ 	return 0;
+ }
+diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+index 620bb5cf617c..a4766acd0ea2 100644
+--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+@@ -339,24 +339,47 @@ static int vmw_dummy_query_bo_create(struct vmw_private *dev_priv)
+ 	return ret;
+ }
+ 
+-static int vmw_request_device(struct vmw_private *dev_priv)
++/**
++ * vmw_request_device_late - Perform late device setup
++ *
++ * @dev_priv: Pointer to device private.
++ *
++ * This function performs setup of otables and enables large command
++ * buffer submission. These tasks are split out to a separate function
++ * because it reverts vmw_release_device_early and is intended to be used
++ * by an error path in the hibernation code.
++ */
++static int vmw_request_device_late(struct vmw_private *dev_priv)
+ {
+ 	int ret;
+ 
+-	ret = vmw_fifo_init(dev_priv, &dev_priv->fifo);
+-	if (unlikely(ret != 0)) {
+-		DRM_ERROR("Unable to initialize FIFO.\n");
+-		return ret;
+-	}
+-	vmw_fence_fifo_up(dev_priv->fman);
+ 	if (dev_priv->has_mob) {
+ 		ret = vmw_otables_setup(dev_priv);
+ 		if (unlikely(ret != 0)) {
+ 			DRM_ERROR("Unable to initialize "
+ 				  "guest Memory OBjects.\n");
+-			goto out_no_mob;
++			return ret;
+ 		}
+ 	}
++
++	return 0;
++}
++
++static int vmw_request_device(struct vmw_private *dev_priv)
++{
++	int ret;
++
++	ret = vmw_fifo_init(dev_priv, &dev_priv->fifo);
++	if (unlikely(ret != 0)) {
++		DRM_ERROR("Unable to initialize FIFO.\n");
++		return ret;
++	}
++	vmw_fence_fifo_up(dev_priv->fman);
++
++	ret = vmw_request_device_late(dev_priv);
++	if (ret)
++		goto out_no_mob;
++
+ 	ret = vmw_dummy_query_bo_create(dev_priv);
+ 	if (unlikely(ret != 0))
+ 		goto out_no_query_bo;
+@@ -364,15 +387,25 @@ static int vmw_request_device(struct vmw_private *dev_priv)
+ 	return 0;
+ 
+ out_no_query_bo:
+-	if (dev_priv->has_mob)
++	if (dev_priv->has_mob) {
++		(void) ttm_bo_evict_mm(&dev_priv->bdev, VMW_PL_MOB);
+ 		vmw_otables_takedown(dev_priv);
++	}
+ out_no_mob:
+ 	vmw_fence_fifo_down(dev_priv->fman);
+ 	vmw_fifo_release(dev_priv, &dev_priv->fifo);
+ 	return ret;
+ }
+ 
+-static void vmw_release_device(struct vmw_private *dev_priv)
++/**
++ * vmw_release_device_early - Early part of fifo takedown.
++ *
++ * @dev_priv: Pointer to device private struct.
++ *
++ * This is the first part of command submission takedown, to be called before
++ * buffer management is taken down.
++ */
++static void vmw_release_device_early(struct vmw_private *dev_priv)
+ {
+ 	/*
+ 	 * Previous destructions should've released
+@@ -382,64 +415,24 @@ static void vmw_release_device(struct vmw_private *dev_priv)
+ 	BUG_ON(dev_priv->pinned_bo != NULL);
+ 
+ 	ttm_bo_unref(&dev_priv->dummy_query_bo);
+-	if (dev_priv->has_mob)
++	if (dev_priv->has_mob) {
++		ttm_bo_evict_mm(&dev_priv->bdev, VMW_PL_MOB);
+ 		vmw_otables_takedown(dev_priv);
+-	vmw_fence_fifo_down(dev_priv->fman);
+-	vmw_fifo_release(dev_priv, &dev_priv->fifo);
+-}
+-
+-
+-/**
+- * Increase the 3d resource refcount.
+- * If the count was prevously zero, initialize the fifo, switching to svga
+- * mode. Note that the master holds a ref as well, and may request an
+- * explicit switch to svga mode if fb is not running, using @unhide_svga.
+- */
+-int vmw_3d_resource_inc(struct vmw_private *dev_priv,
+-			bool unhide_svga)
+-{
+-	int ret = 0;
+-
+-	mutex_lock(&dev_priv->release_mutex);
+-	if (unlikely(dev_priv->num_3d_resources++ == 0)) {
+-		ret = vmw_request_device(dev_priv);
+-		if (unlikely(ret != 0))
+-			--dev_priv->num_3d_resources;
+-	} else if (unhide_svga) {
+-		vmw_write(dev_priv, SVGA_REG_ENABLE,
+-			  vmw_read(dev_priv, SVGA_REG_ENABLE) &
+-			  ~SVGA_REG_ENABLE_HIDE);
+ 	}
+-
+-	mutex_unlock(&dev_priv->release_mutex);
+-	return ret;
+ }
+ 
+ /**
+- * Decrease the 3d resource refcount.
+- * If the count reaches zero, disable the fifo, switching to vga mode.
+- * Note that the master holds a refcount as well, and may request an
+- * explicit switch to vga mode when it releases its refcount to account
+- * for the situation of an X server vt switch to VGA with 3d resources
+- * active.
++ * vmw_release_device_late - Late part of fifo takedown.
++ *
++ * @dev_priv: Pointer to device private struct.
++ *
++ * This is the last part of the command submission takedown, to be called when
++ * command submission is no longer needed. It may wait on pending fences.
+  */
+-void vmw_3d_resource_dec(struct vmw_private *dev_priv,
+-			 bool hide_svga)
++static void vmw_release_device_late(struct vmw_private *dev_priv)
+ {
+-	int32_t n3d;
+-
+-	mutex_lock(&dev_priv->release_mutex);
+-	if (unlikely(--dev_priv->num_3d_resources == 0))
+-		vmw_release_device(dev_priv);
+-	else if (hide_svga)
+-		vmw_write(dev_priv, SVGA_REG_ENABLE,
+-			  vmw_read(dev_priv, SVGA_REG_ENABLE) |
+-			  SVGA_REG_ENABLE_HIDE);
+-
+-	n3d = (int32_t) dev_priv->num_3d_resources;
+-	mutex_unlock(&dev_priv->release_mutex);
+-
+-	BUG_ON(n3d < 0);
++	vmw_fence_fifo_down(dev_priv->fman);
++	vmw_fifo_release(dev_priv, &dev_priv->fifo);
+ }
+ 
+ /**
+@@ -603,6 +596,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
+ 	spin_lock_init(&dev_priv->hw_lock);
+ 	spin_lock_init(&dev_priv->waiter_lock);
+ 	spin_lock_init(&dev_priv->cap_lock);
++	spin_lock_init(&dev_priv->svga_lock);
+ 
+ 	for (i = vmw_res_context; i < vmw_res_max; ++i) {
+ 		idr_init(&dev_priv->res_idr[i]);
+@@ -714,17 +708,6 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
+ 	dev_priv->active_master = &dev_priv->fbdev_master;
+ 
+ 
+-	ret = ttm_bo_device_init(&dev_priv->bdev,
+-				 dev_priv->bo_global_ref.ref.object,
+-				 &vmw_bo_driver,
+-				 dev->anon_inode->i_mapping,
+-				 VMWGFX_FILE_PAGE_OFFSET,
+-				 false);
+-	if (unlikely(ret != 0)) {
+-		DRM_ERROR("Failed initializing TTM buffer object driver.\n");
+-		goto out_err1;
+-	}
+-
+ 	dev_priv->mmio_mtrr = arch_phys_wc_add(dev_priv->mmio_start,
+ 					       dev_priv->mmio_size);
+ 
+@@ -787,13 +770,28 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
+ 		goto out_no_fman;
+ 	}
+ 
++	ret = ttm_bo_device_init(&dev_priv->bdev,
++				 dev_priv->bo_global_ref.ref.object,
++				 &vmw_bo_driver,
++				 dev->anon_inode->i_mapping,
++				 VMWGFX_FILE_PAGE_OFFSET,
++				 false);
++	if (unlikely(ret != 0)) {
++		DRM_ERROR("Failed initializing TTM buffer object driver.\n");
++		goto out_no_bdev;
++	}
+ 
++	/*
++	 * Enable VRAM, but initially don't use it until SVGA is enabled and
++	 * unhidden.
++	 */
+ 	ret = ttm_bo_init_mm(&dev_priv->bdev, TTM_PL_VRAM,
+ 			     (dev_priv->vram_size >> PAGE_SHIFT));
+ 	if (unlikely(ret != 0)) {
+ 		DRM_ERROR("Failed initializing memory manager for VRAM.\n");
+ 		goto out_no_vram;
+ 	}
++	dev_priv->bdev.man[TTM_PL_VRAM].use_type = false;
+ 
+ 	dev_priv->has_gmr = true;
+ 	if (((dev_priv->capabilities & (SVGA_CAP_GMR | SVGA_CAP_GMR2)) == 0) ||
+@@ -814,18 +812,18 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
+ 		}
+ 	}
+ 
+-	vmw_kms_save_vga(dev_priv);
+-
+-	/* Start kms and overlay systems, needs fifo. */
+ 	ret = vmw_kms_init(dev_priv);
+ 	if (unlikely(ret != 0))
+ 		goto out_no_kms;
+ 	vmw_overlay_init(dev_priv);
+ 
++	ret = vmw_request_device(dev_priv);
++	if (ret)
++		goto out_no_fifo;
++
+ 	if (dev_priv->enable_fb) {
+-		ret = vmw_3d_resource_inc(dev_priv, true);
+-		if (unlikely(ret != 0))
+-			goto out_no_fifo;
++		vmw_fifo_resource_inc(dev_priv);
++		vmw_svga_enable(dev_priv);
+ 		vmw_fb_init(dev_priv);
+ 	}
+ 
+@@ -838,13 +836,14 @@ out_no_fifo:
+ 	vmw_overlay_close(dev_priv);
+ 	vmw_kms_close(dev_priv);
+ out_no_kms:
+-	vmw_kms_restore_vga(dev_priv);
+ 	if (dev_priv->has_mob)
+ 		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_MOB);
+ 	if (dev_priv->has_gmr)
+ 		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_GMR);
+ 	(void)ttm_bo_clean_mm(&dev_priv->bdev, TTM_PL_VRAM);
+ out_no_vram:
++	(void)ttm_bo_device_release(&dev_priv->bdev);
++out_no_bdev:
+ 	vmw_fence_manager_takedown(dev_priv->fman);
+ out_no_fman:
+ 	if (dev_priv->capabilities & SVGA_CAP_IRQMASK)
+@@ -860,8 +859,6 @@ out_err4:
+ 	iounmap(dev_priv->mmio_virt);
+ out_err3:
+ 	arch_phys_wc_del(dev_priv->mmio_mtrr);
+-	(void)ttm_bo_device_release(&dev_priv->bdev);
+-out_err1:
+ 	vmw_ttm_global_release(dev_priv);
+ out_err0:
+ 	for (i = vmw_res_context; i < vmw_res_max; ++i)
+@@ -883,18 +880,22 @@ static int vmw_driver_unload(struct drm_device *dev)
+ 	vfree(dev_priv->ctx.cmd_bounce);
+ 	if (dev_priv->enable_fb) {
+ 		vmw_fb_close(dev_priv);
+-		vmw_kms_restore_vga(dev_priv);
+-		vmw_3d_resource_dec(dev_priv, false);
++		vmw_fifo_resource_dec(dev_priv);
++		vmw_svga_disable(dev_priv);
+ 	}
++
+ 	vmw_kms_close(dev_priv);
+ 	vmw_overlay_close(dev_priv);
+ 
+-	if (dev_priv->has_mob)
+-		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_MOB);
+ 	if (dev_priv->has_gmr)
+ 		(void)ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_GMR);
+ 	(void)ttm_bo_clean_mm(&dev_priv->bdev, TTM_PL_VRAM);
+ 
++	vmw_release_device_early(dev_priv);
++	if (dev_priv->has_mob)
++		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_MOB);
++	(void) ttm_bo_device_release(&dev_priv->bdev);
++	vmw_release_device_late(dev_priv);
+ 	vmw_fence_manager_takedown(dev_priv->fman);
+ 	if (dev_priv->capabilities & SVGA_CAP_IRQMASK)
+ 		drm_irq_uninstall(dev_priv->dev);
+@@ -1148,27 +1149,13 @@ static int vmw_master_set(struct drm_device *dev,
+ 	struct vmw_master *vmaster = vmw_master(file_priv->master);
+ 	int ret = 0;
+ 
+-	if (!dev_priv->enable_fb) {
+-		ret = vmw_3d_resource_inc(dev_priv, true);
+-		if (unlikely(ret != 0))
+-			return ret;
+-		vmw_kms_save_vga(dev_priv);
+-		vmw_write(dev_priv, SVGA_REG_TRACES, 0);
+-	}
+-
+ 	if (active) {
+ 		BUG_ON(active != &dev_priv->fbdev_master);
+ 		ret = ttm_vt_lock(&active->lock, false, vmw_fp->tfile);
+ 		if (unlikely(ret != 0))
+-			goto out_no_active_lock;
++			return ret;
+ 
+ 		ttm_lock_set_kill(&active->lock, true, SIGTERM);
+-		ret = ttm_bo_evict_mm(&dev_priv->bdev, TTM_PL_VRAM);
+-		if (unlikely(ret != 0)) {
+-			DRM_ERROR("Unable to clean VRAM on "
+-				  "master drop.\n");
+-		}
+-
+ 		dev_priv->active_master = NULL;
+ 	}
+ 
+@@ -1182,14 +1169,6 @@ static int vmw_master_set(struct drm_device *dev,
+ 	dev_priv->active_master = vmaster;
+ 
+ 	return 0;
+-
+-out_no_active_lock:
+-	if (!dev_priv->enable_fb) {
+-		vmw_kms_restore_vga(dev_priv);
+-		vmw_3d_resource_dec(dev_priv, true);
+-		vmw_write(dev_priv, SVGA_REG_TRACES, 1);
+-	}
+-	return ret;
+ }
+ 
+ static void vmw_master_drop(struct drm_device *dev,
+@@ -1214,16 +1193,9 @@ static void vmw_master_drop(struct drm_device *dev,
+ 	}
+ 
+ 	ttm_lock_set_kill(&vmaster->lock, false, SIGTERM);
+-	vmw_execbuf_release_pinned_bo(dev_priv);
+ 
+-	if (!dev_priv->enable_fb) {
+-		ret = ttm_bo_evict_mm(&dev_priv->bdev, TTM_PL_VRAM);
+-		if (unlikely(ret != 0))
+-			DRM_ERROR("Unable to clean VRAM on master drop.\n");
+-		vmw_kms_restore_vga(dev_priv);
+-		vmw_3d_resource_dec(dev_priv, true);
+-		vmw_write(dev_priv, SVGA_REG_TRACES, 1);
+-	}
++	if (!dev_priv->enable_fb)
++		vmw_svga_disable(dev_priv);
+ 
+ 	dev_priv->active_master = &dev_priv->fbdev_master;
+ 	ttm_lock_set_kill(&dev_priv->fbdev_master.lock, false, SIGTERM);
+@@ -1233,6 +1205,74 @@ static void vmw_master_drop(struct drm_device *dev,
+ 		vmw_fb_on(dev_priv);
+ }
+ 
++/**
++ * __vmw_svga_enable - Enable SVGA mode, FIFO and use of VRAM.
++ *
++ * @dev_priv: Pointer to device private struct.
++ * Needs the reservation sem to be held in non-exclusive mode.
++ */
++void __vmw_svga_enable(struct vmw_private *dev_priv)
++{
++	spin_lock(&dev_priv->svga_lock);
++	if (!dev_priv->bdev.man[TTM_PL_VRAM].use_type) {
++		vmw_write(dev_priv, SVGA_REG_ENABLE, SVGA_REG_ENABLE);
++		dev_priv->bdev.man[TTM_PL_VRAM].use_type = true;
++	}
++	spin_unlock(&dev_priv->svga_lock);
++}
++
++/**
++ * vmw_svga_enable - Enable SVGA mode, FIFO and use of VRAM.
++ *
++ * @dev_priv: Pointer to device private struct.
++ */
++void vmw_svga_enable(struct vmw_private *dev_priv)
++{
++	ttm_read_lock(&dev_priv->reservation_sem, false);
++	__vmw_svga_enable(dev_priv);
++	ttm_read_unlock(&dev_priv->reservation_sem);
++}
++
++/**
++ * __vmw_svga_disable - Disable SVGA mode and use of VRAM.
++ *
++ * @dev_priv: Pointer to device private struct.
++ * Needs the reservation sem to be held in exclusive mode.
++ * Will not empty VRAM. VRAM must be emptied by caller.
++ */
++void __vmw_svga_disable(struct vmw_private *dev_priv)
++{
++	spin_lock(&dev_priv->svga_lock);
++	if (dev_priv->bdev.man[TTM_PL_VRAM].use_type) {
++		dev_priv->bdev.man[TTM_PL_VRAM].use_type = false;
++		vmw_write(dev_priv, SVGA_REG_ENABLE,
++			  SVGA_REG_ENABLE_ENABLE_HIDE);
++	}
++	spin_unlock(&dev_priv->svga_lock);
++}
++
++/**
++ * vmw_svga_disable - Disable SVGA_MODE, and use of VRAM. Keep the fifo
++ * running.
++ *
++ * @dev_priv: Pointer to device private struct.
++ * Will empty VRAM.
++ */
++void vmw_svga_disable(struct vmw_private *dev_priv)
++{
++	ttm_write_lock(&dev_priv->reservation_sem, false);
++	spin_lock(&dev_priv->svga_lock);
++	if (dev_priv->bdev.man[TTM_PL_VRAM].use_type) {
++		dev_priv->bdev.man[TTM_PL_VRAM].use_type = false;
++		vmw_write(dev_priv, SVGA_REG_ENABLE,
++			  SVGA_REG_ENABLE_ENABLE_HIDE);
++		spin_unlock(&dev_priv->svga_lock);
++		if (ttm_bo_evict_mm(&dev_priv->bdev, TTM_PL_VRAM))
++			DRM_ERROR("Failed evicting VRAM buffers.\n");
++	} else
++		spin_unlock(&dev_priv->svga_lock);
++	ttm_write_unlock(&dev_priv->reservation_sem);
++}
+ 
+ static void vmw_remove(struct pci_dev *pdev)
+ {
+@@ -1250,21 +1290,21 @@ static int vmwgfx_pm_notifier(struct notifier_block *nb, unsigned long val,
+ 
+ 	switch (val) {
+ 	case PM_HIBERNATION_PREPARE:
+-	case PM_SUSPEND_PREPARE:
+ 		ttm_suspend_lock(&dev_priv->reservation_sem);
+ 
+-		/**
++		/*
+ 		 * This empties VRAM and unbinds all GMR bindings.
+ 		 * Buffer contents is moved to swappable memory.
+ 		 */
+ 		vmw_execbuf_release_pinned_bo(dev_priv);
+ 		vmw_resource_evict_all(dev_priv);
++		vmw_release_device_early(dev_priv);
+ 		ttm_bo_swapout_all(&dev_priv->bdev);
+-
++		vmw_fence_fifo_down(dev_priv->fman);
+ 		break;
+ 	case PM_POST_HIBERNATION:
+-	case PM_POST_SUSPEND:
+ 	case PM_POST_RESTORE:
++		vmw_fence_fifo_up(dev_priv->fman);
+ 		ttm_suspend_unlock(&dev_priv->reservation_sem);
+ 
+ 		break;
+@@ -1276,20 +1316,13 @@ static int vmwgfx_pm_notifier(struct notifier_block *nb, unsigned long val,
+ 	return 0;
+ }
+ 
+-/**
+- * These might not be needed with the virtual SVGA device.
+- */
+-
+ static int vmw_pci_suspend(struct pci_dev *pdev, pm_message_t state)
+ {
+ 	struct drm_device *dev = pci_get_drvdata(pdev);
+ 	struct vmw_private *dev_priv = vmw_priv(dev);
+ 
+-	if (dev_priv->num_3d_resources != 0) {
+-		DRM_INFO("Can't suspend or hibernate "
+-			 "while 3D resources are active.\n");
++	if (dev_priv->refuse_hibernation)
+ 		return -EBUSY;
+-	}
+ 
+ 	pci_save_state(pdev);
+ 	pci_disable_device(pdev);
+@@ -1321,56 +1354,62 @@ static int vmw_pm_resume(struct device *kdev)
+ 	return vmw_pci_resume(pdev);
+ }
+ 
+-static int vmw_pm_prepare(struct device *kdev)
++static int vmw_pm_freeze(struct device *kdev)
+ {
+ 	struct pci_dev *pdev = to_pci_dev(kdev);
+ 	struct drm_device *dev = pci_get_drvdata(pdev);
+ 	struct vmw_private *dev_priv = vmw_priv(dev);
+ 
+-	/**
+-	 * Release 3d reference held by fbdev and potentially
+-	 * stop fifo.
+-	 */
+ 	dev_priv->suspended = true;
+ 	if (dev_priv->enable_fb)
+-			vmw_3d_resource_dec(dev_priv, true);
+-
+-	if (dev_priv->num_3d_resources != 0) {
+-
+-		DRM_INFO("Can't suspend or hibernate "
+-			 "while 3D resources are active.\n");
++		vmw_fifo_resource_dec(dev_priv);
+ 
++	if (atomic_read(&dev_priv->num_fifo_resources) != 0) {
++		DRM_ERROR("Can't hibernate while 3D resources are active.\n");
+ 		if (dev_priv->enable_fb)
+-			vmw_3d_resource_inc(dev_priv, true);
++			vmw_fifo_resource_inc(dev_priv);
++		WARN_ON(vmw_request_device_late(dev_priv));
+ 		dev_priv->suspended = false;
+ 		return -EBUSY;
+ 	}
+ 
++	if (dev_priv->enable_fb)
++		__vmw_svga_disable(dev_priv);
++	
++	vmw_release_device_late(dev_priv);
++
+ 	return 0;
+ }
+ 
+-static void vmw_pm_complete(struct device *kdev)
++static int vmw_pm_restore(struct device *kdev)
+ {
+ 	struct pci_dev *pdev = to_pci_dev(kdev);
+ 	struct drm_device *dev = pci_get_drvdata(pdev);
+ 	struct vmw_private *dev_priv = vmw_priv(dev);
++	int ret;
+ 
+ 	vmw_write(dev_priv, SVGA_REG_ID, SVGA_ID_2);
+ 	(void) vmw_read(dev_priv, SVGA_REG_ID);
+ 
+-	/**
+-	 * Reclaim 3d reference held by fbdev and potentially
+-	 * start fifo.
+-	 */
+ 	if (dev_priv->enable_fb)
+-			vmw_3d_resource_inc(dev_priv, false);
++		vmw_fifo_resource_inc(dev_priv);
++
++	ret = vmw_request_device(dev_priv);
++	if (ret)
++		return ret;
++
++	if (dev_priv->enable_fb)
++		__vmw_svga_enable(dev_priv);
+ 
+ 	dev_priv->suspended = false;
++
++	return 0;
+ }
+ 
+ static const struct dev_pm_ops vmw_pm_ops = {
+-	.prepare = vmw_pm_prepare,
+-	.complete = vmw_pm_complete,
++	.freeze = vmw_pm_freeze,
++	.thaw = vmw_pm_restore,
++	.restore = vmw_pm_restore,
+ 	.suspend = vmw_pm_suspend,
+ 	.resume = vmw_pm_resume,
+ };
+diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+index d26a6daa9719..a5f221eaf076 100644
+--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+@@ -484,6 +484,7 @@ struct vmw_private {
+ 
+ 	bool stealth;
+ 	bool enable_fb;
++	spinlock_t svga_lock;
+ 
+ 	/**
+ 	 * Master management.
+@@ -493,9 +494,10 @@ struct vmw_private {
+ 	struct vmw_master fbdev_master;
+ 	struct notifier_block pm_nb;
+ 	bool suspended;
++	bool refuse_hibernation;
+ 
+ 	struct mutex release_mutex;
+-	uint32_t num_3d_resources;
++	atomic_t num_fifo_resources;
+ 
+ 	/*
+ 	 * Replace this with an rwsem as soon as we have down_xx_interruptible()
+@@ -587,8 +589,9 @@ static inline uint32_t vmw_read(struct vmw_private *dev_priv,
+ 	return val;
+ }
+ 
+-int vmw_3d_resource_inc(struct vmw_private *dev_priv, bool unhide_svga);
+-void vmw_3d_resource_dec(struct vmw_private *dev_priv, bool hide_svga);
++extern void vmw_svga_enable(struct vmw_private *dev_priv);
++extern void vmw_svga_disable(struct vmw_private *dev_priv);
++
+ 
+ /**
+  * GMR utilities - vmwgfx_gmr.c
+@@ -1116,4 +1119,14 @@ static inline struct ttm_mem_global *vmw_mem_glob(struct vmw_private *dev_priv)
+ {
+ 	return (struct ttm_mem_global *) dev_priv->mem_global_ref.object;
+ }
++
++static inline void vmw_fifo_resource_inc(struct vmw_private *dev_priv)
++{
++	atomic_inc(&dev_priv->num_fifo_resources);
++}
++
++static inline void vmw_fifo_resource_dec(struct vmw_private *dev_priv)
++{
++	atomic_dec(&dev_priv->num_fifo_resources);
++}
+ #endif
+diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+index 0a474f391fad..0e062613a7db 100644
+--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+@@ -596,7 +596,10 @@ int vmw_fb_off(struct vmw_private *vmw_priv)
+ 
+ 	info = vmw_priv->fb_info;
+ 	par = info->par;
++	if (!par->bo_ptr)
++		return 0;
+ 
++	vmw_kms_save_vga(vmw_priv);
+ 	spin_lock_irqsave(&par->dirty.lock, flags);
+ 	par->dirty.active = false;
+ 	spin_unlock_irqrestore(&par->dirty.lock, flags);
+@@ -648,6 +651,7 @@ int vmw_fb_on(struct vmw_private *vmw_priv)
+ 	spin_lock_irqsave(&par->dirty.lock, flags);
+ 	par->dirty.active = true;
+ 	spin_unlock_irqrestore(&par->dirty.lock, flags);
++	vmw_kms_restore_vga(vmw_priv);
+ 
+ err_no_buffer:
+ 	vmw_fb_set_par(info);
+diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+index 39f2b03888e7..cd5d9f3fe0e0 100644
+--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+@@ -98,7 +98,6 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
+ 	__le32 __iomem *fifo_mem = dev_priv->mmio_virt;
+ 	uint32_t max;
+ 	uint32_t min;
+-	uint32_t dummy;
+ 
+ 	fifo->static_buffer_size = VMWGFX_FIFO_STATIC_SIZE;
+ 	fifo->static_buffer = vmalloc(fifo->static_buffer_size);
+@@ -112,10 +111,6 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
+ 	mutex_init(&fifo->fifo_mutex);
+ 	init_rwsem(&fifo->rwsem);
+ 
+-	/*
+-	 * Allow mapping the first page read-only to user-space.
+-	 */
+-
+ 	DRM_INFO("width %d\n", vmw_read(dev_priv, SVGA_REG_WIDTH));
+ 	DRM_INFO("height %d\n", vmw_read(dev_priv, SVGA_REG_HEIGHT));
+ 	DRM_INFO("bpp %d\n", vmw_read(dev_priv, SVGA_REG_BITS_PER_PIXEL));
+@@ -123,7 +118,9 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
+ 	dev_priv->enable_state = vmw_read(dev_priv, SVGA_REG_ENABLE);
+ 	dev_priv->config_done_state = vmw_read(dev_priv, SVGA_REG_CONFIG_DONE);
+ 	dev_priv->traces_state = vmw_read(dev_priv, SVGA_REG_TRACES);
+-	vmw_write(dev_priv, SVGA_REG_ENABLE, 1);
++
++	vmw_write(dev_priv, SVGA_REG_ENABLE, SVGA_REG_ENABLE_ENABLE_HIDE);
++	vmw_write(dev_priv, SVGA_REG_TRACES, 0);
+ 
+ 	min = 4;
+ 	if (dev_priv->capabilities & SVGA_CAP_EXTENDED_FIFO)
+@@ -155,7 +152,8 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
+ 	atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
+ 	iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
+ 	vmw_marker_queue_init(&fifo->marker_queue);
+-	return vmw_fifo_send_fence(dev_priv, &dummy);
++
++	return 0;
+ }
+ 
+ void vmw_fifo_ping_host(struct vmw_private *dev_priv, uint32_t reason)
+diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+index 5c289f748ab4..53579f278b63 100644
+--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+@@ -280,6 +280,7 @@ static int vmw_ldu_crtc_set_config(struct drm_mode_set *set)
+ 	}
+ 
+ 	vmw_fb_off(dev_priv);
++	vmw_svga_enable(dev_priv);
+ 
+ 	crtc->primary->fb = fb;
+ 	encoder->crtc = crtc;
+diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c b/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c
+index 04a64b8cd3cd..f06d60f41fa7 100644
+--- a/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c
++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c
+@@ -574,7 +574,7 @@ void vmw_mob_unbind(struct vmw_private *dev_priv,
+ 		vmw_fence_single_bo(bo, NULL);
+ 		ttm_bo_unreserve(bo);
+ 	}
+-	vmw_3d_resource_dec(dev_priv, false);
++	vmw_fifo_resource_dec(dev_priv);
+ }
+ 
+ /*
+@@ -627,7 +627,7 @@ int vmw_mob_bind(struct vmw_private *dev_priv,
+ 		mob->pt_level += VMW_MOBFMT_PTDEPTH_1 - SVGA3D_MOBFMT_PTDEPTH_1;
+ 	}
+ 
+-	(void) vmw_3d_resource_inc(dev_priv, false);
++	vmw_fifo_resource_inc(dev_priv);
+ 
+ 	cmd = vmw_fifo_reserve(dev_priv, sizeof(*cmd));
+ 	if (unlikely(cmd == NULL)) {
+@@ -648,7 +648,7 @@ int vmw_mob_bind(struct vmw_private *dev_priv,
+ 	return 0;
+ 
+ out_no_cmd_space:
+-	vmw_3d_resource_dec(dev_priv, false);
++	vmw_fifo_resource_dec(dev_priv);
+ 	if (pt_set_up)
+ 		ttm_bo_unref(&mob->pt_bo);
+ 
+diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+index 7dc591d04d9a..9e8eb364a6ac 100644
+--- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+@@ -332,6 +332,7 @@ static int vmw_sou_crtc_set_config(struct drm_mode_set *set)
+ 	}
+ 
+ 	vmw_fb_off(dev_priv);
++	vmw_svga_enable(dev_priv);
+ 
+ 	if (mode->hdisplay != crtc->mode.hdisplay ||
+ 	    mode->vdisplay != crtc->mode.vdisplay) {
+diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c b/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c
+index 6a4584a43aa6..6110a433ebfe 100644
+--- a/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c
++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c
+@@ -165,7 +165,7 @@ static int vmw_gb_shader_create(struct vmw_resource *res)
+ 	cmd->body.type = shader->type;
+ 	cmd->body.sizeInBytes = shader->size;
+ 	vmw_fifo_commit(dev_priv, sizeof(*cmd));
+-	(void) vmw_3d_resource_inc(dev_priv, false);
++	vmw_fifo_resource_inc(dev_priv);
+ 
+ 	return 0;
+ 
+@@ -275,7 +275,7 @@ static int vmw_gb_shader_destroy(struct vmw_resource *res)
+ 	vmw_fifo_commit(dev_priv, sizeof(*cmd));
+ 	mutex_unlock(&dev_priv->binding_mutex);
+ 	vmw_resource_release_id(res);
+-	vmw_3d_resource_dec(dev_priv, false);
++	vmw_fifo_resource_dec(dev_priv);
+ 
+ 	return 0;
+ }
+diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
+index 4ecdbf3e59da..4d0c98edeb6a 100644
+--- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
+@@ -340,7 +340,7 @@ static void vmw_hw_surface_destroy(struct vmw_resource *res)
+ 		dev_priv->used_memory_size -= res->backup_size;
+ 		mutex_unlock(&dev_priv->cmdbuf_mutex);
+ 	}
+-	vmw_3d_resource_dec(dev_priv, false);
++	vmw_fifo_resource_dec(dev_priv);
+ }
+ 
+ /**
+@@ -576,14 +576,14 @@ static int vmw_surface_init(struct vmw_private *dev_priv,
+ 
+ 	BUG_ON(res_free == NULL);
+ 	if (!dev_priv->has_mob)
+-		(void) vmw_3d_resource_inc(dev_priv, false);
++		vmw_fifo_resource_inc(dev_priv);
+ 	ret = vmw_resource_init(dev_priv, res, true, res_free,
+ 				(dev_priv->has_mob) ? &vmw_gb_surface_func :
+ 				&vmw_legacy_surface_func);
+ 
+ 	if (unlikely(ret != 0)) {
+ 		if (!dev_priv->has_mob)
+-			vmw_3d_resource_dec(dev_priv, false);
++			vmw_fifo_resource_dec(dev_priv);
+ 		res_free(res);
+ 		return ret;
+ 	}
+@@ -1028,7 +1028,7 @@ static int vmw_gb_surface_create(struct vmw_resource *res)
+ 	if (likely(res->id != -1))
+ 		return 0;
+ 
+-	(void) vmw_3d_resource_inc(dev_priv, false);
++	vmw_fifo_resource_inc(dev_priv);
+ 	ret = vmw_resource_alloc_id(res);
+ 	if (unlikely(ret != 0)) {
+ 		DRM_ERROR("Failed to allocate a surface id.\n");
+@@ -1068,7 +1068,7 @@ static int vmw_gb_surface_create(struct vmw_resource *res)
+ out_no_fifo:
+ 	vmw_resource_release_id(res);
+ out_no_id:
+-	vmw_3d_resource_dec(dev_priv, false);
++	vmw_fifo_resource_dec(dev_priv);
+ 	return ret;
+ }
+ 
+@@ -1213,7 +1213,7 @@ static int vmw_gb_surface_destroy(struct vmw_resource *res)
+ 	vmw_fifo_commit(dev_priv, sizeof(*cmd));
+ 	mutex_unlock(&dev_priv->binding_mutex);
+ 	vmw_resource_release_id(res);
+-	vmw_3d_resource_dec(dev_priv, false);
++	vmw_fifo_resource_dec(dev_priv);
+ 
+ 	return 0;
+ }
+-- 
+2.4.3
+
diff --git a/watchdog-Disable-watchdog-on-virtual-machines.patch b/watchdog-Disable-watchdog-on-virtual-machines.patch
index d15fd84fa..11bce5bb7 100644
--- a/watchdog-Disable-watchdog-on-virtual-machines.patch
+++ b/watchdog-Disable-watchdog-on-virtual-machines.patch
@@ -1,3 +1,4 @@
+From f1293c68aff98cd913a59b151aac938ec4ce4857 Mon Sep 17 00:00:00 2001
 From: Dave Jones <davej@redhat.com>
 Date: Tue, 24 Jun 2014 08:43:34 -0400
 Subject: [PATCH] watchdog: Disable watchdog on virtual machines.
@@ -20,19 +21,19 @@ Signed-off-by: Dave Jones <davej@redhat.com>
  1 file changed, 29 insertions(+)
 
 diff --git a/kernel/watchdog.c b/kernel/watchdog.c
-index 3174bf8e3538..d0a8abec3df9 100644
+index 18f34cf..6aadffe 100644
 --- a/kernel/watchdog.c
 +++ b/kernel/watchdog.c
-@@ -19,6 +19,7 @@
- #include <linux/sysctl.h>
+@@ -20,6 +20,7 @@
  #include <linux/smpboot.h>
  #include <linux/sched/rt.h>
+ #include <linux/tick.h>
 +#include <linux/dmi.h>
  
  #include <asm/irq_regs.h>
  #include <linux/kvm_para.h>
-@@ -135,6 +136,32 @@ static int __init softlockup_all_cpu_backtrace_setup(char *str)
- __setup("softlockup_all_cpu_backtrace=", softlockup_all_cpu_backtrace_setup);
+@@ -185,6 +186,32 @@ static int __init hardlockup_all_cpu_backtrace_setup(char *str)
+ __setup("hardlockup_all_cpu_backtrace=", hardlockup_all_cpu_backtrace_setup);
  #endif
  
 +static int disable_watchdog(const struct dmi_system_id *d)
@@ -64,7 +65,7 @@ index 3174bf8e3538..d0a8abec3df9 100644
  /*
   * Hard-lockup warnings should be triggered after just a few seconds. Soft-
   * lockups can have false positives under extreme conditions. So we generally
-@@ -704,6 +731,8 @@ out:
+@@ -1030,6 +1057,8 @@ out:
  
  void __init lockup_detector_init(void)
  {
@@ -72,7 +73,7 @@ index 3174bf8e3538..d0a8abec3df9 100644
 +
  	set_sample_period();
  
- 	if (watchdog_user_enabled)
+ #ifdef CONFIG_NO_HZ_FULL
 -- 
-2.1.0
+2.5.0
 
diff --git a/weird-root-dentry-name-debug.patch b/weird-root-dentry-name-debug.patch
deleted file mode 100644
index 9179fc9b3..000000000
--- a/weird-root-dentry-name-debug.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Bugzilla: 787171 766277
-Upstream-status: Fedora mustard
-
-debug patch for bz 787171/766277
-
-diff --git a/fs/dcache.c b/fs/dcache.c
-index bcbdb33..a6a5fdb 100644
---- a/fs/dcache.c
-+++ b/fs/dcache.c
-@@ -2530,8 +2530,10 @@ global_root:
- 	 */
- 	if (IS_ROOT(dentry) &&
- 	    (dentry->d_name.len != 1 || dentry->d_name.name[0] != '/')) {
--		WARN(1, "Root dentry has weird name <%.*s>\n",
--		     (int) dentry->d_name.len, dentry->d_name.name);
-+		WARN(1, "Root dentry has weird name <%.*s>  vfsmnt:%s fs:%s\n",
-+		     (int) dentry->d_name.len, dentry->d_name.name,
-+			vfsmnt->mnt_root->d_name.name,
-+			vfsmnt->mnt_sb->s_type->name);
- 	}
- 	if (!slash)
- 		error = prepend(buffer, buflen, "/", 1);
diff --git a/x86-Lock-down-IO-port-access-when-module-security-is.patch b/x86-Lock-down-IO-port-access-when-module-security-is.patch
index 0c6498190..185b1da99 100644
--- a/x86-Lock-down-IO-port-access-when-module-security-is.patch
+++ b/x86-Lock-down-IO-port-access-when-module-security-is.patch
@@ -1,3 +1,4 @@
+From 8010b5eb4680df797575e6306d4d891200e303ab Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Thu, 8 Mar 2012 10:35:59 -0500
 Subject: [PATCH] x86: Lock down IO port access when module security is enabled
@@ -14,7 +15,7 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
-index 4ddaf66ea35f..00b440307419 100644
+index 589b3193f102..ab8372443efb 100644
 --- a/arch/x86/kernel/ioport.c
 +++ b/arch/x86/kernel/ioport.c
 @@ -15,6 +15,7 @@
@@ -34,7 +35,7 @@ index 4ddaf66ea35f..00b440307419 100644
  		return -EPERM;
  
  	/*
-@@ -103,7 +104,7 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
+@@ -108,7 +109,7 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
  		return -EINVAL;
  	/* Trying to gain more privileges? */
  	if (level > old) {
@@ -42,15 +43,15 @@ index 4ddaf66ea35f..00b440307419 100644
 +		if (!capable(CAP_SYS_RAWIO) || secure_modules())
  			return -EPERM;
  	}
- 	regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
+ 	regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) |
 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
-index 297110c12635..efe38c1bc234 100644
+index 71025c2f6bbb..86e5bfa91563 100644
 --- a/drivers/char/mem.c
 +++ b/drivers/char/mem.c
 @@ -27,6 +27,7 @@
  #include <linux/export.h>
  #include <linux/io.h>
- #include <linux/aio.h>
+ #include <linux/uio.h>
 +#include <linux/module.h>
  
  #include <linux/uaccess.h>
@@ -66,5 +67,5 @@ index 297110c12635..efe38c1bc234 100644
  		return -EFAULT;
  	while (count-- > 0 && i < 65536) {
 -- 
-2.1.0
+2.5.5
 
diff --git a/x86-Restrict-MSR-access-when-module-loading-is-restr.patch b/x86-Restrict-MSR-access-when-module-loading-is-restr.patch
index 39ea0604b..5c91ab143 100644
--- a/x86-Restrict-MSR-access-when-module-loading-is-restr.patch
+++ b/x86-Restrict-MSR-access-when-module-loading-is-restr.patch
@@ -1,6 +1,8 @@
+From c076ed5eed97cba612d7efec41359815c5547f4c Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Fri, 8 Feb 2013 11:12:13 -0800
-Subject: [PATCH] x86: Restrict MSR access when module loading is restricted
+Subject: [PATCH 09/20] x86: Restrict MSR access when module loading is
+ restricted
 
 Writing to MSRs should not be allowed if module loading is restricted,
 since it could lead to execution of arbitrary code in kernel mode. Based
@@ -38,5 +40,5 @@ index 113e70784854..26c2f83fc470 100644
  			err = -EFAULT;
  			break;
 -- 
-2.1.0
+2.4.3
 
diff --git a/x86-apic-Fix-fallout-from-x2apic-cleanup.patch b/x86-apic-Fix-fallout-from-x2apic-cleanup.patch
new file mode 100644
index 000000000..8f7b578dd
--- /dev/null
+++ b/x86-apic-Fix-fallout-from-x2apic-cleanup.patch
@@ -0,0 +1,81 @@
+From a57e456a7b28431b55e407e5ab78ebd5b378d19e Mon Sep 17 00:00:00 2001
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sat, 22 Aug 2015 16:41:17 +0200
+Subject: [PATCH] x86/apic: Fix fallout from x2apic cleanup
+
+In the recent x2apic cleanup I got two things really wrong:
+1) The safety check in __disable_x2apic which allows the function to
+   be called unconditionally is backwards. The check is there to
+   prevent access to the apic MSR in case that the machine has no
+   apic. Though right now it returns if the machine has an apic and
+   therefor the disabling of x2apic is never invoked.
+
+2) x2apic_disable() sets x2apic_mode to 0 after registering the local
+   apic. That's wrong, because register_lapic_address() checks x2apic
+   mode and therefor takes the wrong code path.
+
+This results in boot failures on machines with x2apic preenabled by
+BIOS and can also lead to an fatal MSR access on machines without
+apic.
+
+The solutions are simple:
+1) Correct the sanity check for apic availability
+2) Clear x2apic_mode _before_ calling register_lapic_address()
+
+Fixes: 659006bf3ae3 'x86/x2apic: Split enable and setup function'
+Reported-and-tested-by: Javier Monteagudo <javiermon@gmail.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Link: https://bugzilla.redhat.com/show_bug.cgi?id=1224764
+Cc: stable@vger.kernel.org # 4.0+
+Cc: Laura Abbott <labbott@redhat.com>
+Cc: Jiang Liu <jiang.liu@linux.intel.com>
+Cc: Joerg Roedel <joro@8bytes.org>
+Cc: Tony Luck <tony.luck@intel.com>
+Cc: Borislav Petkov <bp@alien8.de>
+---
+ arch/x86/kernel/apic/apic.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
+index dcb5285..cde732c 100644
+--- a/arch/x86/kernel/apic/apic.c
++++ b/arch/x86/kernel/apic/apic.c
+@@ -1424,7 +1424,7 @@ static inline void __x2apic_disable(void)
+ {
+ 	u64 msr;
+ 
+-	if (cpu_has_apic)
++	if (!cpu_has_apic)
+ 		return;
+ 
+ 	rdmsrl(MSR_IA32_APICBASE, msr);
+@@ -1483,10 +1483,13 @@ void x2apic_setup(void)
+ 
+ static __init void x2apic_disable(void)
+ {
+-	u32 x2apic_id;
++	u32 x2apic_id, state = x2apic_state;
+ 
+-	if (x2apic_state != X2APIC_ON)
+-		goto out;
++	x2apic_mode = 0;
++	x2apic_state = X2APIC_DISABLED;
++
++	if (state != X2APIC_ON)
++		return;
+ 
+ 	x2apic_id = read_apic_id();
+ 	if (x2apic_id >= 255)
+@@ -1494,9 +1497,6 @@ static __init void x2apic_disable(void)
+ 
+ 	__x2apic_disable();
+ 	register_lapic_address(mp_lapic_addr);
+-out:
+-	x2apic_state = X2APIC_DISABLED;
+-	x2apic_mode = 0;
+ }
+ 
+ static __init void x2apic_enable(void)
+-- 
+2.4.3
+
diff --git a/x86-efi-bgrt-Switch-all-pr_err-to-pr_debug-for-inval.patch b/x86-efi-bgrt-Switch-all-pr_err-to-pr_debug-for-inval.patch
new file mode 100644
index 000000000..d3d0aa2c3
--- /dev/null
+++ b/x86-efi-bgrt-Switch-all-pr_err-to-pr_debug-for-inval.patch
@@ -0,0 +1,94 @@
+From 3e4f68f273ef86e6ed8be24a86f8ef514deaecc0 Mon Sep 17 00:00:00 2001
+From: Josh Boyer <jwboyer@fedoraproject.org>
+Date: Wed, 27 Apr 2016 08:37:41 -0400
+Subject: [PATCH] x86/efi-bgrt: Switch all pr_err() to pr_debug() for invalid
+ BGRT
+
+The promise of pretty boot splashes from firmware via BGRT was at
+best only that; a promise.  The kernel diligently checks to make
+sure the BGRT data firmware gives it is valid, and dutifully warns
+the user when it isn't.  However, it does so via the pr_err log
+level which seems unnecessary.  The user cannot do anything about
+this and there really isn't an error on the part of Linux to
+correct.
+
+This lowers the log level by using pr_debug instead.  Users will
+no longer have their boot process uglified by the kernel reminding
+us that firmware can and often is broken.  Ironic, considering
+BGRT is supposed to make boot pretty to begin with.
+
+Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
+---
+ arch/x86/platform/efi/efi-bgrt.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/arch/x86/platform/efi/efi-bgrt.c b/arch/x86/platform/efi/efi-bgrt.c
+index ea48449b2e63..87da4108785b 100644
+--- a/arch/x86/platform/efi/efi-bgrt.c
++++ b/arch/x86/platform/efi/efi-bgrt.c
+@@ -41,17 +41,17 @@ void __init efi_bgrt_init(void)
+ 		return;
+ 
+ 	if (bgrt_tab->header.length < sizeof(*bgrt_tab)) {
+-		pr_err("Ignoring BGRT: invalid length %u (expected %zu)\n",
++		pr_debug("Ignoring BGRT: invalid length %u (expected %zu)\n",
+ 		       bgrt_tab->header.length, sizeof(*bgrt_tab));
+ 		return;
+ 	}
+ 	if (bgrt_tab->version != 1) {
+-		pr_err("Ignoring BGRT: invalid version %u (expected 1)\n",
++		pr_debug("Ignoring BGRT: invalid version %u (expected 1)\n",
+ 		       bgrt_tab->version);
+ 		return;
+ 	}
+ 	if (bgrt_tab->status & 0xfe) {
+-		pr_err("Ignoring BGRT: reserved status bits are non-zero %u\n",
++		pr_debug("Ignoring BGRT: reserved status bits are non-zero %u\n",
+ 		       bgrt_tab->status);
+ 		return;
+ 	}
+@@ -61,12 +61,12 @@ void __init efi_bgrt_init(void)
+ 		return;
+ 	}
+ 	if (bgrt_tab->image_type != 0) {
+-		pr_err("Ignoring BGRT: invalid image type %u (expected 0)\n",
++		pr_debug("Ignoring BGRT: invalid image type %u (expected 0)\n",
+ 		       bgrt_tab->image_type);
+ 		return;
+ 	}
+ 	if (!bgrt_tab->image_address) {
+-		pr_err("Ignoring BGRT: null image address\n");
++		pr_debug("Ignoring BGRT: null image address\n");
+ 		return;
+ 	}
+ 
+@@ -76,7 +76,7 @@ void __init efi_bgrt_init(void)
+ 				       sizeof(bmp_header));
+ 		ioremapped = true;
+ 		if (!image) {
+-			pr_err("Ignoring BGRT: failed to map image header memory\n");
++			pr_debug("Ignoring BGRT: failed to map image header memory\n");
+ 			return;
+ 		}
+ 	}
+@@ -88,7 +88,7 @@ void __init efi_bgrt_init(void)
+ 
+ 	bgrt_image = kmalloc(bgrt_image_size, GFP_KERNEL | __GFP_NOWARN);
+ 	if (!bgrt_image) {
+-		pr_err("Ignoring BGRT: failed to allocate memory for image (wanted %zu bytes)\n",
++		pr_debug("Ignoring BGRT: failed to allocate memory for image (wanted %zu bytes)\n",
+ 		       bgrt_image_size);
+ 		return;
+ 	}
+@@ -97,7 +97,7 @@ void __init efi_bgrt_init(void)
+ 		image = early_ioremap(bgrt_tab->image_address,
+ 				       bmp_header.size);
+ 		if (!image) {
+-			pr_err("Ignoring BGRT: failed to map image memory\n");
++			pr_debug("Ignoring BGRT: failed to map image memory\n");
+ 			kfree(bgrt_image);
+ 			bgrt_image = NULL;
+ 			return;
+-- 
+2.5.5
+
diff --git a/x86-mm-32-Enable-full-randomization-on-i386-and-X86_.patch b/x86-mm-32-Enable-full-randomization-on-i386-and-X86_.patch
new file mode 100644
index 000000000..0776982c1
--- /dev/null
+++ b/x86-mm-32-Enable-full-randomization-on-i386-and-X86_.patch
@@ -0,0 +1,83 @@
+From 8b8addf891de8a00e4d39fc32f93f7c5eb8feceb Mon Sep 17 00:00:00 2001
+From: Hector Marco-Gisbert <hecmargi@upv.es>
+Date: Thu, 10 Mar 2016 20:51:00 +0100
+Subject: [PATCH] x86/mm/32: Enable full randomization on i386 and X86_32
+
+Currently on i386 and on X86_64 when emulating X86_32 in legacy mode, only
+the stack and the executable are randomized but not other mmapped files
+(libraries, vDSO, etc.). This patch enables randomization for the
+libraries, vDSO and mmap requests on i386 and in X86_32 in legacy mode.
+
+By default on i386 there are 8 bits for the randomization of the libraries,
+vDSO and mmaps which only uses 1MB of VA.
+
+This patch preserves the original randomness, using 1MB of VA out of 3GB or
+4GB. We think that 1MB out of 3GB is not a big cost for having the ASLR.
+
+The first obvious security benefit is that all objects are randomized (not
+only the stack and the executable) in legacy mode which highly increases
+the ASLR effectiveness, otherwise the attackers may use these
+non-randomized areas. But also sensitive setuid/setgid applications are
+more secure because currently, attackers can disable the randomization of
+these applications by setting the ulimit stack to "unlimited". This is a
+very old and widely known trick to disable the ASLR in i386 which has been
+allowed for too long.
+
+Another trick used to disable the ASLR was to set the ADDR_NO_RANDOMIZE
+personality flag, but fortunately this doesn't work on setuid/setgid
+applications because there is security checks which clear Security-relevant
+flags.
+
+This patch always randomizes the mmap_legacy_base address, removing the
+possibility to disable the ASLR by setting the stack to "unlimited".
+
+Signed-off-by: Hector Marco-Gisbert <hecmargi@upv.es>
+Acked-by: Ismael Ripoll Ripoll <iripoll@upv.es>
+Acked-by: Kees Cook <keescook@chromium.org>
+Acked-by: Arjan van de Ven <arjan@linux.intel.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: akpm@linux-foundation.org
+Cc: kees Cook <keescook@chromium.org>
+Link: http://lkml.kernel.org/r/1457639460-5242-1-git-send-email-hecmargi@upv.es
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+---
+ arch/x86/mm/mmap.c | 14 +-------------
+ 1 file changed, 1 insertion(+), 13 deletions(-)
+
+diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
+index 96bd1e2..389939f 100644
+--- a/arch/x86/mm/mmap.c
++++ b/arch/x86/mm/mmap.c
+@@ -94,18 +94,6 @@ static unsigned long mmap_base(unsigned long rnd)
+ }
+
+ /*
+- * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
+- * does, but not when emulating X86_32
+- */
+-static unsigned long mmap_legacy_base(unsigned long rnd)
+-{
+-	if (mmap_is_ia32())
+-		return TASK_UNMAPPED_BASE;
+-	else
+-		return TASK_UNMAPPED_BASE + rnd;
+-}
+-
+-/*
+  * This function, called very early during the creation of a new
+  * process VM image, sets up which VM layout function to use:
+  */
+@@ -116,7 +104,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+ 	if (current->flags & PF_RANDOMIZE)
+ 		random_factor = arch_mmap_rnd();
+
+-	mm->mmap_legacy_base = mmap_legacy_base(random_factor);
++	mm->mmap_legacy_base = TASK_UNMAPPED_BASE + random_factor;
+
+ 	if (mmap_is_legacy()) {
+ 		mm->mmap_base = mm->mmap_legacy_base;
+-- 
+2.7.3
+
diff --git a/xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch b/xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch
new file mode 100644
index 000000000..4c55bf2da
--- /dev/null
+++ b/xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch
@@ -0,0 +1,48 @@
+From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Date: Fri, 27 Mar 2015 13:31:11 -0400
+Subject: [PATCH] xen/pciback: Don't disable PCI_COMMAND on PCI device reset.
+
+There is no need for this at all. Worst it means that if
+the guest tries to write to BARs it could lead (on certain
+platforms) to PCI SERR errors.
+
+Please note that with af6fc858a35b90e89ea7a7ee58e66628c55c776b
+"xen-pciback: limit guest control of command register"
+a guest is still allowed to enable those control bits (safely), but
+is not allowed to disable them and that therefore a well behaved
+frontend which enables things before using them will still
+function correctly.
+
+This is done via an write to the configuration register 0x4 which
+triggers on the backend side:
+command_write
+  \- pci_enable_device
+     \- pci_enable_device_flags
+        \- do_pci_enable_device
+           \- pcibios_enable_device
+              \-pci_enable_resourcess
+                [which enables the PCI_COMMAND_MEMORY|PCI_COMMAND_IO]
+
+However guests (and drivers) which don't do this could cause
+problems, including the security issues which XSA-120 sought
+to address.
+
+Reported-by: Jan Beulich <jbeulich@suse.com>
+Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+---
+ drivers/xen/xen-pciback/pciback_ops.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/drivers/xen/xen-pciback/pciback_ops.c b/drivers/xen/xen-pciback/pciback_ops.c
+index c4a0666de6f5..26e651336787 100644
+--- a/drivers/xen/xen-pciback/pciback_ops.c
++++ b/drivers/xen/xen-pciback/pciback_ops.c
+@@ -119,8 +119,6 @@ void xen_pcibk_reset_device(struct pci_dev *dev)
+ 		if (pci_is_enabled(dev))
+ 			pci_disable_device(dev);
+ 
+-		pci_write_config_word(dev, PCI_COMMAND, 0);
+-
+ 		dev->is_busmaster = 0;
+ 	} else {
+ 		pci_read_config_word(dev, PCI_COMMAND, &cmd);