rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Linux v4.15-rc2-174-g328b4ed93b69

This commit is contained in:
Laura Abbott 2017-12-06 09:47:01 -08:00
parent f6b1a997be
commit 5919ce3742
24 changed files with 44 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
USB-ulpi-fix-bus-node-lookup.patch
View File

@ -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;

1
configs/base-generic/CONFIG_TYPEC Normal file
View File

@ -0,0 +1 @@
CONFIG_TYPEC=m

1
configs/base-generic/CONFIG_USB_GADGET_LEGACY Normal file
View File

@ -0,0 +1 @@
# CONFIG_USB_GADGET_LEGACY is not set

2
gitrev
View File

@ -1 +1 @@
a0651c7fa2c088a605f63792279859608ed7f2c8
328b4ed93b69a6f2083d52f31a240a09e5de386a

2
kernel-aarch64-debug.config
View File

@ -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

2
kernel-aarch64.config
View File

@ -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

2
kernel-armv7hl-debug.config
View File

@ -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

2
kernel-armv7hl-lpae-debug.config
View File

@ -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

2
kernel-armv7hl-lpae.config
View File

@ -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

2
kernel-armv7hl.config
View File

@ -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

2
kernel-i686-PAE.config
View File

@ -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

2
kernel-i686-PAEdebug.config
View File

@ -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

2
kernel-i686-debug.config
View File

@ -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

2
kernel-i686.config
View File

@ -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

2
kernel-ppc64-debug.config
View File

@ -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

2
kernel-ppc64.config
View File

@ -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

2
kernel-ppc64le-debug.config
View File

@ -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

2
kernel-ppc64le.config
View File

@ -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

2
kernel-s390x-debug.config
View File

@ -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

2
kernel-s390x.config
View File

@ -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

2
kernel-x86_64-debug.config
View File

@ -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

2
kernel-x86_64.config
View File

@ -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

8
kernel.spec
View File

@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 2
# The git snapshot level
%define gitrev 0
%define gitrev 1
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@ -596,9 +596,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
@ -2189,6 +2186,9 @@ fi
#
#
%changelog
* 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.

1
sources
View File

@ -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-git1.xz) = 09a1afb57d36699078f7cd62ebbad53a70262f80234d54b365998f3e1c25a954bee305ec90d683ee11b006fbf524b08e8aacf5fad676823492804160b293369c