diff --git a/arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch b/arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch new file mode 100644 index 000000000..73516b006 --- /dev/null +++ b/arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch @@ -0,0 +1,36 @@ +From 406d27321583d444cd2067dc1130c1260b072576 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Mon, 20 Jan 2020 13:48:55 +0000 +Subject: [PATCH] usb: host: xhci-tegra: set MODULE_FIRMWARE for tegra186 + +Set the MODULE_FIRMWARE for tegra186, it's registered for 124/210 and +ensures the firmware is available at the appropriate time such as in +the initrd, else if the firmware is unavailable the driver fails with +the following errors: + +tegra-xusb 3530000.usb: Direct firmware load for nvidia/tegra186/xusb.bin failed with error -2 +tegra-xusb 3530000.usb: failed to request firmware: -2 +tegra-xusb 3530000.usb: failed to load firmware: -2 +tegra-xusb: probe of 3530000.usb failed with error -2 + +Fixes: 5f9be5f3f899 ("usb: host: xhci-tegra: Add Tegra186 XUSB support") +Signed-off-by: Peter Robinson +--- + drivers/usb/host/xhci-tegra.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c +index bf9065438320..7b0d175ad708 100644 +--- a/drivers/usb/host/xhci-tegra.c ++++ b/drivers/usb/host/xhci-tegra.c +@@ -1432,6 +1432,7 @@ MODULE_FIRMWARE("nvidia/tegra210/xusb.bin"); + + static const char * const tegra186_supply_names[] = { + }; ++MODULE_FIRMWARE("nvidia/tegra186/xusb.bin"); + + static const struct tegra_xusb_phy_type tegra186_phy_types[] = { + { .name = "usb3", .num = 3, }, +-- +2.24.1 + diff --git a/configs/fedora/generic/CONFIG_EXTCON_QCOM_SPMI_MISC b/configs/fedora/generic/CONFIG_EXTCON_QCOM_SPMI_MISC deleted file mode 100644 index 5f2508da3..000000000 --- a/configs/fedora/generic/CONFIG_EXTCON_QCOM_SPMI_MISC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_EXTCON_QCOM_SPMI_MISC is not set diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_EXTCON_QCOM_SPMI_MISC b/configs/fedora/generic/arm/aarch64/CONFIG_EXTCON_QCOM_SPMI_MISC index b52487909..5f2508da3 100644 --- a/configs/fedora/generic/arm/aarch64/CONFIG_EXTCON_QCOM_SPMI_MISC +++ b/configs/fedora/generic/arm/aarch64/CONFIG_EXTCON_QCOM_SPMI_MISC @@ -1 +1 @@ -CONFIG_EXTCON_QCOM_SPMI_MISC=m +# CONFIG_EXTCON_QCOM_SPMI_MISC is not set diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_QCOM_RPM b/configs/fedora/generic/arm/aarch64/CONFIG_MFD_QCOM_RPM index d88a4c4c7..a5c3c02d4 100644 --- a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_QCOM_RPM +++ b/configs/fedora/generic/arm/aarch64/CONFIG_MFD_QCOM_RPM @@ -1 +1 @@ -CONFIG_MFD_QCOM_RPM=m +# CONFIG_MFD_QCOM_RPM is not set diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_CLK_RPM b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_CLK_RPM index 5650c8603..49d6fe218 100644 --- a/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_CLK_RPM +++ b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_CLK_RPM @@ -1 +1 @@ -CONFIG_QCOM_CLK_RPM=m +# CONFIG_QCOM_CLK_RPM is not set diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_QCOM_RPM b/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_QCOM_RPM index 3d002cac5..8eaec88ff 100644 --- a/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_QCOM_RPM +++ b/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_QCOM_RPM @@ -1 +1 @@ -CONFIG_REGULATOR_QCOM_RPM=m +# CONFIG_REGULATOR_QCOM_RPM is not set diff --git a/gitrev b/gitrev index a981d1c4e..839c2588b 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -b3a987b0264d3ddbb24293ebff10eddfc472f653 +def9d2780727cec3313ed3522d0123158d87224d diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index b6547d5fe..6239a8378 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1810,7 +1810,7 @@ CONFIG_EXTCON_AXP288=m CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_MAX3355 is not set # CONFIG_EXTCON_PTN5150 is not set -CONFIG_EXTCON_QCOM_SPMI_MISC=m +# CONFIG_EXTCON_QCOM_SPMI_MISC is not set # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set CONFIG_EXTCON_USBC_CROS_EC=m @@ -3420,7 +3420,7 @@ CONFIG_MFD_MAX77686=y # CONFIG_MFD_PALMAS is not set # CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_PM8XXX is not set -CONFIG_MFD_QCOM_RPM=m +# CONFIG_MFD_QCOM_RPM is not set # CONFIG_MFD_RC5T583 is not set # CONFIG_MFD_RDC321X is not set # CONFIG_MFD_RETU is not set @@ -4826,7 +4826,7 @@ CONFIG_QCOM_APR=m CONFIG_QCOM_BAM_DMA=y CONFIG_QCOM_CLK_APCS_MSM8916=m CONFIG_QCOM_CLK_RPMH=y -CONFIG_QCOM_CLK_RPM=m +# CONFIG_QCOM_CLK_RPM is not set CONFIG_QCOM_CLK_SMD_RPM=m CONFIG_QCOM_COINCELL=m CONFIG_QCOM_COMMAND_DB=y @@ -5023,7 +5023,7 @@ CONFIG_REGULATOR_PFUZE100=m # CONFIG_REGULATOR_PV88090 is not set CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_QCOM_RPMH=y -CONFIG_REGULATOR_QCOM_RPM=m +# CONFIG_REGULATOR_QCOM_RPM is not set CONFIG_REGULATOR_QCOM_SMD_RPM=m CONFIG_REGULATOR_QCOM_SPMI=m CONFIG_REGULATOR_RK808=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 901e0c460..87f423d15 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1802,7 +1802,7 @@ CONFIG_EXTCON_AXP288=m CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_MAX3355 is not set # CONFIG_EXTCON_PTN5150 is not set -CONFIG_EXTCON_QCOM_SPMI_MISC=m +# CONFIG_EXTCON_QCOM_SPMI_MISC is not set # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set CONFIG_EXTCON_USBC_CROS_EC=m @@ -3401,7 +3401,7 @@ CONFIG_MFD_MAX77686=y # CONFIG_MFD_PALMAS is not set # CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_PM8XXX is not set -CONFIG_MFD_QCOM_RPM=m +# CONFIG_MFD_QCOM_RPM is not set # CONFIG_MFD_RC5T583 is not set # CONFIG_MFD_RDC321X is not set # CONFIG_MFD_RETU is not set @@ -4805,7 +4805,7 @@ CONFIG_QCOM_APR=m CONFIG_QCOM_BAM_DMA=y CONFIG_QCOM_CLK_APCS_MSM8916=m CONFIG_QCOM_CLK_RPMH=y -CONFIG_QCOM_CLK_RPM=m +# CONFIG_QCOM_CLK_RPM is not set CONFIG_QCOM_CLK_SMD_RPM=m CONFIG_QCOM_COINCELL=m CONFIG_QCOM_COMMAND_DB=y @@ -5002,7 +5002,7 @@ CONFIG_REGULATOR_PFUZE100=m # CONFIG_REGULATOR_PV88090 is not set CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_QCOM_RPMH=y -CONFIG_REGULATOR_QCOM_RPM=m +# CONFIG_REGULATOR_QCOM_RPM is not set CONFIG_REGULATOR_QCOM_SMD_RPM=m CONFIG_REGULATOR_QCOM_SPMI=m CONFIG_REGULATOR_RK808=y diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 1f0c45979..5e707135f 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1790,7 +1790,6 @@ CONFIG_EXTCON_GPIO=m CONFIG_EXTCON_MAX8997=m CONFIG_EXTCON_PALMAS=m # CONFIG_EXTCON_PTN5150 is not set -# CONFIG_EXTCON_QCOM_SPMI_MISC is not set # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set CONFIG_EXTCON_USBC_CROS_EC=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 44da16fd1..cbe6f58b6 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1783,7 +1783,6 @@ CONFIG_EXTCON_GPIO=m CONFIG_EXTCON_MAX8997=m CONFIG_EXTCON_PALMAS=m # CONFIG_EXTCON_PTN5150 is not set -# CONFIG_EXTCON_QCOM_SPMI_MISC is not set # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set CONFIG_EXTCON_USBC_CROS_EC=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index e9fc26c9e..82fb808fb 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -1547,7 +1547,6 @@ CONFIG_EXT4_USE_FOR_EXT2=y CONFIG_EXTCON_INTEL_INT3496=m # CONFIG_EXTCON_MAX3355 is not set # CONFIG_EXTCON_PTN5150 is not set -# CONFIG_EXTCON_QCOM_SPMI_MISC is not set # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set # CONFIG_EXTCON_USB_GPIO is not set diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 02bd15240..58e6a3376 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -1538,7 +1538,6 @@ CONFIG_EXT4_USE_FOR_EXT2=y CONFIG_EXTCON_INTEL_INT3496=m # CONFIG_EXTCON_MAX3355 is not set # CONFIG_EXTCON_PTN5150 is not set -# CONFIG_EXTCON_QCOM_SPMI_MISC is not set # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set # CONFIG_EXTCON_USB_GPIO is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 24d9126c6..75478559b 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1407,7 +1407,6 @@ CONFIG_EXT4_USE_FOR_EXT2=y # CONFIG_EXTCON_GPIO is not set # CONFIG_EXTCON_MAX3355 is not set # CONFIG_EXTCON_PTN5150 is not set -# CONFIG_EXTCON_QCOM_SPMI_MISC is not set # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set # CONFIG_EXTCON_USB_GPIO is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 353c5181d..b0f0be033 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1398,7 +1398,6 @@ CONFIG_EXT4_USE_FOR_EXT2=y # CONFIG_EXTCON_GPIO is not set # CONFIG_EXTCON_MAX3355 is not set # CONFIG_EXTCON_PTN5150 is not set -# CONFIG_EXTCON_QCOM_SPMI_MISC is not set # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set # CONFIG_EXTCON_USB_GPIO is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index ead3b7900..8bb13c0bc 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1416,7 +1416,6 @@ CONFIG_EXT4_USE_FOR_EXT2=y # CONFIG_EXTCON_GPIO is not set # CONFIG_EXTCON_MAX3355 is not set # CONFIG_EXTCON_PTN5150 is not set -# CONFIG_EXTCON_QCOM_SPMI_MISC is not set # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set # CONFIG_EXTCON_USB_GPIO is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index ec245bc1b..b52eebc07 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1407,7 +1407,6 @@ CONFIG_EXT4_USE_FOR_EXT2=y # CONFIG_EXTCON_GPIO is not set # CONFIG_EXTCON_MAX3355 is not set # CONFIG_EXTCON_PTN5150 is not set -# CONFIG_EXTCON_QCOM_SPMI_MISC is not set # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set # CONFIG_EXTCON_USB_GPIO is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index b5e7b5097..94d67ed5e 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1589,7 +1589,6 @@ CONFIG_EXTCON_INTEL_CHT_WC=m CONFIG_EXTCON_INTEL_INT3496=m # CONFIG_EXTCON_MAX3355 is not set # CONFIG_EXTCON_PTN5150 is not set -# CONFIG_EXTCON_QCOM_SPMI_MISC is not set # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set CONFIG_EXTCON_USBC_CROS_EC=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index c4b24fb05..512173510 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1580,7 +1580,6 @@ CONFIG_EXTCON_INTEL_CHT_WC=m CONFIG_EXTCON_INTEL_INT3496=m # CONFIG_EXTCON_MAX3355 is not set # CONFIG_EXTCON_PTN5150 is not set -# CONFIG_EXTCON_QCOM_SPMI_MISC is not set # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set CONFIG_EXTCON_USBC_CROS_EC=m diff --git a/kernel.spec b/kernel.spec index 26574ddc9..b32a6932b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -102,7 +102,7 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 6 +%global rcrev 7 # The git snapshot level %define gitrev 0 # Set rpm version accordingly @@ -842,6 +842,8 @@ Patch320: arm64-tegra-jetson-tx1-fixes.patch # https://www.spinics.net/lists/linux-tegra/msg43110.html Patch321: arm64-tegra-Jetson-TX2-Allow-bootloader-to-configure.patch +Patch322: arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch + # 400 - IBM (ppc/s390x) patches # 500 - Temp fixes/CVEs etc @@ -1951,7 +1953,6 @@ BuildKernel() { %endif # then drop all but the needed Makefiles/Kconfig files - rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Documentation rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include cp .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build @@ -2858,12 +2859,7 @@ fi /lib/modules/%{KVERREL}%{?3:+%{3}}/source\ /lib/modules/%{KVERREL}%{?3:+%{3}}/updates\ /lib/modules/%{KVERREL}%{?3:+%{3}}/bls.conf\ -%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}/kernel-signing-ca.cer\ -%ifarch s390x ppc64le\ -%if 0%{!?4:1}\ -%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}/%{signing_key_filename} \ -%endif\ -%endif\ +%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}\ %if %{1}\ /lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\ %endif\ @@ -2911,6 +2907,25 @@ fi # # %changelog +* Mon Jan 20 2020 Justin M. Forbes - 5.5.0-0.rc7.git0.1 +- Linux v5.5-rc7 + +* Mon Jan 20 2020 Justin M. Forbes +- Disable debugging options. + +* Fri Jan 17 2020 Justin M. Forbes - 5.5.0-0.rc6.git3.1 +- Linux v5.5-rc6-143-gab7541c3addd + +* Wed Jan 15 2020 Justin M. Forbes - 5.5.0-0.rc6.git2.1 +- Linux v5.5-rc6-45-g51d69817519f + +* Tue Jan 14 2020 Justin M. Forbes - 5.5.0-0.rc6.git1.1 +- Linux v5.5-rc6-27-g452424cdcbca +- Reenable debugging options. + +* Mon Jan 13 2020 Justin M. Forbes +- Add Documentation back to kernel-devel as it has Kconfig now (rhbz 1789641) + * Mon Jan 13 2020 Justin M. Forbes - 5.5.0-0.rc6.git0.1 - Linux v5.5-rc6 diff --git a/sources b/sources index aaa409541..c56520cdf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f -SHA512 (patch-5.5-rc6.xz) = 3e14b02a2bfaa1cc2b994079c6ae1e20cece2d72184c3b64c9c399a621cdaca77d623204fd35780ccadc23a942a6e8d54a4977423a119771dcbfb3233c09edf2 +SHA512 (patch-5.5-rc7.xz) = 201e1da9acb0a9dfea4aa2eda89453c390f2aec7fe5ebcc9a46ef6a44dc16aacc7eb75aada461fbf12102014eb8767c6a640ac2dcc441e9803a4942c0b83c5e8