update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
..
..
@@ -20,6 +20,7 @@
20
20
 #define	PCI_DEVID_OCTEONTX2_RVU_AF		0xA065
21
21
 
22
22
 /* Subsystem Device ID */
23
+#define PCI_SUBSYS_DEVID_98XX                  0xB100
23
24
 #define PCI_SUBSYS_DEVID_96XX                  0xB200
24
25
 
25
26
 /* PCI BAR nos */
..
..
@@ -137,6 +138,7 @@
137
138
 	u16		ssow;
138
139
 	u16		cptlfs;
139
140
 	u16		timlfs;
141
+	u16		cpt1_lfs;
140
142
 	u8		cgx_lmac;
141
143
 
142
144
 	/* Block LF's MSIX vector info */
..
..
@@ -182,6 +184,8 @@
182
184
 
183
185
 	bool	cgx_in_use; /* this PF/VF using CGX? */
184
186
 	int	cgx_users;  /* number of cgx users - used only by PFs */
187
+
188
+	u8	nix_blkaddr; /* BLKADDR_NIX0/1 assigned to this PF */
185
189
 };
186
190
 
187
191
 struct nix_txsch {
..
..
@@ -400,6 +404,16 @@
400
404
 		(pdev->subsystem_device == PCI_SUBSYS_DEVID_96XX);
401
405
 }
402
406
 
407
+static inline bool is_rvu_supports_nix1(struct rvu *rvu)
408
+{
409
+	struct pci_dev *pdev = rvu->pdev;
410
+
411
+	if (pdev->subsystem_device == PCI_SUBSYS_DEVID_98XX)
412
+		return true;
413
+
414
+	return false;
415
+}
416
+
403
417
 /* Function Prototypes
404
418
  * RVU
405
419
  */
..
..
@@ -420,6 +434,7 @@
420
434
 int rvu_rsrc_free_count(struct rsrc_bmap *rsrc);
421
435
 int rvu_alloc_rsrc_contig(struct rsrc_bmap *rsrc, int nrsrc);
422
436
 bool rvu_rsrc_check_contig(struct rsrc_bmap *rsrc, int nrsrc);
437
+u16 rvu_get_rsrc_mapcount(struct rvu_pfvf *pfvf, int blkaddr);
423
438
 int rvu_get_pf(u16 pcifunc);
424
439
 struct rvu_pfvf *rvu_get_pfvf(struct rvu *rvu, int pcifunc);
425
440
 void rvu_get_pf_numvfs(struct rvu *rvu, int pf, int *numvfs, int *hwvf);