kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/net/ethernet/i825xx/lasi_82596.c
..
..
@@ -96,22 +96,13 @@
96
96
 
97
97
 #define OPT_SWAP_PORT	0x0001	/* Need to wordswp on the MPU port */
98
98
 
99
-#define LIB82596_DMA_ATTR	DMA_ATTR_NON_CONSISTENT
100
-
101
-#define DMA_WBACK(ndev, addr, len) \
102
-	do { dma_cache_sync((ndev)->dev.parent, (void *)addr, len, DMA_TO_DEVICE); } while (0)
103
-
104
-#define DMA_INV(ndev, addr, len) \
105
-	do { dma_cache_sync((ndev)->dev.parent, (void *)addr, len, DMA_FROM_DEVICE); } while (0)
106
-
107
-#define DMA_WBACK_INV(ndev, addr, len) \
108
-	do { dma_cache_sync((ndev)->dev.parent, (void *)addr, len, DMA_BIDIRECTIONAL); } while (0)
109
-
110
-#define SYSBUS      0x0000006c;
99
+#define SYSBUS      0x0000006c
111
100
 
112
101
 /* big endian CPU, 82596 "big" endian mode */
113
102
 #define SWAP32(x)   (((u32)(x)<<16) | ((((u32)(x)))>>16))
114
103
 #define SWAP16(x)   (x)
104
+
105
+#define NONCOHERENT_DMA 1
115
106
 
116
107
 #include "lib82596.c"
117
108
 
..
..
@@ -143,7 +134,8 @@
143
134
 	}
144
135
 
145
136
 	gsc_writel(a, dev->base_addr + PA_CPU_PORT_L_ACCESS);
146
-	udelay(1);
137
+	if (!running_on_qemu)
138
+		udelay(1);
147
139
 	gsc_writel(b, dev->base_addr + PA_CPU_PORT_L_ACCESS);
148
140
 }
149
141
 
..
..
@@ -154,7 +146,7 @@
154
146
 {
155
147
 	struct	net_device *netdevice;
156
148
 	struct i596_private *lp;
157
-	int	retval;
149
+	int retval = -ENOMEM;
158
150
 	int i;
159
151
 
160
152
 	if (!dev->irq) {
..
..
@@ -185,12 +177,22 @@
185
177
 
186
178
 	lp = netdev_priv(netdevice);
187
179
 	lp->options = dev->id.sversion == 0x72 ? OPT_SWAP_PORT : 0;
180
+	lp->dma = dma_alloc_noncoherent(&dev->dev,
181
+			sizeof(struct i596_dma), &lp->dma_addr,
182
+			DMA_BIDIRECTIONAL, GFP_KERNEL);
183
+	if (!lp->dma)
184
+		goto out_free_netdev;
188
185
 
189
186
 	retval = i82596_probe(netdevice);
190
-	if (retval) {
191
-		free_netdev(netdevice);
192
-		return -ENODEV;
193
-	}
187
+	if (retval)
188
+		goto out_free_dma;
189
+	return 0;
190
+
191
+out_free_dma:
192
+	dma_free_noncoherent(&dev->dev, sizeof(struct i596_dma),
193
+		       lp->dma, lp->dma_addr, DMA_BIDIRECTIONAL);
194
+out_free_netdev:
195
+	free_netdev(netdevice);
194
196
 	return retval;
195
197
 }
196
198
 
..
..
@@ -200,8 +202,8 @@
200
202
 	struct i596_private *lp = netdev_priv(dev);
201
203
 
202
204
 	unregister_netdev (dev);
203
-	dma_free_attrs(&pdev->dev, sizeof(struct i596_private), lp->dma,
204
-		       lp->dma_addr, LIB82596_DMA_ATTR);
205
+	dma_free_noncoherent(&pdev->dev, sizeof(struct i596_private), lp->dma,
206
+		       lp->dma_addr, DMA_BIDIRECTIONAL);
205
207
 	free_netdev (dev);
206
208
 	return 0;
207
209
 }