Commit de0bc3df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 272b98c6 e823acc0

arch/tile/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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"

arch/tile/gxio/iorpc_mpipe.c

+44 −46
Original line number Diff line number Diff line
@@ -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;
@@ -475,25 +474,6 @@ 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;
@@ -520,6 +500,24 @@ 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;

};

arch/tile/gxio/iorpc_mpipe_info.c

+7 −8
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
/* This file is machine-generated; DO NOT EDIT! */

#include "gxio/iorpc_mpipe_info.h"





struct instance_aux_param {

	_gxio_mpipe_link_name_t name;

};

arch/tile/include/arch/mpipe.h

+18 −6
Original line number Diff line number Diff line
@@ -176,7 +176,18 @@ typedef union 
     */

    uint_reg_t stack_idx    : 5;

    /* Reserved. */

    uint_reg_t __reserved_2 : 5;

    uint_reg_t __reserved_2 : 3;

    /*

     * Instance ID.  For devices that support automatic buffer return between

     * mPIPE instances, this field indicates the buffer owner.  If the INST

     * field does not match the mPIPE's instance number when a packet is

     * egressed, buffers with HWB set will be returned to the other mPIPE

     * instance.  Note that not all devices support multi-mPIPE buffer

     * return.  The MPIPE_EDMA_INFO.REMOTE_BUFF_RTN_SUPPORT bit indicates

     * whether the INST field in the buffer descriptor is populated by iDMA

     * hardware. This field is ignored on writes.

     */

    uint_reg_t inst         : 2;

    /*

     * Reads as one to indicate that this is a hardware managed buffer.

     * Ignored on writes since all buffers on a given stack are the same size.
@@ -205,7 +216,8 @@ typedef union 
    uint_reg_t c            : 2;

    uint_reg_t size         : 3;

    uint_reg_t hwb          : 1;

    uint_reg_t __reserved_2 : 5;

    uint_reg_t inst         : 2;

    uint_reg_t __reserved_2 : 3;

    uint_reg_t stack_idx    : 5;

    uint_reg_t __reserved_1 : 6;

    int_reg_t va           : 35;
@@ -231,9 +243,9 @@ typedef union 
    /* Reserved. */

    uint_reg_t __reserved_0 : 3;

    /* eDMA ring being accessed */

    uint_reg_t ring         : 5;

    uint_reg_t ring         : 6;

    /* Reserved. */

    uint_reg_t __reserved_1 : 18;

    uint_reg_t __reserved_1 : 17;

    /*

     * This field of the address selects the region (address space) to be

     * accessed.  For the egress DMA post region, this field must be 5.
@@ -250,8 +262,8 @@ typedef union 
    uint_reg_t svc_dom      : 5;

    uint_reg_t __reserved_2 : 6;

    uint_reg_t region       : 3;

    uint_reg_t __reserved_1 : 18;

    uint_reg_t ring         : 5;

    uint_reg_t __reserved_1 : 17;

    uint_reg_t ring         : 6;

    uint_reg_t __reserved_0 : 3;

#endif

  };

arch/tile/include/arch/mpipe_constants.h

+3 −3
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 
#ifndef __ARCH_MPIPE_CONSTANTS_H__

#define __ARCH_MPIPE_CONSTANTS_H__



#define MPIPE_NUM_CLASSIFIERS 10

#define MPIPE_NUM_CLASSIFIERS 16

#define MPIPE_CLS_MHZ 1200



#define MPIPE_NUM_EDMA_RINGS 32

#define MPIPE_NUM_EDMA_RINGS 64



#define MPIPE_NUM_SGMII_MACS 16

#define MPIPE_NUM_XAUI_MACS 4

#define MPIPE_NUM_XAUI_MACS 16

#define MPIPE_NUM_LOOPBACK_CHANNELS 4

#define MPIPE_NUM_NON_LB_CHANNELS 28

CRA Git | Maintained and supported by SUSTech CRA and CCSE