Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-06-14 07:13:31 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-06-14 07:13:31 +0200
commit59a2a516b4eaade1ebe25c363c3a70f08685cfde (patch)
tree89fc4e92f667732a1bdacd15a9b45650ee89a7c4
parente86c1f917eb8948675a61556903b860e550247d2 (diff)
parent2c93ce9f253ab9870654acbc05e6cc05b83fc615 (diff)
Merge branch 'SLE15' into SLE15-AZURE
-rw-r--r--patches.drivers/i2c-i801-Add-support-for-Intel-Comet-Lake.patch84
-rw-r--r--patches.drivers/scsi-mpt3sas_ctl-fix-double-fetch-bug-in-ctl_ioctl_main2
-rw-r--r--patches.drivers/spi-pxa2xx-Add-support-for-Intel-Comet-Lake.patch38
-rw-r--r--series.conf2
4 files changed, 125 insertions, 1 deletions
diff --git a/patches.drivers/i2c-i801-Add-support-for-Intel-Comet-Lake.patch b/patches.drivers/i2c-i801-Add-support-for-Intel-Comet-Lake.patch
new file mode 100644
index 0000000000..9eb33d3177
--- /dev/null
+++ b/patches.drivers/i2c-i801-Add-support-for-Intel-Comet-Lake.patch
@@ -0,0 +1,84 @@
+From 5cd1c56c42beb6d228cc8d4373fdc5f5ec78a5ad Mon Sep 17 00:00:00 2001
+From: Jarkko Nikula <jarkko.nikula@linux.intel.com>
+Date: Fri, 15 Mar 2019 12:56:49 +0200
+Subject: [PATCH] i2c: i801: Add support for Intel Comet Lake
+Git-commit: 5cd1c56c42beb6d228cc8d4373fdc5f5ec78a5ad
+Patch-mainline: v5.1-rc3
+References: jsc#SLE-5331
+
+Add PCI ID for Intel Comet Lake PCH.
+
+Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
+Reviewed-by: Jean Delvare <jdelvare@suse.de>
+Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ Documentation/i2c/busses/i2c-i801 | 1 +
+ drivers/i2c/busses/Kconfig | 1 +
+ drivers/i2c/busses/i2c-i801.c | 4 ++++
+ 3 files changed, 6 insertions(+)
+
+diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801
+index d1ee484a787d..ee9984f35868 100644
+--- a/Documentation/i2c/busses/i2c-i801
++++ b/Documentation/i2c/busses/i2c-i801
+@@ -36,6 +36,7 @@ Supported adapters:
+ * Intel Cannon Lake (PCH)
+ * Intel Cedar Fork (PCH)
+ * Intel Ice Lake (PCH)
++ * Intel Comet Lake (PCH)
+ Datasheets: Publicly available at the Intel website
+
+ On Intel Patsburg and later chipsets, both the normal host SMBus controller
+diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
+index f2c681971201..f8979abb9a19 100644
+--- a/drivers/i2c/busses/Kconfig
++++ b/drivers/i2c/busses/Kconfig
+@@ -131,6 +131,7 @@ config I2C_I801
+ Cannon Lake (PCH)
+ Cedar Fork (PCH)
+ Ice Lake (PCH)
++ Comet Lake (PCH)
+
+ This driver can also be built as a module. If so, the module
+ will be called i2c-i801.
+diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
+index c91e145ef5a5..679c6c41f64b 100644
+--- a/drivers/i2c/busses/i2c-i801.c
++++ b/drivers/i2c/busses/i2c-i801.c
+@@ -71,6 +71,7 @@
+ * Cannon Lake-LP (PCH) 0x9da3 32 hard yes yes yes
+ * Cedar Fork (PCH) 0x18df 32 hard yes yes yes
+ * Ice Lake-LP (PCH) 0x34a3 32 hard yes yes yes
++ * Comet Lake (PCH) 0x02a3 32 hard yes yes yes
+ *
+ * Features supported by this driver:
+ * Software PEC no
+@@ -240,6 +241,7 @@
+ #define PCI_DEVICE_ID_INTEL_LEWISBURG_SSKU_SMBUS 0xa223
+ #define PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS 0xa2a3
+ #define PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS 0xa323
++#define PCI_DEVICE_ID_INTEL_COMETLAKE_SMBUS 0x02a3
+
+ struct i801_mux_config {
+ char *gpio_chip;
+@@ -1038,6 +1040,7 @@ static const struct pci_device_id i801_ids[] = {
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS) },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CANNONLAKE_LP_SMBUS) },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICELAKE_LP_SMBUS) },
++ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COMETLAKE_SMBUS) },
+ { 0, }
+ };
+
+@@ -1534,6 +1537,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
+ case PCI_DEVICE_ID_INTEL_DNV_SMBUS:
+ case PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS:
+ case PCI_DEVICE_ID_INTEL_ICELAKE_LP_SMBUS:
++ case PCI_DEVICE_ID_INTEL_COMETLAKE_SMBUS:
+ priv->features |= FEATURE_I2C_BLOCK_READ;
+ priv->features |= FEATURE_IRQ;
+ priv->features |= FEATURE_SMBUS_PEC;
+--
+2.16.4
+
diff --git a/patches.drivers/scsi-mpt3sas_ctl-fix-double-fetch-bug-in-ctl_ioctl_main b/patches.drivers/scsi-mpt3sas_ctl-fix-double-fetch-bug-in-ctl_ioctl_main
index 0523dab948..3bb9ba6856 100644
--- a/patches.drivers/scsi-mpt3sas_ctl-fix-double-fetch-bug-in-ctl_ioctl_main
+++ b/patches.drivers/scsi-mpt3sas_ctl-fix-double-fetch-bug-in-ctl_ioctl_main
@@ -4,7 +4,7 @@ Subject: scsi: mpt3sas_ctl: fix double-fetch bug in _ctl_ioctl_main()
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
Git-commit: 86e5aca7fa2927060839f3e3b40c8bd65a7e8d1e
Patch-mainline: Queued in subsystem maintainer repo
-References: bsc#1136922 cve-2019-12456
+References: bsc#1136922 CVE-2019-12456
In _ctl_ioctl_main(), 'ioctl_header' is fetched the first time from
userspace. 'ioctl_header.ioc_number' is then checked. The legal result is
diff --git a/patches.drivers/spi-pxa2xx-Add-support-for-Intel-Comet-Lake.patch b/patches.drivers/spi-pxa2xx-Add-support-for-Intel-Comet-Lake.patch
new file mode 100644
index 0000000000..db0c87fcdb
--- /dev/null
+++ b/patches.drivers/spi-pxa2xx-Add-support-for-Intel-Comet-Lake.patch
@@ -0,0 +1,38 @@
+From 41a918026407be4ca2727cd0d6243fe6cdbfc4ed Mon Sep 17 00:00:00 2001
+From: Evan Green <evgreen@chromium.org>
+Date: Mon, 15 Apr 2019 20:27:43 -0700
+Subject: [PATCH] spi: pxa2xx: Add support for Intel Comet Lake
+Git-commit: 41a918026407be4ca2727cd0d6243fe6cdbfc4ed
+Patch-mainline: v5.2-rc1
+References: jsc#SLE-5331
+
+Add PCI IDs for SPI on Comet Lake.
+
+Signed-off-by: Evan Green <evgreen@chromium.org>
+Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
+Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/spi/spi-pxa2xx.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
+index 3e6811ef37e8..f5546eeaebe4 100644
+--- a/drivers/spi/spi-pxa2xx.c
++++ b/drivers/spi/spi-pxa2xx.c
+@@ -1454,6 +1454,10 @@ static const struct pci_device_id pxa2xx_spi_pci_compound_match[] = {
+ { PCI_VDEVICE(INTEL, 0xa32a), LPSS_CNL_SSP },
+ { PCI_VDEVICE(INTEL, 0xa32b), LPSS_CNL_SSP },
+ { PCI_VDEVICE(INTEL, 0xa37b), LPSS_CNL_SSP },
++ /* CML-LP */
++ { PCI_VDEVICE(INTEL, 0x02aa), LPSS_CNL_SSP },
++ { PCI_VDEVICE(INTEL, 0x02ab), LPSS_CNL_SSP },
++ { PCI_VDEVICE(INTEL, 0x02fb), LPSS_CNL_SSP },
+ { },
+ };
+
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 03bd691407..7f28c07dc6 100644
--- a/series.conf
+++ b/series.conf
@@ -21948,6 +21948,7 @@
patches.drivers/ALSA-hda-realtek-Enable-headset-mic-of-ASUS-P5440FF-.patch
patches.drivers/ALSA-pcm-Fix-possible-OOB-access-in-PCM-oss-plugins.patch
patches.drivers/ALSA-pcm-Don-t-suspend-stream-in-unrecoverable-PCM-s.patch
+ patches.drivers/i2c-i801-Add-support-for-Intel-Comet-Lake.patch
patches.drivers/iommu-don-t-print-warning-when-iommu-driver-only-supports-unmanaged-domains
patches.drivers/iommu-amd-reserve-exclusion-range-in-iova-domain
patches.fixes/mm-Fix-modifying-of-page-protection-by-insert_pfn.patch
@@ -22215,6 +22216,7 @@
patches.drivers/spi-bcm2835aux-fix-driver-to-not-allow-65535-1-cs-gp.patch
patches.drivers/spi-bcm2835aux-warn-in-dmesg-that-native-cs-is-not-r.patch
patches.drivers/spi-bcm2835aux-setup-gpio-cs-to-output-and-correct-l.patch
+ patches.drivers/spi-pxa2xx-Add-support-for-Intel-Comet-Lake.patch
patches.fixes/0001-keys-safe-concurrent-user-session-uid-_keyring-acces.patch
patches.drivers/HID-logitech-hidpp-change-low-battery-level-threshol.patch
patches.drivers/HID-logitech-hidpp-use-RAP-instead-of-FAP-to-get-the.patch