Skip to content

Commit de0bc3d

Browse files
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull more tile architecture updates from Chris Metcalf: "This second batch of changes is just cleanup of various kinds from doing some tidying work in the sources. Some dead code is removed, comment typos fixed, whitespace and style issues cleaned up, and some header updates from our internal "upstream" architecture team" * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: tile: remove stray blank space tile: <arch/> header updates from upstream tile: improve gxio iorpc autogenerated code style tile: double default VMALLOC space tile: remove stale arch/tile/kernel/futex_64.S tile: remove HUGE_VMAP dead code tile: use pmd_pfn() instead of casting via pte_t tile: fix typos in comment in arch/tile/kernel/unaligned.c
2 parents 272b98c + e823acc commit de0bc3d

25 files changed

+197
-250
lines changed

arch/tile/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ config CMDLINE_OVERRIDE
361361

362362
config VMALLOC_RESERVE
363363
hex
364-
default 0x1000000
364+
default 0x2000000
365365

366366
config HARDWALL
367367
bool "Hardwall support to allow access to user dynamic network"

arch/tile/gxio/iorpc_mpipe.c

Lines changed: 44 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ struct alloc_buffer_stacks_param {
2121
unsigned int flags;
2222
};
2323

24-
int gxio_mpipe_alloc_buffer_stacks(gxio_mpipe_context_t * context,
24+
int gxio_mpipe_alloc_buffer_stacks(gxio_mpipe_context_t *context,
2525
unsigned int count, unsigned int first,
2626
unsigned int flags)
2727
{
@@ -45,7 +45,7 @@ struct init_buffer_stack_aux_param {
4545
unsigned int buffer_size_enum;
4646
};
4747

48-
int gxio_mpipe_init_buffer_stack_aux(gxio_mpipe_context_t * context,
48+
int gxio_mpipe_init_buffer_stack_aux(gxio_mpipe_context_t *context,
4949
void *mem_va, size_t mem_size,
5050
unsigned int mem_flags, unsigned int stack,
5151
unsigned int buffer_size_enum)
@@ -80,7 +80,7 @@ struct alloc_notif_rings_param {
8080
unsigned int flags;
8181
};
8282

83-
int gxio_mpipe_alloc_notif_rings(gxio_mpipe_context_t * context,
83+
int gxio_mpipe_alloc_notif_rings(gxio_mpipe_context_t *context,
8484
unsigned int count, unsigned int first,
8585
unsigned int flags)
8686
{
@@ -102,7 +102,7 @@ struct init_notif_ring_aux_param {
102102
unsigned int ring;
103103
};
104104

105-
int gxio_mpipe_init_notif_ring_aux(gxio_mpipe_context_t * context, void *mem_va,
105+
int gxio_mpipe_init_notif_ring_aux(gxio_mpipe_context_t *context, void *mem_va,
106106
size_t mem_size, unsigned int mem_flags,
107107
unsigned int ring)
108108
{
@@ -133,7 +133,7 @@ struct request_notif_ring_interrupt_param {
133133
unsigned int ring;
134134
};
135135

136-
int gxio_mpipe_request_notif_ring_interrupt(gxio_mpipe_context_t * context,
136+
int gxio_mpipe_request_notif_ring_interrupt(gxio_mpipe_context_t *context,
137137
int inter_x, int inter_y,
138138
int inter_ipi, int inter_event,
139139
unsigned int ring)
@@ -158,7 +158,7 @@ struct enable_notif_ring_interrupt_param {
158158
unsigned int ring;
159159
};
160160

161-
int gxio_mpipe_enable_notif_ring_interrupt(gxio_mpipe_context_t * context,
161+
int gxio_mpipe_enable_notif_ring_interrupt(gxio_mpipe_context_t *context,
162162
unsigned int ring)
163163
{
164164
struct enable_notif_ring_interrupt_param temp;
@@ -179,7 +179,7 @@ struct alloc_notif_groups_param {
179179
unsigned int flags;
180180
};
181181

182-
int gxio_mpipe_alloc_notif_groups(gxio_mpipe_context_t * context,
182+
int gxio_mpipe_alloc_notif_groups(gxio_mpipe_context_t *context,
183183
unsigned int count, unsigned int first,
184184
unsigned int flags)
185185
{
@@ -201,7 +201,7 @@ struct init_notif_group_param {
201201
gxio_mpipe_notif_group_bits_t bits;
202202
};
203203

204-
int gxio_mpipe_init_notif_group(gxio_mpipe_context_t * context,
204+
int gxio_mpipe_init_notif_group(gxio_mpipe_context_t *context,
205205
unsigned int group,
206206
gxio_mpipe_notif_group_bits_t bits)
207207
{
@@ -223,7 +223,7 @@ struct alloc_buckets_param {
223223
unsigned int flags;
224224
};
225225

226-
int gxio_mpipe_alloc_buckets(gxio_mpipe_context_t * context, unsigned int count,
226+
int gxio_mpipe_alloc_buckets(gxio_mpipe_context_t *context, unsigned int count,
227227
unsigned int first, unsigned int flags)
228228
{
229229
struct alloc_buckets_param temp;
@@ -244,7 +244,7 @@ struct init_bucket_param {
244244
MPIPE_LBL_INIT_DAT_BSTS_TBL_t bucket_info;
245245
};
246246

247-
int gxio_mpipe_init_bucket(gxio_mpipe_context_t * context, unsigned int bucket,
247+
int gxio_mpipe_init_bucket(gxio_mpipe_context_t *context, unsigned int bucket,
248248
MPIPE_LBL_INIT_DAT_BSTS_TBL_t bucket_info)
249249
{
250250
struct init_bucket_param temp;
@@ -265,7 +265,7 @@ struct alloc_edma_rings_param {
265265
unsigned int flags;
266266
};
267267

268-
int gxio_mpipe_alloc_edma_rings(gxio_mpipe_context_t * context,
268+
int gxio_mpipe_alloc_edma_rings(gxio_mpipe_context_t *context,
269269
unsigned int count, unsigned int first,
270270
unsigned int flags)
271271
{
@@ -288,7 +288,7 @@ struct init_edma_ring_aux_param {
288288
unsigned int channel;
289289
};
290290

291-
int gxio_mpipe_init_edma_ring_aux(gxio_mpipe_context_t * context, void *mem_va,
291+
int gxio_mpipe_init_edma_ring_aux(gxio_mpipe_context_t *context, void *mem_va,
292292
size_t mem_size, unsigned int mem_flags,
293293
unsigned int ring, unsigned int channel)
294294
{
@@ -315,7 +315,7 @@ int gxio_mpipe_init_edma_ring_aux(gxio_mpipe_context_t * context, void *mem_va,
315315
EXPORT_SYMBOL(gxio_mpipe_init_edma_ring_aux);
316316

317317

318-
int gxio_mpipe_commit_rules(gxio_mpipe_context_t * context, const void *blob,
318+
int gxio_mpipe_commit_rules(gxio_mpipe_context_t *context, const void *blob,
319319
size_t blob_size)
320320
{
321321
const void *params = blob;
@@ -332,7 +332,7 @@ struct register_client_memory_param {
332332
unsigned int flags;
333333
};
334334

335-
int gxio_mpipe_register_client_memory(gxio_mpipe_context_t * context,
335+
int gxio_mpipe_register_client_memory(gxio_mpipe_context_t *context,
336336
unsigned int iotlb, HV_PTE pte,
337337
unsigned int flags)
338338
{
@@ -355,7 +355,7 @@ struct link_open_aux_param {
355355
unsigned int flags;
356356
};
357357

358-
int gxio_mpipe_link_open_aux(gxio_mpipe_context_t * context,
358+
int gxio_mpipe_link_open_aux(gxio_mpipe_context_t *context,
359359
_gxio_mpipe_link_name_t name, unsigned int flags)
360360
{
361361
struct link_open_aux_param temp;
@@ -374,7 +374,7 @@ struct link_close_aux_param {
374374
int mac;
375375
};
376376

377-
int gxio_mpipe_link_close_aux(gxio_mpipe_context_t * context, int mac)
377+
int gxio_mpipe_link_close_aux(gxio_mpipe_context_t *context, int mac)
378378
{
379379
struct link_close_aux_param temp;
380380
struct link_close_aux_param *params = &temp;
@@ -393,7 +393,7 @@ struct link_set_attr_aux_param {
393393
int64_t val;
394394
};
395395

396-
int gxio_mpipe_link_set_attr_aux(gxio_mpipe_context_t * context, int mac,
396+
int gxio_mpipe_link_set_attr_aux(gxio_mpipe_context_t *context, int mac,
397397
uint32_t attr, int64_t val)
398398
{
399399
struct link_set_attr_aux_param temp;
@@ -415,8 +415,8 @@ struct get_timestamp_aux_param {
415415
uint64_t cycles;
416416
};
417417

418-
int gxio_mpipe_get_timestamp_aux(gxio_mpipe_context_t * context, uint64_t * sec,
419-
uint64_t * nsec, uint64_t * cycles)
418+
int gxio_mpipe_get_timestamp_aux(gxio_mpipe_context_t *context, uint64_t *sec,
419+
uint64_t *nsec, uint64_t *cycles)
420420
{
421421
int __result;
422422
struct get_timestamp_aux_param temp;
@@ -440,7 +440,7 @@ struct set_timestamp_aux_param {
440440
uint64_t cycles;
441441
};
442442

443-
int gxio_mpipe_set_timestamp_aux(gxio_mpipe_context_t * context, uint64_t sec,
443+
int gxio_mpipe_set_timestamp_aux(gxio_mpipe_context_t *context, uint64_t sec,
444444
uint64_t nsec, uint64_t cycles)
445445
{
446446
struct set_timestamp_aux_param temp;
@@ -460,8 +460,7 @@ struct adjust_timestamp_aux_param {
460460
int64_t nsec;
461461
};
462462

463-
int gxio_mpipe_adjust_timestamp_aux(gxio_mpipe_context_t * context,
464-
int64_t nsec)
463+
int gxio_mpipe_adjust_timestamp_aux(gxio_mpipe_context_t *context, int64_t nsec)
465464
{
466465
struct adjust_timestamp_aux_param temp;
467466
struct adjust_timestamp_aux_param *params = &temp;
@@ -475,33 +474,14 @@ int gxio_mpipe_adjust_timestamp_aux(gxio_mpipe_context_t * context,
475474

476475
EXPORT_SYMBOL(gxio_mpipe_adjust_timestamp_aux);
477476

478-
struct adjust_timestamp_freq_param {
479-
int32_t ppb;
480-
};
481-
482-
int gxio_mpipe_adjust_timestamp_freq(gxio_mpipe_context_t * context,
483-
int32_t ppb)
484-
{
485-
struct adjust_timestamp_freq_param temp;
486-
struct adjust_timestamp_freq_param *params = &temp;
487-
488-
params->ppb = ppb;
489-
490-
return hv_dev_pwrite(context->fd, 0, (HV_VirtAddr) params,
491-
sizeof(*params),
492-
GXIO_MPIPE_OP_ADJUST_TIMESTAMP_FREQ);
493-
}
494-
495-
EXPORT_SYMBOL(gxio_mpipe_adjust_timestamp_freq);
496-
497477
struct config_edma_ring_blks_param {
498478
unsigned int ering;
499479
unsigned int max_blks;
500480
unsigned int min_snf_blks;
501481
unsigned int db;
502482
};
503483

504-
int gxio_mpipe_config_edma_ring_blks(gxio_mpipe_context_t * context,
484+
int gxio_mpipe_config_edma_ring_blks(gxio_mpipe_context_t *context,
505485
unsigned int ering, unsigned int max_blks,
506486
unsigned int min_snf_blks, unsigned int db)
507487
{
@@ -520,11 +500,29 @@ int gxio_mpipe_config_edma_ring_blks(gxio_mpipe_context_t * context,
520500

521501
EXPORT_SYMBOL(gxio_mpipe_config_edma_ring_blks);
522502

503+
struct adjust_timestamp_freq_param {
504+
int32_t ppb;
505+
};
506+
507+
int gxio_mpipe_adjust_timestamp_freq(gxio_mpipe_context_t *context, int32_t ppb)
508+
{
509+
struct adjust_timestamp_freq_param temp;
510+
struct adjust_timestamp_freq_param *params = &temp;
511+
512+
params->ppb = ppb;
513+
514+
return hv_dev_pwrite(context->fd, 0, (HV_VirtAddr) params,
515+
sizeof(*params),
516+
GXIO_MPIPE_OP_ADJUST_TIMESTAMP_FREQ);
517+
}
518+
519+
EXPORT_SYMBOL(gxio_mpipe_adjust_timestamp_freq);
520+
523521
struct arm_pollfd_param {
524522
union iorpc_pollfd pollfd;
525523
};
526524

527-
int gxio_mpipe_arm_pollfd(gxio_mpipe_context_t * context, int pollfd_cookie)
525+
int gxio_mpipe_arm_pollfd(gxio_mpipe_context_t *context, int pollfd_cookie)
528526
{
529527
struct arm_pollfd_param temp;
530528
struct arm_pollfd_param *params = &temp;
@@ -541,7 +539,7 @@ struct close_pollfd_param {
541539
union iorpc_pollfd pollfd;
542540
};
543541

544-
int gxio_mpipe_close_pollfd(gxio_mpipe_context_t * context, int pollfd_cookie)
542+
int gxio_mpipe_close_pollfd(gxio_mpipe_context_t *context, int pollfd_cookie)
545543
{
546544
struct close_pollfd_param temp;
547545
struct close_pollfd_param *params = &temp;
@@ -558,7 +556,7 @@ struct get_mmio_base_param {
558556
HV_PTE base;
559557
};
560558

561-
int gxio_mpipe_get_mmio_base(gxio_mpipe_context_t * context, HV_PTE *base)
559+
int gxio_mpipe_get_mmio_base(gxio_mpipe_context_t *context, HV_PTE *base)
562560
{
563561
int __result;
564562
struct get_mmio_base_param temp;
@@ -579,7 +577,7 @@ struct check_mmio_offset_param {
579577
unsigned long size;
580578
};
581579

582-
int gxio_mpipe_check_mmio_offset(gxio_mpipe_context_t * context,
580+
int gxio_mpipe_check_mmio_offset(gxio_mpipe_context_t *context,
583581
unsigned long offset, unsigned long size)
584582
{
585583
struct check_mmio_offset_param temp;

arch/tile/gxio/iorpc_mpipe_info.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
/* This file is machine-generated; DO NOT EDIT! */
1616
#include "gxio/iorpc_mpipe_info.h"
1717

18-
1918
struct instance_aux_param {
2019
_gxio_mpipe_link_name_t name;
2120
};
2221

23-
int gxio_mpipe_info_instance_aux(gxio_mpipe_info_context_t * context,
22+
int gxio_mpipe_info_instance_aux(gxio_mpipe_info_context_t *context,
2423
_gxio_mpipe_link_name_t name)
2524
{
2625
struct instance_aux_param temp;
@@ -39,18 +38,18 @@ struct enumerate_aux_param {
3938
_gxio_mpipe_link_mac_t mac;
4039
};
4140

42-
int gxio_mpipe_info_enumerate_aux(gxio_mpipe_info_context_t * context,
41+
int gxio_mpipe_info_enumerate_aux(gxio_mpipe_info_context_t *context,
4342
unsigned int idx,
44-
_gxio_mpipe_link_name_t * name,
45-
_gxio_mpipe_link_mac_t * mac)
43+
_gxio_mpipe_link_name_t *name,
44+
_gxio_mpipe_link_mac_t *mac)
4645
{
4746
int __result;
4847
struct enumerate_aux_param temp;
4948
struct enumerate_aux_param *params = &temp;
5049

5150
__result =
5251
hv_dev_pread(context->fd, 0, (HV_VirtAddr) params, sizeof(*params),
53-
(((uint64_t) idx << 32) |
52+
(((uint64_t)idx << 32) |
5453
GXIO_MPIPE_INFO_OP_ENUMERATE_AUX));
5554
*name = params->name;
5655
*mac = params->mac;
@@ -64,7 +63,7 @@ struct get_mmio_base_param {
6463
HV_PTE base;
6564
};
6665

67-
int gxio_mpipe_info_get_mmio_base(gxio_mpipe_info_context_t * context,
66+
int gxio_mpipe_info_get_mmio_base(gxio_mpipe_info_context_t *context,
6867
HV_PTE *base)
6968
{
7069
int __result;
@@ -86,7 +85,7 @@ struct check_mmio_offset_param {
8685
unsigned long size;
8786
};
8887

89-
int gxio_mpipe_info_check_mmio_offset(gxio_mpipe_info_context_t * context,
88+
int gxio_mpipe_info_check_mmio_offset(gxio_mpipe_info_context_t *context,
9089
unsigned long offset, unsigned long size)
9190
{
9291
struct check_mmio_offset_param temp;

0 commit comments

Comments
 (0)