Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Linus Torvalds committed Sep 17, 2013
2 parents 272b98c + e823acc commit de0bc3d
Show file tree
Hide file tree
Showing 25 changed files with 197 additions and 250 deletions.
2 changes: 1 addition & 1 deletion arch/tile/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ config CMDLINE_OVERRIDE

config VMALLOC_RESERVE
hex
default 0x1000000
default 0x2000000

config HARDWALL
bool "Hardwall support to allow access to user dynamic network"
Expand Down
90 changes: 44 additions & 46 deletions arch/tile/gxio/iorpc_mpipe.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ struct alloc_buffer_stacks_param {
unsigned int flags;
};

int gxio_mpipe_alloc_buffer_stacks(gxio_mpipe_context_t * context,
int gxio_mpipe_alloc_buffer_stacks(gxio_mpipe_context_t *context,
unsigned int count, unsigned int first,
unsigned int flags)
{
Expand All @@ -45,7 +45,7 @@ struct init_buffer_stack_aux_param {
unsigned int buffer_size_enum;
};

int gxio_mpipe_init_buffer_stack_aux(gxio_mpipe_context_t * context,
int gxio_mpipe_init_buffer_stack_aux(gxio_mpipe_context_t *context,
void *mem_va, size_t mem_size,
unsigned int mem_flags, unsigned int stack,
unsigned int buffer_size_enum)
Expand Down Expand Up @@ -80,7 +80,7 @@ struct alloc_notif_rings_param {
unsigned int flags;
};

int gxio_mpipe_alloc_notif_rings(gxio_mpipe_context_t * context,
int gxio_mpipe_alloc_notif_rings(gxio_mpipe_context_t *context,
unsigned int count, unsigned int first,
unsigned int flags)
{
Expand All @@ -102,7 +102,7 @@ struct init_notif_ring_aux_param {
unsigned int ring;
};

int gxio_mpipe_init_notif_ring_aux(gxio_mpipe_context_t * context, void *mem_va,
int gxio_mpipe_init_notif_ring_aux(gxio_mpipe_context_t *context, void *mem_va,
size_t mem_size, unsigned int mem_flags,
unsigned int ring)
{
Expand Down Expand Up @@ -133,7 +133,7 @@ struct request_notif_ring_interrupt_param {
unsigned int ring;
};

int gxio_mpipe_request_notif_ring_interrupt(gxio_mpipe_context_t * context,
int gxio_mpipe_request_notif_ring_interrupt(gxio_mpipe_context_t *context,
int inter_x, int inter_y,
int inter_ipi, int inter_event,
unsigned int ring)
Expand All @@ -158,7 +158,7 @@ struct enable_notif_ring_interrupt_param {
unsigned int ring;
};

int gxio_mpipe_enable_notif_ring_interrupt(gxio_mpipe_context_t * context,
int gxio_mpipe_enable_notif_ring_interrupt(gxio_mpipe_context_t *context,
unsigned int ring)
{
struct enable_notif_ring_interrupt_param temp;
Expand All @@ -179,7 +179,7 @@ struct alloc_notif_groups_param {
unsigned int flags;
};

int gxio_mpipe_alloc_notif_groups(gxio_mpipe_context_t * context,
int gxio_mpipe_alloc_notif_groups(gxio_mpipe_context_t *context,
unsigned int count, unsigned int first,
unsigned int flags)
{
Expand All @@ -201,7 +201,7 @@ struct init_notif_group_param {
gxio_mpipe_notif_group_bits_t bits;
};

int gxio_mpipe_init_notif_group(gxio_mpipe_context_t * context,
int gxio_mpipe_init_notif_group(gxio_mpipe_context_t *context,
unsigned int group,
gxio_mpipe_notif_group_bits_t bits)
{
Expand All @@ -223,7 +223,7 @@ struct alloc_buckets_param {
unsigned int flags;
};

int gxio_mpipe_alloc_buckets(gxio_mpipe_context_t * context, unsigned int count,
int gxio_mpipe_alloc_buckets(gxio_mpipe_context_t *context, unsigned int count,
unsigned int first, unsigned int flags)
{
struct alloc_buckets_param temp;
Expand All @@ -244,7 +244,7 @@ struct init_bucket_param {
MPIPE_LBL_INIT_DAT_BSTS_TBL_t bucket_info;
};

int gxio_mpipe_init_bucket(gxio_mpipe_context_t * context, unsigned int bucket,
int gxio_mpipe_init_bucket(gxio_mpipe_context_t *context, unsigned int bucket,
MPIPE_LBL_INIT_DAT_BSTS_TBL_t bucket_info)
{
struct init_bucket_param temp;
Expand All @@ -265,7 +265,7 @@ struct alloc_edma_rings_param {
unsigned int flags;
};

int gxio_mpipe_alloc_edma_rings(gxio_mpipe_context_t * context,
int gxio_mpipe_alloc_edma_rings(gxio_mpipe_context_t *context,
unsigned int count, unsigned int first,
unsigned int flags)
{
Expand All @@ -288,7 +288,7 @@ struct init_edma_ring_aux_param {
unsigned int channel;
};

int gxio_mpipe_init_edma_ring_aux(gxio_mpipe_context_t * context, void *mem_va,
int gxio_mpipe_init_edma_ring_aux(gxio_mpipe_context_t *context, void *mem_va,
size_t mem_size, unsigned int mem_flags,
unsigned int ring, unsigned int channel)
{
Expand All @@ -315,7 +315,7 @@ int gxio_mpipe_init_edma_ring_aux(gxio_mpipe_context_t * context, void *mem_va,
EXPORT_SYMBOL(gxio_mpipe_init_edma_ring_aux);


int gxio_mpipe_commit_rules(gxio_mpipe_context_t * context, const void *blob,
int gxio_mpipe_commit_rules(gxio_mpipe_context_t *context, const void *blob,
size_t blob_size)
{
const void *params = blob;
Expand All @@ -332,7 +332,7 @@ struct register_client_memory_param {
unsigned int flags;
};

int gxio_mpipe_register_client_memory(gxio_mpipe_context_t * context,
int gxio_mpipe_register_client_memory(gxio_mpipe_context_t *context,
unsigned int iotlb, HV_PTE pte,
unsigned int flags)
{
Expand All @@ -355,7 +355,7 @@ struct link_open_aux_param {
unsigned int flags;
};

int gxio_mpipe_link_open_aux(gxio_mpipe_context_t * context,
int gxio_mpipe_link_open_aux(gxio_mpipe_context_t *context,
_gxio_mpipe_link_name_t name, unsigned int flags)
{
struct link_open_aux_param temp;
Expand All @@ -374,7 +374,7 @@ struct link_close_aux_param {
int mac;
};

int gxio_mpipe_link_close_aux(gxio_mpipe_context_t * context, int mac)
int gxio_mpipe_link_close_aux(gxio_mpipe_context_t *context, int mac)
{
struct link_close_aux_param temp;
struct link_close_aux_param *params = &temp;
Expand All @@ -393,7 +393,7 @@ struct link_set_attr_aux_param {
int64_t val;
};

int gxio_mpipe_link_set_attr_aux(gxio_mpipe_context_t * context, int mac,
int gxio_mpipe_link_set_attr_aux(gxio_mpipe_context_t *context, int mac,
uint32_t attr, int64_t val)
{
struct link_set_attr_aux_param temp;
Expand All @@ -415,8 +415,8 @@ struct get_timestamp_aux_param {
uint64_t cycles;
};

int gxio_mpipe_get_timestamp_aux(gxio_mpipe_context_t * context, uint64_t * sec,
uint64_t * nsec, uint64_t * cycles)
int gxio_mpipe_get_timestamp_aux(gxio_mpipe_context_t *context, uint64_t *sec,
uint64_t *nsec, uint64_t *cycles)
{
int __result;
struct get_timestamp_aux_param temp;
Expand All @@ -440,7 +440,7 @@ struct set_timestamp_aux_param {
uint64_t cycles;
};

int gxio_mpipe_set_timestamp_aux(gxio_mpipe_context_t * context, uint64_t sec,
int gxio_mpipe_set_timestamp_aux(gxio_mpipe_context_t *context, uint64_t sec,
uint64_t nsec, uint64_t cycles)
{
struct set_timestamp_aux_param temp;
Expand All @@ -460,8 +460,7 @@ struct adjust_timestamp_aux_param {
int64_t nsec;
};

int gxio_mpipe_adjust_timestamp_aux(gxio_mpipe_context_t * context,
int64_t nsec)
int gxio_mpipe_adjust_timestamp_aux(gxio_mpipe_context_t *context, int64_t nsec)
{
struct adjust_timestamp_aux_param temp;
struct adjust_timestamp_aux_param *params = &temp;
Expand All @@ -475,33 +474,14 @@ int gxio_mpipe_adjust_timestamp_aux(gxio_mpipe_context_t * context,

EXPORT_SYMBOL(gxio_mpipe_adjust_timestamp_aux);

struct adjust_timestamp_freq_param {
int32_t ppb;
};

int gxio_mpipe_adjust_timestamp_freq(gxio_mpipe_context_t * context,
int32_t ppb)
{
struct adjust_timestamp_freq_param temp;
struct adjust_timestamp_freq_param *params = &temp;

params->ppb = ppb;

return hv_dev_pwrite(context->fd, 0, (HV_VirtAddr) params,
sizeof(*params),
GXIO_MPIPE_OP_ADJUST_TIMESTAMP_FREQ);
}

EXPORT_SYMBOL(gxio_mpipe_adjust_timestamp_freq);

struct config_edma_ring_blks_param {
unsigned int ering;
unsigned int max_blks;
unsigned int min_snf_blks;
unsigned int db;
};

int gxio_mpipe_config_edma_ring_blks(gxio_mpipe_context_t * context,
int gxio_mpipe_config_edma_ring_blks(gxio_mpipe_context_t *context,
unsigned int ering, unsigned int max_blks,
unsigned int min_snf_blks, unsigned int db)
{
Expand All @@ -520,11 +500,29 @@ int gxio_mpipe_config_edma_ring_blks(gxio_mpipe_context_t * context,

EXPORT_SYMBOL(gxio_mpipe_config_edma_ring_blks);

struct adjust_timestamp_freq_param {
int32_t ppb;
};

int gxio_mpipe_adjust_timestamp_freq(gxio_mpipe_context_t *context, int32_t ppb)
{
struct adjust_timestamp_freq_param temp;
struct adjust_timestamp_freq_param *params = &temp;

params->ppb = ppb;

return hv_dev_pwrite(context->fd, 0, (HV_VirtAddr) params,
sizeof(*params),
GXIO_MPIPE_OP_ADJUST_TIMESTAMP_FREQ);
}

EXPORT_SYMBOL(gxio_mpipe_adjust_timestamp_freq);

struct arm_pollfd_param {
union iorpc_pollfd pollfd;
};

int gxio_mpipe_arm_pollfd(gxio_mpipe_context_t * context, int pollfd_cookie)
int gxio_mpipe_arm_pollfd(gxio_mpipe_context_t *context, int pollfd_cookie)
{
struct arm_pollfd_param temp;
struct arm_pollfd_param *params = &temp;
Expand All @@ -541,7 +539,7 @@ struct close_pollfd_param {
union iorpc_pollfd pollfd;
};

int gxio_mpipe_close_pollfd(gxio_mpipe_context_t * context, int pollfd_cookie)
int gxio_mpipe_close_pollfd(gxio_mpipe_context_t *context, int pollfd_cookie)
{
struct close_pollfd_param temp;
struct close_pollfd_param *params = &temp;
Expand All @@ -558,7 +556,7 @@ struct get_mmio_base_param {
HV_PTE base;
};

int gxio_mpipe_get_mmio_base(gxio_mpipe_context_t * context, HV_PTE *base)
int gxio_mpipe_get_mmio_base(gxio_mpipe_context_t *context, HV_PTE *base)
{
int __result;
struct get_mmio_base_param temp;
Expand All @@ -579,7 +577,7 @@ struct check_mmio_offset_param {
unsigned long size;
};

int gxio_mpipe_check_mmio_offset(gxio_mpipe_context_t * context,
int gxio_mpipe_check_mmio_offset(gxio_mpipe_context_t *context,
unsigned long offset, unsigned long size)
{
struct check_mmio_offset_param temp;
Expand Down
15 changes: 7 additions & 8 deletions arch/tile/gxio/iorpc_mpipe_info.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@
/* This file is machine-generated; DO NOT EDIT! */
#include "gxio/iorpc_mpipe_info.h"


struct instance_aux_param {
_gxio_mpipe_link_name_t name;
};

int gxio_mpipe_info_instance_aux(gxio_mpipe_info_context_t * context,
int gxio_mpipe_info_instance_aux(gxio_mpipe_info_context_t *context,
_gxio_mpipe_link_name_t name)
{
struct instance_aux_param temp;
Expand All @@ -39,18 +38,18 @@ struct enumerate_aux_param {
_gxio_mpipe_link_mac_t mac;
};

int gxio_mpipe_info_enumerate_aux(gxio_mpipe_info_context_t * context,
int gxio_mpipe_info_enumerate_aux(gxio_mpipe_info_context_t *context,
unsigned int idx,
_gxio_mpipe_link_name_t * name,
_gxio_mpipe_link_mac_t * mac)
_gxio_mpipe_link_name_t *name,
_gxio_mpipe_link_mac_t *mac)
{
int __result;
struct enumerate_aux_param temp;
struct enumerate_aux_param *params = &temp;

__result =
hv_dev_pread(context->fd, 0, (HV_VirtAddr) params, sizeof(*params),
(((uint64_t) idx << 32) |
(((uint64_t)idx << 32) |
GXIO_MPIPE_INFO_OP_ENUMERATE_AUX));
*name = params->name;
*mac = params->mac;
Expand All @@ -64,7 +63,7 @@ struct get_mmio_base_param {
HV_PTE base;
};

int gxio_mpipe_info_get_mmio_base(gxio_mpipe_info_context_t * context,
int gxio_mpipe_info_get_mmio_base(gxio_mpipe_info_context_t *context,
HV_PTE *base)
{
int __result;
Expand All @@ -86,7 +85,7 @@ struct check_mmio_offset_param {
unsigned long size;
};

int gxio_mpipe_info_check_mmio_offset(gxio_mpipe_info_context_t * context,
int gxio_mpipe_info_check_mmio_offset(gxio_mpipe_info_context_t *context,
unsigned long offset, unsigned long size)
{
struct check_mmio_offset_param temp;
Expand Down
Loading

0 comments on commit de0bc3d

Please sign in to comment.