From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 28 Mar 2022 09:57:19 +0000 (+0200)
Subject: 4.19-stable patches
X-Git-Tag: v4.14.275~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=14e07e25fdb751b42088f4cbc9825089bdf73de5;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch
	netdevice-add-the-case-if-dev-is-null.patch
---

diff --git a/queue-4.19/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch b/queue-4.19/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch
new file mode 100644
index 00000000000..ecbc5e6773d
--- /dev/null
+++ b/queue-4.19/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch
@@ -0,0 +1,50 @@
+From 1dc2f2b81a6a9895da59f3915760f6c0c3074492 Mon Sep 17 00:00:00 2001
+From: Randy Dunlap <rdunlap@infradead.org>
+Date: Thu, 25 Nov 2021 18:33:16 -0800
+Subject: hv: utils: add PTP_1588_CLOCK to Kconfig to fix build
+
+From: Randy Dunlap <rdunlap@infradead.org>
+
+commit 1dc2f2b81a6a9895da59f3915760f6c0c3074492 upstream.
+
+The hyperv utilities use PTP clock interfaces and should depend a
+a kconfig symbol such that they will be built as a loadable module or
+builtin so that linker errors do not happen.
+
+Prevents these build errors:
+
+ld: drivers/hv/hv_util.o: in function `hv_timesync_deinit':
+hv_util.c:(.text+0x37d): undefined reference to `ptp_clock_unregister'
+ld: drivers/hv/hv_util.o: in function `hv_timesync_init':
+hv_util.c:(.text+0x738): undefined reference to `ptp_clock_register'
+
+Fixes: 3716a49a81ba ("hv_utils: implement Hyper-V PTP source")
+Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
+Reported-by: kernel test robot <lkp@intel.com>
+Cc: Arnd Bergmann <arnd@arndb.de>
+Cc: "K. Y. Srinivasan" <kys@microsoft.com>
+Cc: Haiyang Zhang <haiyangz@microsoft.com>
+Cc: Stephen Hemminger <sthemmin@microsoft.com>
+Cc: Wei Liu <wei.liu@kernel.org>
+Cc: Dexuan Cui <decui@microsoft.com>
+Cc: linux-hyperv@vger.kernel.org
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Reviewed-by: Michael Kelley <mikelley@microsoft.com>
+Link: https://lore.kernel.org/r/20211126023316.25184-1-rdunlap@infradead.org
+Signed-off-by: Wei Liu <wei.liu@kernel.org>
+Cc: Petr Å tetiar <ynezz@true.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/hv/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/hv/Kconfig
++++ b/drivers/hv/Kconfig
+@@ -16,6 +16,7 @@ config HYPERV_TSCPAGE
+ config HYPERV_UTILS
+ 	tristate "Microsoft Hyper-V Utilities driver"
+ 	depends on HYPERV && CONNECTOR && NLS
++	depends on PTP_1588_CLOCK_OPTIONAL
+ 	help
+ 	  Select this option to enable the Hyper-V Utilities.
+ 
diff --git a/queue-4.19/netdevice-add-the-case-if-dev-is-null.patch b/queue-4.19/netdevice-add-the-case-if-dev-is-null.patch
new file mode 100644
index 00000000000..a10a23a3aad
--- /dev/null
+++ b/queue-4.19/netdevice-add-the-case-if-dev-is-null.patch
@@ -0,0 +1,42 @@
+From b37a466837393af72fe8bcb8f1436410f3f173f3 Mon Sep 17 00:00:00 2001
+From: Yajun Deng <yajun.deng@linux.dev>
+Date: Thu, 5 Aug 2021 19:54:34 +0800
+Subject: netdevice: add the case if dev is NULL
+
+From: Yajun Deng <yajun.deng@linux.dev>
+
+commit b37a466837393af72fe8bcb8f1436410f3f173f3 upstream.
+
+Add the case if dev is NULL in dev_{put, hold}, so the caller doesn't
+need to care whether dev is NULL or not.
+
+Signed-off-by: Yajun Deng <yajun.deng@linux.dev>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Cc: Pavel Machek <pavel@denx.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/netdevice.h |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -3674,7 +3674,8 @@ void netdev_run_todo(void);
+  */
+ static inline void dev_put(struct net_device *dev)
+ {
+-	this_cpu_dec(*dev->pcpu_refcnt);
++	if (dev)
++		this_cpu_dec(*dev->pcpu_refcnt);
+ }
+ 
+ /**
+@@ -3685,7 +3686,8 @@ static inline void dev_put(struct net_de
+  */
+ static inline void dev_hold(struct net_device *dev)
+ {
+-	this_cpu_inc(*dev->pcpu_refcnt);
++	if (dev)
++		this_cpu_inc(*dev->pcpu_refcnt);
+ }
+ 
+ /* Carrier loss detection, dial on demand. The functions netif_carrier_on
diff --git a/queue-4.19/series b/queue-4.19/series
index 2ef59a86f05..c276d554964 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -1,2 +1,4 @@
 usb-serial-pl2303-add-ibm-device-ids.patch
 usb-serial-simple-add-nokia-phone-driver.patch
+hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch
+netdevice-add-the-case-if-dev-is-null.patch