kernel 5.14.16

6 files changed, 131 insertions, 14 deletions

diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver
index 8fceaba..7fb2464 100644
--- a/SOURCES/Makefile.rhelver
+++ b/SOURCES/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 0
+RHEL_RELEASE = 1
 
 #
 # Early y+1 numbering
diff --git a/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog
index 1a22339..3fa8428 100644
--- a/SOURCES/Patchlist.changelog
+++ b/SOURCES/Patchlist.changelog
@@ -1,3 +1,9 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/4ea42fc748bc3ba5da69dd285681603f8474732e
+ 4ea42fc748bc3ba5da69dd285681603f8474732e Revert "xhci: Set HCD flag to defer primary roothub registration"
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/492e6a0e07e3e62e977f7b705eab528495923772
+ 492e6a0e07e3e62e977f7b705eab528495923772 Revert "usb: core: hcd: Add support for deferring roothub registration"
+
 https://gitlab.com/cki-project/kernel-ark/-/commit/c72074b04c2b97c40f0fecb2754cd58f83c21642
  c72074b04c2b97c40f0fecb2754cd58f83c21642 autofs: fix wait name hash calculation in autofs_wait()
 
diff --git a/SOURCES/kernel-aarch64-debug-rhel.config b/SOURCES/kernel-aarch64-debug-rhel.config
index 79c1842..10a8564 100644
--- a/SOURCES/kernel-aarch64-debug-rhel.config
+++ b/SOURCES/kernel-aarch64-debug-rhel.config
@@ -4407,7 +4407,6 @@ CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 # CONFIG_QCOM_QFPROM is not set
 # CONFIG_QCOM_RMTFS_MEM is not set
 # CONFIG_QCOM_RPMH is not set
-CONFIG_QCOM_SCM=y
 # CONFIG_QCOM_SMEM is not set
 # CONFIG_QCOM_SPMI_IADC is not set
 # CONFIG_QCOM_SPMI_VADC is not set
diff --git a/SOURCES/kernel-aarch64-rhel.config b/SOURCES/kernel-aarch64-rhel.config
index ef5a924..1f46f9f 100644
--- a/SOURCES/kernel-aarch64-rhel.config
+++ b/SOURCES/kernel-aarch64-rhel.config
@@ -4386,7 +4386,6 @@ CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 # CONFIG_QCOM_QFPROM is not set
 # CONFIG_QCOM_RMTFS_MEM is not set
 # CONFIG_QCOM_RPMH is not set
-CONFIG_QCOM_SCM=y
 # CONFIG_QCOM_SMEM is not set
 # CONFIG_QCOM_SPMI_IADC is not set
 # CONFIG_QCOM_SPMI_VADC is not set
diff --git a/SOURCES/patch-5.14-redhat.patch b/SOURCES/patch-5.14-redhat.patch
index 77eb7a5..e2d266b 100644
--- a/SOURCES/patch-5.14-redhat.patch
+++ b/SOURCES/patch-5.14-redhat.patch
@@ -23,7 +23,9 @@
  drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c     |   4 +
  drivers/net/wireguard/main.c                       |   6 +
  drivers/pci/quirks.c                               |  24 +
+ drivers/usb/core/hcd.c                             |  29 +-
  drivers/usb/core/hub.c                             |   7 +
+ drivers/usb/host/xhci.c                            |   1 -
  fs/xfs/xfs_super.c                                 |   8 -
  include/linux/efi.h                                |  22 +-
  include/linux/lsm_hook_defs.h                      |   2 +
@@ -31,6 +33,7 @@
  include/linux/random.h                             |   7 +
  include/linux/rmi.h                                |   1 +
  include/linux/security.h                           |   5 +
+ include/linux/usb/hcd.h                            |   2 -
  init/Kconfig                                       |   2 +-
  kernel/module_signing.c                            |   9 +-
  mm/cma.c                                           |  10 +
@@ -52,7 +55,7 @@
  tools/testing/selftests/bpf/progs/linked_maps2.c   |  76 ---
  tools/testing/selftests/bpf/progs/linked_vars1.c   |  54 --
  tools/testing/selftests/bpf/progs/linked_vars2.c   |  55 ---
- 54 files changed, 671 insertions(+), 1494 deletions(-)
+ 57 files changed, 677 insertions(+), 1520 deletions(-)
 
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
 index 110b305af27f..488feec76f0a 100644
@@ -1330,6 +1333,76 @@ index 8c3c1ef92171..18431236ab9f 100644
  /*
   * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
   * class code.  Fix it.
+diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
+index 99ff2d23be05..0f8b7c93310e 100644
+--- a/drivers/usb/core/hcd.c
++++ b/drivers/usb/core/hcd.c
+@@ -2775,7 +2775,6 @@ int usb_add_hcd(struct usb_hcd *hcd,
+ {
+ 	int retval;
+ 	struct usb_device *rhdev;
+-	struct usb_hcd *shared_hcd;
+
+ 	if (!hcd->skip_phy_initialization && usb_hcd_is_primary_hcd(hcd)) {
+ 		hcd->phy_roothub = usb_phy_roothub_alloc(hcd->self.sysdev);
+@@ -2936,26 +2935,13 @@ int usb_add_hcd(struct usb_hcd *hcd,
+ 		goto err_hcd_driver_start;
+ 	}
+
+-	/* starting here, usbcore will pay attention to the shared HCD roothub */
+-	shared_hcd = hcd->shared_hcd;
+-	if (!usb_hcd_is_primary_hcd(hcd) && shared_hcd && HCD_DEFER_RH_REGISTER(shared_hcd)) {
+-		retval = register_root_hub(shared_hcd);
+-		if (retval != 0)
+-			goto err_register_root_hub;
+-
+-		if (shared_hcd->uses_new_polling && HCD_POLL_RH(shared_hcd))
+-			usb_hcd_poll_rh_status(shared_hcd);
+-	}
+-
+ 	/* starting here, usbcore will pay attention to this root hub */
+-	if (!HCD_DEFER_RH_REGISTER(hcd)) {
+-		retval = register_root_hub(hcd);
+-		if (retval != 0)
+-			goto err_register_root_hub;
++	retval = register_root_hub(hcd);
++	if (retval != 0)
++		goto err_register_root_hub;
+
+-		if (hcd->uses_new_polling && HCD_POLL_RH(hcd))
+-			usb_hcd_poll_rh_status(hcd);
+-	}
++	if (hcd->uses_new_polling && HCD_POLL_RH(hcd))
++		usb_hcd_poll_rh_status(hcd);
+
+ 	return retval;
+
+@@ -2999,7 +2985,6 @@ EXPORT_SYMBOL_GPL(usb_add_hcd);
+ void usb_remove_hcd(struct usb_hcd *hcd)
+ {
+ 	struct usb_device *rhdev = hcd->self.root_hub;
+-	bool rh_registered;
+
+ 	dev_info(hcd->self.controller, "remove, state %x\n", hcd->state);
+
+@@ -3010,7 +2995,6 @@ void usb_remove_hcd(struct usb_hcd *hcd)
+
+ 	dev_dbg(hcd->self.controller, "roothub graceful disconnect\n");
+ 	spin_lock_irq (&hcd_root_hub_lock);
+-	rh_registered = hcd->rh_registered;
+ 	hcd->rh_registered = 0;
+ 	spin_unlock_irq (&hcd_root_hub_lock);
+
+@@ -3020,8 +3004,7 @@ void usb_remove_hcd(struct usb_hcd *hcd)
+ 	cancel_work_sync(&hcd->died_work);
+
+ 	mutex_lock(&usb_bus_idr_lock);
+-	if (rh_registered)
+-		usb_disconnect(&rhdev);		/* Sets rhdev to NULL */
++	usb_disconnect(&rhdev);		/* Sets rhdev to NULL */
+ 	mutex_unlock(&usb_bus_idr_lock);
+
+ 	/*
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
 index 86658a81d284..5647f4756e97 100644
 --- a/drivers/usb/core/hub.c
@@ -1348,6 +1421,18 @@ index 86658a81d284..5647f4756e97 100644
  	/* Lock the device, then check to see if we were
  	 * disconnected while waiting for the lock to succeed. */
  	usb_lock_device(hdev);
+diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
+index cb730683f898..4e32b96ccc88 100644
+--- a/drivers/usb/host/xhci.c
++++ b/drivers/usb/host/xhci.c
+@@ -692,7 +692,6 @@ int xhci_run(struct usb_hcd *hcd)
+ 		if (ret)
+ 			xhci_free_command(xhci, command);
+ 	}
+-	set_bit(HCD_FLAG_DEFER_RH_REGISTER, &hcd->flags);
+ 	xhci_dbg_trace(xhci, trace_xhci_dbg_init,
+ 			"Finished xhci_run for USB2 roothub");
+
 diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
 index 2c9e26a44546..f96324912d6a 100644
 --- a/fs/xfs/xfs_super.c
@@ -1532,6 +1617,26 @@ index 5b7288521300..f966f591c91e 100644
  #endif	/* CONFIG_SECURITY */
 
  #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
+diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
+index 2c1fc9212cf2..548a028f2dab 100644
+--- a/include/linux/usb/hcd.h
++++ b/include/linux/usb/hcd.h
+@@ -124,7 +124,6 @@ struct usb_hcd {
+ #define HCD_FLAG_RH_RUNNING		5	/* root hub is running? */
+ #define HCD_FLAG_DEAD			6	/* controller has died? */
+ #define HCD_FLAG_INTF_AUTHORIZED	7	/* authorize interfaces? */
+-#define HCD_FLAG_DEFER_RH_REGISTER	8	/* Defer roothub registration */
+
+ 	/* The flags can be tested using these macros; they are likely to
+ 	 * be slightly faster than test_bit().
+@@ -135,7 +134,6 @@ struct usb_hcd {
+ #define HCD_WAKEUP_PENDING(hcd)	((hcd)->flags & (1U << HCD_FLAG_WAKEUP_PENDING))
+ #define HCD_RH_RUNNING(hcd)	((hcd)->flags & (1U << HCD_FLAG_RH_RUNNING))
+ #define HCD_DEAD(hcd)		((hcd)->flags & (1U << HCD_FLAG_DEAD))
+-#define HCD_DEFER_RH_REGISTER(hcd) ((hcd)->flags & (1U << HCD_FLAG_DEFER_RH_REGISTER))
+
+ 	/*
+ 	 * Specifies if interfaces are authorized by default
 diff --git a/init/Kconfig b/init/Kconfig
 index 55f9f7738ebb..564553afb251 100644
 --- a/init/Kconfig
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index c02a144..c46131d 100755
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -80,7 +80,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 
-%global distro_build 300
+%global distro_build 301
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -123,15 +123,15 @@ Summary: The Linux kernel
 # The kernel tarball/base version
 %define kversion 5.14
 
-%define rpmversion 5.14.15
+%define rpmversion 5.14.16
 %define patchversion 5.14
-%define pkgrelease 301
+%define pkgrelease 302
 
 # This is needed to do merge window version magic
 %define patchlevel 14
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 301%{?buildid}%{?dist}
+%define specrelease 302%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -672,7 +672,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.14.15.tar.xz
+Source0: linux-5.14.16.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1366,8 +1366,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.14.15 -c
-mv linux-5.14.15 linux-%{KVERREL}
+%setup -q -n kernel-5.14.16 -c
+mv linux-5.14.16 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2974,10 +2974,18 @@ fi
 #
 #
 %changelog
-* Tue Nov 02 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.14.15-301.fsync
-- Linux v5.14.15 futex2 zen openrgb
+* Sat Nov 06 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.14.16-302
+- Linux v5.14.16 futex2 zen openrgb
 
-* Wed Oct 27 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.15-300]
+* Wed Nov 03 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.16-1]
+- Update release for usb fix rebuild (Justin M. Forbes)
+- Revert "xhci: Set HCD flag to defer primary roothub registration" (Justin M. Forbes)
+- Revert "usb: core: hcd: Add support for deferring roothub registration" (Justin M. Forbes)
+
+* Tue Nov 02 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.16-0]
+- Changelog entry for 5.14.15 (Justin M. Forbes)
+
+* Wed Oct 27 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.15-0]
 - Linux v5.14.15
 
 * Wed Oct 20 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.14-0]