Commit f9546de4 authored by Chris Packham's avatar Chris Packham Committed by Greg Kroah-Hartman
Browse files

MIPS: octeon: remove typedef declaration for cvmx_wqe 



Remove typedef declaration from struct cvmx_wqe and replace its previous
uses with new struct declaration.

Signed-off-by: default avatarChris Packham <chris.packham@alliedtelesis.co.nz>
Link: https://lore.kernel.org/r/20200205001116.14096-4-chris.packham@alliedtelesis.co.nz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 422d97b8

arch/mips/cavium-octeon/executive/cvmx-helper.c

+1 −1
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ static int __cvmx_helper_errata_fix_ipd_ptr_alignment(void) 
	uint64_t *p64;

	cvmx_pko_command_word0_t pko_command;

	union cvmx_buf_ptr g_buffer, pkt_buffer;

	cvmx_wqe_t *work;

	struct cvmx_wqe *work;

	int size, num_segs = 0, wqe_pcnt, pkt_pcnt;

	union cvmx_gmxx_prtx_cfg gmx_cfg;

	int retry_cnt;

arch/mips/include/asm/octeon/cvmx-helper-util.h

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static inline int cvmx_helper_get_last_ipd_port(int interface) 
 *

 * @work:   Work queue entry with packet to free

 */

static inline void cvmx_helper_free_packet_data(cvmx_wqe_t *work)

static inline void cvmx_helper_free_packet_data(struct cvmx_wqe *work)

{

	uint64_t number_buffers;

	union cvmx_buf_ptr buffer_ptr;

arch/mips/include/asm/octeon/cvmx-pko.h

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ static inline void cvmx_pko_send_packet_prepare(uint64_t port, uint64_t queue, 
		    CVMX_TAG_SW_BITS_INTERNAL << CVMX_TAG_SW_SHIFT |

		    CVMX_TAG_SUBGROUP_PKO << CVMX_TAG_SUBGROUP_SHIFT |

		    (CVMX_TAG_SUBGROUP_MASK & queue);

		cvmx_pow_tag_sw_full((cvmx_wqe_t *) cvmx_phys_to_ptr(0x80), tag,

		cvmx_pow_tag_sw_full((struct cvmx_wqe *) cvmx_phys_to_ptr(0x80), tag,

				     CVMX_POW_TAG_TYPE_ATOMIC, 0);

	}

}

arch/mips/include/asm/octeon/cvmx-pow.h

+11 −11
Original line number Diff line number Diff line
@@ -1283,7 +1283,7 @@ static inline cvmx_pow_tag_req_t cvmx_pow_get_current_tag(void) 
 *

 * Returns WQE pointer

 */

static inline cvmx_wqe_t *cvmx_pow_get_current_wqp(void)

static inline struct cvmx_wqe *cvmx_pow_get_current_wqp(void)

{

	cvmx_pow_load_addr_t load_addr;

	cvmx_pow_tag_load_resp_t load_resp;
@@ -1296,7 +1296,7 @@ static inline cvmx_wqe_t *cvmx_pow_get_current_wqp(void) 
	load_addr.sstatus.get_cur = 1;

	load_addr.sstatus.get_wqp = 1;

	load_resp.u64 = cvmx_read_csr(load_addr.u64);

	return (cvmx_wqe_t *) cvmx_phys_to_ptr(load_resp.s_sstatus4.wqp);

	return (struct cvmx_wqe *) cvmx_phys_to_ptr(load_resp.s_sstatus4.wqp);

}



#ifndef CVMX_MF_CHORD
@@ -1348,7 +1348,7 @@ static inline void cvmx_pow_tag_sw_wait(void) 
 * Returns Returns the WQE pointer from POW. Returns NULL if no work

 * was available.

 */

static inline cvmx_wqe_t *cvmx_pow_work_request_sync_nocheck(cvmx_pow_wait_t

static inline struct cvmx_wqe *cvmx_pow_work_request_sync_nocheck(cvmx_pow_wait_t

							     wait)

{

	cvmx_pow_load_addr_t ptr;
@@ -1368,7 +1368,7 @@ static inline cvmx_wqe_t *cvmx_pow_work_request_sync_nocheck(cvmx_pow_wait_t 
	if (result.s_work.no_work)

		return NULL;

	else

		return (cvmx_wqe_t *) cvmx_phys_to_ptr(result.s_work.addr);

		return (struct cvmx_wqe *) cvmx_phys_to_ptr(result.s_work.addr);

}



/**
@@ -1382,7 +1382,7 @@ static inline cvmx_wqe_t *cvmx_pow_work_request_sync_nocheck(cvmx_pow_wait_t 
 * Returns Returns the WQE pointer from POW. Returns NULL if no work

 * was available.

 */

static inline cvmx_wqe_t *cvmx_pow_work_request_sync(cvmx_pow_wait_t wait)

static inline struct cvmx_wqe *cvmx_pow_work_request_sync(cvmx_pow_wait_t wait)

{

	if (CVMX_ENABLE_POW_CHECKS)

		__cvmx_pow_warn_if_pending_switch(__func__);
@@ -1485,7 +1485,7 @@ static inline void cvmx_pow_work_request_async(int scr_addr, 
 * Returns Returns the WQE from the scratch register, or NULL if no

 * work was available.

 */

static inline cvmx_wqe_t *cvmx_pow_work_response_async(int scr_addr)

static inline struct cvmx_wqe *cvmx_pow_work_response_async(int scr_addr)

{

	cvmx_pow_tag_load_resp_t result;
@@ -1495,7 +1495,7 @@ static inline cvmx_wqe_t *cvmx_pow_work_response_async(int scr_addr) 
	if (result.s_work.no_work)

		return NULL;

	else

		return (cvmx_wqe_t *) cvmx_phys_to_ptr(result.s_work.addr);

		return (struct cvmx_wqe *) cvmx_phys_to_ptr(result.s_work.addr);

}



/**
@@ -1508,7 +1508,7 @@ static inline cvmx_wqe_t *cvmx_pow_work_response_async(int scr_addr) 
 * Returns 0 if pointer is valid

 *	   1 if invalid (no work was returned)

 */

static inline uint64_t cvmx_pow_work_invalid(cvmx_wqe_t *wqe_ptr)

static inline uint64_t cvmx_pow_work_invalid(struct cvmx_wqe *wqe_ptr)

{

	return wqe_ptr == NULL;

}
@@ -1638,7 +1638,7 @@ static inline void cvmx_pow_tag_sw(uint32_t tag, 
 * @tag_type: type of tag

 * @group:    group value for the work queue entry.

 */

static inline void cvmx_pow_tag_sw_full_nocheck(cvmx_wqe_t *wqp, uint32_t tag,

static inline void cvmx_pow_tag_sw_full_nocheck(struct cvmx_wqe *wqp, uint32_t tag,

						enum cvmx_pow_tag_type tag_type,

						uint64_t group)

{
@@ -1712,7 +1712,7 @@ static inline void cvmx_pow_tag_sw_full_nocheck(cvmx_wqe_t *wqp, uint32_t tag, 
 * @tag_type: type of tag

 * @group:	group value for the work queue entry.

 */

static inline void cvmx_pow_tag_sw_full(cvmx_wqe_t *wqp, uint32_t tag,

static inline void cvmx_pow_tag_sw_full(struct cvmx_wqe *wqp, uint32_t tag,

					enum cvmx_pow_tag_type tag_type,

					uint64_t group)

{
@@ -1803,7 +1803,7 @@ static inline void cvmx_pow_tag_sw_null(void) 
 * @qos:      Input queue to add to.

 * @grp:      group value for the work queue entry.

 */

static inline void cvmx_pow_work_submit(cvmx_wqe_t *wqp, uint32_t tag,

static inline void cvmx_pow_work_submit(struct cvmx_wqe *wqp, uint32_t tag,

					enum cvmx_pow_tag_type tag_type,

					uint64_t qos, uint64_t grp)

{

arch/mips/include/asm/octeon/cvmx-wqe.h

+8 −8
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ union cvmx_wqe_word1 { 
 *

 * must be 8-byte aligned

 */

typedef struct {

struct cvmx_wqe {



    /*****************************************************************

     * WORD 0
@@ -593,9 +593,9 @@ typedef struct { 
     *

     */



} CVMX_CACHE_LINE_ALIGNED cvmx_wqe_t;

} CVMX_CACHE_LINE_ALIGNED;



static inline int cvmx_wqe_get_port(cvmx_wqe_t *work)

static inline int cvmx_wqe_get_port(struct cvmx_wqe *work)

{

	int port;
@@ -607,7 +607,7 @@ static inline int cvmx_wqe_get_port(cvmx_wqe_t *work) 
	return port;

}



static inline void cvmx_wqe_set_port(cvmx_wqe_t *work, int port)

static inline void cvmx_wqe_set_port(struct cvmx_wqe *work, int port)

{

	if (octeon_has_feature(OCTEON_FEATURE_CN68XX_WQE))

		work->word2.s_cn68xx.port = port;
@@ -615,7 +615,7 @@ static inline void cvmx_wqe_set_port(cvmx_wqe_t *work, int port) 
		work->word1.cn38xx.ipprt = port;

}



static inline int cvmx_wqe_get_grp(cvmx_wqe_t *work)

static inline int cvmx_wqe_get_grp(struct cvmx_wqe *work)

{

	int grp;
@@ -627,7 +627,7 @@ static inline int cvmx_wqe_get_grp(cvmx_wqe_t *work) 
	return grp;

}



static inline void cvmx_wqe_set_grp(cvmx_wqe_t *work, int grp)

static inline void cvmx_wqe_set_grp(struct cvmx_wqe *work, int grp)

{

	if (octeon_has_feature(OCTEON_FEATURE_CN68XX_WQE))

		work->word1.cn68xx.grp = grp;
@@ -635,7 +635,7 @@ static inline void cvmx_wqe_set_grp(cvmx_wqe_t *work, int grp) 
		work->word1.cn38xx.grp = grp;

}



static inline int cvmx_wqe_get_qos(cvmx_wqe_t *work)

static inline int cvmx_wqe_get_qos(struct cvmx_wqe *work)

{

	int qos;
@@ -647,7 +647,7 @@ static inline int cvmx_wqe_get_qos(cvmx_wqe_t *work) 
	return qos;

}



static inline void cvmx_wqe_set_qos(cvmx_wqe_t *work, int qos)

static inline void cvmx_wqe_set_qos(struct cvmx_wqe *work, int qos)

{

	if (octeon_has_feature(OCTEON_FEATURE_CN68XX_WQE))

		work->word1.cn68xx.qos = qos;

CRA Git | Maintained and supported by SUSTech CRA and CCSE