diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-12-08 07:37:23 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-12-08 07:37:23 +0100 |
| commit | 3b546ff2748786d240a824ef1ebc178c3a5229d5 (patch) | |
| tree | 1cd9a46d26f9c76bdcb0d5efcd0bed254bcfa70e | |
| parent | e7b8c45c20c13229bc17c715e237f4b35aa26fd1 (diff) | |
| parent | 75eb8a5a5a78152622d1eff02aeb83684bcc6210 (diff) | |
| download | kernel-3b546ff2748786d240a824ef1ebc178c3a5229d5.tar.gz kernel-3b546ff2748786d240a824ef1ebc178c3a5229d5.tar.xz kernel-3b546ff2748786d240a824ef1ebc178c3a5229d5.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.15.0-0.rc2.git2.1.vanilla.knurd.1.fc28kernel-4.15.0-0.rc2.git2.1.vanilla.knurd.1.fc27kernel-4.15.0-0.rc2.git2.1.vanilla.knurd.1.fc26kernel-4.15.0-0.rc2.git2.1.vanilla.knurd.1.fc25
28 files changed, 205 insertions, 73 deletions
diff --git a/0001-x86-PCI-fix-infinity-loop-in-search-for-64bit-BAR-pl.patch b/0001-x86-PCI-fix-infinity-loop-in-search-for-64bit-BAR-pl.patch new file mode 100644 index 000000000..e846f204a --- /dev/null +++ b/0001-x86-PCI-fix-infinity-loop-in-search-for-64bit-BAR-pl.patch @@ -0,0 +1,38 @@ +From 91990a4f966e1862f9747072c4f46946169e2d8b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Tue, 21 Nov 2017 11:20:00 +0100 +Subject: [PATCH 1/3] x86/PCI: fix infinity loop in search for 64bit BAR + placement +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Break the loop if we can't find some address space for a 64bit BAR. + +Signed-off-by: Christian König <christian.koenig@amd.com> +--- + arch/x86/pci/fixup.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c +index e59378bf37d9..e857b3ac5755 100644 +--- a/arch/x86/pci/fixup.c ++++ b/arch/x86/pci/fixup.c +@@ -695,8 +695,13 @@ static void pci_amd_enable_64bit_bar(struct pci_dev *dev) + res->end = 0xfd00000000ull - 1; + + /* Just grab the free area behind system memory for this */ +- while ((conflict = request_resource_conflict(&iomem_resource, res))) ++ while ((conflict = request_resource_conflict(&iomem_resource, res))) { ++ if (conflict->end >= res->end) { ++ kfree(res); ++ return; ++ } + res->start = conflict->end + 1; ++ } + + dev_info(&dev->dev, "adding root bus resource %pR\n", res); + +-- +2.11.0 + diff --git a/0002-x86-PCI-only-enable-a-64bit-BAR-on-single-socket-AMD.patch b/0002-x86-PCI-only-enable-a-64bit-BAR-on-single-socket-AMD.patch new file mode 100644 index 000000000..11b48aa9c --- /dev/null +++ b/0002-x86-PCI-only-enable-a-64bit-BAR-on-single-socket-AMD.patch @@ -0,0 +1,58 @@ +From 21ae889eaa7330b57f17cc86b6d0239300eb3f95 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Tue, 21 Nov 2017 11:08:33 +0100 +Subject: [PATCH 2/3] x86/PCI: only enable a 64bit BAR on single socket AMD + Family 15h systems +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When we have a multi socket system each CPU core needs the same setup. Since +this is tricky to do in the fixup code disable enabling a 64bit BAR on multi +socket systems for now. + +Signed-off-by: Christian König <christian.koenig@amd.com> +--- + arch/x86/pci/fixup.c | 20 +++++++++++++++----- + 1 file changed, 15 insertions(+), 5 deletions(-) + +diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c +index e857b3ac5755..c817ab85dc82 100644 +--- a/arch/x86/pci/fixup.c ++++ b/arch/x86/pci/fixup.c +@@ -664,6 +664,16 @@ static void pci_amd_enable_64bit_bar(struct pci_dev *dev) + unsigned i; + u32 base, limit, high; + struct resource *res, *conflict; ++ struct pci_dev *other; ++ ++ /* Check that we are the only device of that type */ ++ other = pci_get_device(dev->vendor, dev->device, NULL); ++ if (other != dev || ++ (other = pci_get_device(dev->vendor, dev->device, other))) { ++ /* This is a multi socket system, don't touch it for now */ ++ pci_dev_put(other); ++ return; ++ } + + for (i = 0; i < 8; i++) { + pci_read_config_dword(dev, AMD_141b_MMIO_BASE(i), &base); +@@ -718,10 +728,10 @@ static void pci_amd_enable_64bit_bar(struct pci_dev *dev) + + pci_bus_add_resource(dev->bus, res, 0); + } +-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x1401, pci_amd_enable_64bit_bar); +-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x141b, pci_amd_enable_64bit_bar); +-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x1571, pci_amd_enable_64bit_bar); +-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x15b1, pci_amd_enable_64bit_bar); +-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x1601, pci_amd_enable_64bit_bar); ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1401, pci_amd_enable_64bit_bar); ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x141b, pci_amd_enable_64bit_bar); ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1571, pci_amd_enable_64bit_bar); ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x15b1, pci_amd_enable_64bit_bar); ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1601, pci_amd_enable_64bit_bar); + + #endif +-- +2.11.0 + diff --git a/0003-x86-PCI-limit-the-size-of-the-64bit-BAR-to-256GB.patch b/0003-x86-PCI-limit-the-size-of-the-64bit-BAR-to-256GB.patch new file mode 100644 index 000000000..22b0c6e3e --- /dev/null +++ b/0003-x86-PCI-limit-the-size-of-the-64bit-BAR-to-256GB.patch @@ -0,0 +1,33 @@ +From e5d5c9682aa02a6b9c0c6bd446d433b924441679 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Tue, 28 Nov 2017 10:02:35 +0100 +Subject: [PATCH 3/3] x86/PCI: limit the size of the 64bit BAR to 256GB +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This avoids problems with Xen which hides some memory resources from the +OS and potentially also allows memory hotplug while this fixup is +enabled. + +Signed-off-by: Christian König <christian.koenig@amd.com> +--- + arch/x86/pci/fixup.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c +index c817ab85dc82..149adbc7f2a3 100644 +--- a/arch/x86/pci/fixup.c ++++ b/arch/x86/pci/fixup.c +@@ -701,7 +701,7 @@ static void pci_amd_enable_64bit_bar(struct pci_dev *dev) + res->name = "PCI Bus 0000:00"; + res->flags = IORESOURCE_PREFETCH | IORESOURCE_MEM | + IORESOURCE_MEM_64 | IORESOURCE_WINDOW; +- res->start = 0x100000000ull; ++ res->start = 0xbd00000000ull; + res->end = 0xfd00000000ull - 1; + + /* Just grab the free area behind system memory for this */ +-- +2.11.0 + diff --git a/USB-ulpi-fix-bus-node-lookup.patch b/USB-ulpi-fix-bus-node-lookup.patch deleted file mode 100644 index 835cf2ab6..000000000 --- a/USB-ulpi-fix-bus-node-lookup.patch +++ /dev/null @@ -1,48 +0,0 @@ -From patchwork Sat Nov 11 15:31:18 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: USB: ulpi: fix bus-node lookup -From: Johan Hovold <johan@kernel.org> -X-Patchwork-Id: 10054387 -Message-Id: <20171111153118.16038-1-johan@kernel.org> -To: Heikki Krogerus <heikki.krogerus@linux.intel.com> -Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, - linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, - linux-arm-msm@vger.kernel.org, Rob Clark <robdclark@gmail.com>, - Peter Robinson <pbrobinson@gmail.com>, Johan Hovold <johan@kernel.org>, - stable <stable@vger.kernel.org> -Date: Sat, 11 Nov 2017 16:31:18 +0100 - -Fix bus-node lookup during registration, which ended up searching the whole -device tree depth-first starting at the parent (or grand parent) rather -than just matching on its children. - -To make things worse, the parent (or grand-parent) node could end being -prematurely freed as well. - -Fixes: ef6a7bcfb01c ("usb: ulpi: Support device discovery via DT") -Reported-by: Peter Robinson <pbrobinson@gmail.com> -Reported-by: Stephen Boyd <sboyd@codeaurora.org> -Cc: stable <stable@vger.kernel.org> # 4.10 -Signed-off-by: Johan Hovold <johan@kernel.org> ---- - drivers/usb/common/ulpi.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c -index 8b351444cc40..9a2ab6751a23 100644 ---- a/drivers/usb/common/ulpi.c -+++ b/drivers/usb/common/ulpi.c -@@ -180,9 +180,9 @@ static int ulpi_of_register(struct ulpi *ulpi) - /* Find a ulpi bus underneath the parent or the grandparent */ - parent = ulpi->dev.parent; - if (parent->of_node) -- np = of_find_node_by_name(parent->of_node, "ulpi"); -+ np = of_get_child_by_name(parent->of_node, "ulpi"); - else if (parent->parent && parent->parent->of_node) -- np = of_find_node_by_name(parent->parent->of_node, "ulpi"); -+ np = of_get_child_by_name(parent->parent->of_node, "ulpi"); - if (!np) - return 0; - diff --git a/configs/base-generic/CONFIG_HID_CP2112 b/configs/base-generic/CONFIG_HID_CP2112 index 3f9425d1d..d0f72fae1 100644 --- a/configs/base-generic/CONFIG_HID_CP2112 +++ b/configs/base-generic/CONFIG_HID_CP2112 @@ -1 +1 @@ -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m diff --git a/configs/base-generic/CONFIG_TYPEC b/configs/base-generic/CONFIG_TYPEC new file mode 100644 index 000000000..d8e689e93 --- /dev/null +++ b/configs/base-generic/CONFIG_TYPEC @@ -0,0 +1 @@ +CONFIG_TYPEC=m diff --git a/configs/base-generic/CONFIG_USB_GADGET_LEGACY b/configs/base-generic/CONFIG_USB_GADGET_LEGACY new file mode 100644 index 000000000..9c3130405 --- /dev/null +++ b/configs/base-generic/CONFIG_USB_GADGET_LEGACY @@ -0,0 +1 @@ +# CONFIG_USB_GADGET_LEGACY is not set @@ -1 +1 @@ -a0651c7fa2c088a605f63792279859608ed7f2c8 +968edbd93c0cbb40ab48aca972392d377713a0c3 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 2a12ea4d5..5c658c5ab 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1846,7 +1846,7 @@ CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELECOM=m @@ -5850,6 +5850,7 @@ CONFIG_TUN=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m @@ -5976,6 +5977,7 @@ CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_GADGET_DEBUG_FS is not set # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGETFS is not set +# CONFIG_USB_GADGET_LEGACY is not set CONFIG_USB_GADGET=m CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 CONFIG_USB_GADGET_VBUS_DRAW=100 diff --git a/kernel-aarch64.config b/kernel-aarch64.config index ab7456b9a..8940d979b 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1829,7 +1829,7 @@ CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELECOM=m @@ -5827,6 +5827,7 @@ CONFIG_TUN=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m @@ -5953,6 +5954,7 @@ CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_GADGET_DEBUG_FS is not set # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGETFS is not set +# CONFIG_USB_GADGET_LEGACY is not set CONFIG_USB_GADGET=m CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 CONFIG_USB_GADGET_VBUS_DRAW=100 diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 356929654..6fb73fd7c 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1981,7 +1981,7 @@ CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELECOM=m @@ -6350,6 +6350,7 @@ CONFIG_TWL6030_GPADC=m CONFIG_TWL6030_USB=m CONFIG_TWL6040_CORE=y CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m @@ -6485,6 +6486,7 @@ CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_GADGET_DEBUG_FS is not set # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGETFS is not set +# CONFIG_USB_GADGET_LEGACY is not set CONFIG_USB_GADGET=m CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 CONFIG_USB_GADGET_VBUS_DRAW=100 diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index e3e13b4e1..309de1bd1 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1875,7 +1875,7 @@ CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELECOM=m @@ -5934,6 +5934,7 @@ CONFIG_TUN=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m @@ -6063,6 +6064,7 @@ CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_GADGET_DEBUG_FS is not set # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGETFS is not set +# CONFIG_USB_GADGET_LEGACY is not set CONFIG_USB_GADGET=m CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 CONFIG_USB_GADGET_VBUS_DRAW=100 diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 2e97c5065..494744bc4 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1858,7 +1858,7 @@ CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELECOM=m @@ -5911,6 +5911,7 @@ CONFIG_TUN=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m @@ -6040,6 +6041,7 @@ CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_GADGET_DEBUG_FS is not set # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGETFS is not set +# CONFIG_USB_GADGET_LEGACY is not set CONFIG_USB_GADGET=m CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 CONFIG_USB_GADGET_VBUS_DRAW=100 diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index f1295aef1..c28c79e0d 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1964,7 +1964,7 @@ CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELECOM=m @@ -6327,6 +6327,7 @@ CONFIG_TWL6030_GPADC=m CONFIG_TWL6030_USB=m CONFIG_TWL6040_CORE=y CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m @@ -6462,6 +6463,7 @@ CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_GADGET_DEBUG_FS is not set # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGETFS is not set +# CONFIG_USB_GADGET_LEGACY is not set CONFIG_USB_GADGET=m CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 CONFIG_USB_GADGET_VBUS_DRAW=100 diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index ae202a3ca..08e83261a 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -1706,7 +1706,7 @@ CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELECOM=m @@ -5500,6 +5500,7 @@ CONFIG_TUN=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m @@ -5588,6 +5589,7 @@ CONFIG_USB_EZUSB=y CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_GADGETFS is not set # CONFIG_USB_GADGET is not set +# CONFIG_USB_GADGET_LEGACY is not set CONFIG_USB_GL860=m # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_GR_UDC is not set diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index b6182ce73..1cbee7cd6 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -1724,7 +1724,7 @@ CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELECOM=m @@ -5522,6 +5522,7 @@ CONFIG_TUN=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m @@ -5610,6 +5611,7 @@ CONFIG_USB_EZUSB=y CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_GADGETFS is not set # CONFIG_USB_GADGET is not set +# CONFIG_USB_GADGET_LEGACY is not set CONFIG_USB_GL860=m # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_GR_UDC is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 717f3160a..b00247420 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -1724,7 +1724,7 @@ CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELECOM=m @@ -5522,6 +5522,7 @@ CONFIG_TUN=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m @@ -5610,6 +5611,7 @@ CONFIG_USB_EZUSB=y CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_GADGETFS is not set # CONFIG_USB_GADGET is not set +# CONFIG_USB_GADGET_LEGACY is not set CONFIG_USB_GL860=m # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_GR_UDC is not set diff --git a/kernel-i686.config b/kernel-i686.config index 809cf9150..deb93d08a 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -1706,7 +1706,7 @@ CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELECOM=m @@ -5500,6 +5500,7 @@ CONFIG_TUN=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m @@ -5588,6 +5589,7 @@ CONFIG_USB_EZUSB=y CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_GADGETFS is not set # CONFIG_USB_GADGET is not set +# CONFIG_USB_GADGET_LEGACY is not set CONFIG_USB_GL860=m # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_GR_UDC is not set diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 5400e93bb..5e07a1559 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -1628,7 +1628,7 @@ CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELECOM=m @@ -5285,6 +5285,7 @@ CONFIG_TUN=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m @@ -5376,6 +5377,7 @@ CONFIG_USB_EZUSB=y CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_GADGETFS is not set # CONFIG_USB_GADGET is not set +# CONFIG_USB_GADGET_LEGACY is not set CONFIG_USB_GL860=m # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_GR_UDC is not set diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 9985b0f2b..0a445c0e9 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -1610,7 +1610,7 @@ CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELECOM=m @@ -5261,6 +5261,7 @@ CONFIG_TUN=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m @@ -5352,6 +5353,7 @@ CONFIG_USB_EZUSB=y CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_GADGETFS is not set # CONFIG_USB_GADGET is not set +# CONFIG_USB_GADGET_LEGACY is not set CONFIG_USB_GL860=m # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_GR_UDC is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index eeb33e98d..c630d338a 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -1581,7 +1581,7 @@ CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELECOM=m @@ -5213,6 +5213,7 @@ CONFIG_TUN=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m @@ -5304,6 +5305,7 @@ CONFIG_USB_EZUSB=y CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_GADGETFS is not set # CONFIG_USB_GADGET is not set +# CONFIG_USB_GADGET_LEGACY is not set CONFIG_USB_GL860=m # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_GR_UDC is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 37ee234e7..7556814dd 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -1563,7 +1563,7 @@ CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELECOM=m @@ -5189,6 +5189,7 @@ CONFIG_TUN=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m @@ -5280,6 +5281,7 @@ CONFIG_USB_EZUSB=y CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_GADGETFS is not set # CONFIG_USB_GADGET is not set +# CONFIG_USB_GADGET_LEGACY is not set CONFIG_USB_GL860=m # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_GR_UDC is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index d63b2ac8a..1942dc4e5 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1551,7 +1551,7 @@ CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELECOM=m @@ -5112,6 +5112,7 @@ CONFIG_TUN=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m @@ -5199,6 +5200,7 @@ CONFIG_USB_EZUSB=y CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_GADGETFS is not set # CONFIG_USB_GADGET is not set +# CONFIG_USB_GADGET_LEGACY is not set CONFIG_USB_GL860=m # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_GR_UDC is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index 5fae96448..a7b2dc307 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1533,7 +1533,7 @@ CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELECOM=m @@ -5088,6 +5088,7 @@ CONFIG_TUN=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m @@ -5175,6 +5176,7 @@ CONFIG_USB_EZUSB=y CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_GADGETFS is not set # CONFIG_USB_GADGET is not set +# CONFIG_USB_GADGET_LEGACY is not set CONFIG_USB_GL860=m # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_GR_UDC is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 9e604e123..de590262d 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -1768,7 +1768,7 @@ CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELECOM=m @@ -5573,6 +5573,7 @@ CONFIG_TUN=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m @@ -5661,6 +5662,7 @@ CONFIG_USB_EZUSB=y CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_GADGETFS is not set # CONFIG_USB_GADGET is not set +# CONFIG_USB_GADGET_LEGACY is not set CONFIG_USB_GL860=m # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_GR_UDC is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 0a0a55037..026c86f92 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -1750,7 +1750,7 @@ CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELECOM=m @@ -5551,6 +5551,7 @@ CONFIG_TUN=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m @@ -5639,6 +5640,7 @@ CONFIG_USB_EZUSB=y CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_GADGETFS is not set # CONFIG_USB_GADGET is not set +# CONFIG_USB_GADGET_LEGACY is not set CONFIG_USB_GL860=m # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_GR_UDC is not set diff --git a/kernel.spec b/kernel.spec index 651ddb3fc..7edc1d33f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 2 # The git snapshot level -%define gitrev 0 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -133,7 +133,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} @@ -613,9 +613,6 @@ Patch307: arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch # https://patchwork.kernel.org/patch/9820417/ Patch310: qcom-msm89xx-fixes.patch -# https://patchwork.kernel.org/patch/10054387/ -Patch311: USB-ulpi-fix-bus-node-lookup.patch - # Fix USB on the RPi https://patchwork.kernel.org/patch/9879371/ Patch321: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe.patch @@ -656,6 +653,11 @@ Patch630: 0001-HID-multitouch-Properly-deal-with-Win8-PTP-reports-w.patch Patch631: 0002-HID-multitouch-Only-look-at-non-touch-fields-in-firs.patch Patch632: 0003-HID-multitouch-Combine-all-left-button-events-in-a-f.patch +# Reported upstream +Patch633: 0001-x86-PCI-fix-infinity-loop-in-search-for-64bit-BAR-pl.patch +Patch634: 0002-x86-PCI-only-enable-a-64bit-BAR-on-single-socket-AMD.patch +Patch635: 0003-x86-PCI-limit-the-size-of-the-64bit-BAR-to-256GB.patch + # END OF PATCH DEFINITIONS %endif @@ -2131,6 +2133,7 @@ fi %files -n kernel-tools-libs-devel %{_libdir}/libcpupower.so %{_includedir}/cpufreq.h +%{_includedir}/cpuidle.h %endif %endif # with_perf @@ -2209,6 +2212,15 @@ fi # # %changelog +* Thu Dec 07 2017 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc2.git2.1 +- Linux v4.15-rc2-252-g968edbd93c0c + +* Wed Dec 06 2017 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc2.git1.1 +- Linux v4.15-rc2-174-g328b4ed93b69 + +* Wed Dec 06 2017 Laura Abbott <labbott@redhat.com> +- Reenable debugging options. + * Wed Dec 6 2017 Peter Robinson <pbrobinson@fedoraproject.org> - Disable IrDA (broken, being dropped upstream) @@ -1,3 +1,4 @@ SHA512 (linux-4.14.tar.xz) = 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 SHA512 (perf-man-4.14.tar.gz) = 76a9d8adc284cdffd4b3fbb060e7f9a14109267707ce1d03f4c3239cd70d8d164f697da3a0f90a363fbcac42a61d3c378afbcc2a86f112c501b9cb5ce74ef9f8 SHA512 (patch-4.15-rc2.xz) = beacb7f7dea88819a391f4b0a10b7faf2ef5055dd53f7fe95ca5603c019ea7e5ff5d7af15fba08c4c6ba257d9bca7ce15a9320741a811a9b9c9fa5bbc0e78078 +SHA512 (patch-4.15-rc2-git2.xz) = 268b5e2b8975aeae4a3e6a96a3e20a91dbbbf347d6cd3407a682dac1fae63d3c3820bcf03d148062aaa46c10f2c2f102e01c9369535b7d16584a4514ea88b6ad |