update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/iio/adc/stx104.c
..
..
@@ -15,7 +15,9 @@
15
15
 #include <linux/kernel.h>
16
16
 #include <linux/module.h>
17
17
 #include <linux/moduleparam.h>
18
+#include <linux/mutex.h>
18
19
 #include <linux/spinlock.h>
20
+#include <linux/types.h>
19
21
 
20
22
 #define STX104_OUT_CHAN(chan) {				\
21
23
 	.type = IIO_VOLTAGE,				\
..
..
@@ -45,13 +47,37 @@
45
47
 MODULE_PARM_DESC(base, "Apex Embedded Systems STX104 base addresses");
46
48
 
47
49
 /**
50
+ * struct stx104_reg - device register structure
51
+ * @ssr_ad:	Software Strobe Register and ADC Data
52
+ * @achan:	ADC Channel
53
+ * @dio:	Digital I/O
54
+ * @dac:	DAC Channels
55
+ * @cir_asr:	Clear Interrupts and ADC Status
56
+ * @acr:	ADC Control
57
+ * @pccr_fsh:	Pacer Clock Control and FIFO Status MSB
58
+ * @acfg:	ADC Configuration
59
+ */
60
+struct stx104_reg {
61
+	u16 ssr_ad;
62
+	u8 achan;
63
+	u8 dio;
64
+	u16 dac[2];
65
+	u8 cir_asr;
66
+	u8 acr;
67
+	u8 pccr_fsh;
68
+	u8 acfg;
69
+};
70
+
71
+/**
48
72
  * struct stx104_iio - IIO device private data structure
73
+ * @lock: synchronization lock to prevent I/O race conditions
49
74
  * @chan_out_states:	channels' output states
50
- * @base:		base port address of the IIO device
75
+ * @reg:		I/O address offset for the device registers
51
76
  */
52
77
 struct stx104_iio {
78
+	struct mutex lock;
53
79
 	unsigned int chan_out_states[STX104_NUM_OUT_CHAN];
54
-	unsigned int base;
80
+	struct stx104_reg __iomem *reg;
55
81
 };
56
82
 
57
83
 /**
..
..
@@ -64,7 +90,7 @@
64
90
 struct stx104_gpio {
65
91
 	struct gpio_chip chip;
66
92
 	spinlock_t lock;
67
-	unsigned int base;
93
+	u8 __iomem *base;
68
94
 	unsigned int out_state;
69
95
 };
70
96
 
..
..
@@ -72,6 +98,7 @@
72
98
 	struct iio_chan_spec const *chan, int *val, int *val2, long mask)
73
99
 {
74
100
 	struct stx104_iio *const priv = iio_priv(indio_dev);
101
+	struct stx104_reg __iomem *const reg = priv->reg;
75
102
 	unsigned int adc_config;
76
103
 	int adbu;
77
104
 	int gain;
..
..
@@ -79,7 +106,7 @@
79
106
 	switch (mask) {
80
107
 	case IIO_CHAN_INFO_HARDWAREGAIN:
81
108
 		/* get gain configuration */
82
-		adc_config = inb(priv->base + 11);
109
+		adc_config = ioread8(&reg->acfg);
83
110
 		gain = adc_config & 0x3;
84
111
 
85
112
 		*val = 1 << gain;
..
..
@@ -90,25 +117,31 @@
90
117
 			return IIO_VAL_INT;
91
118
 		}
92
119
 
120
+		mutex_lock(&priv->lock);
121
+
93
122
 		/* select ADC channel */
94
-		outb(chan->channel | (chan->channel << 4), priv->base + 2);
123
+		iowrite8(chan->channel | (chan->channel << 4), &reg->achan);
95
124
 
96
-		/* trigger ADC sample capture and wait for completion */
97
-		outb(0, priv->base);
98
-		while (inb(priv->base + 8) & BIT(7));
125
+		/* trigger ADC sample capture by writing to the 8-bit
126
+		 * Software Strobe Register and wait for completion
127
+		 */
128
+		iowrite8(0, &reg->ssr_ad);
129
+		while (ioread8(&reg->cir_asr) & BIT(7));
99
130
 
100
-		*val = inw(priv->base);
131
+		*val = ioread16(&reg->ssr_ad);
132
+
133
+		mutex_unlock(&priv->lock);
101
134
 		return IIO_VAL_INT;
102
135
 	case IIO_CHAN_INFO_OFFSET:
103
136
 		/* get ADC bipolar/unipolar configuration */
104
-		adc_config = inb(priv->base + 11);
137
+		adc_config = ioread8(&reg->acfg);
105
138
 		adbu = !(adc_config & BIT(2));
106
139
 
107
140
 		*val = -32768 * adbu;
108
141
 		return IIO_VAL_INT;
109
142
 	case IIO_CHAN_INFO_SCALE:
110
143
 		/* get ADC bipolar/unipolar and gain configuration */
111
-		adc_config = inb(priv->base + 11);
144
+		adc_config = ioread8(&reg->acfg);
112
145
 		adbu = !(adc_config & BIT(2));
113
146
 		gain = adc_config & 0x3;
114
147
 
..
..
@@ -130,16 +163,16 @@
130
163
 		/* Only four gain states (x1, x2, x4, x8) */
131
164
 		switch (val) {
132
165
 		case 1:
133
-			outb(0, priv->base + 11);
166
+			iowrite8(0, &priv->reg->acfg);
134
167
 			break;
135
168
 		case 2:
136
-			outb(1, priv->base + 11);
169
+			iowrite8(1, &priv->reg->acfg);
137
170
 			break;
138
171
 		case 4:
139
-			outb(2, priv->base + 11);
172
+			iowrite8(2, &priv->reg->acfg);
140
173
 			break;
141
174
 		case 8:
142
-			outb(3, priv->base + 11);
175
+			iowrite8(3, &priv->reg->acfg);
143
176
 			break;
144
177
 		default:
145
178
 			return -EINVAL;
..
..
@@ -152,9 +185,12 @@
152
185
 			if ((unsigned int)val > 65535)
153
186
 				return -EINVAL;
154
187
 
155
-			priv->chan_out_states[chan->channel] = val;
156
-			outw(val, priv->base + 4 + 2 * chan->channel);
188
+			mutex_lock(&priv->lock);
157
189
 
190
+			priv->chan_out_states[chan->channel] = val;
191
+			iowrite16(val, &priv->reg->dac[chan->channel]);
192
+
193
+			mutex_unlock(&priv->lock);
158
194
 			return 0;
159
195
 		}
160
196
 		return -EINVAL;
..
..
@@ -222,7 +258,7 @@
222
258
 	if (offset >= 4)
223
259
 		return -EINVAL;
224
260
 
225
-	return !!(inb(stx104gpio->base) & BIT(offset));
261
+	return !!(ioread8(stx104gpio->base) & BIT(offset));
226
262
 }
227
263
 
228
264
 static int stx104_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask,
..
..
@@ -230,7 +266,7 @@
230
266
 {
231
267
 	struct stx104_gpio *const stx104gpio = gpiochip_get_data(chip);
232
268
 
233
-	*bits = inb(stx104gpio->base);
269
+	*bits = ioread8(stx104gpio->base);
234
270
 
235
271
 	return 0;
236
272
 }
..
..
@@ -252,7 +288,7 @@
252
288
 	else
253
289
 		stx104gpio->out_state &= ~mask;
254
290
 
255
-	outb(stx104gpio->out_state, stx104gpio->base);
291
+	iowrite8(stx104gpio->out_state, stx104gpio->base);
256
292
 
257
293
 	spin_unlock_irqrestore(&stx104gpio->lock, flags);
258
294
 }
..
..
@@ -279,7 +315,7 @@
279
315
 
280
316
 	stx104gpio->out_state &= ~*mask;
281
317
 	stx104gpio->out_state |= *mask & *bits;
282
-	outb(stx104gpio->out_state, stx104gpio->base);
318
+	iowrite8(stx104gpio->out_state, stx104gpio->base);
283
319
 
284
320
 	spin_unlock_irqrestore(&stx104gpio->lock, flags);
285
321
 }
..
..
@@ -306,11 +342,16 @@
306
342
 		return -EBUSY;
307
343
 	}
308
344
 
345
+	priv = iio_priv(indio_dev);
346
+	priv->reg = devm_ioport_map(dev, base[id], STX104_EXTENT);
347
+	if (!priv->reg)
348
+		return -ENOMEM;
349
+
309
350
 	indio_dev->info = &stx104_info;
310
351
 	indio_dev->modes = INDIO_DIRECT_MODE;
311
352
 
312
353
 	/* determine if differential inputs */
313
-	if (inb(base[id] + 8) & BIT(5)) {
354
+	if (ioread8(&priv->reg->cir_asr) & BIT(5)) {
314
355
 		indio_dev->num_channels = ARRAY_SIZE(stx104_channels_diff);
315
356
 		indio_dev->channels = stx104_channels_diff;
316
357
 	} else {
..
..
@@ -320,18 +361,17 @@
320
361
 
321
362
 	indio_dev->name = dev_name(dev);
322
363
 
323
-	priv = iio_priv(indio_dev);
324
-	priv->base = base[id];
364
+	mutex_init(&priv->lock);
325
365
 
326
366
 	/* configure device for software trigger operation */
327
-	outb(0, base[id] + 9);
367
+	iowrite8(0, &priv->reg->acr);
328
368
 
329
369
 	/* initialize gain setting to x1 */
330
-	outb(0, base[id] + 11);
370
+	iowrite8(0, &priv->reg->acfg);
331
371
 
332
372
 	/* initialize DAC output to 0V */
333
-	outw(0, base[id] + 4);
334
-	outw(0, base[id] + 6);
373
+	iowrite16(0, &priv->reg->dac[0]);
374
+	iowrite16(0, &priv->reg->dac[1]);
335
375
 
336
376
 	stx104gpio->chip.label = dev_name(dev);
337
377
 	stx104gpio->chip.parent = dev;
..
..
@@ -346,7 +386,7 @@
346
386
 	stx104gpio->chip.get_multiple = stx104_gpio_get_multiple;
347
387
 	stx104gpio->chip.set = stx104_gpio_set;
348
388
 	stx104gpio->chip.set_multiple = stx104_gpio_set_multiple;
349
-	stx104gpio->base = base[id] + 3;
389
+	stx104gpio->base = &priv->reg->dio;
350
390
 	stx104gpio->out_state = 0x0;
351
391
 
352
392
 	spin_lock_init(&stx104gpio->lock);