4.9-stable patches

added patches:
	arm64-initialise-high_memory-global-variable-earlier.patch
	cxl-check-if-vphb-exists-before-iterating-over-afu-devices.patch

diff --git a/queue-4.9/arm64-initialise-high_memory-global-variable-earlier.patch b/queue-4.9/arm64-initialise-high_memory-global-variable-earlier.patch
new file mode 100644 (file)
index 0000000..4c0f2e1
--- /dev/null
+++ b/queue-4.9/arm64-initialise-high_memory-global-variable-earlier.patch
@@ -0,0 +1,47 @@
+From f24e5834a2c3f6c5f814a417f858226f0a010ade Mon Sep 17 00:00:00 2001
+From: Steve Capper <steve.capper@arm.com>
+Date: Mon, 4 Dec 2017 14:13:05 +0000
+Subject: arm64: Initialise high_memory global variable earlier
+
+From: Steve Capper <steve.capper@arm.com>
+
+commit f24e5834a2c3f6c5f814a417f858226f0a010ade upstream.
+
+The high_memory global variable is used by
+cma_declare_contiguous(.) before it is defined.
+
+We don't notice this as we compute __pa(high_memory - 1), and it looks
+like we're processing a VA from the direct linear map.
+
+This problem becomes apparent when we flip the kernel virtual address
+space and the linear map is moved to the bottom of the kernel VA space.
+
+This patch moves the initialisation of high_memory before it used.
+
+Fixes: f7426b983a6a ("mm: cma: adjust address limit to avoid hitting low/high memory boundary")
+Signed-off-by: Steve Capper <steve.capper@arm.com>
+Signed-off-by: Will Deacon <will.deacon@arm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm64/mm/init.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm64/mm/init.c
++++ b/arch/arm64/mm/init.c
+@@ -296,6 +296,7 @@ void __init arm64_memblock_init(void)
+               arm64_dma_phys_limit = max_zone_dma_phys();
+       else
+               arm64_dma_phys_limit = PHYS_MASK + 1;
++      high_memory = __va(memblock_end_of_DRAM() - 1) + 1;
+       dma_contiguous_reserve(arm64_dma_phys_limit);
+ 
+       memblock_allow_resize();
+@@ -322,7 +323,6 @@ void __init bootmem_init(void)
+       sparse_init();
+       zone_sizes_init(min, max);
+ 
+-      high_memory = __va((max << PAGE_SHIFT) - 1) + 1;
+       memblock_dump_all();
+ }
+ 

diff --git a/queue-4.9/cxl-check-if-vphb-exists-before-iterating-over-afu-devices.patch b/queue-4.9/cxl-check-if-vphb-exists-before-iterating-over-afu-devices.patch
new file mode 100644 (file)
index 0000000..109810d
--- /dev/null
+++ b/queue-4.9/cxl-check-if-vphb-exists-before-iterating-over-afu-devices.patch
@@ -0,0 +1,72 @@
+From 12841f87b7a8ceb3d54f171660f72a86941bfcb3 Mon Sep 17 00:00:00 2001
+From: Vaibhav Jain <vaibhav@linux.vnet.ibm.com>
+Date: Thu, 23 Nov 2017 09:08:57 +0530
+Subject: cxl: Check if vphb exists before iterating over AFU devices
+
+From: Vaibhav Jain <vaibhav@linux.vnet.ibm.com>
+
+commit 12841f87b7a8ceb3d54f171660f72a86941bfcb3 upstream.
+
+During an eeh a kernel-oops is reported if no vPHB is allocated to the
+AFU. This happens as during AFU init, an error in creation of vPHB is
+a non-fatal error. Hence afu->phb should always be checked for NULL
+before iterating over it for the virtual AFU pci devices.
+
+This patch fixes the kenel-oops by adding a NULL pointer check for
+afu->phb before it is dereferenced.
+
+Fixes: 9e8df8a21963 ("cxl: EEH support")
+Signed-off-by: Vaibhav Jain <vaibhav@linux.vnet.ibm.com>
+Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
+Acked-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/misc/cxl/pci.c |   14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+--- a/drivers/misc/cxl/pci.c
++++ b/drivers/misc/cxl/pci.c
+@@ -1758,6 +1758,9 @@ static pci_ers_result_t cxl_vphb_error_d
+       /* There should only be one entry, but go through the list
+        * anyway
+        */
++      if (afu->phb == NULL)
++              return result;
++
+       list_for_each_entry(afu_dev, &afu->phb->bus->devices, bus_list) {
+               if (!afu_dev->driver)
+                       continue;
+@@ -1801,6 +1804,11 @@ static pci_ers_result_t cxl_pci_error_de
+                       /* Only participate in EEH if we are on a virtual PHB */
+                       if (afu->phb == NULL)
+                               return PCI_ERS_RESULT_NONE;
++
++                      /*
++                       * Tell the AFU drivers; but we don't care what they
++                       * say, we're going away.
++                       */
+                       cxl_vphb_error_detected(afu, state);
+               }
+               return PCI_ERS_RESULT_DISCONNECT;
+@@ -1941,6 +1949,9 @@ static pci_ers_result_t cxl_pci_slot_res
+               if (cxl_afu_select_best_mode(afu))
+                       goto err;
+ 
++              if (afu->phb == NULL)
++                      continue;
++
+               list_for_each_entry(afu_dev, &afu->phb->bus->devices, bus_list) {
+                       /* Reset the device context.
+                        * TODO: make this less disruptive
+@@ -2003,6 +2014,9 @@ static void cxl_pci_resume(struct pci_de
+       for (i = 0; i < adapter->slices; i++) {
+               afu = adapter->afu[i];
+ 
++              if (afu->phb == NULL)
++                      continue;
++
+               list_for_each_entry(afu_dev, &afu->phb->bus->devices, bus_list) {
+                       if (afu_dev->driver && afu_dev->driver->err_handler &&
+                           afu_dev->driver->err_handler->resume)

diff --git a/queue-4.9/series b/queue-4.9/series
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8ef57ee9089da8bb4fdf92e1ba24623c11f4d15c 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -0,0 +1,2 @@
+cxl-check-if-vphb-exists-before-iterating-over-afu-devices.patch
+arm64-initialise-high_memory-global-variable-earlier.patch