2006-03-15 22:26:32

by David Miller

[permalink] [raw]
Subject: [PATCH]: e1000 endianness bugs


return -E_NO_BIG_ENDIAN_TESTING;

[E1000]: Fix 4 missed endianness conversions on RX descriptor fields.

Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 5b7d0f4..1d91117 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3710,7 +3710,7 @@ e1000_clean_rx_irq(struct e1000_adapter
e1000_rx_checksum(adapter,
(uint32_t)(status) |
((uint32_t)(rx_desc->errors) << 24),
- rx_desc->csum, skb);
+ le16_to_cpu(rx_desc->csum), skb);

skb->protocol = eth_type_trans(skb, netdev);
#ifdef CONFIG_E1000_NAPI
@@ -3854,11 +3854,11 @@ e1000_clean_rx_irq_ps(struct e1000_adapt
}

e1000_rx_checksum(adapter, staterr,
- rx_desc->wb.lower.hi_dword.csum_ip.csum, skb);
+ le16_to_cpu(rx_desc->wb.lower.hi_dword.csum_ip.csum), skb);
skb->protocol = eth_type_trans(skb, netdev);

if (likely(rx_desc->wb.upper.header_status &
- E1000_RXDPS_HDRSTAT_HDRSP))
+ cpu_to_le16(E1000_RXDPS_HDRSTAT_HDRSP)))
adapter->rx_hdr_split++;
#ifdef CONFIG_E1000_NAPI
if (unlikely(adapter->vlgrp && (staterr & E1000_RXD_STAT_VP))) {
@@ -3884,7 +3884,7 @@ e1000_clean_rx_irq_ps(struct e1000_adapt
#endif

next_desc:
- rx_desc->wb.middle.status_error &= ~0xFF;
+ rx_desc->wb.middle.status_error &= cpu_to_le32(~0xFF);
buffer_info->skb = NULL;

/* return some buffers to hardware, one at a time is too slow */


2006-03-15 23:33:46

by Jesse Brandeburg

[permalink] [raw]
Subject: Re: [PATCH]: e1000 endianness bugs

On 3/15/06, David S. Miller <[email protected]> wrote:
>
> return -E_NO_BIG_ENDIAN_TESTING;
>
> [E1000]: Fix 4 missed endianness conversions on RX descriptor fields.
>
> Signed-off-by: David S. Miller <[email protected]>

Yep, those look like bugs to me, thanks and congratulations, you're
the first person to test our PCI Express adapters in a big endian
system (they haven't been available before, and we don't have one,
yet)

Acked-by: Jesse Brandeburg <[email protected]>

2006-03-15 23:40:52

by David Miller

[permalink] [raw]
Subject: Re: [PATCH]: e1000 endianness bugs

From: "Jesse Brandeburg" <[email protected]>
Date: Wed, 15 Mar 2006 15:33:43 -0800

> Yep, those look like bugs to me, thanks and congratulations, you're
> the first person to test our PCI Express adapters in a big endian
> system (they haven't been available before, and we don't have one,
> yet)

It was onboard a Niagara T2000 system.

2006-03-16 07:31:44

by Christoph Hellwig

[permalink] [raw]
Subject: Re: [PATCH]: e1000 endianness bugs

On Wed, Mar 15, 2006 at 02:26:28PM -0800, David S. Miller wrote:
>
> return -E_NO_BIG_ENDIAN_TESTING;
>
> [E1000]: Fix 4 missed endianness conversions on RX descriptor fields.

Could the e1000 maintainers please add endianess annotations so that
sparse will catch such things in the future?

2006-03-17 00:18:00

by Jeff Garzik

[permalink] [raw]
Subject: Re: [PATCH]: e1000 endianness bugs

David S. Miller wrote:
> return -E_NO_BIG_ENDIAN_TESTING;
>
> [E1000]: Fix 4 missed endianness conversions on RX descriptor fields.
>
> Signed-off-by: David S. Miller <[email protected]>

applied