This adds support for the Trace Hub in Elkhart Lake CPU.
Signed-off-by: Alexander Shishkin alexander.shishkin@linux.intel.com Reviewed-by: Andy Shevchenko andriy.shevchenko@linux.intel.com Cc: stable@vger.kernel.org --- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c index ad7e51ebe49e..7ccac74553a6 100644 --- a/drivers/hwtracing/intel_th/pci.c +++ b/drivers/hwtracing/intel_th/pci.c @@ -238,6 +238,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4da6), .driver_data = (kernel_ulong_t)&intel_th_2x, }, + { + /* Elkhart Lake CPU */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4529), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, { /* Elkhart Lake */ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4b26),
Hi
[This is an automated email]
This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all
The bot has tested the following trees: v5.5.9, v5.4.25, v4.19.109, v4.14.173, v4.9.216, v4.4.216.
v5.5.9: Build OK! v5.4.25: Build OK! v4.19.109: Build OK! v4.14.173: Build OK! v4.9.216: Failed to apply! Possible dependencies: 4aa5aed2b6f2 ("intel_th: pci: Add Ice Lake NNPI support") 59d08d00d43c ("intel_th: pci: Add Ice Lake PCH support") 88385866bab8 ("intel_th: pci: Add Elkhart Lake SOC support") 920ce7c33db2 ("intel_th: pci: Add Cedar Fork PCH support") 9c78255fdde4 ("intel_th: pci: Add Tiger Lake support") 9d55499d8da4 ("intel_th: pci: Add Jasper Lake PCH support") e60e9a4b231a ("intel_th: pci: Add Comet Lake support")
v4.4.216: Failed to apply! Possible dependencies: 4aa5aed2b6f2 ("intel_th: pci: Add Ice Lake NNPI support") 59d08d00d43c ("intel_th: pci: Add Ice Lake PCH support") 88385866bab8 ("intel_th: pci: Add Elkhart Lake SOC support") 920ce7c33db2 ("intel_th: pci: Add Cedar Fork PCH support") 9c78255fdde4 ("intel_th: pci: Add Tiger Lake support") 9d55499d8da4 ("intel_th: pci: Add Jasper Lake PCH support") e60e9a4b231a ("intel_th: pci: Add Comet Lake support")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
On Tue, Mar 17, 2020 at 08:22:15AM +0200, Alexander Shishkin wrote:
This adds support for the Trace Hub in Elkhart Lake CPU.
Signed-off-by: Alexander Shishkin alexander.shishkin@linux.intel.com Reviewed-by: Andy Shevchenko andriy.shevchenko@linux.intel.com Cc: stable@vger.kernel.org
drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
And again, for 5.6.
Wow this pull request was messed up. Let's go back to just normal patch series submissions please. If I hadn't seen that build warning, this would have been a mess.
greg k-h
linux-stable-mirror@lists.linaro.org