Minor changes done to harmonize with Linux kernel v6.10

Author: Deniz-Eren

src/kernel/drivers/net/can/sja1000/sja1000.c

@@ -93,12 +93,22 @@ static const struct can_bittiming_const sja1000_bittiming_const = {
 
 static void sja1000_write_cmdreg(struct sja1000_priv *priv, u8 val)
 {
+#ifndef __QNX__
+	unsigned long flags;
+#endif
+
 	/*
 	 * The command register needs some locking and time to settle
 	 * the write_reg() operation - especially on SMP systems.
 	 */
+#ifndef __QNX__
+	spin_lock_irqsave(&priv->cmdreg_lock, flags);
+#endif
 	priv->write_reg(priv, SJA1000_CMR, val);
 	priv->read_reg(priv, SJA1000_SR);
+#ifndef __QNX__
+	spin_unlock_irqrestore(&priv->cmdreg_lock, flags);
+#endif
 }
 
 static int sja1000_is_absent(struct sja1000_priv *priv)
@@ -691,6 +701,10 @@ struct net_device *alloc_sja1000dev(int sizeof_priv)
 				       CAN_CTRLMODE_PRESUME_ACK |
 				       CAN_CTRLMODE_CC_LEN8_DLC;
 
+#ifndef __QNX__
+	spin_lock_init(&priv->cmdreg_lock);
+#endif
+
 	if (sizeof_priv)
 		priv->priv = (void *)malloc(sizeof_priv);
 

src/kernel/drivers/net/can/sja1000/sja1000.h

@@ -181,6 +181,9 @@ struct sja1000_priv {
 
 	void __iomem *reg_base;	 /* ioremap'ed address to registers */
 	unsigned long irq_flags; /* for request_irq() */
+#ifndef __QNX__
+	spinlock_t cmdreg_lock;  /* lock for concurrent cmd register writes */
+#endif
 
 	u16 flags;		/* custom mode flags */
 	u8 ocr;			/* output control register */

src/kernel/include/asm-generic/bitops/__fls.h

@@ -38,9 +38,9 @@
  *
  * Undefined if no set bit exists, so code should check against 0 first.
  */
-static __always_inline unsigned long generic___fls(unsigned long word)
+static __always_inline unsigned int generic___fls(unsigned long word)
 {
-	int num = BITS_PER_LONG - 1;
+	unsigned int num = BITS_PER_LONG - 1;
 
 #if BITS_PER_LONG == 64
 	if (!(word & (~0ul << 32))) {

src/kernel/include/linux/math64.h

@@ -203,16 +203,12 @@ static __always_inline u64 mul_u64_u64_shr(u64 a, u64 mul, unsigned int shift)
 #ifndef mul_u64_u32_shr
 static __always_inline u64 mul_u64_u32_shr(u64 a, u32 mul, unsigned int shift)
 {
-	u32 ah, al;
+	u32 ah = a >> 32, al = a;
 	u64 ret;
 
-	al = a;
-	ah = a >> 32;
-
 	ret = mul_u32_u32(al, mul) >> shift;
 	if (ah)
 		ret += mul_u32_u32(ah, mul) << (32 - shift);
-
 	return ret;
 }
 #endif /* mul_u64_u32_shr */

src/kernel/include/linux/minmax.h

@@ -26,8 +26,8 @@
 #ifndef _LINUX_MINMAX_H
 #define _LINUX_MINMAX_H
 
-#include <linux/const.h>
 #include <linux/build_bug.h>
+#include <linux/const.h>
 
 /*
  * min()/max()/clamp() macros must accomplish three things:

src/kernel/include/linux/pci_ids.h

@@ -2632,6 +2632,8 @@
 
 #define PCI_VENDOR_ID_ALIBABA		0x1ded
 
+#define PCI_VENDOR_ID_CXL		0x1e98
+
 #define PCI_VENDOR_ID_TEHUTI		0x1fc9
 #define PCI_DEVICE_ID_TEHUTI_3009	0x3009
 #define PCI_DEVICE_ID_TEHUTI_3010	0x3010
@@ -2711,8 +2713,10 @@
 #define PCI_DEVICE_ID_INTEL_I960	0x0960
 #define PCI_DEVICE_ID_INTEL_I960RM	0x0962
 #define PCI_DEVICE_ID_INTEL_HDA_HSW_0	0x0a0c
+#define PCI_DEVICE_ID_INTEL_DSA_SPR0	0x0b25
 #define PCI_DEVICE_ID_INTEL_HDA_HSW_2	0x0c0c
 #define PCI_DEVICE_ID_INTEL_CENTERTON_ILB	0x0c60
+#define PCI_DEVICE_ID_INTEL_IAX_SPR0	0x0cfe
 #define PCI_DEVICE_ID_INTEL_HDA_HSW_3	0x0d0c
 #define PCI_DEVICE_ID_INTEL_HDA_BYT	0x0f04
 #define PCI_DEVICE_ID_INTEL_SST_BYT	0x0f28
@@ -3131,6 +3135,7 @@
 #define PCI_DEVICE_ID_INTEL_HDA_CML_S	0xa3f0
 #define PCI_DEVICE_ID_INTEL_HDA_LNL_P	0xa828
 #define PCI_DEVICE_ID_INTEL_S21152BB	0xb152
+#define PCI_DEVICE_ID_INTEL_HDA_BMG	0xe2f7
 #define PCI_DEVICE_ID_INTEL_HDA_CML_R	0xf0c8
 #define PCI_DEVICE_ID_INTEL_HDA_RKL_S	0xf1c8
 

src/kernel/include/uapi/linux/if.h

@@ -2,7 +2,7 @@
 /*
  * \file    uapi/linux/if.h
  * \brief   This file is originally from the Linux Kernel source-code and has
- *          been modified by removing contents until only the defitions for
+ *          been modified by removing contents until only the definitions for
  *          IFNAMSIZ macro and enum net_device_flags remains.
  *
  *		Global definitions for the INET interface module.

src/kernel/include/uapi/linux/pci_regs.h

@@ -1166,8 +1166,14 @@
 #define PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH		0x0003ffff
 
 #define PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX		0x000000ff
+#define PCI_DOE_DATA_OBJECT_DISC_REQ_3_VER		0x0000ff00
 #define PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID		0x0000ffff
 #define PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL		0x00ff0000
 #define PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX	0xff000000
 
+/* Compute Express Link (CXL r3.1, sec 8.1.5) */
+#define PCI_DVSEC_CXL_PORT				3
+#define PCI_DVSEC_CXL_PORT_CTL				0x0c
+#define PCI_DVSEC_CXL_PORT_CTL_UNMASK_SBR		0x00000001
+
 #endif /* LINUX_PCI_REGS_H */