Skip to content

Commit c61cfb9

Browse files
Alex Elderdavem330
Alex Elder
authored and
davem330
committed
net: ipa: don't index mem data array by ID
Finally the code handles the IPA memory region array in the configuration data without assuming it is indexed by region ID. Get rid of the array index designators where these arrays are initialized. As a result, there's no more need to define an explicitly undefined memory region ID, so get rid of that. Change ipa_mem_find() so it no longer assumes the ipa->mem[] array is indexed by memory region ID. Instead, have it search the array for the entry having the requested memory ID, and return the address of the descriptor if found. Otherwise return NULL. Stop allowing memory regions to be defined with zero size and zero canary value. Check for this condition in ipa_mem_valid_one(). As a result, it is not necessary to check for this case in ipa_mem_config(). Finally, there is no need for IPA_MEM_UNDEFINED to be defined any more, so get rid of it. Signed-off-by: Alex Elder <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 5e3bc1e commit c61cfb9

File tree

7 files changed

+117
-124
lines changed

7 files changed

+117
-124
lines changed

‎drivers/net/ipa/ipa_data-v3.5.1.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -271,91 +271,91 @@ static const struct ipa_resource_data ipa_resource_data = {
271271

272272
/* IPA-resident memory region data for an SoC having IPA v3.5.1 */
273273
static const struct ipa_mem ipa_mem_local_data[] = {
274-
[IPA_MEM_UC_SHARED] = {
274+
{
275275
.id = IPA_MEM_UC_SHARED,
276276
.offset = 0x0000,
277277
.size = 0x0080,
278278
.canary_count = 0,
279279
},
280-
[IPA_MEM_UC_INFO] = {
280+
{
281281
.id = IPA_MEM_UC_INFO,
282282
.offset = 0x0080,
283283
.size = 0x0200,
284284
.canary_count = 0,
285285
},
286-
[IPA_MEM_V4_FILTER_HASHED] = {
286+
{
287287
.id = IPA_MEM_V4_FILTER_HASHED,
288288
.offset = 0x0288,
289289
.size = 0x0078,
290290
.canary_count = 2,
291291
},
292-
[IPA_MEM_V4_FILTER] = {
292+
{
293293
.id = IPA_MEM_V4_FILTER,
294294
.offset = 0x0308,
295295
.size = 0x0078,
296296
.canary_count = 2,
297297
},
298-
[IPA_MEM_V6_FILTER_HASHED] = {
298+
{
299299
.id = IPA_MEM_V6_FILTER_HASHED,
300300
.offset = 0x0388,
301301
.size = 0x0078,
302302
.canary_count = 2,
303303
},
304-
[IPA_MEM_V6_FILTER] = {
304+
{
305305
.id = IPA_MEM_V6_FILTER,
306306
.offset = 0x0408,
307307
.size = 0x0078,
308308
.canary_count = 2,
309309
},
310-
[IPA_MEM_V4_ROUTE_HASHED] = {
310+
{
311311
.id = IPA_MEM_V4_ROUTE_HASHED,
312312
.offset = 0x0488,
313313
.size = 0x0078,
314314
.canary_count = 2,
315315
},
316-
[IPA_MEM_V4_ROUTE] = {
316+
{
317317
.id = IPA_MEM_V4_ROUTE,
318318
.offset = 0x0508,
319319
.size = 0x0078,
320320
.canary_count = 2,
321321
},
322-
[IPA_MEM_V6_ROUTE_HASHED] = {
322+
{
323323
.id = IPA_MEM_V6_ROUTE_HASHED,
324324
.offset = 0x0588,
325325
.size = 0x0078,
326326
.canary_count = 2,
327327
},
328-
[IPA_MEM_V6_ROUTE] = {
328+
{
329329
.id = IPA_MEM_V6_ROUTE,
330330
.offset = 0x0608,
331331
.size = 0x0078,
332332
.canary_count = 2,
333333
},
334-
[IPA_MEM_MODEM_HEADER] = {
334+
{
335335
.id = IPA_MEM_MODEM_HEADER,
336336
.offset = 0x0688,
337337
.size = 0x0140,
338338
.canary_count = 2,
339339
},
340-
[IPA_MEM_MODEM_PROC_CTX] = {
340+
{
341341
.id = IPA_MEM_MODEM_PROC_CTX,
342342
.offset = 0x07d0,
343343
.size = 0x0200,
344344
.canary_count = 2,
345345
},
346-
[IPA_MEM_AP_PROC_CTX] = {
346+
{
347347
.id = IPA_MEM_AP_PROC_CTX,
348348
.offset = 0x09d0,
349349
.size = 0x0200,
350350
.canary_count = 0,
351351
},
352-
[IPA_MEM_MODEM] = {
352+
{
353353
.id = IPA_MEM_MODEM,
354354
.offset = 0x0bd8,
355355
.size = 0x1024,
356356
.canary_count = 0,
357357
},
358-
[IPA_MEM_UC_EVENT_RING] = {
358+
{
359359
.id = IPA_MEM_UC_EVENT_RING,
360360
.offset = 0x1c00,
361361
.size = 0x0400,

‎drivers/net/ipa/ipa_data-v4.11.c

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -220,133 +220,133 @@ static const struct ipa_resource_data ipa_resource_data = {
220220

221221
/* IPA-resident memory region data for an SoC having IPA v4.11 */
222222
static const struct ipa_mem ipa_mem_local_data[] = {
223-
[IPA_MEM_UC_SHARED] = {
223+
{
224224
.id = IPA_MEM_UC_SHARED,
225225
.offset = 0x0000,
226226
.size = 0x0080,
227227
.canary_count = 0,
228228
},
229-
[IPA_MEM_UC_INFO] = {
229+
{
230230
.id = IPA_MEM_UC_INFO,
231231
.offset = 0x0080,
232232
.size = 0x0200,
233233
.canary_count = 0,
234234
},
235-
[IPA_MEM_V4_FILTER_HASHED] = {
235+
{
236236
.id = IPA_MEM_V4_FILTER_HASHED,
237237
.offset = 0x0288,
238238
.size = 0x0078,
239239
.canary_count = 2,
240240
},
241-
[IPA_MEM_V4_FILTER] = {
241+
{
242242
.id = IPA_MEM_V4_FILTER,
243243
.offset = 0x0308,
244244
.size = 0x0078,
245245
.canary_count = 2,
246246
},
247-
[IPA_MEM_V6_FILTER_HASHED] = {
247+
{
248248
.id = IPA_MEM_V6_FILTER_HASHED,
249249
.offset = 0x0388,
250250
.size = 0x0078,
251251
.canary_count = 2,
252252
},
253-
[IPA_MEM_V6_FILTER] = {
253+
{
254254
.id = IPA_MEM_V6_FILTER,
255255
.offset = 0x0408,
256256
.size = 0x0078,
257257
.canary_count = 2,
258258
},
259-
[IPA_MEM_V4_ROUTE_HASHED] = {
259+
{
260260
.id = IPA_MEM_V4_ROUTE_HASHED,
261261
.offset = 0x0488,
262262
.size = 0x0078,
263263
.canary_count = 2,
264264
},
265-
[IPA_MEM_V4_ROUTE] = {
265+
{
266266
.id = IPA_MEM_V4_ROUTE,
267267
.offset = 0x0508,
268268
.size = 0x0078,
269269
.canary_count = 2,
270270
},
271-
[IPA_MEM_V6_ROUTE_HASHED] = {
271+
{
272272
.id = IPA_MEM_V6_ROUTE_HASHED,
273273
.offset = 0x0588,
274274
.size = 0x0078,
275275
.canary_count = 2,
276276
},
277-
[IPA_MEM_V6_ROUTE] = {
277+
{
278278
.id = IPA_MEM_V6_ROUTE,
279279
.offset = 0x0608,
280280
.size = 0x0078,
281281
.canary_count = 2,
282282
},
283-
[IPA_MEM_MODEM_HEADER] = {
283+
{
284284
.id = IPA_MEM_MODEM_HEADER,
285285
.offset = 0x0688,
286286
.size = 0x0240,
287287
.canary_count = 2,
288288
},
289-
[IPA_MEM_AP_HEADER] = {
289+
{
290290
.id = IPA_MEM_AP_HEADER,
291291
.offset = 0x08c8,
292292
.size = 0x0200,
293293
.canary_count = 0,
294294
},
295-
[IPA_MEM_MODEM_PROC_CTX] = {
295+
{
296296
.id = IPA_MEM_MODEM_PROC_CTX,
297297
.offset = 0x0ad0,
298298
.size = 0x0200,
299299
.canary_count = 2,
300300
},
301-
[IPA_MEM_AP_PROC_CTX] = {
301+
{
302302
.id = IPA_MEM_AP_PROC_CTX,
303303
.offset = 0x0cd0,
304304
.size = 0x0200,
305305
.canary_count = 0,
306306
},
307-
[IPA_MEM_NAT_TABLE] = {
307+
{
308308
.id = IPA_MEM_NAT_TABLE,
309309
.offset = 0x0ee0,
310310
.size = 0x0d00,
311311
.canary_count = 4,
312312
},
313-
[IPA_MEM_PDN_CONFIG] = {
313+
{
314314
.id = IPA_MEM_PDN_CONFIG,
315315
.offset = 0x1be8,
316316
.size = 0x0050,
317317
.canary_count = 0,
318318
},
319-
[IPA_MEM_STATS_QUOTA_MODEM] = {
319+
{
320320
.id = IPA_MEM_STATS_QUOTA_MODEM,
321321
.offset = 0x1c40,
322322
.size = 0x0030,
323323
.canary_count = 4,
324324
},
325-
[IPA_MEM_STATS_QUOTA_AP] = {
325+
{
326326
.id = IPA_MEM_STATS_QUOTA_AP,
327327
.offset = 0x1c70,
328328
.size = 0x0048,
329329
.canary_count = 0,
330330
},
331-
[IPA_MEM_STATS_TETHERING] = {
331+
{
332332
.id = IPA_MEM_STATS_TETHERING,
333333
.offset = 0x1cb8,
334334
.size = 0x0238,
335335
.canary_count = 0,
336336
},
337-
[IPA_MEM_STATS_DROP] = {
337+
{
338338
.id = IPA_MEM_STATS_DROP,
339339
.offset = 0x1ef0,
340340
.size = 0x0020,
341341
.canary_count = 0,
342342
},
343-
[IPA_MEM_MODEM] = {
343+
{
344344
.id = IPA_MEM_MODEM,
345345
.offset = 0x1f18,
346346
.size = 0x100c,
347347
.canary_count = 2,
348348
},
349-
[IPA_MEM_END_MARKER] = {
349+
{
350350
.id = IPA_MEM_END_MARKER,
351351
.offset = 0x3000,
352352
.size = 0x0000,

‎drivers/net/ipa/ipa_data-v4.2.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -219,109 +219,109 @@ static const struct ipa_resource_data ipa_resource_data = {
219219

220220
/* IPA-resident memory region data for an SoC having IPA v4.2 */
221221
static const struct ipa_mem ipa_mem_local_data[] = {
222-
[IPA_MEM_UC_SHARED] = {
222+
{
223223
.id = IPA_MEM_UC_SHARED,
224224
.offset = 0x0000,
225225
.size = 0x0080,
226226
.canary_count = 0,
227227
},
228-
[IPA_MEM_UC_INFO] = {
228+
{
229229
.id = IPA_MEM_UC_INFO,
230230
.offset = 0x0080,
231231
.size = 0x0200,
232232
.canary_count = 0,
233233
},
234-
[IPA_MEM_V4_FILTER_HASHED] = {
234+
{
235235
.id = IPA_MEM_V4_FILTER_HASHED,
236236
.offset = 0x0288,
237237
.size = 0,
238238
.canary_count = 2,
239239
},
240-
[IPA_MEM_V4_FILTER] = {
240+
{
241241
.id = IPA_MEM_V4_FILTER,
242242
.offset = 0x0290,
243243
.size = 0x0078,
244244
.canary_count = 2,
245245
},
246-
[IPA_MEM_V6_FILTER_HASHED] = {
246+
{
247247
.id = IPA_MEM_V6_FILTER_HASHED,
248248
.offset = 0x0310,
249249
.size = 0,
250250
.canary_count = 2,
251251
},
252-
[IPA_MEM_V6_FILTER] = {
252+
{
253253
.id = IPA_MEM_V6_FILTER,
254254
.offset = 0x0318,
255255
.size = 0x0078,
256256
.canary_count = 2,
257257
},
258-
[IPA_MEM_V4_ROUTE_HASHED] = {
258+
{
259259
.id = IPA_MEM_V4_ROUTE_HASHED,
260260
.offset = 0x0398,
261261
.size = 0,
262262
.canary_count = 2,
263263
},
264-
[IPA_MEM_V4_ROUTE] = {
264+
{
265265
.id = IPA_MEM_V4_ROUTE,
266266
.offset = 0x03a0,
267267
.size = 0x0078,
268268
.canary_count = 2,
269269
},
270-
[IPA_MEM_V6_ROUTE_HASHED] = {
270+
{
271271
.id = IPA_MEM_V6_ROUTE_HASHED,
272272
.offset = 0x0420,
273273
.size = 0,
274274
.canary_count = 2,
275275
},
276-
[IPA_MEM_V6_ROUTE] = {
276+
{
277277
.id = IPA_MEM_V6_ROUTE,
278278
.offset = 0x0428,
279279
.size = 0x0078,
280280
.canary_count = 2,
281281
},
282-
[IPA_MEM_MODEM_HEADER] = {
282+
{
283283
.id = IPA_MEM_MODEM_HEADER,
284284
.offset = 0x04a8,
285285
.size = 0x0140,
286286
.canary_count = 2,
287287
},
288-
[IPA_MEM_MODEM_PROC_CTX] = {
288+
{
289289
.id = IPA_MEM_MODEM_PROC_CTX,
290290
.offset = 0x05f0,
291291
.size = 0x0200,
292292
.canary_count = 2,
293293
},
294-
[IPA_MEM_AP_PROC_CTX] = {
294+
{
295295
.id = IPA_MEM_AP_PROC_CTX,
296296
.offset = 0x07f0,
297297
.size = 0x0200,
298298
.canary_count = 0,
299299
},
300-
[IPA_MEM_PDN_CONFIG] = {
300+
{
301301
.id = IPA_MEM_PDN_CONFIG,
302302
.offset = 0x09f8,
303303
.size = 0x0050,
304304
.canary_count = 2,
305305
},
306-
[IPA_MEM_STATS_QUOTA_MODEM] = {
306+
{
307307
.id = IPA_MEM_STATS_QUOTA_MODEM,
308308
.offset = 0x0a50,
309309
.size = 0x0060,
310310
.canary_count = 2,
311311
},
312-
[IPA_MEM_STATS_TETHERING] = {
312+
{
313313
.id = IPA_MEM_STATS_TETHERING,
314314
.offset = 0x0ab0,
315315
.size = 0x0140,
316316
.canary_count = 0,
317317
},
318-
[IPA_MEM_MODEM] = {
318+
{
319319
.id = IPA_MEM_MODEM,
320320
.offset = 0x0bf0,
321321
.size = 0x140c,
322322
.canary_count = 0,
323323
},
324-
[IPA_MEM_END_MARKER] = {
324+
{
325325
.id = IPA_MEM_END_MARKER,
326326
.offset = 0x2000,
327327
.size = 0,

0 commit comments

Comments
 (0)