public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Marek Vasut <marek.vasut@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 03/15] FEC: Add support for iMX28 quirks
Date: Mon, 12 Sep 2011 06:06:37 +0200	[thread overview]
Message-ID: <1315800409-19876-4-git-send-email-marek.vasut@gmail.com> (raw)
In-Reply-To: <1315800409-19876-1-git-send-email-marek.vasut@gmail.com>

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(-)

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;
-- 
1.7.5.4

  parent reply	other threads:[~2011-09-12  4:06 UTC|newest]

Thread overview: 116+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-12  4:06 [U-Boot] [PATCH 00/15 V2] Support for the DENX M28 SoM Marek Vasut
2011-09-12  4:06 ` [U-Boot] [PATCH 01/15] iMX28: Initial support for iMX28 CPU Marek Vasut
2011-09-14  7:10   ` Stefano Babic
2011-09-27 13:45   ` [U-Boot] [PATCH 01/15 V2] " Marek Vasut
2011-09-30  9:42     ` [U-Boot] [PATCH 01/15 V3] " Marek Vasut
2011-10-13 16:19       ` Stefano Babic
2011-10-13 18:14         ` Marek Vasut
2011-10-13 20:45           ` Wolfgang Denk
2011-10-14  7:51           ` Stefano Babic
2011-10-14  7:59             ` Marek Vasut
2011-10-14 21:00               ` Wolfgang Denk
2011-10-14 21:06                 ` Marek Vasut
2011-10-13 23:38       ` [U-Boot] [PATCH 01/15 V4] " Marek Vasut
2011-10-14 21:14         ` [U-Boot] [PATCH 01/15 V5] " Marek Vasut
2011-10-14 21:01       ` [U-Boot] [PATCH 01/15 V3] " Wolfgang Denk
2011-10-14 21:10         ` Marek Vasut
2011-09-12  4:06 ` [U-Boot] [PATCH 02/15] iMX28: Add SSP MMC driver Marek Vasut
2011-09-12  4:06 ` Marek Vasut [this message]
2011-09-14  7:17   ` [U-Boot] [PATCH 03/15] FEC: Add support for iMX28 quirks Stefano Babic
2011-09-14 12:11     ` Marek Vasut
2011-09-14 15:38       ` Mike Frysinger
2011-09-12  4:06 ` [U-Boot] [PATCH 04/15] iMX28: Add PINMUX control Marek Vasut
2011-09-12  4:06 ` [U-Boot] [PATCH 05/15] iMX28: Add I2C bus driver Marek Vasut
2011-09-12  5:30   ` Heiko Schocher
2011-09-12 13:31     ` Marek Vasut
2011-09-13 12:05   ` Wolfram Sang
2011-09-13 12:56     ` Marek Vasut
2011-09-13 13:12       ` Wolfram Sang
2011-09-13 13:20         ` Marek Vasut
2011-09-13 13:31           ` Wolfram Sang
2011-09-13 22:24   ` [U-Boot] [PATCH 05/15 V2] " Marek Vasut
2011-09-12  4:06 ` [U-Boot] [PATCH 06/15] iMX28: Add GPIO control Marek Vasut
2011-09-14  7:25   ` Stefano Babic
2011-09-12  4:06 ` [U-Boot] [PATCH 07/15] iMX28: Add SPI driver Marek Vasut
2011-09-12 16:35   ` Mike Frysinger
2011-09-12 17:42     ` Marek Vasut
2011-09-12 20:26       ` Mike Frysinger
2011-09-12 22:45         ` Marek Vasut
2011-09-13 22:26   ` [U-Boot] [PATCH 07/15 V2] " Marek Vasut
2011-09-14  2:50     ` Mike Frysinger
2011-09-14  3:14       ` Marek Vasut
2011-09-12  4:06 ` [U-Boot] [PATCH 08/15] iMX28: Add APBH DMA driver Marek Vasut
2011-09-12  4:06 ` [U-Boot] [PATCH 09/15] iMX28: Add GPMI NAND driver Marek Vasut
2011-09-28 21:26   ` Scott Wood
2011-09-28 21:42     ` Marek Vasut
2011-09-28 21:57       ` Scott Wood
2011-09-28 22:09         ` Marek Vasut
2011-09-28 22:13           ` Scott Wood
2011-09-28 22:34             ` Marek Vasut
2011-09-28 22:12     ` Marek Vasut
2011-09-28 22:23       ` Scott Wood
2011-09-28 22:17   ` [U-Boot] [PATCH 09/15 V2] " Marek Vasut
2011-09-28 22:32     ` [U-Boot] [PATCH 09/15 V3] " Marek Vasut
2011-09-29  0:07       ` [U-Boot] [PATCH 09/15 V4] " Marek Vasut
2011-09-30  9:39         ` [U-Boot] [PATCH 09/15 V5] " Marek Vasut
2011-10-10 21:06           ` Scott Wood
2011-09-12  4:06 ` [U-Boot] [PATCH 10/15] iMX28: Add driver for internal RTC Marek Vasut
2011-09-12  4:06 ` [U-Boot] [PATCH 11/15] iMX28: Add image header generator tool Marek Vasut
2011-09-12 16:38   ` Mike Frysinger
2011-09-12 17:40     ` Marek Vasut
2011-09-12 20:24       ` Mike Frysinger
2011-09-12 22:13         ` Marek Vasut
2011-09-13 22:27   ` [U-Boot] [PATCH 11/15 V2] " Marek Vasut
2011-09-12  4:06 ` [U-Boot] [PATCH 12/15] iMX28: Add u-boot.sb target to Makefile Marek Vasut
2011-09-12 16:33   ` Mike Frysinger
2011-09-12 17:40     ` Marek Vasut
2011-09-13 22:28   ` [U-Boot] [PATCH 12/15 V2] " Marek Vasut
2011-09-12  4:06 ` [U-Boot] [PATCH 13/15] iMX28: Add support for DENX M28EVK board Marek Vasut
2011-09-13 22:29   ` [U-Boot] [PATCH 13/15 V2] " Marek Vasut
2011-09-14  2:48     ` Mike Frysinger
2011-09-14  3:17       ` Marek Vasut
2011-09-14  3:33         ` Mike Frysinger
2011-09-14  4:24           ` Marek Vasut
2011-09-14  5:01             ` Mike Frysinger
2011-09-14  5:10               ` Marek Vasut
2011-09-14 22:12                 ` Mike Frysinger
2011-09-14 23:13                   ` Marek Vasut
2011-09-20  2:15     ` [U-Boot] [PATCH 13/15 V3] " Marek Vasut
2011-09-12  4:06 ` [U-Boot] [PATCH 14/15] M28: Add MMC SPL Marek Vasut
2011-09-30  9:40   ` [U-Boot] [PATCH 14/15 V2] " Marek Vasut
2011-10-14 12:09     ` [U-Boot] [PATCH 14/15 V3] " Marek Vasut
2011-09-12  4:06 ` [U-Boot] [PATCH 15/15] M28: Add doc/README.m28 documentation Marek Vasut
2011-10-21 22:44 ` [U-Boot] [PATCH 00/17 V3] Support for the DENX M28 SoM Marek Vasut
2011-10-21 22:44   ` [U-Boot] [PATCH 01/17 RESEND V5] iMX28: Initial support for iMX28 CPU Marek Vasut
2011-10-21 22:44   ` [U-Boot] [PATCH 02/17 RESEND] iMX28: Add SSP MMC driver Marek Vasut
2011-11-08 20:45     ` Andy Fleming
2011-11-08 21:42       ` Marek Vasut
2011-11-08 21:50         ` Andy Fleming
2011-11-09  8:18           ` Stefano Babic
2011-11-09  8:38             ` Marek Vasut
2011-11-09  8:52               ` Stefano Babic
2011-10-21 22:44   ` [U-Boot] [PATCH 03/17 RESEND] FEC: Add support for iMX28 quirks Marek Vasut
2011-10-21 22:44   ` [U-Boot] [PATCH 04/17 RESEND] iMX28: Add PINMUX control Marek Vasut
2011-10-21 22:44   ` [U-Boot] [PATCH 05/17 RESEND V2] iMX28: Add I2C bus driver Marek Vasut
2011-10-21 22:44   ` [U-Boot] [PATCH 06/17 RESEND] iMX28: Add GPIO control Marek Vasut
2011-10-21 22:44   ` [U-Boot] [PATCH 07/17 RESEND V2] iMX28: Add SPI driver Marek Vasut
2011-10-21 22:44   ` [U-Boot] [PATCH 08/17 RESEND] iMX28: Add APBH DMA driver Marek Vasut
2011-10-21 22:44   ` [U-Boot] [PATCH 09/17 RESEND V5] iMX28: Add GPMI NAND driver Marek Vasut
2011-11-04 13:13     ` Veli-Pekka Peltola
2011-11-04 13:30       ` Marek Vasut
2011-11-04 14:02         ` Veli-Pekka Peltola
2011-11-05  2:24           ` Marek Vasut
2011-10-21 22:44   ` [U-Boot] [PATCH 10/17 RESEND] iMX28: Add driver for internal RTC Marek Vasut
2011-10-21 22:44   ` [U-Boot] [PATCH 11/17 RESEND V2] iMX28: Add image header generator tool Marek Vasut
2011-10-21 22:44   ` [U-Boot] [PATCH 12/17 V3] iMX28: Add u-boot.sb target to Makefile Marek Vasut
2011-10-21 22:44   ` [U-Boot] [PATCH 13/17 V4] iMX28: Add support for DENX M28EVK board Marek Vasut
2011-10-31  9:12     ` Igor Grinberg
2011-10-31 11:42     ` [U-Boot] [PATCH 13/17 V5] " Marek Vasut
2011-10-21 22:44   ` [U-Boot] [PATCH 14/17 V4] M28: Add MMC SPL Marek Vasut
2011-10-23 21:42     ` Robert Schwebel
2011-10-31 11:44     ` [U-Boot] [PATCH 14/17 V5] " Marek Vasut
2011-10-21 22:44   ` [U-Boot] [PATCH 15/17 RESEND] M28: Add doc/README.m28 documentation Marek Vasut
2011-10-21 22:44   ` [U-Boot] [PATCH 16/17] iMX28: Fix ARM vector handling Marek Vasut
2011-10-21 22:44   ` [U-Boot] [PATCH 17/17] M28: Add memory detection into SPL Marek Vasut
2011-10-31 11:45     ` [U-Boot] [PATCH 17/17 V2] " Marek Vasut
2011-11-05  2:39       ` [U-Boot] [PATCH 17/17 V3] " Marek Vasut

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1315800409-19876-4-git-send-email-marek.vasut@gmail.com \
    --to=marek.vasut@gmail.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox