移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/net/ethernet/freescale/fman/fman.c
..
..
@@ -639,6 +639,9 @@
639
639
 {
640
640
 	u32 tmp;
641
641
 
642
+	iowrite32be(liodn_ofst, &fman->bmi_regs->fmbm_spliodn[port_id - 1]);
643
+	if (!IS_ENABLED(CONFIG_FSL_PAMU))
644
+		return;
642
645
 	/* set LIODN base for this port */
643
646
 	tmp = ioread32be(&fman->dma_regs->fmdmplr[port_id / 2]);
644
647
 	if (port_id % 2) {
..
..
@@ -649,7 +652,6 @@
649
652
 		tmp |= liodn_base << DMA_LIODN_SHIFT;
650
653
 	}
651
654
 	iowrite32be(tmp, &fman->dma_regs->fmdmplr[port_id / 2]);
652
-	iowrite32be(liodn_ofst, &fman->bmi_regs->fmbm_spliodn[port_id - 1]);
653
655
 }
654
656
 
655
657
 static void enable_rams_ecc(struct fman_fpm_regs __iomem *fpm_rg)
..
..
@@ -1946,6 +1948,8 @@
1946
1948
 
1947
1949
 		fman->liodn_offset[i] =
1948
1950
 			ioread32be(&fman->bmi_regs->fmbm_spliodn[i - 1]);
1951
+		if (!IS_ENABLED(CONFIG_FSL_PAMU))
1952
+			continue;
1949
1953
 		liodn_base = ioread32be(&fman->dma_regs->fmdmplr[i / 2]);
1950
1954
 		if (i % 2) {
1951
1955
 			/* FMDM_PLR LSB holds LIODN base for odd ports */
..
..
@@ -2059,11 +2063,11 @@
2059
2063
 /**
2060
2064
  * fman_register_intr
2061
2065
  * @fman:	A Pointer to FMan device
2062
- * @mod:	Calling module
2066
+ * @module:	Calling module
2063
2067
  * @mod_id:	Module id (if more than 1 exists, '0' if not)
2064
2068
  * @intr_type:	Interrupt type (error/normal) selection.
2065
- * @f_isr:	The interrupt service routine.
2066
- * @h_src_arg:	Argument to be passed to f_isr.
2069
+ * @isr_cb:	The interrupt service routine.
2070
+ * @src_arg:	Argument to be passed to isr_cb.
2067
2071
  *
2068
2072
  * Used to register an event handler to be processed by FMan
2069
2073
  *
..
..
@@ -2087,7 +2091,7 @@
2087
2091
 /**
2088
2092
  * fman_unregister_intr
2089
2093
  * @fman:	A Pointer to FMan device
2090
- * @mod:	Calling module
2094
+ * @module:	Calling module
2091
2095
  * @mod_id:	Module id (if more than 1 exists, '0' if not)
2092
2096
  * @intr_type:	Interrupt type (error/normal) selection.
2093
2097
  *
..
..
@@ -2338,8 +2342,8 @@
2338
2342
 
2339
2343
 /**
2340
2344
  * fman_get_revision
2341
- * @fman		- Pointer to the FMan module
2342
- * @rev_info		- A structure of revision information parameters.
2345
+ * @fman:		- Pointer to the FMan module
2346
+ * @rev_info:		- A structure of revision information parameters.
2343
2347
  *
2344
2348
  * Returns the FM revision
2345
2349
  *
..
..
@@ -2443,9 +2447,6 @@
2443
2447
  * buffers when not using jumbo frames.
2444
2448
  * Must be large enough to accommodate the network MTU, but small enough
2445
2449
  * to avoid wasting skb memory.
2446
- *
2447
- * Could be overridden once, at boot-time, via the
2448
- * fm_set_max_frm() callback.
2449
2450
  */
2450
2451
 static int fsl_fm_max_frm = FSL_FM_MAX_FRAME_SIZE;
2451
2452
 module_param(fsl_fm_max_frm, int, 0);
..
..
@@ -2507,7 +2508,7 @@
2507
2508
 
2508
2509
 /**
2509
2510
  * fman_bind
2510
- * @dev:	FMan OF device pointer
2511
+ * @fm_dev:	FMan OF device pointer
2511
2512
  *
2512
2513
  * Bind to a specific FMan device.
2513
2514
  *