Merge 4.19-rc6

We want those fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 18 insertions, 3 deletions

diff --git a/drivers/hwtracing/intel_th/core.c b/drivers/hwtracing/intel_th/core.c
index da962aa2cef5..fc6b7f8b62fb 100644
--- a/drivers/hwtracing/intel_th/core.c
+++ b/drivers/hwtracing/intel_th/core.c
@@ -139,7 +139,8 @@ static int intel_th_remove(struct device *dev)
                         th->thdev[i] = NULL;
                 }
 
-                th->num_thdevs = lowest;
+                if (lowest >= 0)
+                        th->num_thdevs = lowest;
         }
 
         if (thdrv->attr_group)
@@ -487,7 +488,7 @@ static const struct intel_th_subdevice {
                                 .flags  = IORESOURCE_MEM,
                         },
                         {
-                                .start  = TH_MMIO_SW,
+                                .start  = 1, /* use resource[1] */
                                 .end    = 0,
                                 .flags  = IORESOURCE_MEM,
                         },
@@ -580,6 +581,7 @@ intel_th_subdevice_alloc(struct intel_th *th,
         struct intel_th_device *thdev;
         struct resource res[3];
         unsigned int req = 0;
+        bool is64bit = false;
         int r, err;
 
         thdev = intel_th_device_alloc(th, subdev->type, subdev->name,
@@ -589,12 +591,18 @@ intel_th_subdevice_alloc(struct intel_th *th,
 
         thdev->drvdata = th->drvdata;
 
+        for (r = 0; r < th->num_resources; r++)
+                if (th->resource[r].flags & IORESOURCE_MEM_64) {
+                        is64bit = true;
+                        break;
+                }
+
         memcpy(res, subdev->res,
                sizeof(struct resource) * subdev->nres);
 
         for (r = 0; r < subdev->nres; r++) {
                 struct resource *devres = th->resource;
-                int bar = TH_MMIO_CONFIG;
+                int bar = 0; /* cut subdevices' MMIO from resource[0] */
 
                 /*
                  * Take .end == 0 to mean 'take the whole bar',
@@ -603,6 +611,8 @@ intel_th_subdevice_alloc(struct intel_th *th,
                  */
                 if (!res[r].end && res[r].flags == IORESOURCE_MEM) {
                         bar = res[r].start;
+                        if (is64bit)
+                                bar *= 2;
                         res[r].start = 0;
                         res[r].end = resource_size(&devres[bar]) - 1;
                 }
diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c
index c2e55e5d97f6..1cf6290d6435 100644
--- a/drivers/hwtracing/intel_th/pci.c
+++ b/drivers/hwtracing/intel_th/pci.c
@@ -160,6 +160,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = {
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x18e1),
                 .driver_data = (kernel_ulong_t)&intel_th_2x,
         },
+        {
+                /* Ice Lake PCH */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x34a6),
+                .driver_data = (kernel_ulong_t)&intel_th_2x,
+        },
         { 0 },
 };