Linux v4.10.3 rebase

2017-03-15 11:12:32 -05:00 · 2017-03-15 11:12:32 -05:00 · 970e3c5af9
parent 1c83e43b54
commit 970e3c5af9
9465 changed files with 132195 additions and 17126 deletions
--- a/0001-HID-input-ignore-System-Control-application-usages-i.patch
+++ b/0001-HID-input-ignore-System-Control-application-usages-i.patch
@ -1,75 +0,0 @@
-From 1989dada7ce07848196991c9ebf25ff9c5f14d4e Mon Sep 17 00:00:00 2001
-From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Date: Tue, 13 Sep 2016 11:52:37 +0200
-Subject: [PATCH] HID: input: ignore System Control application usages if not
- System Controls
-
-Microsoft is reusing its report descriptor again and again, and part of it
-looks like this:
-
-0x05, 0x01,                    // Usage Page (Generic Desktop)        299
-0x09, 0x80,                    // Usage (System Control)              301
-0xa1, 0x01,                    // Collection (Application)            303
-0x85, 0x03,                    //  Report ID (3)                      305
-0x19, 0x00,                    //  Usage Minimum (0)                  307
-0x29, 0xff,                    //  Usage Maximum (255)                309
-0x15, 0x00,                    //  Logical Minimum (0)                311
-0x26, 0xff, 0x00,              //  Logical Maximum (255)              313
-0x81, 0x00,                    //  Input (Data,Arr,Abs)               316
-0xc0,                          // End Collection                      318
-
-While there is nothing wrong in term of processing, we do however blindly
-map the full usage range (it's an array) from 0x00 to 0xff, which creates
-some interesting axis, like ABS_X|Y, and a bunch of ABS_MISC + n.
-
-While libinput and other stacks don't care that much (we can detect them),
-joydev is very happy and attaches itself to the mouse or keyboard.
-
-The problem is that joydev now handles the device as a joystick, but given
-that we have a HID array, it sets all the ABS_* values to 0. And in its
-world, 0 means -32767 (minimum value), which sends spurious events to games
-(think Steam).
-
-It looks like hid-microsoft tries to tackle the very same problem with its
-.report_fixup callback. But fixing the report descriptor is an endless task
-and is quite obfuscated.
-
-So take the hammer, and decide that if the application is meant to be
-System Control, any other usage not in the System Control range should
-be ignored.
-
-Link: https://bugzilla.redhat.com/show_bug.cgi?id=1325354
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=28912
-Link: https://github.com/ValveSoftware/steam-for-linux/issues/3384
-Link: https://bugzilla.redhat.com/show_bug.cgi?id=1325354
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=37982
-
-Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---
- drivers/hid/hid-input.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
-index bcfaf32..058919d 100644
--- a/drivers/hid/hid-input.c
-+++ b/drivers/hid/hid-input.c
-@@ -604,6 +604,15 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
- 			break;
- 		}
-
-+		/*
-+		 * Some lazy vendors declare 255 usages for System Control,
-+		 * leading to the creation of ABS_X|Y axis and too many others.
-+		 * It wouldn't be a problem if joydev doesn't consider the
-+		 * device as a joystick then.
-+		 */
-+		if (field->application == HID_GD_SYSTEM_CONTROL)
-+			goto ignore;
-+
- 		if ((usage->hid & 0xf0) == 0x90) {	/* D-pad */
- 			switch (usage->hid) {
- 			case HID_GD_UP:	   usage->hat_dir = 1; break;
-- 
-2.7.4
-
--- a/0001-Work-around-for-gcc7-and-arm64.patch
+++ b/0001-Work-around-for-gcc7-and-arm64.patch
@ -0,0 +1,62 @@
+From 975dcf140bd307b431aff7b6d671155c796cfe5e Mon Sep 17 00:00:00 2001
+From: Laura Abbott <labbott@redhat.com>
+Date: Sat, 28 Jan 2017 16:13:49 +0100
+Subject: [PATCH] Work around for gcc7 and  arm64
+
+Originally proposed by Will Deacon <will.deacon@arm.com>
+
+http://lists.infradead.org/pipermail/linux-arm-kernel/2016-October/462224.html
+
+Signed-off-by: Laura Abbott <labbott@redhat.com>
+---
+ include/linux/log2.h | 13 ++-----------
+ 1 file changed, 2 insertions(+), 11 deletions(-)
+
+diff --git a/include/linux/log2.h b/include/linux/log2.h
+index fd7ff3d91e6a..1ab22b79681e 100644
+--- a/include/linux/log2.h
+++ b/include/linux/log2.h
+@@ -16,12 +16,6 @@
+ #include <linux/bitops.h>
+ 
+ /*
+- * deal with unrepresentable constant logarithms
+- */
+-extern __attribute__((const, noreturn))
+-int ____ilog2_NaN(void);
+-
+-/*
+  * non-constant log of base 2 calculators
+  * - the arch may override these in asm/bitops.h if they can be implemented
+  *   more efficiently than using fls() and fls64()
+@@ -85,7 +79,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
+ #define ilog2(n)				\
+ (						\
+ 	__builtin_constant_p(n) ? (		\
+-		(n) < 1 ? ____ilog2_NaN() :	\
+		(n) < 1 ? 0 :	\
+ 		(n) & (1ULL << 63) ? 63 :	\
+ 		(n) & (1ULL << 62) ? 62 :	\
+ 		(n) & (1ULL << 61) ? 61 :	\
+@@ -149,9 +143,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
+ 		(n) & (1ULL <<  3) ?  3 :	\
+ 		(n) & (1ULL <<  2) ?  2 :	\
+ 		(n) & (1ULL <<  1) ?  1 :	\
+-		(n) & (1ULL <<  0) ?  0 :	\
+-		____ilog2_NaN()			\
+-				   ) :		\
+		0 ) :		\
+ 	(sizeof(n) <= 4) ?			\
+ 	__ilog2_u32(n) :			\
+ 	__ilog2_u64(n)				\
+@@ -194,7 +186,6 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
+  * @n: parameter
+  *
+  * The first few values calculated by this routine:
+- *  ob2(0) = 0
+  *  ob2(1) = 0
+  *  ob2(2) = 1
+  *  ob2(3) = 2
+-- 
+2.11.0
+
--- a/0001-i2c-bcm2835-Debug-test-for-curr_msg.patch
+++ b/0001-i2c-bcm2835-Debug-test-for-curr_msg.patch
@ -0,0 +1,29 @@
+From 81c53729ee7c7f721c357ed3b531ebc97ca44051 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Wed, 15 Feb 2017 11:57:57 -0800
+Subject: [PATCH] i2c-bcm2835: Debug test for curr_msg
+
+Signed-off-by: Eric Anholt <eric@anholt.net>
+---
+ drivers/i2c/busses/i2c-bcm2835.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
+index c3436f627028..a75fab4dd660 100644
+--- a/drivers/i2c/busses/i2c-bcm2835.c
+++ b/drivers/i2c/busses/i2c-bcm2835.c
+@@ -195,7 +195,10 @@ static irqreturn_t bcm2835_i2c_isr(int this_irq, void *data)
+ 	}
+ 
+ 	if (val & BCM2835_I2C_S_DONE) {
+-		if (i2c_dev->curr_msg->flags & I2C_M_RD) {
+		if (!i2c_dev->curr_msg) {
+			dev_info(i2c_dev->dev,
+				 "Processing DONE interrupt with no msg\n");
+		} else if (i2c_dev->curr_msg->flags & I2C_M_RD) {
+ 			bcm2835_drain_rxfifo(i2c_dev);
+ 			val = bcm2835_i2c_readl(i2c_dev, BCM2835_I2C_S);
+ 		}
+-- 
+2.11.0
+
--- a/0001-netfilter-ipv6-nf_defrag-drop-mangled-skb-on-ream-er.patch
+++ b/0001-netfilter-ipv6-nf_defrag-drop-mangled-skb-on-ream-er.patch
@ -1,69 +0,0 @@
-From 9b57da0630c9fd36ed7a20fc0f98dc82cc0777fa Mon Sep 17 00:00:00 2001
-From: Florian Westphal <fw@strlen.de>
-Date: Tue, 29 Nov 2016 02:17:34 +0100
-Subject: [PATCH] netfilter: ipv6: nf_defrag: drop mangled skb on ream error
-
-Dmitry Vyukov reported GPF in network stack that Andrey traced down to
-negative nh offset in nf_ct_frag6_queue().
-
-Problem is that all network headers before fragment header are pulled.
-Normal ipv6 reassembly will drop the skb when errors occur further down
-the line.
-
-netfilter doesn't do this, and instead passed the original fragment
-along.  That was also fine back when netfilter ipv6 defrag worked with
-cloned fragments, as the original, pristine fragment was passed on.
-
-So we either have to undo the pull op, or discard such fragments.
-Since they're malformed after all (e.g. overlapping fragment) it seems
-preferrable to just drop them.
-
-Same for temporary errors -- it doesn't make sense to accept (and
-perhaps forward!) only some fragments of same datagram.
-
-Fixes: 029f7f3b8701cc7ac ("netfilter: ipv6: nf_defrag: avoid/free clone operations")
-Reported-by: Dmitry Vyukov <dvyukov@google.com>
-Debugged-by: Andrey Konovalov <andreyknvl@google.com>
-Diagnosed-by: Eric Dumazet <Eric Dumazet <edumazet@google.com>
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Acked-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
- net/ipv6/netfilter/nf_conntrack_reasm.c   | 4 ++--
- net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
-index e4347ae..9948b5c 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
-+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
-@@ -576,11 +576,11 @@ int nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user)
- 	/* Jumbo payload inhibits frag. header */
- 	if (ipv6_hdr(skb)->payload_len == 0) {
- 		pr_debug("payload len = 0\n");
-		return -EINVAL;
-+		return 0;
- 	}
-
- 	if (find_prev_fhdr(skb, &prevhdr, &nhoff, &fhoff) < 0)
-		return -EINVAL;
-+		return 0;
-
- 	if (!pskb_may_pull(skb, fhoff + sizeof(*fhdr)))
- 		return -ENOMEM;
-diff --git a/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c b/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
-index f7aab5a..f06b047 100644
--- a/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
-+++ b/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
-@@ -69,7 +69,7 @@ static unsigned int ipv6_defrag(void *priv,
- 	if (err == -EINPROGRESS)
- 		return NF_STOLEN;
-
-	return NF_ACCEPT;
-+	return err == 0 ? NF_ACCEPT : NF_DROP;
- }
-
- static struct nf_hook_ops ipv6_defrag_ops[] = {
-- 
-2.9.3
-
--- a/0001-platform-x86-ideapad-laptop-Add-Lenovo-Yoga-910-13IK.patch
+++ b/0001-platform-x86-ideapad-laptop-Add-Lenovo-Yoga-910-13IK.patch
@ -1,40 +0,0 @@
-From 40c30bbf3377babc4d6bb16b699184236a8bfa27 Mon Sep 17 00:00:00 2001
-From: Brian Masney <masneyb@onstation.org>
-Date: Tue, 11 Oct 2016 19:28:02 -0400
-Subject: [PATCH] platform/x86: ideapad-laptop: Add Lenovo Yoga 910-13IKB to
- no_hw_rfkill dmi list
-
-The Lenovo Yoga 910-13IKB does not have a hw rfkill switch, and trying
-to read the hw rfkill switch through the ideapad module causes it to
-always report as blocked.
-
-This commit adds the Lenovo Yoga 910-13IKB to the no_hw_rfkill dmi list,
-fixing the WiFI breakage.
-
-Signed-off-by: Brian Masney <masneyb@onstation.org>
-Signed-off-by: Darren Hart <dvhart@linux.intel.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 d1a091b..a232394 100644
--- a/drivers/platform/x86/ideapad-laptop.c
-+++ b/drivers/platform/x86/ideapad-laptop.c
-@@ -933,6 +933,13 @@ static const struct dmi_system_id no_hw_rfkill_list[] = {
- 			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 900"),
- 		},
- 	},
-+	{
-+		.ident = "Lenovo YOGA 910-13IKB",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 910-13IKB"),
-+		},
-+	},
- 	{}
- };
- 
-- 
-2.7.4
-
--- a/0001-tty-n_hdlc-get-rid-of-racy-n_hdlc.tbuf.patch
+++ b/0001-tty-n_hdlc-get-rid-of-racy-n_hdlc.tbuf.patch
@ -1,311 +0,0 @@
-From 1dea7a8061ad9212f4464464a80d0dcd477eceab Mon Sep 17 00:00:00 2001
-From: Alexander Popov <alex.popov@linux.com>
-Date: Tue, 28 Feb 2017 19:28:54 +0300
-Subject: [PATCH 1/1] tty: n_hdlc: get rid of racy n_hdlc.tbuf
-
-Currently N_HDLC line discipline uses a self-made singly linked list for
-data buffers and has n_hdlc.tbuf pointer for buffer retransmitting after
-an error.
-
-The commit be10eb7589337e5defbe214dae038a53dd21add8
-("tty: n_hdlc add buffer flushing") introduced racy access to n_hdlc.tbuf.
-After tx error concurrent flush_tx_queue() and n_hdlc_send_frames() can put
-one data buffer to tx_free_buf_list twice. That causes double free in
-n_hdlc_release().
-
-Let's use standard kernel linked list and get rid of n_hdlc.tbuf:
-in case of tx error put current data buffer after the head of tx_buf_list.
-
-Signed-off-by: Alexander Popov <alex.popov@linux.com>
---
- drivers/tty/n_hdlc.c | 132 +++++++++++++++++++++++++++------------------------
- 1 file changed, 69 insertions(+), 63 deletions(-)
-
-diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c
-index eb27883..728c824 100644
--- a/drivers/tty/n_hdlc.c
-+++ b/drivers/tty/n_hdlc.c
-@@ -114,7 +114,7 @@
- #define DEFAULT_TX_BUF_COUNT 3
- 
- struct n_hdlc_buf {
-	struct n_hdlc_buf *link;
-+	struct list_head  list_item;
- 	int		  count;
- 	char		  buf[1];
- };
-@@ -122,8 +122,7 @@ struct n_hdlc_buf {
- #define	N_HDLC_BUF_SIZE	(sizeof(struct n_hdlc_buf) + maxframe)
- 
- struct n_hdlc_buf_list {
-	struct n_hdlc_buf *head;
-	struct n_hdlc_buf *tail;
-+	struct list_head  list;
- 	int		  count;
- 	spinlock_t	  spinlock;
- };
-@@ -136,7 +135,6 @@ struct n_hdlc_buf_list {
-  * @backup_tty - TTY to use if tty gets closed
-  * @tbusy - reentrancy flag for tx wakeup code
-  * @woke_up - FIXME: describe this field
- * @tbuf - currently transmitting tx buffer
-  * @tx_buf_list - list of pending transmit frame buffers
-  * @rx_buf_list - list of received frame buffers
-  * @tx_free_buf_list - list unused transmit frame buffers
-@@ -149,7 +147,6 @@ struct n_hdlc {
- 	struct tty_struct	*backup_tty;
- 	int			tbusy;
- 	int			woke_up;
-	struct n_hdlc_buf	*tbuf;
- 	struct n_hdlc_buf_list	tx_buf_list;
- 	struct n_hdlc_buf_list	rx_buf_list;
- 	struct n_hdlc_buf_list	tx_free_buf_list;
-@@ -159,6 +156,8 @@ struct n_hdlc {
- /*
-  * HDLC buffer list manipulation functions
-  */
-+static void n_hdlc_buf_return(struct n_hdlc_buf_list *buf_list,
-+						struct n_hdlc_buf *buf);
- static void n_hdlc_buf_put(struct n_hdlc_buf_list *list,
- 			   struct n_hdlc_buf *buf);
- static struct n_hdlc_buf *n_hdlc_buf_get(struct n_hdlc_buf_list *list);
-@@ -208,16 +207,9 @@ static void flush_tx_queue(struct tty_struct *tty)
- {
- 	struct n_hdlc *n_hdlc = tty2n_hdlc(tty);
- 	struct n_hdlc_buf *buf;
-	unsigned long flags;
- 
- 	while ((buf = n_hdlc_buf_get(&n_hdlc->tx_buf_list)))
- 		n_hdlc_buf_put(&n_hdlc->tx_free_buf_list, buf);
- 	spin_lock_irqsave(&n_hdlc->tx_buf_list.spinlock, flags);
-	if (n_hdlc->tbuf) {
-		n_hdlc_buf_put(&n_hdlc->tx_free_buf_list, n_hdlc->tbuf);
-		n_hdlc->tbuf = NULL;
-	}
-	spin_unlock_irqrestore(&n_hdlc->tx_buf_list.spinlock, flags);
- }
- 
- static struct tty_ldisc_ops n_hdlc_ldisc = {
-@@ -283,7 +275,6 @@ static void n_hdlc_release(struct n_hdlc *n_hdlc)
- 		} else
- 			break;
- 	}
-	kfree(n_hdlc->tbuf);
- 	kfree(n_hdlc);
- 	
- }	/* end of n_hdlc_release() */
-@@ -402,13 +393,7 @@ static void n_hdlc_send_frames(struct n_hdlc *n_hdlc, struct tty_struct *tty)
- 	n_hdlc->woke_up = 0;
- 	spin_unlock_irqrestore(&n_hdlc->tx_buf_list.spinlock, flags);
- 
-	/* get current transmit buffer or get new transmit */
-	/* buffer from list of pending transmit buffers */
-		
-	tbuf = n_hdlc->tbuf;
-	if (!tbuf)
-		tbuf = n_hdlc_buf_get(&n_hdlc->tx_buf_list);
-		
-+	tbuf = n_hdlc_buf_get(&n_hdlc->tx_buf_list);
- 	while (tbuf) {
- 		if (debuglevel >= DEBUG_LEVEL_INFO)	
- 			printk("%s(%d)sending frame %p, count=%d\n",
-@@ -420,7 +405,7 @@ static void n_hdlc_send_frames(struct n_hdlc *n_hdlc, struct tty_struct *tty)
- 
- 		/* rollback was possible and has been done */
- 		if (actual == -ERESTARTSYS) {
-			n_hdlc->tbuf = tbuf;
-+			n_hdlc_buf_return(&n_hdlc->tx_buf_list, tbuf);
- 			break;
- 		}
- 		/* if transmit error, throw frame away by */
-@@ -435,10 +420,7 @@ static void n_hdlc_send_frames(struct n_hdlc *n_hdlc, struct tty_struct *tty)
- 					
- 			/* free current transmit buffer */
- 			n_hdlc_buf_put(&n_hdlc->tx_free_buf_list, tbuf);
-			
-			/* this tx buffer is done */
-			n_hdlc->tbuf = NULL;
-			
-+
- 			/* wait up sleeping writers */
- 			wake_up_interruptible(&tty->write_wait);
- 	
-@@ -448,10 +430,12 @@ static void n_hdlc_send_frames(struct n_hdlc *n_hdlc, struct tty_struct *tty)
- 			if (debuglevel >= DEBUG_LEVEL_INFO)	
- 				printk("%s(%d)frame %p pending\n",
- 					__FILE__,__LINE__,tbuf);
-					
-			/* buffer not accepted by driver */
-			/* set this buffer as pending buffer */
-			n_hdlc->tbuf = tbuf;
-+
-+			/*
-+			 * the buffer was not accepted by driver,
-+			 * return it back into tx queue
-+			 */
-+			n_hdlc_buf_return(&n_hdlc->tx_buf_list, tbuf);
- 			break;
- 		}
- 	}
-@@ -749,7 +733,8 @@ static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file,
- 	int error = 0;
- 	int count;
- 	unsigned long flags;
-	
-+	struct n_hdlc_buf *buf = NULL;
-+
- 	if (debuglevel >= DEBUG_LEVEL_INFO)	
- 		printk("%s(%d)n_hdlc_tty_ioctl() called %d\n",
- 			__FILE__,__LINE__,cmd);
-@@ -763,8 +748,10 @@ static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file,
- 		/* report count of read data available */
- 		/* in next available frame (if any) */
- 		spin_lock_irqsave(&n_hdlc->rx_buf_list.spinlock,flags);
-		if (n_hdlc->rx_buf_list.head)
-			count = n_hdlc->rx_buf_list.head->count;
-+		buf = list_first_entry_or_null(&n_hdlc->rx_buf_list.list,
-+						struct n_hdlc_buf, list_item);
-+		if (buf)
-+			count = buf->count;
- 		else
- 			count = 0;
- 		spin_unlock_irqrestore(&n_hdlc->rx_buf_list.spinlock,flags);
-@@ -776,8 +763,10 @@ static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file,
- 		count = tty_chars_in_buffer(tty);
- 		/* add size of next output frame in queue */
- 		spin_lock_irqsave(&n_hdlc->tx_buf_list.spinlock,flags);
-		if (n_hdlc->tx_buf_list.head)
-			count += n_hdlc->tx_buf_list.head->count;
-+		buf = list_first_entry_or_null(&n_hdlc->tx_buf_list.list,
-+						struct n_hdlc_buf, list_item);
-+		if (buf)
-+			count += buf->count;
- 		spin_unlock_irqrestore(&n_hdlc->tx_buf_list.spinlock,flags);
- 		error = put_user(count, (int __user *)arg);
- 		break;
-@@ -825,14 +814,14 @@ static unsigned int n_hdlc_tty_poll(struct tty_struct *tty, struct file *filp,
- 		poll_wait(filp, &tty->write_wait, wait);
- 
- 		/* set bits for operations that won't block */
-		if (n_hdlc->rx_buf_list.head)
-+		if (!list_empty(&n_hdlc->rx_buf_list.list))
- 			mask |= POLLIN | POLLRDNORM;	/* readable */
- 		if (test_bit(TTY_OTHER_CLOSED, &tty->flags))
- 			mask |= POLLHUP;
- 		if (tty_hung_up_p(filp))
- 			mask |= POLLHUP;
- 		if (!tty_is_writelocked(tty) &&
-				n_hdlc->tx_free_buf_list.head)
-+				!list_empty(&n_hdlc->tx_free_buf_list.list))
- 			mask |= POLLOUT | POLLWRNORM;	/* writable */
- 	}
- 	return mask;
-@@ -856,7 +845,12 @@ static struct n_hdlc *n_hdlc_alloc(void)
- 	spin_lock_init(&n_hdlc->tx_free_buf_list.spinlock);
- 	spin_lock_init(&n_hdlc->rx_buf_list.spinlock);
- 	spin_lock_init(&n_hdlc->tx_buf_list.spinlock);
-	
-+
-+	INIT_LIST_HEAD(&n_hdlc->rx_free_buf_list.list);
-+	INIT_LIST_HEAD(&n_hdlc->tx_free_buf_list.list);
-+	INIT_LIST_HEAD(&n_hdlc->rx_buf_list.list);
-+	INIT_LIST_HEAD(&n_hdlc->tx_buf_list.list);
-+
- 	/* allocate free rx buffer list */
- 	for(i=0;i<DEFAULT_RX_BUF_COUNT;i++) {
- 		buf = kmalloc(N_HDLC_BUF_SIZE, GFP_KERNEL);
-@@ -884,53 +878,65 @@ static struct n_hdlc *n_hdlc_alloc(void)
- }	/* end of n_hdlc_alloc() */
- 
- /**
-+ * n_hdlc_buf_return - put the HDLC buffer after the head of the specified list
-+ * @buf_list - pointer to the buffer list
-+ * @buf - pointer to the buffer
-+ */
-+static void n_hdlc_buf_return(struct n_hdlc_buf_list *buf_list,
-+						struct n_hdlc_buf *buf)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&buf_list->spinlock, flags);
-+
-+	list_add(&buf->list_item, &buf_list->list);
-+	buf_list->count++;
-+
-+	spin_unlock_irqrestore(&buf_list->spinlock, flags);
-+}
-+
-+/**
-  * n_hdlc_buf_put - add specified HDLC buffer to tail of specified list
- * @list - pointer to buffer list
-+ * @buf_list - pointer to buffer list
-  * @buf	- pointer to buffer
-  */
-static void n_hdlc_buf_put(struct n_hdlc_buf_list *list,
-+static void n_hdlc_buf_put(struct n_hdlc_buf_list *buf_list,
- 			   struct n_hdlc_buf *buf)
- {
- 	unsigned long flags;
-	spin_lock_irqsave(&list->spinlock,flags);
-	
-	buf->link=NULL;
-	if (list->tail)
-		list->tail->link = buf;
-	else
-		list->head = buf;
-	list->tail = buf;
-	(list->count)++;
-	
-	spin_unlock_irqrestore(&list->spinlock,flags);
-	
-+
-+	spin_lock_irqsave(&buf_list->spinlock, flags);
-+
-+	list_add_tail(&buf->list_item, &buf_list->list);
-+	buf_list->count++;
-+
-+	spin_unlock_irqrestore(&buf_list->spinlock, flags);
- }	/* end of n_hdlc_buf_put() */
- 
- /**
-  * n_hdlc_buf_get - remove and return an HDLC buffer from list
- * @list - pointer to HDLC buffer list
-+ * @buf_list - pointer to HDLC buffer list
-  * 
-  * Remove and return an HDLC buffer from the head of the specified HDLC buffer
-  * list.
-  * Returns a pointer to HDLC buffer if available, otherwise %NULL.
-  */
-static struct n_hdlc_buf* n_hdlc_buf_get(struct n_hdlc_buf_list *list)
-+static struct n_hdlc_buf *n_hdlc_buf_get(struct n_hdlc_buf_list *buf_list)
- {
- 	unsigned long flags;
- 	struct n_hdlc_buf *buf;
-	spin_lock_irqsave(&list->spinlock,flags);
-	
-	buf = list->head;
-+
-+	spin_lock_irqsave(&buf_list->spinlock, flags);
-+
-+	buf = list_first_entry_or_null(&buf_list->list,
-+						struct n_hdlc_buf, list_item);
- 	if (buf) {
-		list->head = buf->link;
-		(list->count)--;
-+		list_del(&buf->list_item);
-+		buf_list->count--;
- 	}
-	if (!list->head)
-		list->tail = NULL;
-	
-	spin_unlock_irqrestore(&list->spinlock,flags);
-+
-+	spin_unlock_irqrestore(&buf_list->spinlock, flags);
- 	return buf;
-	
- }	/* end of n_hdlc_buf_get() */
- 
- static char hdlc_banner[] __initdata =
-- 
-2.7.4
-
--- a/1-2-media-cxusb-Use-a-dma-capable-buffer-also-for-reading.patch
+++ b/1-2-media-cxusb-Use-a-dma-capable-buffer-also-for-reading.patch
@ -1,63 +0,0 @@
-From patchwork Sun Feb  5 14:57:59 2017
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Subject: [1/2,media] cxusb: Use a dma capable buffer also for reading
-From: =?utf-8?q?Stefan_Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-X-Patchwork-Id: 39207
-Message-Id: <b638428812af41e080ccfc7cf7ad6963@rwthex-w2-b.rwth-ad.de>
-To: <linux-media@vger.kernel.org>
-Cc: <linux-kernel@vger.kernel.org>, Mauro Carvalho Chehab <mchehab@kernel.org>,
- Michael Krufky <mkrufky@linuxtv.org>,
- =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Sun, 5 Feb 2017 15:57:59 +0100
-
-Commit 17ce039b4e54 ("[media] cxusb: don't do DMA on stack")
-added a kmalloc'ed bounce buffer for writes, but missed to do the same
-for reads. As the read only happens after the write is finished, we can
-reuse the same buffer.
-
-As dvb_usb_generic_rw handles a read length of 0 by itself, avoid calling
-it using the dvb_usb_generic_read wrapper function.
-
-Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
---
- drivers/media/usb/dvb-usb/cxusb.c | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
-index 9b8c82d94b3f..8f28a63597bd 100644
--- a/drivers/media/usb/dvb-usb/cxusb.c
-+++ b/drivers/media/usb/dvb-usb/cxusb.c
-@@ -59,23 +59,24 @@ static int cxusb_ctrl_msg(struct dvb_usb_device *d,
- 			  u8 cmd, u8 *wbuf, int wlen, u8 *rbuf, int rlen)
- {
- 	struct cxusb_state *st = d->priv;
-	int ret, wo;
-+	int ret;
- 
- 	if (1 + wlen > MAX_XFER_SIZE) {
- 		warn("i2c wr: len=%d is too big!\n", wlen);
- 		return -EOPNOTSUPP;
- 	}
- 
-	wo = (rbuf == NULL || rlen == 0); /* write-only */
-+	if (rlen > MAX_XFER_SIZE) {
-+		warn("i2c rd: len=%d is too big!\n", rlen);
-+		return -EOPNOTSUPP;
-+	}
- 
- 	mutex_lock(&d->data_mutex);
- 	st->data[0] = cmd;
- 	memcpy(&st->data[1], wbuf, wlen);
-	if (wo)
-		ret = dvb_usb_generic_write(d, st->data, 1 + wlen);
-	else
-		ret = dvb_usb_generic_rw(d, st->data, 1 + wlen,
-					 rbuf, rlen, 0);
-+	ret = dvb_usb_generic_rw(d, st->data, 1 + wlen, st->data, rlen, 0);
-+	if (!ret && rbuf && rlen)
-+		memcpy(rbuf, st->data, rlen);
- 
- 	mutex_unlock(&d->data_mutex);
- 	return ret;
--- a/2-2-media-dvb-usb-firmware-don-t-do-DMA-on-stack.patch
+++ b/2-2-media-dvb-usb-firmware-don-t-do-DMA-on-stack.patch
@ -1,86 +0,0 @@
-From patchwork Sun Feb  5 14:58:00 2017
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Subject: [2/2,media] dvb-usb-firmware: don't do DMA on stack
-From: =?utf-8?q?Stefan_Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-X-Patchwork-Id: 39206
-Message-Id: <cfae2a63a36641bcab2ec298b21b5b06@rwthex-w2-b.rwth-ad.de>
-To: <linux-media@vger.kernel.org>
-Cc: <linux-kernel@vger.kernel.org>, Mauro Carvalho Chehab <mchehab@kernel.org>,
- Michael Krufky <mkrufky@linuxtv.org>,
- =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Sun, 5 Feb 2017 15:58:00 +0100
-
-The USB control messages require DMA to work. We cannot pass
-a stack-allocated buffer, as it is not warranted that the
-stack would be into a DMA enabled area.
-
-Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
---
- drivers/media/usb/dvb-usb/dvb-usb-firmware.c | 30 ++++++++++++++++------------
- 1 file changed, 17 insertions(+), 13 deletions(-)
-
-diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
-index dd048a7c461c..189b6725edd0 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
-+++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
-@@ -35,41 +35,45 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
- 
- int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
- {
-	struct hexline hx;
-	u8 reset;
-	int ret,pos=0;
-+	u8 *buf = kmalloc(sizeof(struct hexline), GFP_KERNEL);
-+	struct hexline *hx = (struct hexline *)buf;
-+	int ret, pos = 0;
-+	u16 cpu_cs_register = cypress[type].cpu_cs_register;
- 
- 	/* stop the CPU */
-	reset = 1;
-	if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
-+	buf[0] = 1;
-+	if (usb_cypress_writemem(udev, cpu_cs_register, buf, 1) != 1)
- 		err("could not stop the USB controller CPU.");
- 
-	while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
-		deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
-		ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
-+	while ((ret = dvb_usb_get_hexline(fw, hx, &pos)) > 0) {
-+		deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",
-+		       hx->addr, hx->len, hx->chk);
-+		ret = usb_cypress_writemem(udev, hx->addr, hx->data, hx->len);
- 
-		if (ret != hx.len) {
-+		if (ret != hx->len) {
- 			err("error while transferring firmware "
- 				"(transferred size: %d, block size: %d)",
-				ret,hx.len);
-+				ret, hx->len);
- 			ret = -EINVAL;
- 			break;
- 		}
- 	}
- 	if (ret < 0) {
-		err("firmware download failed at %d with %d",pos,ret);
-+		err("firmware download failed at %d with %d", pos, ret);
-+		kfree(buf);
- 		return ret;
- 	}
- 
- 	if (ret == 0) {
- 		/* restart the CPU */
-		reset = 0;
-		if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
-+		buf[0] = 0;
-+		if (usb_cypress_writemem(udev, cpu_cs_register, buf, 1) != 1) {
- 			err("could not restart the USB controller CPU.");
- 			ret = -EINVAL;
- 		}
- 	} else
- 		ret = -EIO;
-+	kfree(buf);
- 
- 	return ret;
- }
--- a/ACPI-Limit-access-to-custom_method.patch
+++ b/ACPI-Limit-access-to-custom_method.patch
@ -1,31 +0,0 @@
-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 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.
-Disable it if any such restrictions have been enabled.
-
-Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
---
- drivers/acpi/custom_method.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
-index c68e72414a67..4277938af700 100644
--- a/drivers/acpi/custom_method.c
-+++ b/drivers/acpi/custom_method.c
-@@ -29,6 +29,9 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
- 	struct acpi_table_header table;
- 	acpi_status status;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	if (!(*ppos)) {
- 		/* parse the table header to get the table length */
- 		if (count <= sizeof(struct acpi_table_header))
-- 
-2.4.3
-
--- a/ARM-Drop-fixed-200-Hz-timer-requirement-from-Samsung-platforms.patch
+++ b/ARM-Drop-fixed-200-Hz-timer-requirement-from-Samsung-platforms.patch
@ -1,88 +0,0 @@
-From patchwork Fri Nov 18 11:15:12 2016
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v3] ARM: Drop fixed 200 Hz timer requirement from Samsung platforms
-From: Krzysztof Kozlowski <krzk@kernel.org>
-X-Patchwork-Id: 9436225
-Message-Id: <1479467712-5218-1-git-send-email-krzk@kernel.org>
-To: Russell King <linux@armlinux.org.uk>, Kukjin Kim <kgene@kernel.org>,
- Krzysztof Kozlowski <krzk@kernel.org>,
- Javier Martinez Canillas <javier@osg.samsung.com>,
- linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, 
- linux-kernel@vger.kernel.org
-Cc: Arnd Bergmann <arnd@arndb.de>,
- Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
- Tomasz Figa <tomasz.figa@gmail.com>,
- Ben Dooks <ben.dooks@codethink.co.uk>, 
- Sylwester Nawrocki <s.nawrocki@samsung.com>,
- Lee Jones <lee.jones@linaro.org>, 
- Marek Szyprowski <m.szyprowski@samsung.com>
-Date: Fri, 18 Nov 2016 13:15:12 +0200
-
-All Samsung platforms, including the Exynos, are selecting HZ_FIXED with
-200 Hz.  Unfortunately in case of multiplatform image this affects also
-other platforms when Exynos is enabled.
-
-This looks like an very old legacy code, dating back to initial
-upstreaming of S3C24xx.  Probably it was required for s3c24xx timer
-driver, which was removed in commit ad38bdd15d5b ("ARM: SAMSUNG: Remove
-unused plat-samsung/time.c").
-
-Since then, this fixed 200 Hz spread everywhere, including out-of-tree
-Samsung kernels (SoC vendor's and Tizen's).  I believe this choice
-was rather an effect of coincidence instead of conscious choice.
-
-On S3C24xx, the PWM counter is only 16 bit wide, and with the
-typical 12MHz input clock that overflows every 5.5ms.  This works
-with HZ=200 or higher but not with HZ=100 which needs a 10ms
-interval between ticks.  On Later chips (S3C64xx, S5P and EXYNOS),
-the counter is 32 bits and does not have this problem.
-
-The new samsung_pwm_timer driver solves the problem by scaling the input
-clock by a factor of 50 on S3C24xx, which makes it less accurate but
-allows HZ=100 as well as CONFIG_NO_HZ with fewer wakeups.
-
-Few perf mem and sched tests on Odroid XU3 board (Exynos5422, 4x Cortex
-A7, 4x Cortex A15) show no regressions when switching from 200 Hz to
-other values.
-
-Reported-by: Lee Jones <lee.jones@linaro.org>
-[Dropping of 200_HZ from S3C/S5P was suggested by Arnd]
-Reported-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
-Cc: Kukjin Kim <kgene@kernel.org>
-[Tested on Exynos5800]
-Tested-by: Javier Martinez Canillas <javier@osg.samsung.com>
-Acked-by: Kukjin Kim <kgene@kernel.org>
-[Tested on S3C2440]
-Tested-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
-
-Changes since v2:
-1. Extend message.
-2. Add Kukjin's ack.
-3. Add Sylwester's tested-by.
-
-Changes since v1:
-1. Add Javier's tested-by.
-2. Drop HZ_FIXED also from ARCH_S5PV210 and ARCH_S3C24XX after Arnd
-   suggestions and analysis.
---
- arch/arm/Kconfig | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index b5d529fdffab..ced2e08a9d08 100644
--- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -1496,8 +1496,7 @@ source kernel/Kconfig.preempt
- 
- config HZ_FIXED
- 	int
-	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || \
-		ARCH_S5PV210 || ARCH_EXYNOS4
-+	default 200 if ARCH_EBSA110
- 	default 128 if SOC_AT91RM9200
- 	default 0
- 
--- a/Add-EFI-signature-data-types.patch
+++ b/Add-EFI-signature-data-types.patch
@ -1,7 +1,7 @@
-From 5216de8394ff599e41c8540c0572368c18c51459 Mon Sep 17 00:00:00 2001
+From ba3f737b8521314b62edaa7d4cc4bdc9aeefe394 Mon Sep 17 00:00:00 2001
 From: Dave Howells <dhowells@redhat.com>
 Date: Tue, 23 Oct 2012 09:30:54 -0400
-Subject: [PATCH 4/9] Add EFI signature data types
+Subject: [PATCH 15/20] Add EFI signature data types

 Add the data types that are used for containing hashes, keys and certificates
 for cryptographic verification.
@ -11,16 +11,16 @@ Upstream-status: Fedora mustard for now

 Signed-off-by: David Howells <dhowells@redhat.com>
 ---
- include/linux/efi.h | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
+ include/linux/efi.h | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)

 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 8cb38cfcba74..8c274b4ea8e6 100644
+index 5af91b58afae..190858d62fe3 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
-@@ -647,6 +647,9 @@ void efi_native_runtime_setup(void);
- #define LINUX_EFI_ARM_SCREEN_INFO_TABLE_GUID	EFI_GUID(0xe03fc20a, 0x85dc, 0x406e,  0xb9, 0x0e, 0x4a, 0xb5, 0x02, 0x37, 0x1d, 0x95)
+@@ -603,6 +603,9 @@ void efi_native_runtime_setup(void);
 #define LINUX_EFI_LOADER_ENTRY_GUID		EFI_GUID(0x4a67b082, 0x0a4c, 0x41cf,  0xb6, 0xc7, 0x44, 0x0b, 0x29, 0xbb, 0x8c, 0x4f)
+ #define LINUX_EFI_RANDOM_SEED_TABLE_GUID	EFI_GUID(0x1ce1e5bc, 0x7ceb, 0x42f2,  0x81, 0xe5, 0x8a, 0xad, 0xf1, 0x80, 0xf5, 0x7b)
 
 +#define EFI_CERT_SHA256_GUID			EFI_GUID(0xc1c41626, 0x504c, 0x4092,  0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28)
 +#define EFI_CERT_X509_GUID			EFI_GUID(0xa5c059a1, 0x94e4, 0x4aa7,  0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72)
@ -28,7 +28,7 @@ index 8cb38cfcba74..8c274b4ea8e6 100644
 typedef struct {
 	efi_guid_t guid;
 	u64 table;
-@@ -879,6 +885,20 @@ typedef struct {
+@@ -853,6 +856,20 @@ typedef struct {
 	efi_memory_desc_t entry[0];
 } efi_memory_attributes_table_t;
 
@ -50,5 +50,5 @@ index 8cb38cfcba74..8c274b4ea8e6 100644
  * All runtime access to EFI goes through this structure:
  */
 -- 
-2.5.5
+2.9.3

--- a/Add-an-EFI-signature-blob-parser-and-key-loader.patch
+++ b/Add-an-EFI-signature-blob-parser-and-key-loader.patch
@ -1,7 +1,7 @@
-From e36a2d65e25fdf42b50aa5dc17583d7bfd09c4c4 Mon Sep 17 00:00:00 2001
+From 822b4b3eb76ca451a416a51f0a7bfedfa5c5ea39 Mon Sep 17 00:00:00 2001
 From: Dave Howells <dhowells@redhat.com>
 Date: Tue, 23 Oct 2012 09:36:28 -0400
-Subject: [PATCH 5/9] 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.
@ -17,10 +17,10 @@ Signed-off-by: David Howells <dhowells@redhat.com>
 create mode 100644 crypto/asymmetric_keys/efi_parser.c

 diff --git a/crypto/asymmetric_keys/Kconfig b/crypto/asymmetric_keys/Kconfig
-index e28e912000a7..94024e8aedaa 100644
+index 331f6baf2df8..5f9002d3192e 100644
 --- a/crypto/asymmetric_keys/Kconfig
 +++ b/crypto/asymmetric_keys/Kconfig
-@@ -60,4 +60,12 @@ config SIGNED_PE_FILE_VERIFICATION
+@@ -61,4 +61,12 @@ config SIGNED_PE_FILE_VERIFICATION
 	  This option provides support for verifying the signature(s) on a
 	  signed PE binary.
 
@ -160,10 +160,10 @@ index 000000000000..636feb18b733
 +	return 0;
 +}
 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 8c274b4ea8e6..ff1877145aa4 100644
+index 190858d62fe3..668aa1244885 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
-@@ -1044,6 +1044,10 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,
+@@ -1025,6 +1025,10 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,
 char * __init efi_md_typeattr_format(char *buf, size_t size,
 				     const efi_memory_desc_t *md);
 
@ -175,5 +175,5 @@ index 8c274b4ea8e6..ff1877145aa4 100644
  * efi_range_is_wc - check the WC bit on an address range
  * @start: starting kvirt address
 -- 
-2.5.5
+2.9.3

--- a/Add-option-to-automatically-enforce-module-signature.patch
+++ b/Add-option-to-automatically-enforce-module-signature.patch
@ -1,217 +0,0 @@
-From 0000dc9edd5997cc49b8893a9d5407f89dfa1307 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
-
-UEFI Secure Boot provides a mechanism for ensuring that the firmware will
-only load signed bootloaders and kernels. Certain use cases may also
-require that all kernel modules also be signed. Add a configuration option
-that enforces this automatically when enabled.
-
-Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
---
- Documentation/x86/zero-page.txt       |  2 ++
- arch/x86/Kconfig                      | 11 ++++++
- arch/x86/boot/compressed/eboot.c      | 66 +++++++++++++++++++++++++++++++++++
- arch/x86/include/uapi/asm/bootparam.h |  3 +-
- arch/x86/kernel/setup.c               |  6 ++++
- include/linux/module.h                |  6 ++++
- kernel/module.c                       |  7 ++++
- 7 files changed, 100 insertions(+), 1 deletion(-)
-
-diff --git a/Documentation/x86/zero-page.txt b/Documentation/x86/zero-page.txt
-index 95a4d34af3fd..b8527c6b7646 100644
--- a/Documentation/x86/zero-page.txt
-+++ b/Documentation/x86/zero-page.txt
-@@ -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)
-+1EB/001	ALL     kbd_status      Numlock is enabled
-+1EC/001	ALL     secure_boot	Secure boot is enabled in the firmware
- 1EF/001	ALL	sentinel	Used to detect broken bootloaders
- 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 0a7b885964ba..29b8ba9ae713 100644
--- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -1776,6 +1776,17 @@ config EFI_MIXED
- 
- 	   If unsure, say N.
- 
-+config EFI_SECURE_BOOT_SIG_ENFORCE
-+	def_bool n
-+	depends on EFI
-+	prompt "Force module signing when UEFI Secure Boot is enabled"
-+	---help---
-+	  UEFI Secure Boot provides a mechanism for ensuring that the
-+	  firmware will only load signed bootloaders and kernels. Certain
-+	  use cases may also require that all kernel modules also be signed.
-+	  Say Y here to automatically enable module signature enforcement
-+	  when a system boots with UEFI Secure Boot enabled.
-+
- config SECCOMP
- 	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 52fef606bc54..6b8b9a775b46 100644
--- a/arch/x86/boot/compressed/eboot.c
-+++ b/arch/x86/boot/compressed/eboot.c
-@@ -12,6 +12,7 @@
- #include <asm/efi.h>
- #include <asm/setup.h>
- #include <asm/desc.h>
-+#include <asm/bootparam_utils.h>
- 
- #include "../string.h"
- #include "eboot.h"
-@@ -571,6 +572,67 @@ free_handle:
- 	efi_call_early(free_pool, pci_handle);
- }
- 
-+static int get_secure_boot(void)
-+{
-+	u8 sb, setup;
-+	unsigned long datasize = sizeof(sb);
-+	efi_guid_t var_guid = EFI_GLOBAL_VARIABLE_GUID;
-+	efi_status_t status;
-+
-+	status = efi_early->call((unsigned long)sys_table->runtime->get_variable,
-+				L"SecureBoot", &var_guid, NULL, &datasize, &sb);
-+
-+	if (status != EFI_SUCCESS)
-+		return 0;
-+
-+	if (sb == 0)
-+		return 0;
-+
-+
-+	status = efi_early->call((unsigned long)sys_table->runtime->get_variable,
-+				L"SetupMode", &var_guid, NULL, &datasize,
-+				&setup);
-+
-+	if (status != EFI_SUCCESS)
-+		return 0;
-+
-+	if (setup == 1)
-+		return 0;
-+
-+	return 1;
-+}
-+
-+
-+/*
-+ * See if we have Graphics Output Protocol
-+ */
-+static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto,
-+			      unsigned long size)
-+{
-+	efi_status_t status;
-+	void **gop_handle = NULL;
-+
-+	status = efi_call_early(allocate_pool, EFI_LOADER_DATA,
-+				size, (void **)&gop_handle);
-+	if (status != EFI_SUCCESS)
-+		return status;
-+
-+	status = efi_call_early(locate_handle,
-+				EFI_LOCATE_BY_PROTOCOL,
-+				proto, NULL, &size, gop_handle);
-+	if (status != EFI_SUCCESS)
-+		goto free_handle;
-+
-+	if (efi_early->is64)
-+		status = setup_gop64(si, proto, size, gop_handle);
-+	else
-+		status = setup_gop32(si, proto, size, gop_handle);
-+
-+free_handle:
-+	efi_call_early(free_pool, gop_handle);
-+	return status;
-+}
-+
- static efi_status_t
- setup_uga32(void **uga_handle, unsigned long size, u32 *width, u32 *height)
- {
-@@ -1126,6 +1188,10 @@ struct boot_params *efi_main(struct efi_config *c,
- 	else
- 		setup_boot_services32(efi_early);
- 
-+	sanitize_boot_params(boot_params);
-+
-+	boot_params->secure_boot = get_secure_boot();
-+
- 	setup_graphics(boot_params);
- 
- 	setup_efi_pci(boot_params);
-diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h
-index c18ce67495fa..2b3e5427097b 100644
--- a/arch/x86/include/uapi/asm/bootparam.h
-+++ b/arch/x86/include/uapi/asm/bootparam.h
-@@ -134,7 +134,8 @@ struct boot_params {
- 	__u8  eddbuf_entries;				/* 0x1e9 */
- 	__u8  edd_mbr_sig_buf_entries;			/* 0x1ea */
- 	__u8  kbd_status;				/* 0x1eb */
-	__u8  _pad5[3];					/* 0x1ec */
-+	__u8  secure_boot;				/* 0x1ec */
-+	__u8  _pad5[2];					/* 0x1ed */
- 	/*
- 	 * 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 c4e7b3991b60..bdb9881c7afd 100644
--- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -1152,6 +1152,12 @@ void __init setup_arch(char **cmdline_p)
- 
- 	io_delay_init();
- 
-+#ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
-+	if (boot_params.secure_boot) {
-+		enforce_signed_modules();
-+	}
-+#endif
-+
- 	/*
- 	 * Parse the ACPI tables for possible boot-time SMP configuration.
- 	 */
-diff --git a/include/linux/module.h b/include/linux/module.h
-index 082298a09df1..38d0597f7615 100644
--- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -273,6 +273,12 @@ const struct exception_table_entry *search_exception_tables(unsigned long add);
- 
- struct notifier_block;
- 
-+#ifdef CONFIG_MODULE_SIG
-+extern void enforce_signed_modules(void);
-+#else
-+static inline void enforce_signed_modules(void) {};
-+#endif
-+
- #ifdef CONFIG_MODULES
- 
- extern int modules_disabled; /* for sysctl */
-diff --git a/kernel/module.c b/kernel/module.c
-index 3c384968f553..ea484f3a35b2 100644
--- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -4200,6 +4200,13 @@ void module_layout(struct module *mod,
- EXPORT_SYMBOL(module_layout);
- #endif
- 
-+#ifdef CONFIG_MODULE_SIG
-+void enforce_signed_modules(void)
-+{
-+	sig_enforce = true;
-+}
-+#endif
-+
- bool secure_modules(void)
- {
- #ifdef CONFIG_MODULE_SIG
-- 
-2.5.5
-
--- a/Add-secure_modules-call.patch
+++ b/Add-secure_modules-call.patch
@ -1,63 +0,0 @@
-From 3213f1513a744fb21b6b9e4d4f2650a204855b3e 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
-
-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
-only modules signed with a trusted key.
-
-Bugzilla: N/A
-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 |  6 ++++++
- kernel/module.c        | 10 ++++++++++
- 2 files changed, 16 insertions(+)
-
-diff --git a/include/linux/module.h b/include/linux/module.h
-index 0c3207d..05bd6c9 100644
--- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -641,6 +641,8 @@ static inline bool is_livepatch_module(struct module *mod)
- }
- #endif /* CONFIG_LIVEPATCH */
- 
-+extern bool secure_modules(void);
-+
- #else /* !CONFIG_MODULES... */
- 
- static inline struct module *__module_address(unsigned long addr)
-@@ -750,6 +752,10 @@ static inline bool module_requested_async_probing(struct module *module)
- 	return false;
- }
- 
-+static inline bool secure_modules(void)
-+{
-+	return false;
-+}
- #endif /* CONFIG_MODULES */
- 
- #ifdef CONFIG_SYSFS
-diff --git a/kernel/module.c b/kernel/module.c
-index 529efae..0332fdd 100644
--- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -4279,3 +4279,13 @@ void module_layout(struct module *mod,
- }
- EXPORT_SYMBOL(module_layout);
- #endif
-+
-+bool secure_modules(void)
-+{
-+#ifdef CONFIG_MODULE_SIG
-+	return (sig_enforce || modules_disabled);
-+#else
-+	return modules_disabled;
-+#endif
-+}
-+EXPORT_SYMBOL(secure_modules);
-- 
-2.9.2
-
--- a/Add-sysrq-option-to-disable-secure-boot-mode.patch
+++ b/Add-sysrq-option-to-disable-secure-boot-mode.patch
@ -1,246 +0,0 @@
-From e27a9a98dcf3ff95568593026da065a72ad21b92 Mon Sep 17 00:00:00 2001
-From: Kyle McMartin <kyle@redhat.com>
-Date: Fri, 30 Aug 2013 09:28:51 -0400
-Subject: [PATCH 9/9] Add sysrq option to disable secure boot mode
-
-Bugzilla: N/A
-Upstream-status: Fedora mustard
---
- arch/x86/kernel/setup.c     | 36 ++++++++++++++++++++++++++++++++++++
- drivers/input/misc/uinput.c |  1 +
- drivers/tty/sysrq.c         | 19 +++++++++++++------
- include/linux/input.h       |  5 +++++
- include/linux/sysrq.h       |  8 +++++++-
- kernel/debug/kdb/kdb_main.c |  2 +-
- 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 a666b6c29c77..7732c769937b 100644
--- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -70,6 +70,11 @@
- #include <linux/tboot.h>
- #include <linux/jiffies.h>
- 
-+#include <linux/fips.h>
-+#include <linux/cred.h>
-+#include <linux/sysrq.h>
-+#include <linux/init_task.h>
-+
- #include <video/edid.h>
- 
- #include <asm/mtrr.h>
-@@ -1286,6 +1291,37 @@ void __init i386_reserve_resources(void)
- 
- #endif /* CONFIG_X86_32 */
- 
-+#ifdef CONFIG_MAGIC_SYSRQ
-+#ifdef CONFIG_MODULE_SIG
-+extern bool sig_enforce;
-+#endif
-+
-+static void sysrq_handle_secure_boot(int key)
-+{
-+	if (!efi_enabled(EFI_SECURE_BOOT))
-+		return;
-+
-+	pr_info("Secure boot disabled\n");
-+#ifdef CONFIG_MODULE_SIG
-+	sig_enforce = fips_enabled;
-+#endif
-+}
-+static struct sysrq_key_op secure_boot_sysrq_op = {
-+	.handler	=	sysrq_handle_secure_boot,
-+	.help_msg	=	"unSB(x)",
-+	.action_msg	=	"Disabling Secure Boot restrictions",
-+	.enable_mask	=	SYSRQ_DISABLE_USERSPACE,
-+};
-+static int __init secure_boot_sysrq(void)
-+{
-+	if (efi_enabled(EFI_SECURE_BOOT))
-+		register_sysrq_key('x', &secure_boot_sysrq_op);
-+	return 0;
-+}
-+late_initcall(secure_boot_sysrq);
-+#endif /*CONFIG_MAGIC_SYSRQ*/
-+
-+
- static struct notifier_block kernel_offset_notifier = {
- 	.notifier_call = dump_kernel_offset
- };
-diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
-index abe1a927b332..f4126fcec10c 100644
--- a/drivers/input/misc/uinput.c
-+++ b/drivers/input/misc/uinput.c
-@@ -379,6 +379,7 @@ static int uinput_allocate_device(struct uinput_device *udev)
- 	if (!udev->dev)
- 		return -ENOMEM;
- 
-+	udev->dev->flags |= INPUTDEV_FLAGS_SYNTHETIC;
- 	udev->dev->event = uinput_dev_event;
- 	input_set_drvdata(udev->dev, udev);
- 
-diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
-index e5139402e7f8..5ef2e04a03ad 100644
--- a/drivers/tty/sysrq.c
-+++ b/drivers/tty/sysrq.c
-@@ -478,6 +478,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 */
-@@ -521,7 +522,7 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p)
-                 sysrq_key_table[i] = op_p;
- }
- 
-void __handle_sysrq(int key, bool check_mask)
-+void __handle_sysrq(int key, int from)
- {
- 	struct sysrq_key_op *op_p;
- 	int orig_log_level;
-@@ -541,11 +542,15 @@ void __handle_sysrq(int key, bool check_mask)
- 
-         op_p = __sysrq_get_key_op(key);
-         if (op_p) {
-+		/* Ban synthetic events from some sysrq functionality */
-+		if ((from == SYSRQ_FROM_PROC || from == SYSRQ_FROM_SYNTHETIC) &&
-+		    op_p->enable_mask & SYSRQ_DISABLE_USERSPACE)
-+			printk("This sysrq operation is disabled from userspace.\n");
- 		/*
- 		 * Should we check for enabled operations (/proc/sysrq-trigger
- 		 * should not) and is the invoked operation enabled?
- 		 */
-		if (!check_mask || sysrq_on_mask(op_p->enable_mask)) {
-+		if (from == SYSRQ_FROM_KERNEL || sysrq_on_mask(op_p->enable_mask)) {
- 			pr_cont("%s\n", op_p->action_msg);
- 			console_loglevel = orig_log_level;
- 			op_p->handler(key);
-@@ -577,7 +582,7 @@ void __handle_sysrq(int key, bool check_mask)
- void handle_sysrq(int key)
- {
- 	if (sysrq_on())
-		__handle_sysrq(key, true);
-+		__handle_sysrq(key, SYSRQ_FROM_KERNEL);
- }
- EXPORT_SYMBOL(handle_sysrq);
- 
-@@ -658,7 +663,7 @@ static void sysrq_do_reset(unsigned long _state)
- static void sysrq_handle_reset_request(struct sysrq_state *state)
- {
- 	if (state->reset_requested)
-		__handle_sysrq(sysrq_xlate[KEY_B], false);
-+		__handle_sysrq(sysrq_xlate[KEY_B], SYSRQ_FROM_KERNEL);
- 
- 	if (sysrq_reset_downtime_ms)
- 		mod_timer(&state->keyreset_timer,
-@@ -809,8 +814,10 @@ static bool sysrq_handle_keypress(struct sysrq_state *sysrq,
- 
- 	default:
- 		if (sysrq->active && value && value != 2) {
-+			int from = sysrq->handle.dev->flags & INPUTDEV_FLAGS_SYNTHETIC ?
-+					SYSRQ_FROM_SYNTHETIC : 0;
- 			sysrq->need_reinject = false;
-			__handle_sysrq(sysrq_xlate[code], true);
-+			__handle_sysrq(sysrq_xlate[code], from);
- 		}
- 		break;
- 	}
-@@ -1094,7 +1101,7 @@ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
- 
- 		if (get_user(c, buf))
- 			return -EFAULT;
-		__handle_sysrq(c, false);
-+		__handle_sysrq(c, SYSRQ_FROM_PROC);
- 	}
- 
- 	return count;
-diff --git a/include/linux/input.h b/include/linux/input.h
-index 1e967694e9a5..2b56c6f9673c 100644
--- a/include/linux/input.h
-+++ b/include/linux/input.h
-@@ -42,6 +42,7 @@ struct input_value {
-  * @phys: physical path to the device in the system hierarchy
-  * @uniq: unique identification code for the device (if device has it)
-  * @id: id of the device (struct input_id)
-+ * @flags: input device flags (SYNTHETIC, etc.)
-  * @propbit: bitmap of device properties and quirks
-  * @evbit: bitmap of types of events supported by the device (EV_KEY,
-  *	EV_REL, etc.)
-@@ -124,6 +125,8 @@ struct input_dev {
- 	const char *uniq;
- 	struct input_id id;
- 
-+	unsigned int flags;
-+
- 	unsigned long propbit[BITS_TO_LONGS(INPUT_PROP_CNT)];
- 
- 	unsigned long evbit[BITS_TO_LONGS(EV_CNT)];
-@@ -190,6 +193,8 @@ struct input_dev {
- };
- #define to_input_dev(d) container_of(d, struct input_dev, dev)
- 
-+#define	INPUTDEV_FLAGS_SYNTHETIC	0x000000001
-+
- /*
-  * Verify that we are in sync with input_device_id mod_devicetable.h #defines
-  */
-diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
-index 387fa7d05c98..4b07e30b3279 100644
--- a/include/linux/sysrq.h
-+++ b/include/linux/sysrq.h
-@@ -28,6 +28,8 @@
- #define SYSRQ_ENABLE_BOOT	0x0080
- #define SYSRQ_ENABLE_RTNICE	0x0100
- 
-+#define SYSRQ_DISABLE_USERSPACE	0x00010000
-+
- struct sysrq_key_op {
- 	void (*handler)(int);
- 	char *help_msg;
-@@ -42,8 +44,12 @@ struct sysrq_key_op {
-  * are available -- else NULL's).
-  */
- 
-+#define SYSRQ_FROM_KERNEL	0x0001
-+#define SYSRQ_FROM_PROC		0x0002
-+#define SYSRQ_FROM_SYNTHETIC	0x0004
-+
- void handle_sysrq(int key);
-void __handle_sysrq(int key, bool check_mask);
-+void __handle_sysrq(int key, int from);
- int register_sysrq_key(int key, struct sysrq_key_op *op);
- int unregister_sysrq_key(int key, struct sysrq_key_op *op);
- struct sysrq_key_op *__sysrq_get_key_op(int key);
-diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
-index 2a20c0dfdafc..3d17205dab77 100644
--- a/kernel/debug/kdb/kdb_main.c
-+++ b/kernel/debug/kdb/kdb_main.c
-@@ -1968,7 +1968,7 @@ static int kdb_sr(int argc, const char **argv)
- 		return KDB_ARGCOUNT;
- 
- 	kdb_trap_printk++;
-	__handle_sysrq(*argv[1], check_mask);
-+	__handle_sysrq(*argv[1], check_mask & SYSRQ_FROM_KERNEL);
- 	kdb_trap_printk--;
- 
- 	return 0;
-diff --git a/kernel/module.c b/kernel/module.c
-index ea484f3a35b2..84b00659b0ee 100644
--- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -269,7 +269,7 @@ static void module_assert_mutex_or_preempt(void)
- #endif
- }
- 
-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.5.5
-
--- a/Armada-trace-build-fix.patch
+++ b/Armada-trace-build-fix.patch
@ -0,0 +1,20 @@
+From: Fedora Kernel Team <kernel-team@fedoraproject.org>
+Date: Wed, 14 Dec 2016 16:53:21 -0600
+Subject: [PATCH] Armada trace build fix
+
+---
+ drivers/gpu/drm/armada/Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/gpu/drm/armada/Makefile b/drivers/gpu/drm/armada/Makefile
+--- a/drivers/gpu/drm/armada/Makefile
+++ b/drivers/gpu/drm/armada/Makefile
+@@ -4,3 +4,5 @@ armada-y	+= armada_510.o
+ armada-$(CONFIG_DEBUG_FS) += armada_debugfs.o
+
+ obj-$(CONFIG_DRM_ARMADA) := armada.o
+
+CFLAGS_armada_trace.o := -I$(src)
+-- 
+2.9.3
+
--- a/HID-microsoft-Add-Surface-4-type-cover-pro-4-JP.patch
+++ b/HID-microsoft-Add-Surface-4-type-cover-pro-4-JP.patch
@ -1,76 +0,0 @@
-From b490a8537df60d449199e162417da74ee9262515 Mon Sep 17 00:00:00 2001
-From: Yuta Kobayashi <alu.ula@outlook.com>
-Date: Fri, 12 Aug 2016 07:49:17 +0000
-Subject: [PATCH] HID: microsoft: Add Surface 4 type cover pro 4 (JP)
-
-Adding support for the Microsoft Surface 4 Type Cover Pro (JP).
-
-Signed-off-by: Yuta Kobayashi <alu.ula@outlook.com>
-Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---
- drivers/hid/hid-core.c          | 2 ++
- drivers/hid/hid-ids.h           | 1 +
- drivers/hid/hid-microsoft.c     | 2 ++
- drivers/hid/usbhid/hid-quirks.c | 1 +
- 4 files changed, 6 insertions(+)
-
-diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index ed10d4f..45400de 100644
--- a/drivers/hid/hid-core.c
-+++ b/drivers/hid/hid-core.c
-@@ -727,6 +727,7 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type)
- 	    (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 ||
- 	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 ||
- 	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP ||
-+	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP ||
- 	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 ||
- 	     hid->product == USB_DEVICE_ID_MS_POWER_COVER) &&
- 	    hid->group == HID_GROUP_MULTITOUCH)
-@@ -1982,6 +1983,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600) },
-diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index da1c58e..3466f0d 100644
--- a/drivers/hid/hid-ids.h
-+++ b/drivers/hid/hid-ids.h
-@@ -713,6 +713,7 @@
- #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3    0x07dc
- #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2  0x07e2
- #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd
-+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP 0x07e9
- #define USB_DEVICE_ID_MS_TYPE_COVER_3    0x07de
- #define USB_DEVICE_ID_MS_POWER_COVER     0x07da
-
-diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c
-index e924d55..56c586f 100644
--- a/drivers/hid/hid-microsoft.c
-+++ b/drivers/hid/hid-microsoft.c
-@@ -288,6 +288,8 @@ static const struct hid_device_id ms_devices[] = {
- 		.driver_data = MS_HIDINPUT },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP),
- 		.driver_data = MS_HIDINPUT },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP),
-+		.driver_data = MS_HIDINPUT },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3),
- 		.driver_data = MS_HIDINPUT },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER),
-diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
-index b4b8c6a..1fccffd 100644
--- a/drivers/hid/usbhid/hid-quirks.c
-+++ b/drivers/hid/usbhid/hid-quirks.c
-@@ -98,6 +98,7 @@ static const struct hid_blacklist {
- 	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3, HID_QUIRK_NO_INIT_REPORTS },
- 	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2, HID_QUIRK_NO_INIT_REPORTS },
- 	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP, HID_QUIRK_NO_INIT_REPORTS },
-+	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP, HID_QUIRK_NO_INIT_REPORTS },
- 	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3, HID_QUIRK_NO_INIT_REPORTS },
- 	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER, HID_QUIRK_NO_INIT_REPORTS },
- 	{ USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS },
-- 
-2.7.4
-
--- a/KEYS-Add-a-system-blacklist-keyring.patch
+++ b/KEYS-Add-a-system-blacklist-keyring.patch
@ -1,7 +1,7 @@
-From 096da19de900a115ee3610b666ecb7e55926623d Mon Sep 17 00:00:00 2001
+From 2a54526850121cd0d7cf649a321488b4dab5731d Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Fri, 26 Oct 2012 12:36:24 -0400
-Subject: [PATCH 6/9] 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
@ -78,10 +78,10 @@ index fbd4647767e9..5bc291a3d261 100644
 extern struct key *ima_blacklist_keyring;
 
 diff --git a/init/Kconfig b/init/Kconfig
-index a9c4aefd5436..e5449d5aeff9 100644
+index 34407f15e6d3..461ad575a608 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1829,6 +1829,15 @@ config SYSTEM_DATA_VERIFICATION
+@@ -1859,6 +1859,15 @@ config SYSTEM_DATA_VERIFICATION
 	  module verification, kexec image verification and firmware blob
 	  verification.
 
@ -98,5 +98,5 @@ index a9c4aefd5436..e5449d5aeff9 100644
 	bool "Profiling support"
 	help
 -- 
-2.5.5
+2.9.3

--- a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
+++ b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
@ -102,7 +102,7 @@ index eb26e12c6c2a..e0c2268cb97e 100644
 +
 $(obj)/configs.o: $(obj)/config_data.h
 
- # config_data.h contains the same information as ikconfig.h but gzipped.
+ targets += config_data.gz
 diff --git a/kernel/modsign_uefi.c b/kernel/modsign_uefi.c
 new file mode 100644
 index 000000000000..fe4a6f2bf10a
--- a/MODSIGN-Support-not-importing-certs-from-db.patch
+++ b/MODSIGN-Support-not-importing-certs-from-db.patch
@ -1,7 +1,7 @@
-From 7ce860189df19a38176c1510f4e5615bf35495c1 Mon Sep 17 00:00:00 2001
+From 9d2e5c61d5adcf7911f67ed44a1b0ff881f175bb Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Thu, 3 Oct 2013 10:14:23 -0400
-Subject: [PATCH 2/2] 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.
@ -14,7 +14,7 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
 1 file changed, 31 insertions(+), 9 deletions(-)

 diff --git a/kernel/modsign_uefi.c b/kernel/modsign_uefi.c
-index 03f601a0052c..321c79a3b282 100644
+index fe4a6f2bf10a..a41da14b1ffd 100644
 --- a/kernel/modsign_uefi.c
 +++ b/kernel/modsign_uefi.c
@@ -8,6 +8,23 @@
@ -82,5 +82,5 @@ index 03f601a0052c..321c79a3b282 100644
 
 	mok = get_cert_list(L"MokListRT", &mok_var, &moksize);
 -- 
-2.5.5
+2.9.3

--- a/91
+++ b/91
@ -10,9 +10,7 @@ help:
 	@echo "Try fedpkg $@ or something like that"
 	@exit 1

-include Makefile.config
-
-prep:
+prep: config-files
 	fedpkg -v prep

 noarch:
@ -25,91 +23,22 @@ local:
 extremedebug:
 	@perl -pi -e 's/# CONFIG_DEBUG_PAGEALLOC is not set/CONFIG_DEBUG_PAGEALLOC=y/' config-nodebug

+config-files:
+	@./build_configs.sh
+
 debug:
-	@perl -pi -e 's/# CONFIG_LOCK_STAT is not set/CONFIG_LOCK_STAT=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_STACK_USAGE is not set/CONFIG_DEBUG_STACK_USAGE=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_SLAB is not set/CONFIG_DEBUG_SLAB=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_MUTEXES is not set/CONFIG_DEBUG_MUTEXES=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_RT_MUTEXES is not set/CONFIG_DEBUG_RT_MUTEXES=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_LOCK_ALLOC is not set/CONFIG_DEBUG_LOCK_ALLOC=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_LOCK_TORTURE_TEST is not set/CONFIG_LOCK_TORTURE_TEST=m/' config-nodebug
-	@perl -pi -e 's/# CONFIG_PROVE_LOCKING is not set/CONFIG_PROVE_LOCKING=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_PROVE_RCU is not set/CONFIG_PROVE_RCU=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_SPINLOCK is not set/CONFIG_DEBUG_SPINLOCK=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_VM is not set/CONFIG_DEBUG_VM=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_VM_PGFLAGS is not set/CONFIG_DEBUG_VM_PGFLAGS=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_FAULT_INJECTION is not set/CONFIG_FAULT_INJECTION=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_FAILSLAB is not set/CONFIG_FAILSLAB=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_FAIL_PAGE_ALLOC is not set/CONFIG_FAIL_PAGE_ALLOC=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_FAIL_IO_TIMEOUT is not set/CONFIG_FAIL_IO_TIMEOUT=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_FAIL_MAKE_REQUEST is not set/CONFIG_FAIL_MAKE_REQUEST=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_FAIL_MMC_REQUEST is not set/CONFIG_FAIL_MMC_REQUEST=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_FAULT_INJECTION_DEBUG_FS is not set/CONFIG_FAULT_INJECTION_DEBUG_FS=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_SG is not set/CONFIG_DEBUG_SG=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_PI_LIST is not set/CONFIG_DEBUG_PI_LIST=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_OBJECTS is not set/CONFIG_DEBUG_OBJECTS=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_OBJECTS_FREE is not set/CONFIG_DEBUG_OBJECTS_FREE=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_OBJECTS_TIMERS is not set/CONFIG_DEBUG_OBJECTS_TIMERS=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_OBJECTS_WORK is not set/CONFIG_DEBUG_OBJECTS_WORK=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set/CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_OBJECTS_RCU_HEAD is not set/CONFIG_DEBUG_OBJECTS_RCU_HEAD=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_X86_PTDUMP is not set/CONFIG_X86_PTDUMP=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_ARM64_PTDUMP is not set/CONFIG_ARM64_PTDUMP=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_EFI_PGT_DUMP is not set/CONFIG_EFI_PGT_DUMP=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_CAN_DEBUG_DEVICES is not set/CONFIG_CAN_DEBUG_DEVICES=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_MODULE_FORCE_UNLOAD is not set/CONFIG_MODULE_FORCE_UNLOAD=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_NOTIFIERS is not set/CONFIG_DEBUG_NOTIFIERS=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DMA_API_DEBUG is not set/CONFIG_DMA_API_DEBUG=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_PM_TEST_SUSPEND is not set/CONFIG_PM_TEST_SUSPEND=y/' config-generic
-	@perl -pi -e 's/# CONFIG_PM_ADVANCED_DEBUG is not set/CONFIG_PM_ADVANCED_DEBUG=y/' config-generic
-	@perl -pi -e 's/# CONFIG_B43_DEBUG is not set/CONFIG_B43_DEBUG=y/' config-generic
-	@perl -pi -e 's/# CONFIG_B43LEGACY_DEBUG is not set/CONFIG_B43LEGACY_DEBUG=y/' config-generic
-	@perl -pi -e 's/# CONFIG_MMIOTRACE is not set/CONFIG_MMIOTRACE=y/' config-nodebug
-	@perl -pi -e 's/CONFIG_STRIP_ASM_SYMS=y/# CONFIG_STRIP_ASM_SYMS is not set/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_CREDENTIALS is not set/CONFIG_DEBUG_CREDENTIALS=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set/CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_ACPI_DEBUG is not set/CONFIG_ACPI_DEBUG=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_EXT4_DEBUG is not set/CONFIG_EXT4_DEBUG=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_PERF_USE_VMALLOC is not set/CONFIG_DEBUG_PERF_USE_VMALLOC=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_JBD2_DEBUG is not set/CONFIG_JBD2_DEBUG=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_NFSD_FAULT_INJECTION is not set/CONFIG_NFSD_FAULT_INJECTION=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_BLK_CGROUP is not set/CONFIG_DEBUG_BLK_CGROUP=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DRBD_FAULT_INJECTION is not set/CONFIG_DRBD_FAULT_INJECTION=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_ATH_DEBUG is not set/CONFIG_ATH_DEBUG=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_CARL9170_DEBUGFS is not set/CONFIG_CARL9170_DEBUGFS=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_IWLWIFI_DEVICE_TRACING is not set/CONFIG_IWLWIFI_DEVICE_TRACING=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DMADEVICES_DEBUG is not set/CONFIG_DMADEVICES_DEBUG=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_CEPH_LIB_PRETTYDEBUG is not set/CONFIG_CEPH_LIB_PRETTYDEBUG=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_QUOTA_DEBUG is not set/CONFIG_QUOTA_DEBUG=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_KGDB_KDB is not set/CONFIG_KGDB_KDB=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_KDB_KEYBOARD is not set/CONFIG_KDB_KEYBOARD=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set/CONFIG_CPU_NOTIFIER_ERROR_INJECT=m/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_PER_CPU_MAPS is not set/CONFIG_DEBUG_PER_CPU_MAPS=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_TEST_LIST_SORT is not set/CONFIG_TEST_LIST_SORT=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_ATOMIC_SLEEP is not set/CONFIG_DEBUG_ATOMIC_SLEEP=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DETECT_HUNG_TASK is not set/CONFIG_DETECT_HUNG_TASK=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_WQ_WATCHDOG is not set/CONFIG_WQ_WATCHDOG=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set/CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_KMEMLEAK is not set/CONFIG_DEBUG_KMEMLEAK=y/' config-nodebug
-
-	@# just in case we're going from extremedebug -> debug
-	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
-
-	@perl -pi -e 's/# CONFIG_MAXSMP is not set/CONFIG_MAXSMP=y/' config-x86-generic
-
 	@perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec
 	@rpmdev-bumpspec -c "Reenable debugging options." kernel.spec

-nodebuginfo:
-	@perl -pi -e 's/^%define with_debuginfo %\{\?_without_debuginfo: 0\} %\{\?\!_without_debuginfo: 1\}/%define with_debuginfo %\{\?_without_debuginfo: 0\} %\{\?\!_without_debuginfo: 0\}/' kernel.spec
-nodebug: release
-	@perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec
-release: config-release
+release:
 	@perl -pi -e 's/^%define debugbuildsenabled 0/%define debugbuildsenabled 1/' kernel.spec
 	@rpmdev-bumpspec -c "Disable debugging options." kernel.spec

-include Makefile.release
+nodebuginfo:
+	@perl -pi -e 's/^%define with_debuginfo %\{\?_without_debuginfo: 0\} %\{\?\!_without_debuginfo: 1\}/%define with_debuginfo %\{\?_without_debuginfo: 0\} %\{\?\!_without_debuginfo: 0\}/' kernel.spec
+
+nodebug: release
+	@perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec

 ifeq ($(MAKECMDGOALS),me a sandwich)
 .PHONY: me a sandwich
--- a/Makefile.config
+++ b/Makefile.config
@ -1,129 +0,0 @@
-# Make rules for configuration files.
-#
-# $Id$
-
-CFG		= kernel-$(VERSION)
-
-CONFIGFILES	= \
-	$(CFG)-i686.config $(CFG)-i686-debug.config \
-	$(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \
-	$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
-	$(CFG)-s390x.config \
-	$(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-debug.config
-
-PLATFORMS	= x86 x86_64 powerpc s390x arm arm64
-TEMPFILES	= $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
-
-configs: $(CONFIGFILES)
-	@rm -f kernel-*-config
-	@rm -f $(TEMPFILES)
-	@rm -f temp-generic temp-*-generic temp-*-generic-tmp
-
-# Augment the clean target to clean up our own cruft
-clean ::
-	@rm -fv $(CONFIGFILES) $(TEMPFILES) temp-generic kernel-$(VERSION)*config
-
-temp-generic: config-generic config-nodebug
-	cat $^ > temp-generic
-
-temp-debug-generic: config-generic config-debug
-	cat $^ > temp-debug-generic
-
-temp-no-extra-generic: config-no-extra temp-generic
-	perl merge.pl $^ > $@
-
-temp-arm-generic: config-arm-generic temp-no-extra-generic
-	perl merge.pl $^ > $@
-
-temp-armv7-generic: config-armv7-generic temp-arm-generic
-	perl merge.pl $^ > $@
-
-temp-armv7: config-armv7 temp-armv7-generic
-	perl merge.pl $^ > $@
-
-temp-armv7-lpae: config-armv7-lpae temp-armv7-generic
-	perl merge.pl $^ > $@
-
-temp-arm-debug-generic: temp-arm-generic temp-debug-generic
-	perl merge.pl $^ > $@
-
-temp-arm64: config-arm64 temp-arm-generic
-	perl merge.pl $^ > $@
-
-temp-arm64-debug: config-arm64 temp-arm-debug-generic
-	perl merge.pl $^ > $@
-
-temp-x86-32: config-x86-32-generic config-x86-generic
-	perl merge.pl $^  > $@
-
-temp-x86-32-generic: temp-x86-32 temp-generic
-	perl merge.pl $^  > $@
-
-temp-x86-debug-generic: temp-x86-32 temp-debug-generic
-	perl merge.pl $^  > $@
-
-temp-x86-64: config-x86_64-generic config-x86-generic
-	perl merge.pl $^  > $@
-
-temp-x86_64-generic: temp-x86-64 temp-generic
-	perl merge.pl $^  > $@
-
-temp-x86_64-debug-generic: temp-x86-64 temp-debug-generic
-	perl merge.pl $^  > $@
-
-temp-powerpc64-generic: config-powerpc64-generic temp-generic
-	perl merge.pl $^  > $@
-
-temp-powerpc64-debug-generic: config-powerpc64-generic temp-debug-generic
-	perl merge.pl $^  > $@
-
-temp-s390-generic: config-s390x temp-generic
-	perl merge.pl $^ > $@
-
-$(CFG)-i686-PAE.config: config-i686-PAE temp-x86-32-generic
-	perl merge.pl $^ i386 > $@
-
-$(CFG)-i686-PAEdebug.config: config-i686-PAE temp-x86-debug-generic
-	perl merge.pl $^ i386 > $@
-
-$(CFG)-i686.config: /dev/null temp-x86-32-generic
-	perl merge.pl $^ i386 > $@
-
-$(CFG)-i686-debug.config: /dev/null temp-x86-debug-generic
-	perl merge.pl $^ i386 > $@
-
-$(CFG)-x86_64.config: /dev/null temp-x86_64-generic
-	perl merge.pl $^ x86_64 > $@
-
-$(CFG)-x86_64-debug.config: /dev/null temp-x86_64-debug-generic
-	perl merge.pl $^ x86_64 > $@
-
-$(CFG)-ppc64.config: config-powerpc64 temp-powerpc64-generic
-	perl merge.pl $^ powerpc > $@
-
-$(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: 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
-	perl merge.pl $^ s390 > $@
-
-$(CFG)-armv7hl.config: /dev/null temp-armv7
-	perl merge.pl $^ arm > $@
-
-$(CFG)-armv7hl-lpae.config: /dev/null temp-armv7-lpae
-	perl merge.pl $^ arm > $@
-
-$(CFG)-aarch64.config: /dev/null temp-arm64
-	perl merge.pl $^ arm64 > $@
--- a/Makefile.release
+++ b/Makefile.release
@ -1,84 +0,0 @@
-# Make rules for configuration files.
-#
-# $Id$
-
-# This file contains only entries that change the config files.
-# Anything that changes kernel.spec itself should go in the main Makefile.
-
-config-release:
-	@perl -pi -e 's/CONFIG_LOCK_STAT=y/# CONFIG_LOCK_STAT is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_STACK_USAGE=y/# CONFIG_DEBUG_STACK_USAGE is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_SLAB=y/# CONFIG_DEBUG_SLAB is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_MUTEXES=y/# CONFIG_DEBUG_MUTEXES is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_RT_MUTEXES=y/# CONFIG_DEBUG_RT_MUTEXES is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_LOCK_ALLOC=y/# CONFIG_DEBUG_LOCK_ALLOC is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_LOCK_TORTURE_TEST=m/# CONFIG_LOCK_TORTURE_TEST is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_PROVE_LOCKING=y/# CONFIG_PROVE_LOCKING is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_PROVE_RCU=y/# CONFIG_PROVE_RCU is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_SPINLOCK=y/# CONFIG_DEBUG_SPINLOCK is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_VM=y/# CONFIG_DEBUG_VM is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_VM_PGFLAGS=y/# CONFIG_DEBUG_VM_PGFLAGS is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_FAULT_INJECTION=y/# CONFIG_FAULT_INJECTION is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_FAILSLAB=y/# CONFIG_FAILSLAB is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_FAIL_PAGE_ALLOC=y/# CONFIG_FAIL_PAGE_ALLOC is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_FAIL_IO_TIMEOUT=y/# CONFIG_FAIL_IO_TIMEOUT is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_FAIL_MAKE_REQUEST=y/# CONFIG_FAIL_MAKE_REQUEST is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_FAIL_MMC_REQUEST=y/# CONFIG_FAIL_MMC_REQUEST is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_FAULT_INJECTION_DEBUG_FS=y/# CONFIG_FAULT_INJECTION_DEBUG_FS is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y/# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_SG=y/# CONFIG_DEBUG_SG is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_PI_LIST=y/# CONFIG_DEBUG_PI_LIST is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_OBJECTS=y/# CONFIG_DEBUG_OBJECTS is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_OBJECTS_FREE=y/# CONFIG_DEBUG_OBJECTS_FREE is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_OBJECTS_TIMERS=y/# CONFIG_DEBUG_OBJECTS_TIMERS is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_OBJECTS_WORK=y/# CONFIG_DEBUG_OBJECTS_WORK is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y/# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_OBJECTS_RCU_HEAD=y/# CONFIG_DEBUG_OBJECTS_RCU_HEAD is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_ARM64_PTDUMP=y/# CONFIG_ARM64_PTDUMP is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_EFI_PGT_DUMP=y/# CONFIG_EFI_PGT_DUMP is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_CAN_DEBUG_DEVICES=y/# CONFIG_CAN_DEBUG_DEVICES is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_MODULE_FORCE_UNLOAD=y/# CONFIG_MODULE_FORCE_UNLOAD is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_NOTIFIERS=y/# CONFIG_DEBUG_NOTIFIERS is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DMA_API_DEBUG=y/# CONFIG_DMA_API_DEBUG is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_PM_TEST_SUSPEND=y/# CONFIG_PM_TEST_SUSPEND is not set/' config-generic
-	@perl -pi -e 's/CONFIG_PM_ADVANCED_DEBUG=y/# CONFIG_PM_ADVANCED_DEBUG is not set/' config-generic
-	@perl -pi -e 's/CONFIG_B43_DEBUG=y/# CONFIG_B43_DEBUG is not set/' config-generic
-	@perl -pi -e 's/CONFIG_B43LEGACY_DEBUG=y/# CONFIG_B43LEGACY_DEBUG is not set/' config-generic
-	@perl -pi -e 's/CONFIG_MMIOTRACE=y/# CONFIG_MMIOTRACE is not set/' config-nodebug
-	@perl -pi -e 's/# CONFIG_STRIP_ASM_SYMS is not set/CONFIG_STRIP_ASM_SYMS=y/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_CREDENTIALS=y/# CONFIG_DEBUG_CREDENTIALS is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y/# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_ACPI_DEBUG=y/# CONFIG_ACPI_DEBUG is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_EXT4_DEBUG=y/# CONFIG_EXT4_DEBUG is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_PERF_USE_VMALLOC=y/# CONFIG_DEBUG_PERF_USE_VMALLOC is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_JBD2_DEBUG=y/# CONFIG_JBD2_DEBUG is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_NFSD_FAULT_INJECTION=y/# CONFIG_NFSD_FAULT_INJECTION is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_BLK_CGROUP=y/# CONFIG_DEBUG_BLK_CGROUP is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DRBD_FAULT_INJECTION=y/# CONFIG_DRBD_FAULT_INJECTION is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_ATH_DEBUG=y/# CONFIG_ATH_DEBUG is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_CARL9170_DEBUGFS=y/# CONFIG_CARL9170_DEBUGFS is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_IWLWIFI_DEVICE_TRACING=y/# CONFIG_IWLWIFI_DEVICE_TRACING is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DMADEVICES_DEBUG=y/# CONFIG_DMADEVICES_DEBUG is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_CEPH_LIB_PRETTYDEBUG=y/# CONFIG_CEPH_LIB_PRETTYDEBUG is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_QUOTA_DEBUG=y/# CONFIG_QUOTA_DEBUG is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_CPU_NOTIFIER_ERROR_INJECT=m/# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_PER_CPU_MAPS=y/# CONFIG_DEBUG_PER_CPU_MAPS is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_PERCPU_TEST=m/# CONFIG_PERCPU_TEST is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_TEST_LIST_SORT=y/# CONFIG_TEST_LIST_SORT is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_TEST_STRING_HELPERS=m/# CONFIG_TEST_STRING_HELPERS is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_ATOMIC_SLEEP=y/# CONFIG_DEBUG_ATOMIC_SLEEP is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DETECT_HUNG_TASK=y/# CONFIG_DETECT_HUNG_TASK is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_WQ_WATCHDOG=y/# CONFIG_WQ_WATCHDOG is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y/# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_KMEMLEAK=y/# CONFIG_DEBUG_KMEMLEAK is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_MAC80211_MESSAGE_TRACING=y/# CONFIG_MAC80211_MESSAGE_TRACING is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_XFS_WARN=y/# CONFIG_XFS_WARN is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_EDAC_DEBUG=y/# CONFIG_EDAC_DEBUG is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_RTLWIFI_DEBUG=y/# CONFIG_RTLWIFI_DEBUG is not set/' config-nodebug
-
-	@# Undo anything that make extremedebug might have set
-	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-debug
-	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
-
-	@# Change defaults back to sane things.
-	@perl -pi -e 's/CONFIG_MAXSMP=y/# CONFIG_MAXSMP is not set/' config-x86-generic
--- 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,117 +0,0 @@
-From 6f756b32a45b022428e33ce20181e874c73ca82e 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
-
-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
-kernel code, allowing them to circumvent disabled module loading or module
-signing. Default to paranoid - in future we can potentially relax this for
-sufficiently IOMMU-isolated devices.
-
-Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
---
- drivers/pci/pci-sysfs.c | 10 ++++++++++
- drivers/pci/proc.c      |  8 +++++++-
- drivers/pci/syscall.c   |  3 ++-
- 3 files changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
-index bcd10c7..a950301 100644
--- a/drivers/pci/pci-sysfs.c
-+++ b/drivers/pci/pci-sysfs.c
-@@ -30,6 +30,7 @@
- #include <linux/vgaarb.h>
- #include <linux/pm_runtime.h>
- #include <linux/of.h>
-+#include <linux/module.h>
- #include "pci.h"
- 
- static int sysfs_initialized;	/* = 0 */
-@@ -716,6 +717,9 @@ static ssize_t pci_write_config(struct file *filp, struct kobject *kobj,
- 	loff_t init_off = off;
- 	u8 *data = (u8 *) buf;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	if (off > dev->cfg_size)
- 		return 0;
- 	if (off + count > dev->cfg_size) {
-@@ -1007,6 +1011,9 @@ static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
- 	resource_size_t start, end;
- 	int i;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	for (i = 0; i < PCI_ROM_RESOURCE; i++)
- 		if (res == &pdev->resource[i])
- 			break;
-@@ -1106,6 +1113,9 @@ static ssize_t pci_write_resource_io(struct file *filp, struct kobject *kobj,
- 				     struct bin_attribute *attr, char *buf,
- 				     loff_t off, size_t count)
- {
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	return pci_resource_io(filp, kobj, attr, buf, off, count, true);
- }
- 
-diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
-index 2408abe..59f321c 100644
--- a/drivers/pci/proc.c
-+++ b/drivers/pci/proc.c
-@@ -116,6 +116,9 @@ static ssize_t proc_bus_pci_write(struct file *file, const char __user *buf,
- 	int size = dev->cfg_size;
- 	int cnt;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	if (pos >= size)
- 		return 0;
- 	if (nbytes >= size)
-@@ -195,6 +198,9 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
- #endif /* HAVE_PCI_MMAP */
- 	int ret = 0;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	switch (cmd) {
- 	case PCIIOC_CONTROLLER:
- 		ret = pci_domain_nr(dev->bus);
-@@ -233,7 +239,7 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)
- 	struct pci_filp_private *fpriv = file->private_data;
- 	int i, ret, write_combine;
- 
-	if (!capable(CAP_SYS_RAWIO))
-+	if (!capable(CAP_SYS_RAWIO) || secure_modules())
- 		return -EPERM;
- 
- 	/* Make sure the caller is mapping a real resource for this device */
-diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c
-index b91c4da..98f5637 100644
--- a/drivers/pci/syscall.c
-+++ b/drivers/pci/syscall.c
-@@ -10,6 +10,7 @@
- #include <linux/errno.h>
- #include <linux/pci.h>
- #include <linux/syscalls.h>
-+#include <linux/module.h>
- #include <asm/uaccess.h>
- #include "pci.h"
- 
-@@ -92,7 +93,7 @@ SYSCALL_DEFINE5(pciconfig_write, unsigned long, bus, unsigned long, dfn,
- 	u32 dword;
- 	int err = 0;
- 
-	if (!capable(CAP_SYS_ADMIN))
-+	if (!capable(CAP_SYS_ADMIN) || secure_modules())
- 		return -EPERM;
- 
- 	dev = pci_get_bus_and_slot(bus, dfn);
-- 
-2.9.2
-
--- a/PatchList.txt
+++ b/PatchList.txt
@ -1,79 +1,52 @@
-# This file contains patches that we intend to carry for longer than
-# "Should show up in a stable release soonish"
-# Some of these may eventually drop out
+**** Backports and patches headed/already upsteram *****************************

-kbuild-AFTER_LINK.patch
+* cpupower-Fix-segfault-due-to-incorrect-getopt_long-a.patch (rhbz 1000439)
+  - Queued for next upstream release I believe.  Fixes a segfault in cpupower

-arm64-avoid-needing-console-to-enable-serial-console.patch
+* dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch (rhbz 993744)
+  - Still pending upstream

-geekbox-v4-device-tree-support.patch
+* ath9k_rx_dma_stop_check.patch (rhbz 892811)
+  - Fixes some DMA issue on specific hardware.  Taken from
+https://dev.openwrt.org/browser/trunk/package/mac80211/patches/552-ath9k_rx_dma_stop_check.patch?rev=34910

-Initial-AllWinner-A64-and-PINE64-support.patch
+* secure-modules.patch
+* modsign-uefi.patch
+* sb-hibernate.patch
+* sysrq-secure-boot.patch
+  - Fedora secure boot support.
+  - Dear Matthew, this is your fault.  Run sed already and get a new set out.

-arm64-pcie-quirks-xgene.patch
+**** Other stuff that should go upstream (in decreasing likelyhood) ************

-usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch
+* defaults-acpi-video.patch
+* disable-i8042-check-on-apple-mac.patch
+* no-pcspkr-modalias.patch
+* die-floppy-die.patch
+	Fedora policy decisions
+	Turn into CONFIG_ options and upstream ?

-ARM-tegra-usb-no-reset.patch
+* input-kill-stupid-messages.patch
+* silence-fbcon-logo.patch
+* silence-noise.patch
+	Fedora local 'hush' patches.  (TODO: push more upstream)

-bcm283x-upstream-fixes.patch
+* makefile-after_link.patch
+  Rolandware that is used by the debuginfo generation.
+  Possibly upstreamable ?

-lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
+* serial-460800.patch
+	Probably not upstreamable.
+	http://marc.theaimsgroup.com/?l=linux-kernel&m=112687270832687&w=2
+	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=126403
+	http://lkml.org/lkml/2006/8/2/208

-input-kill-stupid-messages.patch
+********************************************************************************

-die-floppy-die.patch
+'MUSTARD' patches.  Fedora local patches that are very unlikely to go upstream.

-no-pcspkr-modalias.patch
+* crash-driver.patch
+	Unlikely to go upstream.
+	https://bugzilla.redhat.com/show_bug.cgi?id=492803

-silence-fbcon-logo.patch
-
-Kbuild-Add-an-option-to-enable-GCC-VTA.patch
-
-crash-driver.patch
-
-#Secure boot patches
-Add-secure_modules-call.patch
-PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
-x86-Lock-down-IO-port-access-when-module-security-is.patch
-ACPI-Limit-access-to-custom_method.patch
-asus-wmi-Restrict-debugfs-interface-when-module-load.patch
-Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
-acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
-kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
-x86-Restrict-MSR-access-when-module-loading-is-restr.patch
-Add-option-to-automatically-enforce-module-signature.patch
-efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
-efi-Add-EFI_SECURE_BOOT-bit.patch
-hibernate-Disable-in-a-signed-modules-environment.patch
-Add-EFI-signature-data-types.patch
-Add-an-EFI-signature-blob-parser-and-key-loader.patch
-KEYS-Add-a-system-blacklist-keyring.patch
-MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
-MODSIGN-Support-not-importing-certs-from-db.patch
-Add-sysrq-option-to-disable-secure-boot-mode.patch
-kexec-uefi-copy-secure_boot-flag-in-boot-params.patch
-
-drm-i915-hush-check-crtc-state.patch
-
-disable-i8042-check-on-apple-mac.patch
-
-lis3-improve-handling-of-null-rate.patch
-
-watchdog-Disable-watchdog-on-virtual-machines.patch
-
-scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
-
-criu-no-expert.patch
-
-ath9k-rx-dma-stop-check.patch
-
-xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch
-
-Input-synaptics-pin-3-touches-when-the-firmware-repo.patch
-
-firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch
-
-drm-i915-turn-off-wc-mmaps.patch
-
-i8042-skip-selftest-asus-laptops.patch
+********************************************************************************
--- 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,43 +0,0 @@
-From 12e2c6926a6b03e070fc58271cf41a482de06467 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 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
-to be subverted, avoiding module loading restrictions. Prevent this when
-any restrictions have been imposed on loading modules.
-
-[labbott: Rebased again]
-Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
---
- drivers/char/mem.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/drivers/char/mem.c b/drivers/char/mem.c
-index 6d9cc2d39d22..bda271d022a0 100644
--- a/drivers/char/mem.c
-+++ b/drivers/char/mem.c
-@@ -163,6 +163,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf,
- 	if (p != *ppos)
- 		return -EFBIG;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	if (!valid_phys_addr_range(p, count))
- 		return -EFAULT;
- 
-@@ -513,6 +516,9 @@ static ssize_t write_kmem(struct file *file, const char __user *buf,
- 	char *kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
- 	int err = 0;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	if (p < (unsigned long) high_memory) {
- 		unsigned long to_write = min_t(unsigned long, count,
- 					       (unsigned long)high_memory - p);
-- 
-2.11.0
-
--- a/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
+++ b/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
@ -1,39 +0,0 @@
-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 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
-loading modules. Disable it in that case.
-
-Signed-off-by: Josh Boyer <jwboyer@redhat.com>
---
- drivers/acpi/osl.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
-index 739a4a6b3b9b..9ef2a020a7a9 100644
--- a/drivers/acpi/osl.c
-+++ b/drivers/acpi/osl.c
-@@ -40,6 +40,7 @@
- #include <linux/list.h>
- #include <linux/jiffies.h>
- #include <linux/semaphore.h>
-+#include <linux/module.h>
- 
- #include <asm/io.h>
- #include <asm/uaccess.h>
-@@ -253,7 +254,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
- acpi_physical_address __init acpi_os_get_root_pointer(void)
- {
- #ifdef CONFIG_KEXEC
-	if (acpi_rsdp)
-+	if (acpi_rsdp && !secure_modules())
- 		return acpi_rsdp;
- #endif
- 
-- 
-2.4.3
-
--- a/arm-imx6-hummingboard2.patch
+++ b/arm-imx6-hummingboard2.patch
@ -0,0 +1,733 @@
+From e2b55af60f9f498b95ffb458955f4ff787bd55a1 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Fri, 20 Jan 2017 08:32:55 +0000
+Subject: [PATCH] Add support for Hummingobard2 (Edge/Gate)
+
+http://www.spinics.net/lists/arm-kernel/msg552554.html
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ arch/arm/boot/dts/Makefile                   |   2 +
+ arch/arm/boot/dts/imx6dl-hummingboard2.dts   |  52 +++
+ arch/arm/boot/dts/imx6q-hummingboard2.dts    |  60 +++
+ arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 562 +++++++++++++++++++++++++++
+ 4 files changed, 676 insertions(+)
+ create mode 100644 arch/arm/boot/dts/imx6dl-hummingboard2.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-hummingboard2.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 7327250..09227cc 100644
+--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
+@@ -348,6 +348,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
+ 	imx6dl-gw552x.dtb \
+ 	imx6dl-gw553x.dtb \
+ 	imx6dl-hummingboard.dtb \
+	imx6dl-hummingboard2.dtb \
+ 	imx6dl-icore.dtb \
+ 	imx6dl-nit6xlite.dtb \
+ 	imx6dl-nitrogen6x.dtb \
+@@ -390,6 +391,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
+ 	imx6q-gw553x.dtb \
+ 	imx6q-h100.dtb \
+ 	imx6q-hummingboard.dtb \
+	imx6q-hummingboard2.dtb \
+ 	imx6q-icore.dtb \
+ 	imx6q-icore-rqs.dtb \
+ 	imx6q-marsboard.dtb \
+diff --git a/arch/arm/boot/dts/imx6dl-hummingboard2.dts b/arch/arm/boot/dts/imx6dl-hummingboard2.dts
+new file mode 100644
+index 0000000..990b505
+--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-hummingboard2.dts
+@@ -0,0 +1,52 @@
+/*
+ * Device Tree file for SolidRun HummingBoard2
+ * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com>
+ * Based on work by Russell King
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it 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.
+ *
+ *     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.
+ *
+ * Or, alternatively
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (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.
+ *
+ *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+/dts-v1/;
+
+#include "imx6dl.dtsi"
+#include "imx6qdl-hummingboard2.dtsi"
+
+/ {
+	model = "SolidRun HummingBoard2 Solo/DualLite";
+	compatible = "solidrun,hummingboard2/dl", "fsl,imx6dl";
+};
+diff --git a/arch/arm/boot/dts/imx6q-hummingboard2.dts b/arch/arm/boot/dts/imx6q-hummingboard2.dts
+new file mode 100644
+index 0000000..f5eec91
+--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-hummingboard2.dts
+@@ -0,0 +1,60 @@
+/*
+ * Device Tree file for SolidRun HummingBoard2
+ * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com>
+ * Based on work by Russell King
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it 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.
+ *
+ *     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.
+ *
+ * Or, alternatively
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (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.
+ *
+ *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+/dts-v1/;
+
+#include "imx6q.dtsi"
+#include "imx6qdl-hummingboard2.dtsi"
+
+/ {
+	model = "SolidRun HummingBoard2 Dual/Quad";
+	compatible = "solidrun,hummingboard2/q", "fsl,imx6q";
+};
+
+&sata {
+	status = "okay";
+	fsl,transmit-level-mV = <1104>;
+	fsl,transmit-boost-mdB = <0>;
+	fsl,transmit-atten-16ths = <9>;
+	fsl,no-spread-spectrum;
+};
+diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
+new file mode 100644
+index 0000000..66098a5
+--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
+@@ -0,0 +1,562 @@
+/*
+ * Device Tree file for SolidRun HummingBoard2
+ * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it 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.
+ *
+ *     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.
+ *
+ * Or, alternatively
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (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.
+ *
+ *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+#include "imx6qdl-microsom.dtsi"
+#include "imx6qdl-microsom-ar8035.dtsi"
+
+/ {
+	chosen {
+		stdout-path = &uart1;
+	};
+
+	ir_recv: ir-receiver {
+		compatible = "gpio-ir-receiver";
+		gpios = <&gpio7 9 GPIO_ACTIVE_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_hummingboard2_gpio7_9>;
+		linux,rc-map-name = "rc-rc6-mce";
+	};
+
+	regulators {
+		compatible = "simple-bus";
+
+		reg_3p3v: 3p3v {
+			compatible = "regulator-fixed";
+			regulator-name = "3P3V";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			regulator-always-on;
+		};
+
+		reg_1p8v: 1p8v {
+			compatible = "regulator-fixed";
+			regulator-name = "1P8V";
+			regulator-min-microvolt = <1800000>;
+			regulator-max-microvolt = <1800000>;
+			regulator-always-on;
+		};
+
+		reg_usdhc2_vmmc: reg-usdhc2-vmmc {
+			compatible = "regulator-fixed";
+			gpio = <&gpio4 30 GPIO_ACTIVE_HIGH>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_hummingboard2_vmmc>;
+			regulator-boot-on;
+			regulator-max-microvolt = <3300000>;
+			regulator-min-microvolt = <3300000>;
+			regulator-name = "usdhc2_vmmc";
+			startup-delay-us = <1000>;
+		};
+
+		reg_usbh1_vbus: usb-h1-vbus {
+			compatible = "regulator-fixed";
+			enable-active-high;
+			gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_hummingboard2_usbh1_vbus>;
+			regulator-name = "usb_h1_vbus";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+		};
+
+		reg_usbotg_vbus: usb-otg-vbus {
+			compatible = "regulator-fixed";
+			enable-active-high;
+			gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_hummingboard2_usbotg_vbus>;
+			regulator-name = "usb_otg_vbus";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+		};
+
+		reg_usbh2_vbus: usb-h2-vbus {
+			compatible = "regulator-gpio";
+			enable-active-high;
+			enable-gpio = <&gpio2 13 GPIO_ACTIVE_HIGH>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_hummingboard2_usbh2_vbus>;
+			regulator-name = "usb_h2_vbus";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+			regulator-boot-on;
+		};
+
+		reg_usbh3_vbus: usb-h3-vbus {
+			compatible = "regulator-gpio";
+			enable-active-high;
+			enable-gpio = <&gpio7 10 GPIO_ACTIVE_HIGH>;
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_hummingboard2_usbh3_vbus>;
+			regulator-name = "usb_h3_vbus";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+			regulator-boot-on;
+		};
+	};
+
+	sound-sgtl5000 {
+		audio-codec = <&sgtl5000>;
+		audio-routing =
+			"MIC_IN", "Mic Jack",
+			"Mic Jack", "Mic Bias",
+			"Headphone Jack", "HP_OUT";
+		compatible = "fsl,imx-audio-sgtl5000";
+		model = "On-board Codec";
+		mux-ext-port = <5>;
+		mux-int-port = <1>;
+		ssi-controller = <&ssi1>;
+	};
+};
+
+&audmux {
+	status = "okay";
+};
+
+&ecspi2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hummingboard2_ecspi2>;
+	fsl,spi-num-chipselects = <1>;
+	cs-gpios = <&gpio2 26 0>;
+	status = "okay";
+};
+
+&hdmi {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hummingboard2_hdmi>;
+	ddc-i2c-bus = <&i2c2>;
+	status = "okay";
+};
+
+&i2c1 {
+	clock-frequency = <100000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hummingboard2_i2c1>;
+	status = "okay";
+
+	rtc: pcf8523@68 {
+		compatible = "nxp,pcf8523";
+		reg = <0x68>;
+		nxp,12p5_pf;
+	};
+
+	sgtl5000: sgtl5000@0a {
+		clocks = <&clks IMX6QDL_CLK_CKO>;
+		compatible = "fsl,sgtl5000";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_hummingboard2_sgtl5000>;
+		reg = <0x0a>;
+		VDDA-supply = <&reg_3p3v>;
+		VDDIO-supply = <&reg_3p3v>;
+	};
+};
+
+&i2c2 {
+	clock-frequency = <100000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hummingboard2_i2c2>;
+	status = "okay";
+};
+
+&i2c3 {
+	clock-frequency = <100000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hummingboard2_i2c3>;
+	status = "okay";
+};
+
+&iomuxc {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hog>;
+	hummingboard2 {
+		pinctrl_hog: hoggrp {
+		fsl,pins = <
+				/*
+				 * 36 pin headers GPIO description. The pins
+				 * numbering as following -
+				 *
+				 * 	3.2v	5v	74	75
+				 *	73	72	71	70
+				 *	69	68	67	66
+				 *
+				 *	77	78	79	76
+				 *	65	64	61	60
+				 *	53	52	51	50
+				 *	49	48	166	132
+				 *	95	94	90	91
+				 *	GND	54	24	204
+				 *
+				 * The GPIO numbers can be extracted using
+				 * signal name from below.
+				 * Example -
+				 * MX6QDL_PAD_EIM_DA10__GPIO3_IO10 is
+				 * GPIO(3,10) which is (3-1)*32+10 = gpio 74
+				 *
+				 * i.e. The mapping of GPIO(X,Y) to Linux gpio
+				 * number is : gpio number = (X-1) * 32 + Y
+				 */
+				/* DI1_PIN15 */
+				MX6QDL_PAD_EIM_DA10__GPIO3_IO10 0x400130b1
+				/* DI1_PIN02 */
+				MX6QDL_PAD_EIM_DA11__GPIO3_IO11 0x400130b1
+				/* DISP1_DATA00 */
+				MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x400130b1
+				/* DISP1_DATA01 */
+				MX6QDL_PAD_EIM_DA8__GPIO3_IO08 0x400130b1
+				/* DISP1_DATA02 */
+				MX6QDL_PAD_EIM_DA7__GPIO3_IO07 0x400130b1
+				/* DISP1_DATA03 */
+				MX6QDL_PAD_EIM_DA6__GPIO3_IO06 0x400130b1
+				/* DISP1_DATA04 */
+				MX6QDL_PAD_EIM_DA5__GPIO3_IO05 0x400130b1
+				/* DISP1_DATA05 */
+				MX6QDL_PAD_EIM_DA4__GPIO3_IO04 0x400130b1
+				/* DISP1_DATA06 */
+				MX6QDL_PAD_EIM_DA3__GPIO3_IO03 0x400130b1
+				/* DISP1_DATA07 */
+				MX6QDL_PAD_EIM_DA2__GPIO3_IO02 0x400130b1
+				/* DI1_D0_CS */
+				MX6QDL_PAD_EIM_DA13__GPIO3_IO13 0x400130b1
+				/* DI1_D1_CS */
+				MX6QDL_PAD_EIM_DA14__GPIO3_IO14 0x400130b1
+				/* DI1_PIN01 */
+				MX6QDL_PAD_EIM_DA15__GPIO3_IO15 0x400130b1
+				/* DI1_PIN03 */
+				MX6QDL_PAD_EIM_DA12__GPIO3_IO12 0x400130b1
+				/* DISP1_DATA08 */
+				MX6QDL_PAD_EIM_DA1__GPIO3_IO01 0x400130b1
+				/* DISP1_DATA09 */
+				MX6QDL_PAD_EIM_DA0__GPIO3_IO00 0x400130b1
+				/* DISP1_DATA10 */
+				MX6QDL_PAD_EIM_EB1__GPIO2_IO29 0x400130b1
+				/* DISP1_DATA11 */
+				MX6QDL_PAD_EIM_EB0__GPIO2_IO28 0x400130b1
+				/* DISP1_DATA12 */
+				MX6QDL_PAD_EIM_A17__GPIO2_IO21 0x400130b1
+				/* DISP1_DATA13 */
+				MX6QDL_PAD_EIM_A18__GPIO2_IO20 0x400130b1
+				/* DISP1_DATA14 */
+				MX6QDL_PAD_EIM_A19__GPIO2_IO19 0x400130b1
+				/* DISP1_DATA15 */
+				MX6QDL_PAD_EIM_A20__GPIO2_IO18 0x400130b1
+				/* DISP1_DATA16 */
+				MX6QDL_PAD_EIM_A21__GPIO2_IO17 0x400130b1
+				/* DISP1_DATA17 */
+				MX6QDL_PAD_EIM_A22__GPIO2_IO16 0x400130b1
+				/* DISP1_DATA18 */
+				MX6QDL_PAD_EIM_A23__GPIO6_IO06 0x400130b1
+				/* DISP1_DATA19 */
+				MX6QDL_PAD_EIM_A24__GPIO5_IO04 0x400130b1
+				/* DISP1_DATA20 */
+				MX6QDL_PAD_EIM_D31__GPIO3_IO31 0x400130b1
+				/* DISP1_DATA21 */
+				MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x400130b1
+				/* DISP1_DATA22 */
+				MX6QDL_PAD_EIM_D26__GPIO3_IO26 0x400130b1
+				/* DISP1_DATA23 */
+				MX6QDL_PAD_EIM_D27__GPIO3_IO27 0x400130b1
+				/* DI1_DISP_CLK */
+				MX6QDL_PAD_EIM_A16__GPIO2_IO22 0x400130b1
+				/* SPDIF_IN */
+				MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x400130b1
+				/* SPDIF_OUT */
+				MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x400130b1
+
+				/* MikroBUS GPIO pin number 10 */
+				MX6QDL_PAD_EIM_LBA__GPIO2_IO27 0x400130b1
+			>;
+		};
+
+		pinctrl_hummingboard2_gpio7_9: hummingboard2-gpio7_9 {
+			fsl,pins = <
+				MX6QDL_PAD_SD4_CMD__GPIO7_IO09 0x80000000
+			>;
+		};
+
+		pinctrl_hummingboard2_hdmi: hummingboard2-hdmi {
+			fsl,pins = <
+				MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
+			>;
+		};
+
+		pinctrl_hummingboard2_i2c1: hummingboard2-i2c1 {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
+				MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
+			>;
+		};
+
+		pinctrl_hummingboard2_i2c2: hummingboard2-i2c2 {
+			fsl,pins = <
+				MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
+				MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
+			>;
+		};
+
+		pinctrl_hummingboard2_i2c3: hummingboard2-i2c3 {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1
+				MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
+			>;
+		};
+
+                pinctrl_hummingboard2_mipi: hummingboard2_mipi {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x4001b8b1
+                                MX6QDL_PAD_KEY_COL4__GPIO4_IO14 0x4001b8b1
+                                MX6QDL_PAD_NANDF_CS2__CCM_CLKO2 0x130b0
+                        >;
+                };
+
+		pinctrl_hummingboard2_pcie_reset: hummingboard2-pcie-reset {
+			fsl,pins = <
+				MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x1b0b1
+			>;
+		};
+
+		pinctrl_hummingboard2_pwm1: pwm1grp {
+			fsl,pins = <
+				MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b1
+			>;
+		};
+
+		pinctrl_hummingboard2_sgtl5000: hummingboard2-sgtl5000 {
+			fsl,pins = <
+				MX6QDL_PAD_DISP0_DAT19__AUD5_RXD 0x130b0
+				MX6QDL_PAD_KEY_COL0__AUD5_TXC 0x130b0
+				MX6QDL_PAD_KEY_ROW0__AUD5_TXD 0x110b0
+				MX6QDL_PAD_KEY_COL1__AUD5_TXFS 0x130b0
+				MX6QDL_PAD_GPIO_5__CCM_CLKO1 0x130b0
+			>;
+		};
+
+		pinctrl_hummingboard2_usbh1_vbus: hummingboard2-usbh1-vbus {
+			fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0>;
+		};
+
+		pinctrl_hummingboard2_usbh2_vbus: hummingboard2-usbh2-vbus {
+			fsl,pins = <MX6QDL_PAD_SD4_DAT5__GPIO2_IO13 0x1b0b0>;
+		};
+
+		pinctrl_hummingboard2_usbh3_vbus: hummingboard2-usbh3-vbus {
+			fsl,pins = <MX6QDL_PAD_SD4_CLK__GPIO7_IO10 0x1b0b0>;
+		};
+
+		pinctrl_hummingboard2_usbotg_id: hummingboard2-usbotg-id {
+			/*
+			 * Similar to pinctrl_usbotg_2, but we want it
+			 * pulled down for a fixed host connection.
+			 */
+			fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
+		};
+
+		pinctrl_hummingboard2_usbotg_vbus: hummingboard2-usbotg-vbus {
+			fsl,pins = <MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b0>;
+		};
+
+		pinctrl_hummingboard2_usdhc2_aux: hummingboard2-usdhc2-aux {
+			fsl,pins = <
+				MX6QDL_PAD_KEY_ROW1__SD2_VSELECT 0x1b071
+				MX6QDL_PAD_DISP0_DAT9__GPIO4_IO30 0x1b0b0
+			>;
+		};
+
+		pinctrl_hummingboard2_usdhc2: hummingboard2-usdhc2 {
+			fsl,pins = <
+				MX6QDL_PAD_SD2_CMD__SD2_CMD    0x17059
+				MX6QDL_PAD_SD2_CLK__SD2_CLK    0x10059
+				MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059
+				MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059
+				MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059
+				MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059
+			>;
+		};
+
+		pinctrl_hummingboard2_usdhc2_100mhz: hummingboard2-usdhc2-100mhz {
+			fsl,pins = <
+				MX6QDL_PAD_SD2_CMD__SD2_CMD    0x170b9
+				MX6QDL_PAD_SD2_CLK__SD2_CLK    0x100b9
+				MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x170b9
+				MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x170b9
+				MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x170b9
+				MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x130b9
+			>;
+		};
+
+		pinctrl_hummingboard2_usdhc2_200mhz: hummingboard2-usdhc2-200mhz {
+			fsl,pins = <
+				MX6QDL_PAD_SD2_CMD__SD2_CMD    0x170f9
+				MX6QDL_PAD_SD2_CLK__SD2_CLK    0x100f9
+				MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x170f9
+				MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x170f9
+				MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x170f9
+				MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x130f9
+			>;
+		};
+
+		pinctrl_hummingboard2_vmmc: hummingboard2-vmmc {
+			fsl,pins = <
+				MX6QDL_PAD_GPIO_4__GPIO1_IO04    0x1f071
+			>;
+		};
+
+		pinctrl_hummingboard2_usdhc3: hummingboard2-usdhc3 {
+			fsl,pins = <
+				MX6QDL_PAD_SD3_CMD__SD3_CMD    0x17059
+				MX6QDL_PAD_SD3_CLK__SD3_CLK    0x10059
+				MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
+				MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
+				MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
+				MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
+				MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059
+				MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059
+				MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059
+				MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059
+				MX6QDL_PAD_SD3_RST__SD3_RESET  0x17059
+			>;
+		};
+
+		pinctrl_hummingboard2_uart3: hummingboard2-uart3 {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_D25__UART3_TX_DATA	0x1b0b1
+				MX6QDL_PAD_EIM_D24__UART3_RX_DATA	0x40013000
+			>;
+		};
+
+		pinctrl_hummingboard2_ecspi2: hummingboard2-ecspi2grp {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_OE__ECSPI2_MISO	0x100b1
+				MX6QDL_PAD_EIM_CS1__ECSPI2_MOSI	0x100b1
+				MX6QDL_PAD_EIM_CS0__ECSPI2_SCLK	0x100b1
+				MX6QDL_PAD_EIM_RW__GPIO2_IO26	0x000b1 /* CS */
+			>;
+		};
+	};
+};
+
+&ldb {
+	status = "disabled";
+
+	lvds-channel@0 {
+		fsl,data-mapping = "spwg";
+		fsl,data-width = <18>;
+	};
+};
+
+&pcie {
+	pinctrl-names = "default";
+	pinctrl-0 = <
+		&pinctrl_hummingboard2_pcie_reset
+	>;
+	reset-gpio = <&gpio2 11 0>;
+	status = "okay";
+};
+
+&pwm1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hummingboard2_pwm1>;
+        status = "okay";
+};
+
+&pwm3 {
+	status = "disabled";
+};
+
+&pwm4 {
+	status = "disabled";
+};
+
+&ssi1 {
+	fsl,mode = "i2s-slave";
+	status = "okay";
+};
+
+&usbh1 {
+	disable-over-current;
+	vbus-supply = <&reg_usbh1_vbus>;
+	status = "okay";
+};
+
+&usbotg {
+	disable-over-current;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hummingboard2_usbotg_id>;
+	vbus-supply = <&reg_usbotg_vbus>;
+	status = "okay";
+};
+
+&usdhc2 {
+	pinctrl-names = "default", "state_100mhz", "state_200mhz";
+	pinctrl-0 = <
+		&pinctrl_hummingboard2_usdhc2_aux
+		&pinctrl_hummingboard2_usdhc2
+	>;
+	pinctrl-1 = <
+		&pinctrl_hummingboard2_usdhc2_aux
+		&pinctrl_hummingboard2_usdhc2_100mhz
+	>;
+	pinctrl-2 = <
+		&pinctrl_hummingboard2_usdhc2_aux
+		&pinctrl_hummingboard2_usdhc2_200mhz
+	>;
+	vmmc-supply = <&reg_usdhc2_vmmc>;
+	cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
+	status = "okay";
+};
+
+&usdhc3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <
+		&pinctrl_hummingboard2_usdhc3
+	>;
+	vmmc-supply = <&reg_3p3v>;
+	vqmmc-supply = <&reg_3p3v>;
+	bus-width = <8>;
+	non-removable;
+	status = "okay";
+};
+
+&uart3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hummingboard2_uart3>;
+	status = "okay";
+};
+-- 
+2.9.3
+
--- a/arm64-ACPI-parse-SPCR-table.patch
+++ b/arm64-ACPI-parse-SPCR-table.patch
@ -1,596 +0,0 @@
-From patchwork Fri Aug 12 11:07:14 2016
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v9,1/4] of/serial: move earlycon early_param handling to serial
-From: Aleksey Makarov <aleksey.makarov@linaro.org>
-X-Patchwork-Id: 9276727
-Message-Id: <20160812110717.12351-1-aleksey.makarov@linaro.org>
-To: "Rafael J . Wysocki" <rjw@rjwysocki.net>,
- Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Cc: linux-serial@vger.kernel.org, linux-acpi@vger.kernel.org,
- linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
- Aleksey Makarov <aleksey.makarov@linaro.org>,
- Russell King <linux@arm.linux.org.uk>, Len Brown <lenb@kernel.org>,
- Leif Lindholm <leif.lindholm@linaro.org>,
- Graeme Gregory <graeme.gregory@linaro.org>, Al Stone <ahs3@redhat.com>,
- Christopher Covington <cov@codeaurora.org>,
- Yury Norov <ynorov@caviumnetworks.com>,
- Peter Hurley <peter@hurleysoftware.com>,
- Andy Shevchenko <andy.shevchenko@gmail.com>,
- "Zheng, Lv" <lv.zheng@intel.com>, Mark Salter <msalter@redhat.com>,
- Kefeng Wang <wangkefeng.wang@huawei.com>,
- Rob Herring <robh+dt@kernel.org>, Frank Rowand <frowand.list@gmail.com>,
- Jiri Slaby <jslaby@suse.com>, devicetree@vger.kernel.org
-Date: Fri, 12 Aug 2016 14:07:14 +0300
-
-From: Leif Lindholm <leif.lindholm@linaro.org>
-
-We have multiple "earlycon" early_param handlers - merge the DT one into
-the main earlycon one.  It's a cleanup that also will be useful
-to defer setting up DT console until ACPI/DT decision is made.
-
-Rename the exported function to avoid clashing with the function from
-arch/microblaze/kernel/prom.c
-
-Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
-Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
-Acked-by: Rob Herring <robh@kernel.org>
-Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
-Tested-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
- drivers/of/fdt.c              | 11 +----------
- drivers/tty/serial/earlycon.c |  2 +-
- include/linux/of_fdt.h        |  3 +++
- 3 files changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
-index 55f1b83..741cac53 100644
--- a/drivers/of/fdt.c
-+++ b/drivers/of/fdt.c
-@@ -924,7 +924,7 @@ static inline void early_init_dt_check_for_initrd(unsigned long node)
- 
- #ifdef CONFIG_SERIAL_EARLYCON
- 
-static int __init early_init_dt_scan_chosen_serial(void)
-+int __init early_init_dt_scan_chosen_stdout(void)
- {
- 	int offset;
- 	const char *p, *q, *options = NULL;
-@@ -968,15 +968,6 @@ static int __init early_init_dt_scan_chosen_serial(void)
- 	}
- 	return -ENODEV;
- }
-
-static int __init setup_of_earlycon(char *buf)
-{
-	if (buf)
-		return 0;
-
-	return early_init_dt_scan_chosen_serial();
-}
-early_param("earlycon", setup_of_earlycon);
- #endif
- 
- /**
-diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
-index 067783f..7aae655 100644
--- a/drivers/tty/serial/earlycon.c
-+++ b/drivers/tty/serial/earlycon.c
-@@ -209,7 +209,7 @@ static int __init param_setup_earlycon(char *buf)
- 	 * don't generate a warning from parse_early_params() in that case
- 	 */
- 	if (!buf || !buf[0])
-		return 0;
-+		return early_init_dt_scan_chosen_stdout();
- 
- 	err = setup_earlycon(buf);
- 	if (err == -ENOENT || err == -EALREADY)
-diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
-index 26c3302..4341f32 100644
--- a/include/linux/of_fdt.h
-+++ b/include/linux/of_fdt.h
-@@ -14,6 +14,7 @@
- 
- #include <linux/types.h>
- #include <linux/init.h>
-+#include <linux/errno.h>
- 
- /* Definitions used by the flattened device tree */
- #define OF_DT_HEADER		0xd00dfeed	/* marker */
-@@ -66,6 +67,7 @@ extern int early_init_dt_scan_chosen(unsigned long node, const char *uname,
- 				     int depth, void *data);
- extern int early_init_dt_scan_memory(unsigned long node, const char *uname,
- 				     int depth, void *data);
-+extern int early_init_dt_scan_chosen_stdout(void);
- extern void early_init_fdt_scan_reserved_mem(void);
- extern void early_init_fdt_reserve_self(void);
- extern void early_init_dt_add_memory_arch(u64 base, u64 size);
-@@ -94,6 +96,7 @@ extern void early_get_first_memblock_info(void *, phys_addr_t *);
- extern u64 of_flat_dt_translate_address(unsigned long node);
- extern void of_fdt_limit_memory(int limit);
- #else /* CONFIG_OF_FLATTREE */
-+static inline int early_init_dt_scan_chosen_stdout(void) { return -ENODEV; }
- static inline void early_init_fdt_scan_reserved_mem(void) {}
- static inline void early_init_fdt_reserve_self(void) {}
- static inline const char *of_flat_dt_get_machine_name(void) { return NULL; }
-From patchwork Thu Aug 11 15:31:39 2016
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v9,2/4] ACPI: parse SPCR and enable matching console
-From: Aleksey Makarov <aleksey.makarov@linaro.org>
-X-Patchwork-Id: 9275443
-Message-Id: <20160811153152.755-3-aleksey.makarov@linaro.org>
-To: "Rafael J . Wysocki" <rjw@rjwysocki.net>,
- Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Cc: linux-serial@vger.kernel.org, linux-acpi@vger.kernel.org,
- linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
- Aleksey Makarov <aleksey.makarov@linaro.org>,
- Russell King <linux@arm.linux.org.uk>, Len Brown <lenb@kernel.org>,
- Leif Lindholm <leif.lindholm@linaro.org>,
- Graeme Gregory <graeme.gregory@linaro.org>, Al Stone <ahs3@redhat.com>,
- Christopher Covington <cov@codeaurora.org>,
- Yury Norov <ynorov@caviumnetworks.com>,
- Peter Hurley <peter@hurleysoftware.com>,
- Andy Shevchenko <andy.shevchenko@gmail.com>,
- "Zheng, Lv" <lv.zheng@intel.com>, Mark Salter <msalter@redhat.com>,
- Kefeng Wang <wangkefeng.wang@huawei.com>, Jiri Slaby <jslaby@suse.com>
-Date: Thu, 11 Aug 2016 18:31:39 +0300
-
-'ARM Server Base Boot Requiremets' [1] mentions SPCR (Serial Port
-Console Redirection Table) [2] as a mandatory ACPI table that
-specifies the configuration of serial console.
-
-Defer initialization of DT earlycon until ACPI/DT decision is made.
-
-Parse the ACPI SPCR table, setup earlycon if required,
-enable specified console.
-
-Thanks to Peter Hurley for explaining how this should work.
-
-[1] http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.den0044a/index.html
-[2] https://msdn.microsoft.com/en-us/library/windows/hardware/dn639132(v=vs.85).aspx
-
-Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
-Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
-Tested-by: Kefeng Wang <wangkefeng.wang@huawei.com>
-Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
- drivers/acpi/Kconfig          |   3 ++
- drivers/acpi/Makefile         |   1 +
- drivers/acpi/spcr.c           | 111 ++++++++++++++++++++++++++++++++++++++++++
- drivers/tty/serial/earlycon.c |  19 +++++++-
- include/linux/acpi.h          |   6 +++
- include/linux/serial_core.h   |   9 +++-
- 6 files changed, 146 insertions(+), 3 deletions(-)
- create mode 100644 drivers/acpi/spcr.c
-
-diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
-index 6cef2d1..4a269f9 100644
--- a/drivers/acpi/Kconfig
-+++ b/drivers/acpi/Kconfig
-@@ -77,6 +77,9 @@ config ACPI_DEBUGGER_USER
- 
- endif
- 
-+config ACPI_SPCR_TABLE
-+	bool
-+
- config ACPI_SLEEP
- 	bool
- 	depends on SUSPEND || HIBERNATION
-diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
-index e5ada78..d799593 100644
--- a/drivers/acpi/Makefile
-+++ b/drivers/acpi/Makefile
-@@ -81,6 +81,7 @@ obj-$(CONFIG_ACPI_EC_DEBUGFS)	+= ec_sys.o
- obj-$(CONFIG_ACPI_CUSTOM_METHOD)+= custom_method.o
- obj-$(CONFIG_ACPI_BGRT)		+= bgrt.o
- obj-$(CONFIG_ACPI_CPPC_LIB)	+= cppc_acpi.o
-+obj-$(CONFIG_ACPI_SPCR_TABLE)	+= spcr.o
- obj-$(CONFIG_ACPI_DEBUGGER_USER) += acpi_dbg.o
- 
- # processor has its own "processor." module_param namespace
-diff --git a/drivers/acpi/spcr.c b/drivers/acpi/spcr.c
-new file mode 100644
-index 0000000..e8d7bc7
--- /dev/null
-+++ b/drivers/acpi/spcr.c
-@@ -0,0 +1,111 @@
-+/*
-+ * Copyright (c) 2012, Intel Corporation
-+ * Copyright (c) 2015, Red Hat, Inc.
-+ * Copyright (c) 2015, 2016 Linaro 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.
-+ *
-+ */
-+
-+#define pr_fmt(fmt) "ACPI: SPCR: " fmt
-+
-+#include <linux/acpi.h>
-+#include <linux/console.h>
-+#include <linux/kernel.h>
-+#include <linux/serial_core.h>
-+
-+/**
-+ * parse_spcr() - parse ACPI SPCR table and add preferred console
-+ *
-+ * @earlycon: set up earlycon for the console specified by the table
-+ *
-+ * For the architectures with support for ACPI, CONFIG_ACPI_SPCR_TABLE may be
-+ * defined to parse ACPI SPCR table.  As a result of the parsing preferred
-+ * console is registered and if @earlycon is true, earlycon is set up.
-+ *
-+ * When CONFIG_ACPI_SPCR_TABLE is defined, this function should be called
-+ * from arch inintialization code as soon as the DT/ACPI decision is made.
-+ *
-+ */
-+int __init parse_spcr(bool earlycon)
-+{
-+	static char opts[64];
-+	struct acpi_table_spcr *table;
-+	acpi_size table_size;
-+	acpi_status status;
-+	char *uart;
-+	char *iotype;
-+	int baud_rate;
-+	int err;
-+
-+	if (acpi_disabled)
-+		return -ENODEV;
-+
-+	status = acpi_get_table_with_size(ACPI_SIG_SPCR, 0,
-+					  (struct acpi_table_header **)&table,
-+					  &table_size);
-+
-+	if (ACPI_FAILURE(status))
-+		return -ENOENT;
-+
-+	if (table->header.revision < 2) {
-+		err = -ENOENT;
-+		pr_err("wrong table version\n");
-+		goto done;
-+	}
-+
-+	iotype = table->serial_port.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY ?
-+			"mmio" : "io";
-+
-+	switch (table->interface_type) {
-+	case ACPI_DBG2_ARM_SBSA_32BIT:
-+		iotype = "mmio32";
-+		/* fall through */
-+	case ACPI_DBG2_ARM_PL011:
-+	case ACPI_DBG2_ARM_SBSA_GENERIC:
-+	case ACPI_DBG2_BCM2835:
-+		uart = "pl011";
-+		break;
-+	case ACPI_DBG2_16550_COMPATIBLE:
-+	case ACPI_DBG2_16550_SUBSET:
-+		uart = "uart";
-+		break;
-+	default:
-+		err = -ENOENT;
-+		goto done;
-+	}
-+
-+	switch (table->baud_rate) {
-+	case 3:
-+		baud_rate = 9600;
-+		break;
-+	case 4:
-+		baud_rate = 19200;
-+		break;
-+	case 6:
-+		baud_rate = 57600;
-+		break;
-+	case 7:
-+		baud_rate = 115200;
-+		break;
-+	default:
-+		err = -ENOENT;
-+		goto done;
-+	}
-+
-+	snprintf(opts, sizeof(opts), "%s,%s,0x%llx,%d", uart, iotype,
-+		 table->serial_port.address, baud_rate);
-+
-+	pr_info("console: %s\n", opts);
-+
-+	if (earlycon)
-+		setup_earlycon(opts);
-+
-+	err = add_preferred_console(uart, 0, opts + strlen(uart) + 1);
-+
-+done:
-+	early_acpi_os_unmap_memory((void __iomem *)table, table_size);
-+	return err;
-+}
-diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
-index 7aae655..ea00b9f 100644
--- a/drivers/tty/serial/earlycon.c
-+++ b/drivers/tty/serial/earlycon.c
-@@ -21,6 +21,7 @@
- #include <linux/sizes.h>
- #include <linux/of.h>
- #include <linux/of_fdt.h>
-+#include <linux/acpi.h>
- 
- #ifdef CONFIG_FIX_EARLYCON_MEM
- #include <asm/fixmap.h>
-@@ -199,6 +200,14 @@ int __init setup_earlycon(char *buf)
- 	return -ENOENT;
- }
- 
-+/*
-+ * When CONFIG_ACPI_SPCR_TABLE is defined, "earlycon" without parameters in
-+ * command line does not start DT earlycon immediately, instead it defers
-+ * starting it until DT/ACPI decision is made.  At that time if ACPI is enabled
-+ * call parse_spcr(), else call early_init_dt_scan_chosen_stdout()
-+ */
-+bool earlycon_init_is_deferred __initdata;
-+
- /* early_param wrapper for setup_earlycon() */
- static int __init param_setup_earlycon(char *buf)
- {
-@@ -208,8 +217,14 @@ static int __init param_setup_earlycon(char *buf)
- 	 * Just 'earlycon' is a valid param for devicetree earlycons;
- 	 * don't generate a warning from parse_early_params() in that case
- 	 */
-	if (!buf || !buf[0])
-		return early_init_dt_scan_chosen_stdout();
-+	if (!buf || !buf[0]) {
-+		if (IS_ENABLED(CONFIG_ACPI_SPCR_TABLE)) {
-+			earlycon_init_is_deferred = true;
-+			return 0;
-+		} else {
-+			return early_init_dt_scan_chosen_stdout();
-+		}
-+	}
- 
- 	err = setup_earlycon(buf);
- 	if (err == -ENOENT || err == -EALREADY)
-diff --git a/include/linux/acpi.h b/include/linux/acpi.h
-index 4d8452c..32407e4 100644
--- a/include/linux/acpi.h
-+++ b/include/linux/acpi.h
-@@ -1074,4 +1074,10 @@ void acpi_table_upgrade(void);
- static inline void acpi_table_upgrade(void) { }
- #endif
- 
-+#ifdef CONFIG_ACPI_SPCR_TABLE
-+int parse_spcr(bool earlycon);
-+#else
-+static inline int parse_spcr(bool earlycon) { return 0; }
-+#endif
-+
- #endif	/*_LINUX_ACPI_H*/
-diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
-index 2f44e20..04b8cfb 100644
--- a/include/linux/serial_core.h
-+++ b/include/linux/serial_core.h
-@@ -367,11 +367,18 @@ extern const struct earlycon_id __earlycon_table_end[];
- 
- #define EARLYCON_DECLARE(_name, fn)	OF_EARLYCON_DECLARE(_name, "", fn)
- 
-extern int setup_earlycon(char *buf);
- extern int of_setup_earlycon(const struct earlycon_id *match,
- 			     unsigned long node,
- 			     const char *options);
- 
-+#ifdef CONFIG_SERIAL_EARLYCON
-+extern bool earlycon_init_is_deferred __initdata;
-+extern int setup_earlycon(char *buf);
-+#else
-+static const bool earlycon_init_is_deferred;
-+static inline int setup_earlycon(char *buf) { return 0; }
-+#endif
-+
- struct uart_port *uart_get_console(struct uart_port *ports, int nr,
- 				   struct console *c);
- int uart_parse_earlycon(char *p, unsigned char *iotype, unsigned long *addr,
-From patchwork Thu Aug 11 15:31:40 2016
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v9,3/4] ARM64: ACPI: enable ACPI_SPCR_TABLE
-From: Aleksey Makarov <aleksey.makarov@linaro.org>
-X-Patchwork-Id: 9275457
-Message-Id: <20160811153152.755-4-aleksey.makarov@linaro.org>
-To: "Rafael J . Wysocki" <rjw@rjwysocki.net>,
- Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Cc: linux-serial@vger.kernel.org, linux-acpi@vger.kernel.org,
- linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
- Aleksey Makarov <aleksey.makarov@linaro.org>,
- Russell King <linux@arm.linux.org.uk>, Len Brown <lenb@kernel.org>,
- Leif Lindholm <leif.lindholm@linaro.org>,
- Graeme Gregory <graeme.gregory@linaro.org>, Al Stone <ahs3@redhat.com>,
- Christopher Covington <cov@codeaurora.org>,
- Yury Norov <ynorov@caviumnetworks.com>,
- Peter Hurley <peter@hurleysoftware.com>,
- Andy Shevchenko <andy.shevchenko@gmail.com>,
- "Zheng, Lv" <lv.zheng@intel.com>, Mark Salter <msalter@redhat.com>,
- Kefeng Wang <wangkefeng.wang@huawei.com>,
- Catalin Marinas <catalin.marinas@arm.com>,
- Will Deacon <will.deacon@arm.com>
-Date: Thu, 11 Aug 2016 18:31:40 +0300
-
-SBBR mentions SPCR as a mandatory ACPI table.  So enable it for ARM64
-
-Earlycon should be set up as early as possible.  ACPI boot tables are
-mapped in arch/arm64/kernel/acpi.c:acpi_boot_table_init() that
-is called from setup_arch() and that's where we parse SPCR.
-So it has to be opted-in per-arch.
-
-When ACPI_SPCR_TABLE is defined initialization of DT earlycon is
-deferred until the DT/ACPI decision is done.  Initialize DT earlycon
-if ACPI is disabled.
-
-Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
-Tested-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
- arch/arm64/Kconfig       |  1 +
- arch/arm64/kernel/acpi.c | 11 ++++++++++-
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 69c8787..a54dfc0 100644
--- a/arch/arm64/Kconfig
-+++ b/arch/arm64/Kconfig
-@@ -4,6 +4,7 @@ config ARM64
- 	select ACPI_GENERIC_GSI if ACPI
- 	select ACPI_REDUCED_HARDWARE_ONLY if ACPI
- 	select ACPI_MCFG if ACPI
-+	select ACPI_SPCR_TABLE if ACPI
- 	select ARCH_HAS_DEVMEM_IS_ALLOWED
- 	select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI
- 	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
-diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
-index 3e4f1a4..252a6d9 100644
--- a/arch/arm64/kernel/acpi.c
-+++ b/arch/arm64/kernel/acpi.c
-@@ -24,6 +24,7 @@
- #include <linux/memblock.h>
- #include <linux/of_fdt.h>
- #include <linux/smp.h>
-+#include <linux/serial_core.h>
- 
- #include <asm/cputype.h>
- #include <asm/cpu_ops.h>
-@@ -206,7 +207,7 @@ void __init acpi_boot_table_init(void)
- 	if (param_acpi_off ||
- 	    (!param_acpi_on && !param_acpi_force &&
- 	     of_scan_flat_dt(dt_scan_depth1_nodes, NULL)))
-		return;
-+		goto done;
- 
- 	/*
- 	 * ACPI is disabled at this point. Enable it in order to parse
-@@ -226,6 +227,14 @@ void __init acpi_boot_table_init(void)
- 		if (!param_acpi_force)
- 			disable_acpi();
- 	}
-+
-+done:
-+	if (acpi_disabled) {
-+		if (earlycon_init_is_deferred)
-+			early_init_dt_scan_chosen_stdout();
-+	} else {
-+		parse_spcr(earlycon_init_is_deferred);
-+	}
- }
- 
- #ifdef CONFIG_ACPI_APEI
-From patchwork Mon Aug 15 13:35:03 2016
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v9,4/4] serial: pl011: add console matching function
-From: Aleksey Makarov <aleksey.makarov@linaro.org>
-X-Patchwork-Id: 9280971
-Message-Id: <20160815133505.15294-1-aleksey.makarov@linaro.org>
-To: "Rafael J . Wysocki" <rjw@rjwysocki.net>,
- Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Cc: linux-serial@vger.kernel.org, linux-acpi@vger.kernel.org,
- linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
- Aleksey Makarov <aleksey.makarov@linaro.org>,
- Russell King <linux@arm.linux.org.uk>, Len Brown <lenb@kernel.org>,
- Leif Lindholm <leif.lindholm@linaro.org>,
- Graeme Gregory <graeme.gregory@linaro.org>, Al Stone <ahs3@redhat.com>,
- Christopher Covington <cov@codeaurora.org>,
- Yury Norov <ynorov@caviumnetworks.com>,
- Peter Hurley <peter@hurleysoftware.com>,
- Andy Shevchenko <andy.shevchenko@gmail.com>,
- "Zheng, Lv" <lv.zheng@intel.com>, Mark Salter <msalter@redhat.com>,
- Kefeng Wang <wangkefeng.wang@huawei.com>,
- Russell King <linux@armlinux.org.uk>, Jiri Slaby <jslaby@suse.com>
-Date: Mon, 15 Aug 2016 16:35:03 +0300
-
-This patch adds function pl011_console_match() that implements
-method match of struct console.  It allows to match consoles against
-data specified in a string, for example taken from command line or
-compiled by ACPI SPCR table handler.
-
-Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
-Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
-Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
---
- drivers/tty/serial/amba-pl011.c | 55 +++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 55 insertions(+)
-
-diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index 8a9e213..2f9af8a 100644
--- a/drivers/tty/serial/amba-pl011.c
-+++ b/drivers/tty/serial/amba-pl011.c
-@@ -2288,12 +2288,67 @@ static int __init pl011_console_setup(struct console *co, char *options)
- 	return uart_set_options(&uap->port, co, baud, parity, bits, flow);
- }
- 
-+/**
-+ *	pl011_console_match - non-standard console matching
-+ *	@co:	  registering console
-+ *	@name:	  name from console command line
-+ *	@idx:	  index from console command line
-+ *	@options: ptr to option string from console command line
-+ *
-+ *	Only attempts to match console command lines of the form:
-+ *	    console=pl011,mmio|mmio32,<addr>[,<options>]
-+ *	    console=pl011,0x<addr>[,<options>]
-+ *	This form is used to register an initial earlycon boot console and
-+ *	replace it with the amba_console at pl011 driver init.
-+ *
-+ *	Performs console setup for a match (as required by interface)
-+ *	If no <options> are specified, then assume the h/w is already setup.
-+ *
-+ *	Returns 0 if console matches; otherwise non-zero to use default matching
-+ */
-+static int __init pl011_console_match(struct console *co, char *name, int idx,
-+				      char *options)
-+{
-+	unsigned char iotype;
-+	unsigned long addr;
-+	int i;
-+
-+	if (strcmp(name, "pl011") != 0)
-+		return -ENODEV;
-+
-+	if (uart_parse_earlycon(options, &iotype, &addr, &options))
-+		return -ENODEV;
-+
-+	if (iotype != UPIO_MEM && iotype != UPIO_MEM32)
-+		return -ENODEV;
-+
-+	/* try to match the port specified on the command line */
-+	for (i = 0; i < ARRAY_SIZE(amba_ports); i++) {
-+		struct uart_port *port;
-+
-+		if (!amba_ports[i])
-+			continue;
-+
-+		port = &amba_ports[i]->port;
-+
-+		if (port->mapbase != addr)
-+			continue;
-+
-+		co->index = i;
-+		port->cons = co;
-+		return pl011_console_setup(co, options);
-+	}
-+
-+	return -ENODEV;
-+}
-+
- static struct uart_driver amba_reg;
- static struct console amba_console = {
- 	.name		= "ttyAMA",
- 	.write		= pl011_console_write,
- 	.device		= uart_console_device,
- 	.setup		= pl011_console_setup,
-+	.match		= pl011_console_match,
- 	.flags		= CON_PRINTBUFFER,
- 	.index		= -1,
- 	.data		= &amba_reg,
--- a/arm64-pcie-quirks.patch
+++ b/arm64-pcie-quirks.patch
@ -1,977 +0,0 @@
-From 5c4f8b5b68451e5d208a5aefb195fdd108629da4 Mon Sep 17 00:00:00 2001
-From: Tomasz Nowicki <tn@semihalf.com>
-Date: Fri, 9 Sep 2016 21:24:03 +0200
-Subject: [PATCH 1/6] PCI/ACPI: Extend pci_mcfg_lookup() responsibilities
-
-In preparation for adding MCFG platform specific quirk handling move
-CFG resource calculation and ECAM ops assignment to pci_mcfg_lookup().
-It becomes the gate for further ops and CFG resource manipulation
-in arch-agnostic code (drivers/acpi/pci_mcfg.c).
-
-No functionality changes in this patch.
-
-Signed-off-by: Tomasz Nowicki <tn@semihalf.com>
---
- arch/arm64/kernel/pci.c  | 17 +++++------------
- drivers/acpi/pci_mcfg.c  | 28 +++++++++++++++++++++++++---
- include/linux/pci-acpi.h |  4 +++-
- 3 files changed, 33 insertions(+), 16 deletions(-)
-
-diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
-index acf3872..fb439c7 100644
--- a/arch/arm64/kernel/pci.c
-+++ b/arch/arm64/kernel/pci.c
-@@ -125,24 +125,17 @@ pci_acpi_setup_ecam_mapping(struct acpi_pci_root *root)
- 	u16 seg = root->segment;
- 	struct pci_config_window *cfg;
- 	struct resource cfgres;
-	unsigned int bsz;
-+	struct pci_ecam_ops *ecam_ops;
-+	int ret;
- 
-	/* Use address from _CBA if present, otherwise lookup MCFG */
-	if (!root->mcfg_addr)
-		root->mcfg_addr = pci_mcfg_lookup(seg, bus_res);
-
-	if (!root->mcfg_addr) {
-+	ret = pci_mcfg_lookup(root, &cfgres, &ecam_ops);
-+	if (ret) {
- 		dev_err(&root->device->dev, "%04x:%pR ECAM region not found\n",
- 			seg, bus_res);
- 		return NULL;
- 	}
- 
-	bsz = 1 << pci_generic_ecam_ops.bus_shift;
-	cfgres.start = root->mcfg_addr + bus_res->start * bsz;
-	cfgres.end = cfgres.start + resource_size(bus_res) * bsz - 1;
-	cfgres.flags = IORESOURCE_MEM;
-	cfg = pci_ecam_create(&root->device->dev, &cfgres, bus_res,
-			      &pci_generic_ecam_ops);
-+	cfg = pci_ecam_create(&root->device->dev, &cfgres, bus_res, ecam_ops);
- 	if (IS_ERR(cfg)) {
- 		dev_err(&root->device->dev, "%04x:%pR error %ld mapping ECAM\n",
- 			seg, bus_res, PTR_ERR(cfg));
-diff --git a/drivers/acpi/pci_mcfg.c b/drivers/acpi/pci_mcfg.c
-index b5b376e..ffcc651 100644
--- a/drivers/acpi/pci_mcfg.c
-+++ b/drivers/acpi/pci_mcfg.c
-@@ -22,6 +22,7 @@
- #include <linux/kernel.h>
- #include <linux/pci.h>
- #include <linux/pci-acpi.h>
-+#include <linux/pci-ecam.h>
- 
- /* Structure to hold entries from the MCFG table */
- struct mcfg_entry {
-@@ -35,9 +36,18 @@ struct mcfg_entry {
- /* List to save MCFG entries */
- static LIST_HEAD(pci_mcfg_list);
- 
-phys_addr_t pci_mcfg_lookup(u16 seg, struct resource *bus_res)
-+int pci_mcfg_lookup(struct acpi_pci_root *root, struct resource *cfgres,
-+		    struct pci_ecam_ops **ecam_ops)
- {
-+	struct pci_ecam_ops *ops = &pci_generic_ecam_ops;
-+	struct resource *bus_res = &root->secondary;
-+	u16 seg = root->segment;
- 	struct mcfg_entry *e;
-+	struct resource res;
-+
-+	/* Use address from _CBA if present, otherwise lookup MCFG */
-+	if (root->mcfg_addr)
-+		goto skip_lookup;
- 
- 	/*
- 	 * We expect exact match, unless MCFG entry end bus covers more than
-@@ -45,10 +55,22 @@ phys_addr_t pci_mcfg_lookup(u16 seg, struct resource *bus_res)
- 	 */
- 	list_for_each_entry(e, &pci_mcfg_list, list) {
- 		if (e->segment == seg && e->bus_start == bus_res->start &&
-		    e->bus_end >= bus_res->end)
-			return e->addr;
-+		    e->bus_end >= bus_res->end) {
-+			root->mcfg_addr = e->addr;
-+		}
-+
- 	}
- 
-+	if (!root->mcfg_addr)
-+		return -ENXIO;
-+
-+skip_lookup:
-+	memset(&res, 0, sizeof(res));
-+	res.start = root->mcfg_addr + (bus_res->start << 20);
-+	res.end = res.start + (resource_size(bus_res) << 20) - 1;
-+	res.flags = IORESOURCE_MEM;
-+	*cfgres = res;
-+	*ecam_ops = ops;
- 	return 0;
- }
- 
-diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h
-index 7d63a66..7a4e83a 100644
--- a/include/linux/pci-acpi.h
-+++ b/include/linux/pci-acpi.h
-@@ -24,7 +24,9 @@ static inline acpi_status pci_acpi_remove_pm_notifier(struct acpi_device *dev)
- }
- extern phys_addr_t acpi_pci_root_get_mcfg_addr(acpi_handle handle);
- 
-extern phys_addr_t pci_mcfg_lookup(u16 domain, struct resource *bus_res);
-+struct pci_ecam_ops;
-+extern int pci_mcfg_lookup(struct acpi_pci_root *root, struct resource *cfgres,
-+			   struct pci_ecam_ops **ecam_ops);
- 
- static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
- {
-- 
-2.9.3
-
-From 16c02d9cc0e67b48c343aecc4b5566e729a97683 Mon Sep 17 00:00:00 2001
-From: Tomasz Nowicki <tn@semihalf.com>
-Date: Fri, 9 Sep 2016 21:24:04 +0200
-Subject: [PATCH 2/6] PCI/ACPI: Check platform specific ECAM quirks
-
-Some platforms may not be fully compliant with generic set of PCI config
-accessors. For these cases we implement the way to overwrite CFG accessors
-set and configuration space range.
-
-In first place pci_mcfg_parse() saves machine's IDs and revision number
-(these come from MCFG header) in order to match against known quirk entries.
-Then the algorithm traverses available quirk list (static array),
-matches against <oem_id, oem_table_id, rev, domain, bus number range> and
-returns custom PCI config ops and/or CFG resource structure.
-
-When adding new quirk there are two possibilities:
-1. Override default pci_generic_ecam_ops ops but CFG resource comes from MCFG
-{ "OEM_ID", "OEM_TABLE_ID", <REV>, <DOMAIN>, <BUS_NR>, &foo_ops, MCFG_RES_EMPTY },
-2. Override default pci_generic_ecam_ops ops and CFG resource. For this case
-it is also allowed get CFG resource from quirk entry w/o having it in MCFG.
-{ "OEM_ID", "OEM_TABLE_ID", <REV>, <DOMAIN>, <BUS_NR>, &boo_ops,
-  DEFINE_RES_MEM(START, SIZE) },
-
-pci_generic_ecam_ops and MCFG entries will be used for platforms
-free from quirks.
-
-Signed-off-by: Tomasz Nowicki <tn@semihalf.com>
-Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
-Signed-off-by: Christopher Covington <cov@codeaurora.org>
---
- drivers/acpi/pci_mcfg.c | 80 +++++++++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 74 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/acpi/pci_mcfg.c b/drivers/acpi/pci_mcfg.c
-index ffcc651..2b8acc7 100644
--- a/drivers/acpi/pci_mcfg.c
-+++ b/drivers/acpi/pci_mcfg.c
-@@ -32,6 +32,59 @@ struct mcfg_entry {
- 	u8			bus_start;
- 	u8			bus_end;
- };
-+struct mcfg_fixup {
-+	char oem_id[ACPI_OEM_ID_SIZE + 1];
-+	char oem_table_id[ACPI_OEM_TABLE_ID_SIZE + 1];
-+	u32 oem_revision;
-+	u16 seg;
-+	struct resource bus_range;
-+	struct pci_ecam_ops *ops;
-+	struct resource cfgres;
-+};
-+
-+#define MCFG_DOM_ANY			(-1)
-+#define MCFG_BUS_RANGE(start, end)	DEFINE_RES_NAMED((start),	\
-+						((end) - (start) + 1),	\
-+						NULL, IORESOURCE_BUS)
-+#define MCFG_BUS_ANY		MCFG_BUS_RANGE(0x0, 0xff)
-+#define MCFG_RES_EMPTY		DEFINE_RES_NAMED(0, 0, NULL, 0)
-+
-+static struct mcfg_fixup mcfg_quirks[] = {
-+/*	{ OEM_ID, OEM_TABLE_ID, REV, DOMAIN, BUS_RANGE, cfgres, ops }, */
-+};
-+
-+static char mcfg_oem_id[ACPI_OEM_ID_SIZE];
-+static char mcfg_oem_table_id[ACPI_OEM_TABLE_ID_SIZE];
-+static u32 mcfg_oem_revision;
-+
-+static void pci_mcfg_match_quirks(struct acpi_pci_root *root,
-+				  struct resource *cfgres,
-+				  struct pci_ecam_ops **ecam_ops)
-+{
-+	struct mcfg_fixup *f;
-+	int i;
-+
-+	/*
-+	 * First match against PCI topology <domain:bus> then use OEM ID, OEM
-+	 * table ID, and OEM revision from MCFG table standard header.
-+	 */
-+	for (i = 0, f = mcfg_quirks; i < ARRAY_SIZE(mcfg_quirks); i++, f++) {
-+		if (f->seg == root->segment &&
-+		    resource_contains(&f->bus_range, &root->secondary) &&
-+		    !memcmp(f->oem_id, mcfg_oem_id, ACPI_OEM_ID_SIZE) &&
-+		    !memcmp(f->oem_table_id, mcfg_oem_table_id,
-+		            ACPI_OEM_TABLE_ID_SIZE) &&
-+		    f->oem_revision == mcfg_oem_revision) {
-+			if (f->cfgres.start)
-+				*cfgres = f->cfgres;
-+			if (f->ops)
-+				*ecam_ops =  f->ops;
-+			dev_info(&root->device->dev, "Applying PCI MCFG quirks for %s %s rev: %d\n",
-+				 f->oem_id, f->oem_table_id, f->oem_revision);
-+			return;
-+		}
-+	}
-+}
- 
- /* List to save MCFG entries */
- static LIST_HEAD(pci_mcfg_list);
-@@ -61,14 +114,24 @@ int pci_mcfg_lookup(struct acpi_pci_root *root, struct resource *cfgres,
- 
- 	}
- 
-	if (!root->mcfg_addr)
-		return -ENXIO;
-
- skip_lookup:
- 	memset(&res, 0, sizeof(res));
-	res.start = root->mcfg_addr + (bus_res->start << 20);
-	res.end = res.start + (resource_size(bus_res) << 20) - 1;
-	res.flags = IORESOURCE_MEM;
-+	if (root->mcfg_addr) {
-+		res.start = root->mcfg_addr + (bus_res->start << 20);
-+		res.end = res.start + (resource_size(bus_res) << 20) - 1;
-+		res.flags = IORESOURCE_MEM;
-+	}
-+
-+	/*
-+	 * Let to override default ECAM ops and CFG resource range.
-+	 * Also, this might even retrieve CFG resource range in case MCFG
-+	 * does not have it. Invalid CFG start address means MCFG firmware bug
-+	 * or we need another quirk in array.
-+	 */
-+	pci_mcfg_match_quirks(root, &res, &ops);
-+	if (!res.start)
-+		return -ENXIO;
-+
- 	*cfgres = res;
- 	*ecam_ops = ops;
- 	return 0;
-@@ -101,6 +164,11 @@ static __init int pci_mcfg_parse(struct acpi_table_header *header)
- 		list_add(&e->list, &pci_mcfg_list);
- 	}
- 
-+	/* Save MCFG IDs and revision for quirks matching */
-+	memcpy(mcfg_oem_id, header->oem_id, ACPI_OEM_ID_SIZE);
-+	memcpy(mcfg_oem_table_id, header->oem_table_id, ACPI_OEM_TABLE_ID_SIZE);
-+	mcfg_oem_revision = header->revision;
-+
- 	pr_info("MCFG table detected, %d entries\n", n);
- 	return 0;
- }
-- 
-2.9.3
-
-From 2243ab64c12a873e47b72c8e636b40ed09c5f0d4 Mon Sep 17 00:00:00 2001
-From: Tomasz Nowicki <tn@semihalf.com>
-Date: Fri, 9 Sep 2016 21:24:05 +0200
-Subject: [PATCH 3/6] PCI: thunder-pem: Allow to probe PEM-specific register
- range for ACPI case
-
-thunder-pem driver stands for being ACPI based PCI host controller.
-However, there is no standard way to describe its PEM-specific register
-ranges in ACPI tables. Thus we add thunder_pem_init() ACPI extension
-to obtain hardcoded addresses from static resource array.
-Although it is not pretty, it prevents from creating standard mechanism to
-handle similar cases in future.
-
-Signed-off-by: Tomasz Nowicki <tn@semihalf.com>
---
- drivers/pci/host/pci-thunder-pem.c | 61 ++++++++++++++++++++++++++++++--------
- 1 file changed, 48 insertions(+), 13 deletions(-)
-
-diff --git a/drivers/pci/host/pci-thunder-pem.c b/drivers/pci/host/pci-thunder-pem.c
-index 6abaf80..b048761 100644
--- a/drivers/pci/host/pci-thunder-pem.c
-+++ b/drivers/pci/host/pci-thunder-pem.c
-@@ -18,6 +18,7 @@
- #include <linux/init.h>
- #include <linux/of_address.h>
- #include <linux/of_pci.h>
-+#include <linux/pci-acpi.h>
- #include <linux/pci-ecam.h>
- #include <linux/platform_device.h>
- 
-@@ -284,6 +285,40 @@ static int thunder_pem_config_write(struct pci_bus *bus, unsigned int devfn,
- 	return pci_generic_config_write(bus, devfn, where, size, val);
- }
- 
-+#ifdef CONFIG_ACPI
-+static struct resource thunder_pem_reg_res[] = {
-+	[4] = DEFINE_RES_MEM(0x87e0c0000000UL, SZ_16M),
-+	[5] = DEFINE_RES_MEM(0x87e0c1000000UL, SZ_16M),
-+	[6] = DEFINE_RES_MEM(0x87e0c2000000UL, SZ_16M),
-+	[7] = DEFINE_RES_MEM(0x87e0c3000000UL, SZ_16M),
-+	[8] = DEFINE_RES_MEM(0x87e0c4000000UL, SZ_16M),
-+	[9] = DEFINE_RES_MEM(0x87e0c5000000UL, SZ_16M),
-+	[14] = DEFINE_RES_MEM(0x97e0c0000000UL, SZ_16M),
-+	[15] = DEFINE_RES_MEM(0x97e0c1000000UL, SZ_16M),
-+	[16] = DEFINE_RES_MEM(0x97e0c2000000UL, SZ_16M),
-+	[17] = DEFINE_RES_MEM(0x97e0c3000000UL, SZ_16M),
-+	[18] = DEFINE_RES_MEM(0x97e0c4000000UL, SZ_16M),
-+	[19] = DEFINE_RES_MEM(0x97e0c5000000UL, SZ_16M),
-+};
-+
-+static struct resource *thunder_pem_acpi_res(struct pci_config_window *cfg)
-+{
-+	struct acpi_device *adev = to_acpi_device(cfg->parent);
-+	struct acpi_pci_root *root = acpi_driver_data(adev);
-+
-+	if ((root->segment >= 4 && root->segment <= 9) ||
-+	    (root->segment >= 14 && root->segment <= 19))
-+		return &thunder_pem_reg_res[root->segment];
-+
-+	return NULL;
-+}
-+#else
-+static struct resource *thunder_pem_acpi_res(struct pci_config_window *cfg)
-+{
-+	return NULL;
-+}
-+#endif
-+
- static int thunder_pem_init(struct pci_config_window *cfg)
- {
- 	struct device *dev = cfg->parent;
-@@ -292,24 +327,24 @@ static int thunder_pem_init(struct pci_config_window *cfg)
- 	struct thunder_pem_pci *pem_pci;
- 	struct platform_device *pdev;
- 
-	/* Only OF support for now */
-	if (!dev->of_node)
-		return -EINVAL;
-
- 	pem_pci = devm_kzalloc(dev, sizeof(*pem_pci), GFP_KERNEL);
- 	if (!pem_pci)
- 		return -ENOMEM;
- 
-	pdev = to_platform_device(dev);
-
-	/*
-	 * The second register range is the PEM bridge to the PCIe
-	 * bus.  It has a different config access method than those
-	 * devices behind the bridge.
-	 */
-	res_pem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-+	if (acpi_disabled) {
-+		pdev = to_platform_device(dev);
-+
-+		/*
-+		 * The second register range is the PEM bridge to the PCIe
-+		 * bus.  It has a different config access method than those
-+		 * devices behind the bridge.
-+		 */
-+		res_pem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-+	} else {
-+		res_pem = thunder_pem_acpi_res(cfg);
-+	}
- 	if (!res_pem) {
-		dev_err(dev, "missing \"reg[1]\"property\n");
-+		dev_err(dev, "missing configuration region\n");
- 		return -EINVAL;
- 	}
- 
-- 
-2.9.3
-
-From 443d85d47ee00b3f0b6f39d470a11e7eb116817d Mon Sep 17 00:00:00 2001
-From: Tomasz Nowicki <tn@semihalf.com>
-Date: Fri, 9 Sep 2016 21:24:06 +0200
-Subject: [PATCH 4/6] PCI: thunder: Enable ACPI PCI controller for ThunderX
- pass2.x silicon version
-
-ThunderX PCIe controller to off-chip devices (so-called PEM) is not fully
-compliant with ECAM standard. It uses non-standard configuration space
-accessors (see pci_thunder_pem_ops) and custom configuration space granulation
-(see bus_shift = 24). In order to access configuration space and
-probe PEM as ACPI based PCI host controller we need to add MCFG quirk
-infrastructure. This involves:
-1. Export PEM pci_thunder_pem_ops structure so it is visible to MCFG quirk
-   code.
-2. New quirk entries for each PEM segment. Each contains platform IDs,
-   mentioned pci_thunder_pem_ops and CFG resources.
-
-Quirk is considered for ThunderX silicon pass2.x only which is identified
-via MCFG revision 1.
-
-Signed-off-by: Tomasz Nowicki <tn@semihalf.com>
---
- drivers/acpi/pci_mcfg.c            | 27 +++++++++++++++++++++++++++
- drivers/pci/host/pci-thunder-pem.c |  2 +-
- include/linux/pci-ecam.h           |  4 ++++
- 3 files changed, 32 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/acpi/pci_mcfg.c b/drivers/acpi/pci_mcfg.c
-index 2b8acc7..1f73d7b 100644
--- a/drivers/acpi/pci_mcfg.c
-+++ b/drivers/acpi/pci_mcfg.c
-@@ -51,6 +51,33 @@ struct mcfg_fixup {
- 
- static struct mcfg_fixup mcfg_quirks[] = {
- /*	{ OEM_ID, OEM_TABLE_ID, REV, DOMAIN, BUS_RANGE, cfgres, ops }, */
-+#ifdef CONFIG_PCI_HOST_THUNDER_PEM
-+	/* SoC pass2.x */
-+	{ "CAVIUM", "THUNDERX", 1, 4, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x88001f000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 1, 5, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x884057000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 1, 6, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x88808f000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 1, 7, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x89001f000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 1, 8, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x894057000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 1, 9, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x89808f000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 1, 14, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x98001f000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 1, 15, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x984057000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 1, 16, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x98808f000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 1, 17, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x99001f000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 1, 18, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x994057000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 1, 19, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x99808f000000UL, 0x39 * SZ_16M) },
-+#endif
- };
- 
- static char mcfg_oem_id[ACPI_OEM_ID_SIZE];
-diff --git a/drivers/pci/host/pci-thunder-pem.c b/drivers/pci/host/pci-thunder-pem.c
-index b048761..d7c10cc 100644
--- a/drivers/pci/host/pci-thunder-pem.c
-+++ b/drivers/pci/host/pci-thunder-pem.c
-@@ -367,7 +367,7 @@ static int thunder_pem_init(struct pci_config_window *cfg)
- 	return 0;
- }
- 
-static struct pci_ecam_ops pci_thunder_pem_ops = {
-+struct pci_ecam_ops pci_thunder_pem_ops = {
- 	.bus_shift	= 24,
- 	.init		= thunder_pem_init,
- 	.pci_ops	= {
-diff --git a/include/linux/pci-ecam.h b/include/linux/pci-ecam.h
-index 7adad20..65505ea 100644
--- a/include/linux/pci-ecam.h
-+++ b/include/linux/pci-ecam.h
-@@ -58,6 +58,10 @@ void __iomem *pci_ecam_map_bus(struct pci_bus *bus, unsigned int devfn,
- 			       int where);
- /* default ECAM ops */
- extern struct pci_ecam_ops pci_generic_ecam_ops;
-+/* ECAM ops for known quirks */
-+#ifdef CONFIG_PCI_HOST_THUNDER_PEM
-+extern struct pci_ecam_ops pci_thunder_pem_ops;
-+#endif
- 
- #ifdef CONFIG_PCI_HOST_GENERIC
- /* for DT-based PCI controllers that support ECAM */
-- 
-2.9.3
-
-From 6eca99cc392a11bb07b9ef88bca71a85f8bbe273 Mon Sep 17 00:00:00 2001
-From: Tomasz Nowicki <tn@semihalf.com>
-Date: Fri, 9 Sep 2016 21:24:07 +0200
-Subject: [PATCH 5/6] PCI: thunder: Enable ACPI PCI controller for ThunderX
- pass1.x silicon version
-
-ThunderX pass1.x requires to emulate the EA headers for on-chip devices
-hence it has to use custom pci_thunder_ecam_ops for accessing PCI config
-space (pci-thuner-ecam.c). Add new entries to MCFG quirk array where they
-can be applied while probing ACPI based PCI host controller.
-
-ThunderX pass1.x is using the same way for accessing off-chip devices
-(so-called PEM) as silicon pass-2.x so we need to add PEM quirk
-entries too.
-
-Quirk is considered for ThunderX silicon pass1.x only which is identified
-via MCFG revision 2.
-
-Signed-off-by: Tomasz Nowicki <tn@semihalf.com>
---
- drivers/acpi/pci_mcfg.c             | 45 +++++++++++++++++++++++++++++++++++++
- drivers/pci/host/pci-thunder-ecam.c |  2 +-
- include/linux/pci-ecam.h            |  3 +++
- 3 files changed, 49 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/acpi/pci_mcfg.c b/drivers/acpi/pci_mcfg.c
-index 1f73d7b..eb14f74 100644
--- a/drivers/acpi/pci_mcfg.c
-+++ b/drivers/acpi/pci_mcfg.c
-@@ -77,6 +77,51 @@ static struct mcfg_fixup mcfg_quirks[] = {
- 	  DEFINE_RES_MEM(0x994057000000UL, 0x39 * SZ_16M) },
- 	{ "CAVIUM", "THUNDERX", 1, 19, MCFG_BUS_ANY, &pci_thunder_pem_ops,
- 	  DEFINE_RES_MEM(0x99808f000000UL, 0x39 * SZ_16M) },
-+
-+	/* SoC pass1.x */
-+	{ "CAVIUM", "THUNDERX", 2, 4, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x88001f000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 2, 5, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x884057000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 2, 6, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x88808f000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 2, 7, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x89001f000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 2, 8, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x894057000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 2, 9, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x89808f000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 2, 14, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x98001f000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 2, 15, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x984057000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 2, 16, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x98808f000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 2, 17, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x99001f000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 2, 18, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x994057000000UL, 0x39 * SZ_16M) },
-+	{ "CAVIUM", "THUNDERX", 2, 19, MCFG_BUS_ANY, &pci_thunder_pem_ops,
-+	  DEFINE_RES_MEM(0x99808f000000UL, 0x39 * SZ_16M) },
-+#endif
-+#ifdef CONFIG_PCI_HOST_THUNDER_ECAM
-+	/* SoC pass1.x */
-+	{ "CAVIUM", "THUNDERX", 2, 0, MCFG_BUS_ANY, &pci_thunder_ecam_ops,
-+	  MCFG_RES_EMPTY},
-+	{ "CAVIUM", "THUNDERX", 2, 1, MCFG_BUS_ANY, &pci_thunder_ecam_ops,
-+	  MCFG_RES_EMPTY},
-+	{ "CAVIUM", "THUNDERX", 2, 2, MCFG_BUS_ANY, &pci_thunder_ecam_ops,
-+	  MCFG_RES_EMPTY},
-+	{ "CAVIUM", "THUNDERX", 2, 3, MCFG_BUS_ANY, &pci_thunder_ecam_ops,
-+	  MCFG_RES_EMPTY},
-+	{ "CAVIUM", "THUNDERX", 2, 10, MCFG_BUS_ANY, &pci_thunder_ecam_ops,
-+	  MCFG_RES_EMPTY},
-+	{ "CAVIUM", "THUNDERX", 2, 11, MCFG_BUS_ANY, &pci_thunder_ecam_ops,
-+	  MCFG_RES_EMPTY},
-+	{ "CAVIUM", "THUNDERX", 2, 12, MCFG_BUS_ANY, &pci_thunder_ecam_ops,
-+	  MCFG_RES_EMPTY},
-+	{ "CAVIUM", "THUNDERX", 2, 13, MCFG_BUS_ANY, &pci_thunder_ecam_ops,
-+	  MCFG_RES_EMPTY},
- #endif
- };
- 
-diff --git a/drivers/pci/host/pci-thunder-ecam.c b/drivers/pci/host/pci-thunder-ecam.c
-index d50a3dc..b6c17e2 100644
--- a/drivers/pci/host/pci-thunder-ecam.c
-+++ b/drivers/pci/host/pci-thunder-ecam.c
-@@ -346,7 +346,7 @@ static int thunder_ecam_config_write(struct pci_bus *bus, unsigned int devfn,
- 	return pci_generic_config_write(bus, devfn, where, size, val);
- }
- 
-static struct pci_ecam_ops pci_thunder_ecam_ops = {
-+struct pci_ecam_ops pci_thunder_ecam_ops = {
- 	.bus_shift	= 20,
- 	.pci_ops	= {
- 		.map_bus        = pci_ecam_map_bus,
-diff --git a/include/linux/pci-ecam.h b/include/linux/pci-ecam.h
-index 65505ea..35f0e81 100644
--- a/include/linux/pci-ecam.h
-+++ b/include/linux/pci-ecam.h
-@@ -62,6 +62,9 @@ extern struct pci_ecam_ops pci_generic_ecam_ops;
- #ifdef CONFIG_PCI_HOST_THUNDER_PEM
- extern struct pci_ecam_ops pci_thunder_pem_ops;
- #endif
-+#ifdef CONFIG_PCI_HOST_THUNDER_ECAM
-+extern struct pci_ecam_ops pci_thunder_ecam_ops;
-+#endif
- 
- #ifdef CONFIG_PCI_HOST_GENERIC
- /* for DT-based PCI controllers that support ECAM */
-- 
-2.9.3
-
-From 3080ac5bb527155ccdf8490ce221b1c6ad01f502 Mon Sep 17 00:00:00 2001
-From: Duc Dang <dhdang@apm.com>
-Date: Sat, 17 Sep 2016 07:24:38 -0700
-Subject: [PATCH 6/6] PCI/ACPI: xgene: Add ECAM quirk for X-Gene PCIe
- controller
-
-PCIe controller in X-Gene SoCs is not ECAM compliant: software
-needs to configure additional concontroller register to address
-device at bus:dev:function.
-
-This patch depends on "ECAM quirks handling for ARM64 platforms"
-series (http://www.spinics.net/lists/arm-kernel/msg530692.html)
-to address the limitation above for X-Gene PCIe controller.
-
-The quirk will only be applied for X-Gene PCIe MCFG table with
-OEM revison 1, 2, 3 or 4 (PCIe controller v1 and v2 on X-Gene SoCs).
-
-Signed-off-by: Duc Dang <dhdang@apm.com>
---
- drivers/acpi/pci_mcfg.c           |  32 +++++
- drivers/pci/host/Makefile         |   2 +-
- drivers/pci/host/pci-xgene-ecam.c | 280 ++++++++++++++++++++++++++++++++++++++
- include/linux/pci-ecam.h          |   5 +
- 4 files changed, 318 insertions(+), 1 deletion(-)
- create mode 100644 drivers/pci/host/pci-xgene-ecam.c
-
-diff --git a/drivers/acpi/pci_mcfg.c b/drivers/acpi/pci_mcfg.c
-index eb14f74..635ab24 100644
--- a/drivers/acpi/pci_mcfg.c
-+++ b/drivers/acpi/pci_mcfg.c
-@@ -123,6 +123,38 @@ static struct mcfg_fixup mcfg_quirks[] = {
- 	{ "CAVIUM", "THUNDERX", 2, 13, MCFG_BUS_ANY, &pci_thunder_ecam_ops,
- 	  MCFG_RES_EMPTY},
- #endif
-+#ifdef CONFIG_PCI_XGENE
-+	{"APM   ", "XGENE   ", 1, 0, MCFG_BUS_ANY,
-+		&xgene_v1_pcie_ecam_ops, MCFG_RES_EMPTY},
-+	{"APM   ", "XGENE   ", 1, 1, MCFG_BUS_ANY,
-+		&xgene_v1_pcie_ecam_ops, MCFG_RES_EMPTY},
-+	{"APM   ", "XGENE   ", 1, 2, MCFG_BUS_ANY,
-+		&xgene_v1_pcie_ecam_ops, MCFG_RES_EMPTY},
-+	{"APM   ", "XGENE   ", 1, 3, MCFG_BUS_ANY,
-+		&xgene_v1_pcie_ecam_ops, MCFG_RES_EMPTY},
-+	{"APM   ", "XGENE   ", 1, 4, MCFG_BUS_ANY,
-+		&xgene_v1_pcie_ecam_ops, MCFG_RES_EMPTY},
-+	{"APM   ", "XGENE   ", 2, 0, MCFG_BUS_ANY,
-+		&xgene_v1_pcie_ecam_ops, MCFG_RES_EMPTY},
-+	{"APM   ", "XGENE   ", 2, 1, MCFG_BUS_ANY,
-+		&xgene_v1_pcie_ecam_ops, MCFG_RES_EMPTY},
-+	{"APM   ", "XGENE   ", 2, 2, MCFG_BUS_ANY,
-+		&xgene_v1_pcie_ecam_ops, MCFG_RES_EMPTY},
-+	{"APM   ", "XGENE   ", 2, 3, MCFG_BUS_ANY,
-+		&xgene_v1_pcie_ecam_ops, MCFG_RES_EMPTY},
-+	{"APM   ", "XGENE   ", 2, 4, MCFG_BUS_ANY,
-+		&xgene_v1_pcie_ecam_ops, MCFG_RES_EMPTY},
-+	{"APM   ", "XGENE   ", 3, 0, MCFG_BUS_ANY,
-+		&xgene_v2_1_pcie_ecam_ops, MCFG_RES_EMPTY},
-+	{"APM   ", "XGENE   ", 3, 1, MCFG_BUS_ANY,
-+		&xgene_v2_1_pcie_ecam_ops, MCFG_RES_EMPTY},
-+	{"APM   ", "XGENE   ", 4, 0, MCFG_BUS_ANY,
-+		&xgene_v2_2_pcie_ecam_ops, MCFG_RES_EMPTY},
-+	{"APM   ", "XGENE   ", 4, 1, MCFG_BUS_ANY,
-+		&xgene_v2_2_pcie_ecam_ops, MCFG_RES_EMPTY},
-+	{"APM   ", "XGENE   ", 4, 2, MCFG_BUS_ANY,
-+		&xgene_v2_2_pcie_ecam_ops, MCFG_RES_EMPTY},
-+#endif
- };
- 
- static char mcfg_oem_id[ACPI_OEM_ID_SIZE];
-diff --git a/drivers/pci/host/Makefile b/drivers/pci/host/Makefile
-index 8843410..af4f505 100644
--- a/drivers/pci/host/Makefile
-+++ b/drivers/pci/host/Makefile
-@@ -15,7 +15,7 @@ obj-$(CONFIG_PCIE_SPEAR13XX) += pcie-spear13xx.o
- obj-$(CONFIG_PCI_KEYSTONE) += pci-keystone-dw.o pci-keystone.o
- obj-$(CONFIG_PCIE_XILINX) += pcie-xilinx.o
- obj-$(CONFIG_PCIE_XILINX_NWL) += pcie-xilinx-nwl.o
-obj-$(CONFIG_PCI_XGENE) += pci-xgene.o
-+obj-$(CONFIG_PCI_XGENE) += pci-xgene.o pci-xgene-ecam.o
- obj-$(CONFIG_PCI_XGENE_MSI) += pci-xgene-msi.o
- obj-$(CONFIG_PCI_LAYERSCAPE) += pci-layerscape.o
- obj-$(CONFIG_PCI_VERSATILE) += pci-versatile.o
-diff --git a/drivers/pci/host/pci-xgene-ecam.c b/drivers/pci/host/pci-xgene-ecam.c
-new file mode 100644
-index 0000000..b66a04f
--- /dev/null
-+++ b/drivers/pci/host/pci-xgene-ecam.c
-@@ -0,0 +1,280 @@
-+/*
-+ * APM X-Gene PCIe ECAM fixup driver
-+ *
-+ * Copyright (c) 2016, Applied Micro Circuits Corporation
-+ * Author:
-+ *	Duc Dang <dhdang@apm.com>
-+ *
-+ * 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/kernel.h>
-+#include <linux/module.h>
-+#include <linux/of_address.h>
-+#include <linux/of_pci.h>
-+#include <linux/pci-acpi.h>
-+#include <linux/platform_device.h>
-+#include <linux/pci-ecam.h>
-+
-+#ifdef CONFIG_ACPI
-+#define RTDID			0x160
-+#define ROOT_CAP_AND_CTRL	0x5C
-+
-+/* PCIe IP version */
-+#define XGENE_PCIE_IP_VER_UNKN	0
-+#define XGENE_PCIE_IP_VER_1	1
-+#define XGENE_PCIE_IP_VER_2	2
-+
-+#define XGENE_CSR_LENGTH	0x10000
-+
-+struct xgene_pcie_acpi_root {
-+	void __iomem *csr_base;
-+	u32 version;
-+};
-+
-+static int xgene_v1_pcie_ecam_init(struct pci_config_window *cfg)
-+{
-+	struct xgene_pcie_acpi_root *xgene_root;
-+	struct device *dev = cfg->parent;
-+	u32 csr_base;
-+
-+	xgene_root = devm_kzalloc(dev, sizeof(*xgene_root), GFP_KERNEL);
-+	if (!xgene_root)
-+		return -ENOMEM;
-+
-+	switch (cfg->res.start) {
-+	case 0xE0D0000000ULL:
-+		csr_base = 0x1F2B0000;
-+		break;
-+	case 0xD0D0000000ULL:
-+		csr_base = 0x1F2C0000;
-+		break;
-+	case 0x90D0000000ULL:
-+		csr_base = 0x1F2D0000;
-+		break;
-+	case 0xA0D0000000ULL:
-+		csr_base = 0x1F500000;
-+		break;
-+	case 0xC0D0000000ULL:
-+		csr_base = 0x1F510000;
-+		break;
-+	default:
-+		return -ENODEV;
-+	}
-+
-+	xgene_root->csr_base = ioremap(csr_base, XGENE_CSR_LENGTH);
-+	if (!xgene_root->csr_base) {
-+		kfree(xgene_root);
-+		return -ENODEV;
-+	}
-+
-+	xgene_root->version = XGENE_PCIE_IP_VER_1;
-+
-+	cfg->priv = xgene_root;
-+
-+	return 0;
-+}
-+
-+static int xgene_v2_1_pcie_ecam_init(struct pci_config_window *cfg)
-+{
-+	struct xgene_pcie_acpi_root *xgene_root;
-+	struct device *dev = cfg->parent;
-+	resource_size_t csr_base;
-+
-+	xgene_root = devm_kzalloc(dev, sizeof(*xgene_root), GFP_KERNEL);
-+	if (!xgene_root)
-+		return -ENOMEM;
-+
-+	switch (cfg->res.start) {
-+	case 0xC0D0000000ULL:
-+		csr_base = 0x1F2B0000;
-+		break;
-+	case 0xA0D0000000ULL:
-+		csr_base = 0x1F2C0000;
-+		break;
-+	default:
-+		return -ENODEV;
-+	}
-+
-+	xgene_root->csr_base = ioremap(csr_base, XGENE_CSR_LENGTH);
-+	if (!xgene_root->csr_base) {
-+		kfree(xgene_root);
-+		return -ENODEV;
-+	}
-+
-+	xgene_root->version = XGENE_PCIE_IP_VER_2;
-+
-+	cfg->priv = xgene_root;
-+
-+	return 0;
-+}
-+
-+static int xgene_v2_2_pcie_ecam_init(struct pci_config_window *cfg)
-+{
-+	struct xgene_pcie_acpi_root *xgene_root;
-+	struct device *dev = cfg->parent;
-+	resource_size_t csr_base;
-+
-+	xgene_root = devm_kzalloc(dev, sizeof(*xgene_root), GFP_KERNEL);
-+	if (!xgene_root)
-+		return -ENOMEM;
-+
-+	switch (cfg->res.start) {
-+	case 0xE0D0000000ULL:
-+		csr_base = 0x1F2B0000;
-+		break;
-+	case 0xA0D0000000ULL:
-+		csr_base = 0x1F500000;
-+		break;
-+	case 0x90D0000000ULL:
-+		csr_base = 0x1F2D0000;
-+		break;
-+	default:
-+		return -ENODEV;
-+	}
-+
-+	xgene_root->csr_base = ioremap(csr_base, XGENE_CSR_LENGTH);
-+	if (!xgene_root->csr_base) {
-+		kfree(xgene_root);
-+		return -ENODEV;
-+	}
-+
-+	xgene_root->version = XGENE_PCIE_IP_VER_2;
-+
-+	cfg->priv = xgene_root;
-+
-+	return 0;
-+}
-+/*
-+ * For Configuration request, RTDID register is used as Bus Number,
-+ * Device Number and Function number of the header fields.
-+ */
-+static void xgene_pcie_set_rtdid_reg(struct pci_bus *bus, uint devfn)
-+{
-+	struct pci_config_window *cfg = bus->sysdata;
-+	struct xgene_pcie_acpi_root *port = cfg->priv;
-+	unsigned int b, d, f;
-+	u32 rtdid_val = 0;
-+
-+	b = bus->number;
-+	d = PCI_SLOT(devfn);
-+	f = PCI_FUNC(devfn);
-+
-+	if (!pci_is_root_bus(bus))
-+		rtdid_val = (b << 8) | (d << 3) | f;
-+
-+	writel(rtdid_val, port->csr_base + RTDID);
-+	/* read the register back to ensure flush */
-+	readl(port->csr_base + RTDID);
-+}
-+
-+/*
-+ * X-Gene PCIe port uses BAR0-BAR1 of RC's configuration space as
-+ * the translation from PCI bus to native BUS.  Entire DDR region
-+ * is mapped into PCIe space using these registers, so it can be
-+ * reached by DMA from EP devices.  The BAR0/1 of bridge should be
-+ * hidden during enumeration to avoid the sizing and resource allocation
-+ * by PCIe core.
-+ */
-+static bool xgene_pcie_hide_rc_bars(struct pci_bus *bus, int offset)
-+{
-+	if (pci_is_root_bus(bus) && ((offset == PCI_BASE_ADDRESS_0) ||
-+				     (offset == PCI_BASE_ADDRESS_1)))
-+		return true;
-+
-+	return false;
-+}
-+
-+void __iomem *xgene_pcie_ecam_map_bus(struct pci_bus *bus,
-+				      unsigned int devfn, int where)
-+{
-+	struct pci_config_window *cfg = bus->sysdata;
-+	unsigned int busn = bus->number;
-+	void __iomem *base;
-+
-+	if (busn < cfg->busr.start || busn > cfg->busr.end)
-+		return NULL;
-+
-+	if ((pci_is_root_bus(bus) && devfn != 0) ||
-+	    xgene_pcie_hide_rc_bars(bus, where))
-+		return NULL;
-+
-+	xgene_pcie_set_rtdid_reg(bus, devfn);
-+
-+	if (busn > cfg->busr.start)
-+		base = cfg->win + (1 << cfg->ops->bus_shift);
-+	else
-+		base = cfg->win;
-+
-+	return base + where;
-+}
-+
-+static int xgene_pcie_config_read32(struct pci_bus *bus, unsigned int devfn,
-+				    int where, int size, u32 *val)
-+{
-+	struct pci_config_window *cfg = bus->sysdata;
-+	struct xgene_pcie_acpi_root *port = cfg->priv;
-+
-+	if (pci_generic_config_read32(bus, devfn, where & ~0x3, 4, val) !=
-+	    PCIBIOS_SUCCESSFUL)
-+		return PCIBIOS_DEVICE_NOT_FOUND;
-+
-+	/*
-+	* The v1 controller has a bug in its Configuration Request
-+	* Retry Status (CRS) logic: when CRS is enabled and we read the
-+	* Vendor and Device ID of a non-existent device, the controller
-+	* fabricates return data of 0xFFFF0001 ("device exists but is not
-+	* ready") instead of 0xFFFFFFFF ("device does not exist").  This
-+	* causes the PCI core to retry the read until it times out.
-+	* Avoid this by not claiming to support CRS.
-+	*/
-+	if (pci_is_root_bus(bus) && (port->version == XGENE_PCIE_IP_VER_1) &&
-+	    ((where & ~0x3) == ROOT_CAP_AND_CTRL))
-+		*val &= ~(PCI_EXP_RTCAP_CRSVIS << 16);
-+
-+	if (size <= 2)
-+		*val = (*val >> (8 * (where & 3))) & ((1 << (size * 8)) - 1);
-+
-+	return PCIBIOS_SUCCESSFUL;
-+}
-+
-+struct pci_ecam_ops xgene_v1_pcie_ecam_ops = {
-+	.bus_shift	= 16,
-+	.init		= xgene_v1_pcie_ecam_init,
-+	.pci_ops	= {
-+		.map_bus	= xgene_pcie_ecam_map_bus,
-+		.read		= xgene_pcie_config_read32,
-+		.write		= pci_generic_config_write,
-+	}
-+};
-+
-+struct pci_ecam_ops xgene_v2_1_pcie_ecam_ops = {
-+	.bus_shift	= 16,
-+	.init		= xgene_v2_1_pcie_ecam_init,
-+	.pci_ops	= {
-+		.map_bus	= xgene_pcie_ecam_map_bus,
-+		.read		= xgene_pcie_config_read32,
-+		.write		= pci_generic_config_write,
-+	}
-+};
-+
-+struct pci_ecam_ops xgene_v2_2_pcie_ecam_ops = {
-+	.bus_shift	= 16,
-+	.init		= xgene_v2_2_pcie_ecam_init,
-+	.pci_ops	= {
-+		.map_bus	= xgene_pcie_ecam_map_bus,
-+		.read		= xgene_pcie_config_read32,
-+		.write		= pci_generic_config_write,
-+	}
-+};
-+#endif
-diff --git a/include/linux/pci-ecam.h b/include/linux/pci-ecam.h
-index 35f0e81..40da3e7 100644
--- a/include/linux/pci-ecam.h
-+++ b/include/linux/pci-ecam.h
-@@ -65,6 +65,11 @@ extern struct pci_ecam_ops pci_thunder_pem_ops;
- #ifdef CONFIG_PCI_HOST_THUNDER_ECAM
- extern struct pci_ecam_ops pci_thunder_ecam_ops;
- #endif
-+#ifdef CONFIG_PCI_XGENE
-+extern struct pci_ecam_ops xgene_v1_pcie_ecam_ops;
-+extern struct pci_ecam_ops xgene_v2_1_pcie_ecam_ops;
-+extern struct pci_ecam_ops xgene_v2_2_pcie_ecam_ops;
-+#endif
- 
- #ifdef CONFIG_PCI_HOST_GENERIC
- /* for DT-based PCI controllers that support ECAM */
-- 
-2.9.3
-
--- a/asus-wmi-Restrict-debugfs-interface-when-module-load.patch
+++ b/asus-wmi-Restrict-debugfs-interface-when-module-load.patch
@ -1,54 +0,0 @@
-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 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
-be manipulated in such a way that arbitrary code can be executed in the
-kernel, circumventing module loading restrictions. Prevent that if any of
-these features are enabled.
-
-Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
---
- drivers/platform/x86/asus-wmi.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
-index efbc3f0c592b..071171be4b7f 100644
--- a/drivers/platform/x86/asus-wmi.c
-+++ b/drivers/platform/x86/asus-wmi.c
-@@ -1868,6 +1868,9 @@ static int show_dsts(struct seq_file *m, void *data)
- 	int err;
- 	u32 retval = -1;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
- 
- 	if (err < 0)
-@@ -1884,6 +1887,9 @@ static int show_devs(struct seq_file *m, void *data)
- 	int err;
- 	u32 retval = -1;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
- 				    &retval);
- 
-@@ -1908,6 +1914,9 @@ static int show_call(struct seq_file *m, void *data)
- 	union acpi_object *obj;
- 	acpi_status status;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
- 				     1, asus->debug.method_id,
- 				     &input, &output);
-- 
-2.4.3
-
--- a/baseconfig/CONFIG_60XX_WDT
+++ b/baseconfig/CONFIG_60XX_WDT
@ -0,0 +1 @@
+# CONFIG_60XX_WDT is not set
--- a/baseconfig/CONFIG_6LOWPAN
+++ b/baseconfig/CONFIG_6LOWPAN
@ -0,0 +1 @@
+CONFIG_6LOWPAN=m
--- a/baseconfig/CONFIG_6LOWPAN_DEBUGFS
+++ b/baseconfig/CONFIG_6LOWPAN_DEBUGFS
@ -0,0 +1 @@
+CONFIG_6LOWPAN_DEBUGFS=y
--- a/baseconfig/CONFIG_6LOWPAN_GHC_EXT_HDR_DEST
+++ b/baseconfig/CONFIG_6LOWPAN_GHC_EXT_HDR_DEST
@ -0,0 +1 @@
+CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
--- a/baseconfig/CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG
+++ b/baseconfig/CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG
@ -0,0 +1 @@
+CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
--- a/baseconfig/CONFIG_6LOWPAN_GHC_EXT_HDR_HOP
+++ b/baseconfig/CONFIG_6LOWPAN_GHC_EXT_HDR_HOP
@ -0,0 +1 @@
+CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
--- a/baseconfig/CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE
+++ b/baseconfig/CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE
@ -0,0 +1 @@
+CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
--- a/baseconfig/CONFIG_6LOWPAN_GHC_ICMPV6
+++ b/baseconfig/CONFIG_6LOWPAN_GHC_ICMPV6
@ -0,0 +1 @@
+CONFIG_6LOWPAN_GHC_ICMPV6=m
--- a/baseconfig/CONFIG_6LOWPAN_GHC_UDP
+++ b/baseconfig/CONFIG_6LOWPAN_GHC_UDP
@ -0,0 +1 @@
+CONFIG_6LOWPAN_GHC_UDP=m
--- a/baseconfig/CONFIG_6LOWPAN_NHC
+++ b/baseconfig/CONFIG_6LOWPAN_NHC
@ -0,0 +1 @@
+CONFIG_6LOWPAN_NHC=m
--- a/baseconfig/CONFIG_6LOWPAN_NHC_DEST
+++ b/baseconfig/CONFIG_6LOWPAN_NHC_DEST
@ -0,0 +1 @@
+CONFIG_6LOWPAN_NHC_DEST=m
--- a/baseconfig/CONFIG_6LOWPAN_NHC_FRAGMENT
+++ b/baseconfig/CONFIG_6LOWPAN_NHC_FRAGMENT
@ -0,0 +1 @@
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
--- a/baseconfig/CONFIG_6LOWPAN_NHC_HOP
+++ b/baseconfig/CONFIG_6LOWPAN_NHC_HOP
@ -0,0 +1 @@
+CONFIG_6LOWPAN_NHC_HOP=m
--- a/baseconfig/CONFIG_6LOWPAN_NHC_IPV6
+++ b/baseconfig/CONFIG_6LOWPAN_NHC_IPV6
@ -0,0 +1 @@
+CONFIG_6LOWPAN_NHC_IPV6=m
--- a/baseconfig/CONFIG_6LOWPAN_NHC_MOBILITY
+++ b/baseconfig/CONFIG_6LOWPAN_NHC_MOBILITY
@ -0,0 +1 @@
+CONFIG_6LOWPAN_NHC_MOBILITY=m
--- a/baseconfig/CONFIG_6LOWPAN_NHC_ROUTING
+++ b/baseconfig/CONFIG_6LOWPAN_NHC_ROUTING
@ -0,0 +1 @@
+CONFIG_6LOWPAN_NHC_ROUTING=m
--- a/baseconfig/CONFIG_6LOWPAN_NHC_UDP
+++ b/baseconfig/CONFIG_6LOWPAN_NHC_UDP
@ -0,0 +1 @@
+CONFIG_6LOWPAN_NHC_UDP=m
--- a/baseconfig/CONFIG_6PACK
+++ b/baseconfig/CONFIG_6PACK
@ -0,0 +1 @@
+CONFIG_6PACK=m
--- a/baseconfig/CONFIG_8139CP
+++ b/baseconfig/CONFIG_8139CP
@ -0,0 +1 @@
+CONFIG_8139CP=m
--- a/baseconfig/CONFIG_8139TOO
+++ b/baseconfig/CONFIG_8139TOO
@ -0,0 +1 @@
+CONFIG_8139TOO=m
--- a/baseconfig/CONFIG_8139TOO_8129
+++ b/baseconfig/CONFIG_8139TOO_8129
@ -0,0 +1 @@
+CONFIG_8139TOO_8129=y
--- a/baseconfig/CONFIG_8139TOO_PIO
+++ b/baseconfig/CONFIG_8139TOO_PIO
@ -0,0 +1 @@
+# CONFIG_8139TOO_PIO is not set
--- a/baseconfig/CONFIG_8139TOO_TUNE_TWISTER
+++ b/baseconfig/CONFIG_8139TOO_TUNE_TWISTER
@ -0,0 +1 @@
+# CONFIG_8139TOO_TUNE_TWISTER is not set
--- a/baseconfig/CONFIG_8139_OLD_RX_RESET
+++ b/baseconfig/CONFIG_8139_OLD_RX_RESET
@ -0,0 +1 @@
+# CONFIG_8139_OLD_RX_RESET is not set
--- a/baseconfig/CONFIG_8723AU_AP_MODE
+++ b/baseconfig/CONFIG_8723AU_AP_MODE
@ -0,0 +1 @@
+# CONFIG_8723AU_AP_MODE is not set
--- a/baseconfig/CONFIG_8723AU_BT_COEXIST
+++ b/baseconfig/CONFIG_8723AU_BT_COEXIST
@ -0,0 +1 @@
+# CONFIG_8723AU_BT_COEXIST is not set
--- a/baseconfig/CONFIG_9P_FS
+++ b/baseconfig/CONFIG_9P_FS
@ -0,0 +1 @@
+CONFIG_9P_FS=m
--- a/baseconfig/CONFIG_9P_FSCACHE
+++ b/baseconfig/CONFIG_9P_FSCACHE
@ -0,0 +1 @@
+CONFIG_9P_FSCACHE=y
--- a/baseconfig/CONFIG_9P_FS_POSIX_ACL
+++ b/baseconfig/CONFIG_9P_FS_POSIX_ACL
@ -0,0 +1 @@
+CONFIG_9P_FS_POSIX_ACL=y
--- a/baseconfig/CONFIG_9P_FS_SECURITY
+++ b/baseconfig/CONFIG_9P_FS_SECURITY
@ -0,0 +1 @@
+CONFIG_9P_FS_SECURITY=y
--- a/baseconfig/CONFIG_A11Y_BRAILLE_CONSOLE
+++ b/baseconfig/CONFIG_A11Y_BRAILLE_CONSOLE
@ -0,0 +1 @@
+CONFIG_A11Y_BRAILLE_CONSOLE=y
--- a/baseconfig/CONFIG_AB3100_CORE
+++ b/baseconfig/CONFIG_AB3100_CORE
@ -0,0 +1 @@
+# CONFIG_AB3100_CORE is not set
--- a/baseconfig/CONFIG_AB3100_OTP
+++ b/baseconfig/CONFIG_AB3100_OTP
@ -0,0 +1 @@
+# CONFIG_AB3100_OTP is not set
--- a/baseconfig/CONFIG_ABP060MG
+++ b/baseconfig/CONFIG_ABP060MG
@ -0,0 +1 @@
+CONFIG_ABP060MG=m
--- a/baseconfig/CONFIG_ABX500_CORE
+++ b/baseconfig/CONFIG_ABX500_CORE
@ -0,0 +1 @@
+# CONFIG_ABX500_CORE is not set
--- a/baseconfig/CONFIG_ACCESSIBILITY
+++ b/baseconfig/CONFIG_ACCESSIBILITY
@ -0,0 +1 @@
+CONFIG_ACCESSIBILITY=y
--- a/baseconfig/CONFIG_ACENIC
+++ b/baseconfig/CONFIG_ACENIC
@ -0,0 +1 @@
+CONFIG_ACENIC=m
--- a/baseconfig/CONFIG_ACENIC_OMIT_TIGON_I
+++ b/baseconfig/CONFIG_ACENIC_OMIT_TIGON_I
@ -0,0 +1 @@
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
--- a/baseconfig/CONFIG_ACORN_PARTITION
+++ b/baseconfig/CONFIG_ACORN_PARTITION
@ -0,0 +1 @@
+# CONFIG_ACORN_PARTITION is not set
--- a/baseconfig/CONFIG_ACPI_ALS
+++ b/baseconfig/CONFIG_ACPI_ALS
@ -0,0 +1 @@
+CONFIG_ACPI_ALS=m
--- a/baseconfig/CONFIG_ACPI_DEBUG
+++ b/baseconfig/CONFIG_ACPI_DEBUG
@ -0,0 +1 @@
+# CONFIG_ACPI_DEBUG is not set
--- a/baseconfig/CONFIG_ACPI_DEBUGGER
+++ b/baseconfig/CONFIG_ACPI_DEBUGGER
@ -0,0 +1 @@
+# CONFIG_ACPI_DEBUGGER is not set
--- a/baseconfig/CONFIG_ACPI_NFIT
+++ b/baseconfig/CONFIG_ACPI_NFIT
@ -0,0 +1 @@
+# CONFIG_ACPI_NFIT is not set
--- a/baseconfig/CONFIG_ACPI_PCI_SLOT
+++ b/baseconfig/CONFIG_ACPI_PCI_SLOT
@ -0,0 +1 @@
+CONFIG_ACPI_PCI_SLOT=y
--- a/baseconfig/CONFIG_ACQUIRE_WDT
+++ b/baseconfig/CONFIG_ACQUIRE_WDT
@ -0,0 +1 @@
+# CONFIG_ACQUIRE_WDT is not set
--- a/baseconfig/CONFIG_ACT200L_DONGLE
+++ b/baseconfig/CONFIG_ACT200L_DONGLE
@ -0,0 +1 @@
+CONFIG_ACT200L_DONGLE=m
--- a/baseconfig/CONFIG_ACTISYS_DONGLE
+++ b/baseconfig/CONFIG_ACTISYS_DONGLE
@ -0,0 +1 @@
+CONFIG_ACTISYS_DONGLE=m
--- a/baseconfig/CONFIG_AD2S1200
+++ b/baseconfig/CONFIG_AD2S1200
@ -0,0 +1 @@
+# CONFIG_AD2S1200 is not set
--- a/baseconfig/CONFIG_AD2S1210
+++ b/baseconfig/CONFIG_AD2S1210
@ -0,0 +1 @@
+# CONFIG_AD2S1210 is not set
--- a/baseconfig/CONFIG_AD2S90
+++ b/baseconfig/CONFIG_AD2S90
@ -0,0 +1 @@
+# CONFIG_AD2S90 is not set
--- a/baseconfig/CONFIG_AD5064
+++ b/baseconfig/CONFIG_AD5064
@ -0,0 +1 @@
+# CONFIG_AD5064 is not set
--- a/baseconfig/CONFIG_AD525X_DPOT
+++ b/baseconfig/CONFIG_AD525X_DPOT
@ -0,0 +1 @@
+# CONFIG_AD525X_DPOT is not set
--- a/baseconfig/CONFIG_AD5360
+++ b/baseconfig/CONFIG_AD5360
@ -0,0 +1 @@
+# CONFIG_AD5360 is not set
--- a/baseconfig/CONFIG_AD5380
+++ b/baseconfig/CONFIG_AD5380
@ -0,0 +1 @@
+# CONFIG_AD5380 is not set
--- a/baseconfig/CONFIG_AD5421
+++ b/baseconfig/CONFIG_AD5421
@ -0,0 +1 @@
+# CONFIG_AD5421 is not set
--- a/baseconfig/CONFIG_AD5446
+++ b/baseconfig/CONFIG_AD5446
@ -0,0 +1 @@
+# CONFIG_AD5446 is not set
--- a/baseconfig/CONFIG_AD5449
+++ b/baseconfig/CONFIG_AD5449
@ -0,0 +1 @@
+# CONFIG_AD5449 is not set
--- a/baseconfig/CONFIG_AD5504
+++ b/baseconfig/CONFIG_AD5504
@ -0,0 +1 @@
+# CONFIG_AD5504 is not set
--- a/baseconfig/CONFIG_AD5592R
+++ b/baseconfig/CONFIG_AD5592R
@ -0,0 +1 @@
+# CONFIG_AD5592R is not set
--- a/baseconfig/CONFIG_AD5593R
+++ b/baseconfig/CONFIG_AD5593R
@ -0,0 +1 @@
+# CONFIG_AD5593R is not set
--- a/baseconfig/CONFIG_AD5624R_SPI
+++ b/baseconfig/CONFIG_AD5624R_SPI
@ -0,0 +1 @@
+# CONFIG_AD5624R_SPI is not set
--- a/baseconfig/CONFIG_AD5686
+++ b/baseconfig/CONFIG_AD5686
@ -0,0 +1 @@
+# CONFIG_AD5686 is not set
--- a/baseconfig/CONFIG_AD5755
+++ b/baseconfig/CONFIG_AD5755
@ -0,0 +1 @@
+# CONFIG_AD5755 is not set
--- a/baseconfig/CONFIG_AD5761
+++ b/baseconfig/CONFIG_AD5761
@ -0,0 +1 @@
+# CONFIG_AD5761 is not set
--- a/baseconfig/CONFIG_AD5764
+++ b/baseconfig/CONFIG_AD5764
@ -0,0 +1 @@
+# CONFIG_AD5764 is not set
--- a/baseconfig/CONFIG_AD5791
+++ b/baseconfig/CONFIG_AD5791
@ -0,0 +1 @@
+# CONFIG_AD5791 is not set
--- a/baseconfig/CONFIG_AD5933
+++ b/baseconfig/CONFIG_AD5933
@ -0,0 +1 @@
+# CONFIG_AD5933 is not set
--- a/baseconfig/CONFIG_AD7150
+++ b/baseconfig/CONFIG_AD7150
@ -0,0 +1 @@
+# CONFIG_AD7150 is not set
--- a/baseconfig/CONFIG_AD7152
+++ b/baseconfig/CONFIG_AD7152
@ -0,0 +1 @@
+# CONFIG_AD7152 is not set
--- a/Show More
+++ b/Show More