[PATCH 0/4] Various driver fix-lets

[PATCH 0/4] Various driver fix-lets

[Jan Kiszka]

Mostly for post 5.4 kernels, just the peak_canfd is relevant for older
ones as well.

Jan


CC: Jan Kiszka <jan.kiszka@siemens.com>

Jan Kiszka (4):
  drivers/can/peak_canfd: Fix building out-of-tree
  drivers/net: Account for renaming of
    pci_cleanup_aer_uncorrect_error_status in 5.7
  drivers/net/igb: Replace read_barrier_depends
  drivers/net/r8169: Remove duplicate and usused ether_crc definition

 .../include/asm-generic/xenomai/wrappers.h    |  4 ++++
 kernel/drivers/can/peak_canfd/Makefile        |  4 +++-
 kernel/drivers/net/drivers/e1000e/netdev.c    |  2 +-
 kernel/drivers/net/drivers/igb/igb_main.c     |  6 ++---
 kernel/drivers/net/drivers/r8169.c            | 24 -------------------
 5 files changed, 11 insertions(+), 29 deletions(-)

--
2.26.2

[PATCH 1/4] drivers/can/peak_canfd: Fix building out-of-tree

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 kernel/drivers/can/peak_canfd/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/drivers/can/peak_canfd/Makefile b/kernel/drivers/can/peak_canfd/Makefile
index 22670a9c46..f56f451562 100644
--- a/kernel/drivers/can/peak_canfd/Makefile
+++ b/kernel/drivers/can/peak_canfd/Makefile
@@ -1,6 +1,8 @@
 #
 # Makefile for the PEAK-System CAN-FD IP module drivers
 #
-ccflags-y += -Idrivers/xenomai/can
+ccflags-y += -I$(srctree)/drivers/xenomai/can
+
 obj-$(CONFIG_XENO_DRIVERS_CAN_PEAK_CANFD) += xeno_can_peak_pciefd.o
+
 xeno_can_peak_pciefd-y := rtcan_peak_pciefd.o rtcan_peak_canfd.o
--
2.26.2

[PATCH 2/4] drivers/net: Account for renaming of pci_cleanup_aer_uncorrect_error_status in 5.7

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 kernel/cobalt/include/asm-generic/xenomai/wrappers.h | 4 ++++
 kernel/drivers/net/drivers/e1000e/netdev.c           | 2 +-
 kernel/drivers/net/drivers/igb/igb_main.c            | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h
index 2bb344d737..be62ab744b 100644
--- a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h
+++ b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h
@@ -199,4 +199,8 @@ devm_hwmon_device_register_with_groups(struct device *dev, const char *name,
 #define vmalloc_kernel(__size, __flags)	__vmalloc(__size, GFP_KERNEL|__flags)
 #endif

+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,7,0)
+#define pci_aer_clear_nonfatal_status	pci_cleanup_aer_uncorrect_error_status
+#endif
+
 #endif /* _COBALT_ASM_GENERIC_WRAPPERS_H */
diff --git a/kernel/drivers/net/drivers/e1000e/netdev.c b/kernel/drivers/net/drivers/e1000e/netdev.c
index 5beaf2b552..5ce4679113 100644
--- a/kernel/drivers/net/drivers/e1000e/netdev.c
+++ b/kernel/drivers/net/drivers/e1000e/netdev.c
@@ -3778,7 +3778,7 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
 		result = PCI_ERS_RESULT_RECOVERED;
 	}

-	pci_cleanup_aer_uncorrect_error_status(pdev);
+	pci_aer_clear_nonfatal_status(pdev);

 	return result;
 }
diff --git a/kernel/drivers/net/drivers/igb/igb_main.c b/kernel/drivers/net/drivers/igb/igb_main.c
index 01960a6c26..2f49ba17fe 100644
--- a/kernel/drivers/net/drivers/igb/igb_main.c
+++ b/kernel/drivers/net/drivers/igb/igb_main.c
@@ -5437,10 +5437,10 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev)
 		result = PCI_ERS_RESULT_RECOVERED;
 	}

-	err = pci_cleanup_aer_uncorrect_error_status(pdev);
+	err = pci_aer_clear_nonfatal_status(pdev);
 	if (err) {
 		dev_err(&pdev->dev,
-			"pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n",
+			"pci_aer_clear_nonfatal_status failed 0x%0x\n",
 			err);
 		/* non-fatal, continue */
 	}
--
2.26.2

[PATCH 3/4] drivers/net/igb: Replace read_barrier_depends

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Follows upstream commit c4cb99185b4c.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 kernel/drivers/net/drivers/igb/igb_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/drivers/net/drivers/igb/igb_main.c b/kernel/drivers/net/drivers/igb/igb_main.c
index 2f49ba17fe..1dc4732ee2 100644
--- a/kernel/drivers/net/drivers/igb/igb_main.c
+++ b/kernel/drivers/net/drivers/igb/igb_main.c
@@ -4644,7 +4644,7 @@ static bool igb_clean_tx_irq(struct igb_q_vector *q_vector)
 			break;

 		/* prevent any other reads prior to eop_desc */
-		read_barrier_depends();
+		smp_rmb();

 		/* if DD is not set pending work has not been completed */
 		if (!(eop_desc->wb.status & cpu_to_le32(E1000_TXD_STAT_DD)))
--
2.26.2

[PATCH 4/4] drivers/net/r8169: Remove duplicate and usused ether_crc definition

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Provided by linux/crc32.h as well, now causing build errors. But it was
unused anyway.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 kernel/drivers/net/drivers/r8169.c | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/kernel/drivers/net/drivers/r8169.c b/kernel/drivers/net/drivers/r8169.c
index 6255fcb3f2..b49a15e305 100644
--- a/kernel/drivers/net/drivers/r8169.c
+++ b/kernel/drivers/net/drivers/r8169.c
@@ -466,7 +466,6 @@ static int rtl8169_interrupt(rtdm_irq_t *irq_handle);
 static void rtl8169_init_ring (struct rtnet_device *rtdev);
 static void rtl8169_hw_start (struct rtnet_device *rtdev);
 static int rtl8169_close (struct rtnet_device *rtdev);
-static inline u32 ether_crc (int length, unsigned char *data);
 static void rtl8169_set_rx_mode (struct rtnet_device *rtdev);
 /* static void rtl8169_tx_timeout (struct net_device *dev); */	/*** RTnet ***/
 static struct net_device_stats *rtl8169_get_stats(struct rtnet_device *netdev);
@@ -1826,29 +1825,6 @@ static int rtl8169_close (struct rtnet_device *rtdev)



-//======================================================================================================
-static unsigned const ethernet_polynomial = 0x04c11db7U;
-static inline u32 ether_crc (int length, unsigned char *data)
-{
-	int crc = -1;
-
-	while (--length >= 0) {
-		unsigned char current_octet = *data++;
-		int bit;
-		for (bit = 0; bit < 8; bit++, current_octet >>= 1)
-			crc = (crc << 1) ^ ((crc < 0) ^ (current_octet & 1) ? ethernet_polynomial : 0);
-	}
-
-	return crc;
-}
-
-
-
-
-
-
-
-
 //======================================================================================================
 static void rtl8169_set_rx_mode (struct rtnet_device *rtdev)
 {
--
2.26.2

[PATCH 5/4] drivers/net/experimental/e1000: Annotate valid fall-through cases

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 kernel/drivers/net/drivers/experimental/e1000/e1000_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/drivers/net/drivers/experimental/e1000/e1000_main.c b/kernel/drivers/net/drivers/experimental/e1000/e1000_main.c
index 443a9f55b9..c9751c1ddc 100644
--- a/kernel/drivers/net/drivers/experimental/e1000/e1000_main.c
+++ b/kernel/drivers/net/drivers/experimental/e1000/e1000_main.c
@@ -2396,9 +2396,11 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
 		case 3:
 			psrctl |= PAGE_SIZE <<
 				E1000_PSRCTL_BSIZE3_SHIFT;
+			/* fall through */
 		case 2:
 			psrctl |= PAGE_SIZE <<
 				E1000_PSRCTL_BSIZE2_SHIFT;
+			/* fall through */
 		case 1:
 			psrctl |= PAGE_SIZE >>
 				E1000_PSRCTL_BSIZE1_SHIFT;
--
2.26.2

[PATCH 6/4] drivers/net/igb: Make sure CONFIG_IGB_HWMON is off

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

We better exclude this code path due to unknown impact on RT.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 kernel/drivers/net/drivers/igb/igb.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/drivers/net/drivers/igb/igb.h b/kernel/drivers/net/drivers/igb/igb.h
index 16fb5e2ed4..4c65e31c35 100644
--- a/kernel/drivers/net/drivers/igb/igb.h
+++ b/kernel/drivers/net/drivers/igb/igb.h
@@ -39,6 +39,8 @@

 #include <rtdev.h>

+#undef CONFIG_IGB_HWMON
+
 struct igb_adapter;

 #define E1000_PCS_CFG_IGN_SD	1
--
2.26.2