| Message ID | 1315800409-19876-4-git-send-email-marek.vasut@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Stefano Babic |
| Headers | show |
On 09/12/2011 06:06 AM, Marek Vasut wrote: > Signed-off-by: Marek Vasut <marek.vasut@gmail.com> > Cc: Ben Warren <biggerbadderben@gmail.com> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Wolfgang Denk <wd@denx.de> > Cc: Detlev Zundel <dzu@denx.de> > --- Hi Marek, only a small question: > drivers/net/fec_mxc.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- > 1 files changed, 42 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c > index cfe2176..f50433dd 100644 > --- a/drivers/net/fec_mxc.c > +++ b/drivers/net/fec_mxc.c > @@ -42,6 +42,14 @@ DECLARE_GLOBAL_DATA_PTR; > #define CONFIG_FEC_XCV_TYPE MII100 > #endif > > +/* > + * The i.MX28 operates with packets in big endian. We need to swap them before > + * sending and after receiving. > + */ > +#ifdef CONFIG_MX28 > +#define CONFIG_FEC_MXC_SWAP_PACKET > +#endif > + Do we really need two defines ? If the MX28 has the oddity to swap packets and this must be always done for this SOC, we could protect the code only with CONFIG_MX28. I think in the code it is already clear that in case of MX28 the packets are swapped. Best regards, Stefano Babic
On Wednesday, September 14, 2011 09:17:37 AM Stefano Babic wrote: > On 09/12/2011 06:06 AM, Marek Vasut wrote: > > Signed-off-by: Marek Vasut <marek.vasut@gmail.com> > > Cc: Ben Warren <biggerbadderben@gmail.com> > > Cc: Stefano Babic <sbabic@denx.de> > > Cc: Wolfgang Denk <wd@denx.de> > > Cc: Detlev Zundel <dzu@denx.de> > > --- > > Hi Marek, > > only a small question: > > drivers/net/fec_mxc.c | 44 > > ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 42 > > insertions(+), 2 deletions(-) > > > > diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c > > index cfe2176..f50433dd 100644 > > --- a/drivers/net/fec_mxc.c > > +++ b/drivers/net/fec_mxc.c > > @@ -42,6 +42,14 @@ DECLARE_GLOBAL_DATA_PTR; > > > > #define CONFIG_FEC_XCV_TYPE MII100 > > #endif > > > > +/* > > + * The i.MX28 operates with packets in big endian. We need to swap them > > before + * sending and after receiving. > > + */ > > +#ifdef CONFIG_MX28 > > +#define CONFIG_FEC_MXC_SWAP_PACKET > > +#endif > > + > > Do we really need two defines ? If the MX28 has the oddity to swap > packets and this must be always done for this SOC, we could protect the > code only with CONFIG_MX28. I think in the code it is already clear that > in case of MX28 the packets are swapped. Well if any other CPU with this problem pops up on the market, we should be ready. > > Best regards, > Stefano Babic
On Wed, Sep 14, 2011 at 08:11, Marek Vasut wrote: > On Wednesday, September 14, 2011 09:17:37 AM Stefano Babic wrote: >> On 09/12/2011 06:06 AM, Marek Vasut wrote: >> > --- a/drivers/net/fec_mxc.c >> > +++ b/drivers/net/fec_mxc.c >> > >> > +/* >> > + * The i.MX28 operates with packets in big endian. We need to swap them >> > before + * sending and after receiving. >> > + */ >> > +#ifdef CONFIG_MX28 >> > +#define CONFIG_FEC_MXC_SWAP_PACKET >> > +#endif >> >> Do we really need two defines ? If the MX28 has the oddity to swap >> packets and this must be always done for this SOC, we could protect the >> code only with CONFIG_MX28. I think in the code it is already clear that >> in case of MX28 the packets are swapped. > > Well if any other CPU with this problem pops up on the market, we should be > ready. makes sense -mike
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index cfe2176..f50433dd 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -42,6 +42,14 @@ DECLARE_GLOBAL_DATA_PTR; #define CONFIG_FEC_XCV_TYPE MII100 #endif +/* + * The i.MX28 operates with packets in big endian. We need to swap them before + * sending and after receiving. + */ +#ifdef CONFIG_MX28 +#define CONFIG_FEC_MXC_SWAP_PACKET +#endif + #undef DEBUG struct nbuf { @@ -51,6 +59,32 @@ struct nbuf { uint8_t head[16]; /**< MAC header(6 + 6 + 2) + 2(aligned) */ }; +#ifdef CONFIG_FEC_MXC_SWAP_PACKET +static void swap_packet(uint32_t *packet, int length) +{ + int i; + + for (i = 0; i < DIV_ROUND_UP(length, 4); i++) + packet[i] = __swab32(packet[i]); +} +#endif + +/* + * The i.MX28 has two ethernet interfaces, but they are not equal. + * Only the first one can access the MDIO bus. + */ +#ifdef CONFIG_MX28 +static inline struct ethernet_regs *fec_miiphy_fec_to_eth(struct fec_priv *fec) +{ + return (struct ethernet_regs *)MXS_ENET0_BASE; +} +#else +static inline struct ethernet_regs *fec_miiphy_fec_to_eth(struct fec_priv *fec) +{ + return fec->eth; +} +#endif + /* * MII-interface related functions */ @@ -59,7 +93,7 @@ static int fec_miiphy_read(const char *dev, uint8_t phyAddr, uint8_t regAddr, { struct eth_device *edev = eth_get_dev_by_name(dev); struct fec_priv *fec = (struct fec_priv *)edev->priv; - struct ethernet_regs *eth = fec->eth; + struct ethernet_regs *eth = fec_miiphy_fec_to_eth(fec); uint32_t reg; /* convenient holder for the PHY register */ uint32_t phy; /* convenient holder for the PHY */ @@ -117,7 +151,7 @@ static int fec_miiphy_write(const char *dev, uint8_t phyAddr, uint8_t regAddr, { struct eth_device *edev = eth_get_dev_by_name(dev); struct fec_priv *fec = (struct fec_priv *)edev->priv; - struct ethernet_regs *eth = fec->eth; + struct ethernet_regs *eth = fec_miiphy_fec_to_eth(fec); uint32_t reg; /* convenient holder for the PHY register */ uint32_t phy; /* convenient holder for the PHY */ @@ -572,6 +606,9 @@ static int fec_send(struct eth_device *dev, volatile void* packet, int length) * Note: We are always using the first buffer for transmission, * the second will be empty and only used to stop the DMA engine */ +#ifdef CONFIG_FEC_MXC_SWAP_PACKET + swap_packet((uint32_t *)packet, length); +#endif writew(length, &fec->tbd_base[fec->tbd_index].data_length); writel((uint32_t)packet, &fec->tbd_base[fec->tbd_index].data_pointer); /* @@ -668,6 +705,9 @@ static int fec_recv(struct eth_device *dev) /* * Fill the buffer and pass it to upper layers */ +#ifdef CONFIG_FEC_MXC_SWAP_PACKET + swap_packet((uint32_t *)frame->data, frame_length); +#endif memcpy(buff, frame->data, frame_length); NetReceive(buff, frame_length); len = frame_length;
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Ben Warren <biggerbadderben@gmail.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Wolfgang Denk <wd@denx.de> Cc: Detlev Zundel <dzu@denx.de> --- drivers/net/fec_mxc.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 42 insertions(+), 2 deletions(-)