| Message ID | 20090428073216.16015.15940.sendpatchset@rx1.opensource.se |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Magnus Damm <magnus.damm@gmail.com> wrote on 28/04/2009 08:32:16: > From: Magnus Damm <damm@igel.co.jp> > > This is V2 of the smsc911x fifo byteswap patch. > > The smsc911x hardware supports both big and little and endian > hardware configurations, and the linux smsc911x driver currently > detects word order. > > For correct operation on big endian platforms lacking swapped > byte lanes the following patch is needed. Only fifo data is > swapped, register data does not require any swapping. > > Signed-off-by: Magnus Damm <damm@igel.co.jp> > --- Acked-by: Steve Glendinning <steve.glendinning@smsc.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Steve.Glendinning@smsc.com Date: Tue, 28 Apr 2009 09:21:42 +0100 > Magnus Damm <magnus.damm@gmail.com> wrote on 28/04/2009 08:32:16: > >> From: Magnus Damm <damm@igel.co.jp> >> >> This is V2 of the smsc911x fifo byteswap patch. >> >> The smsc911x hardware supports both big and little and endian >> hardware configurations, and the linux smsc911x driver currently >> detects word order. >> >> For correct operation on big endian platforms lacking swapped >> byte lanes the following patch is needed. Only fifo data is >> swapped, register data does not require any swapping. >> >> Signed-off-by: Magnus Damm <damm@igel.co.jp> >> --- > > Acked-by: Steve Glendinning <steve.glendinning@smsc.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- 0001/drivers/net/smsc911x.c +++ work/drivers/net/smsc911x.c 2009-04-28 15:34:56.000000000 +0900 @@ -47,6 +47,7 @@ #include <linux/bitops.h> #include <linux/irq.h> #include <linux/io.h> +#include <linux/swab.h> #include <linux/phy.h> #include <linux/smsc911x.h> #include "smsc911x.h" @@ -175,6 +176,12 @@ static inline void smsc911x_tx_writefifo(struct smsc911x_data *pdata, unsigned int *buf, unsigned int wordcount) { + if (pdata->config.flags & SMSC911X_SWAP_FIFO) { + while (wordcount--) + smsc911x_reg_write(pdata, TX_DATA_FIFO, swab32(*buf++)); + return; + } + if (pdata->config.flags & SMSC911X_USE_32BIT) { writesl(pdata->ioaddr + TX_DATA_FIFO, buf, wordcount); return; @@ -194,6 +201,12 @@ static inline void smsc911x_rx_readfifo(struct smsc911x_data *pdata, unsigned int *buf, unsigned int wordcount) { + if (pdata->config.flags & SMSC911X_SWAP_FIFO) { + while (wordcount--) + *buf++ = swab32(smsc911x_reg_read(pdata, RX_DATA_FIFO)); + return; + } + if (pdata->config.flags & SMSC911X_USE_32BIT) { readsl(pdata->ioaddr + RX_DATA_FIFO, buf, wordcount); return; --- 0001/include/linux/smsc911x.h +++ work/include/linux/smsc911x.h 2009-04-28 15:31:07.000000000 +0900 @@ -47,4 +47,14 @@ struct smsc911x_platform_config { #define SMSC911X_FORCE_EXTERNAL_PHY (BIT(3)) #define SMSC911X_SAVE_MAC_ADDRESS (BIT(4)) +/* + * SMSC911X_SWAP_FIFO: + * Enables software byte swap for fifo data. Should only be used as a + * "last resort" in the case of big endian mode on boards with incorrectly + * routed data bus to older devices such as LAN9118. Newer devices such as + * LAN9221 can handle this in hardware, there are registers to control + * this swapping but the driver doesn't currently use them. + */ +#define SMSC911X_SWAP_FIFO (BIT(5)) + #endif /* __LINUX_SMSC911X_H__ */