Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b536be7 authored by Anton Blanchard's avatar Anton Blanchard Committed by David S. Miller
Browse files

ibmveth: Fix little endian issues 



The hypervisor is big endian, so little endian kernel builds need
to byteswap.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c67c71b4

drivers/net/ethernet/ibm/ibmveth.c

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ struct ibmveth_stat ibmveth_stats[] = { 
/* simple methods of getting data from the current rxq entry */

static inline u32 ibmveth_rxq_flags(struct ibmveth_adapter *adapter)

{

	return adapter->rx_queue.queue_addr[adapter->rx_queue.index].flags_off;

	return be32_to_cpu(adapter->rx_queue.queue_addr[adapter->rx_queue.index].flags_off);

}



static inline int ibmveth_rxq_toggle(struct ibmveth_adapter *adapter)
@@ -132,7 +132,7 @@ static inline int ibmveth_rxq_frame_offset(struct ibmveth_adapter *adapter) 


static inline int ibmveth_rxq_frame_length(struct ibmveth_adapter *adapter)

{

	return adapter->rx_queue.queue_addr[adapter->rx_queue.index].length;

	return be32_to_cpu(adapter->rx_queue.queue_addr[adapter->rx_queue.index].length);

}



static inline int ibmveth_rxq_csum_good(struct ibmveth_adapter *adapter)

drivers/net/ethernet/ibm/ibmveth.h

+16 −3
Original line number Diff line number Diff line
@@ -164,14 +164,26 @@ struct ibmveth_adapter { 
    u64 tx_send_failed;

};



/*

 * We pass struct ibmveth_buf_desc_fields to the hypervisor in registers,

 * so we don't need to byteswap the two elements. However since we use

 * a union (ibmveth_buf_desc) to convert from the struct to a u64 we

 * do end up with endian specific ordering of the elements and that

 * needs correcting.

 */

struct ibmveth_buf_desc_fields {

#ifdef __BIG_ENDIAN

	u32 flags_len;

	u32 address;

#else

	u32 address;

	u32 flags_len;

#endif

#define IBMVETH_BUF_VALID	0x80000000

#define IBMVETH_BUF_TOGGLE	0x40000000

#define IBMVETH_BUF_NO_CSUM	0x02000000

#define IBMVETH_BUF_CSUM_GOOD	0x01000000

#define IBMVETH_BUF_LEN_MASK	0x00FFFFFF

	u32 address;

};



union ibmveth_buf_desc {
@@ -180,7 +192,7 @@ union ibmveth_buf_desc { 
};



struct ibmveth_rx_q_entry {

	u32 flags_off;

	__be32 flags_off;

#define IBMVETH_RXQ_TOGGLE		0x80000000

#define IBMVETH_RXQ_TOGGLE_SHIFT	31

#define IBMVETH_RXQ_VALID		0x40000000
@@ -188,7 +200,8 @@ struct ibmveth_rx_q_entry { 
#define IBMVETH_RXQ_CSUM_GOOD		0x01000000

#define IBMVETH_RXQ_OFF_MASK		0x0000FFFF



	u32 length;

	__be32 length;

	/* correlator is only used by the OS, no need to byte swap */

	u64 correlator;

};