Re: [U-Boot] [PATCH v2] eth: asix88179: Add support for the driver model

[Marek Vasut]

On 08/03/2016 11:51 AM, Alban Bedel wrote:
> Adjust this driver to support driver model for Ethernet.
> 
> Signed-off-by: Alban Bedel 

Applied, thanks

-- 
Best regards,
Marek Vasut
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH v2] eth: asix88179: Add support for the driver model

[Simon Glass]

On 3 August 2016 at 03:51, Alban Bedel  wrote:
> Adjust this driver to support driver model for Ethernet.
>
> Signed-off-by: Alban Bedel 
> ---
>  drivers/usb/eth/asix88179.c | 184 
> 
>  1 file changed, 184 insertions(+)

Reviewed-by: Simon Glass 
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH v2] eth: asix88179: Add support for the driver model

[Alban Bedel]

Adjust this driver to support driver model for Ethernet.

Signed-off-by: Alban Bedel 
---
 drivers/usb/eth/asix88179.c | 184 
 1 file changed, 184 insertions(+)

diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c
index 45106ce5ef59..cc4ae3c17f16 100644
--- a/drivers/usb/eth/asix88179.c
+++ b/drivers/usb/eth/asix88179.c
@@ -7,6 +7,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -197,10 +198,18 @@ static const struct {
{7, 0xcc, 0x4c, 0x04, 8},
 };
 
+#ifndef CONFIG_DM_ETH
 static int curr_eth_dev; /* index for name of next device detected */
+#endif
 
 /* driver private */
 struct asix_private {
+#ifdef CONFIG_DM_ETH
+   struct ueth_data ueth;
+   unsigned pkt_cnt;
+   uint8_t *pkt_data;
+   uint32_t *pkt_hdr;
+#endif
int flags;
int rx_urb_size;
int maxpacketsize;
@@ -495,6 +504,7 @@ static int asix_send_common(struct ueth_data *dev,
return err;
 }
 
+#ifndef CONFIG_DM_ETH
 /*
  * Asix callbacks
  */
@@ -732,3 +742,177 @@ int ax88179_eth_get_info(struct usb_device *dev, struct 
ueth_data *ss,
 
return 1;
 }
+
+#else /* !CONFIG_DM_ETH */
+
+static int ax88179_eth_start(struct udevice *dev)
+{
+   struct asix_private *priv = dev_get_priv(dev);
+
+   return asix_init_common(>ueth, priv);
+}
+
+void ax88179_eth_stop(struct udevice *dev)
+{
+   struct asix_private *priv = dev_get_priv(dev);
+   struct ueth_data *ueth = >ueth;
+
+   debug("** %s()\n", __func__);
+
+   usb_ether_advance_rxbuf(ueth, -1);
+   priv->pkt_cnt = 0;
+   priv->pkt_data = NULL;
+   priv->pkt_hdr = NULL;
+}
+
+int ax88179_eth_send(struct udevice *dev, void *packet, int length)
+{
+   struct asix_private *priv = dev_get_priv(dev);
+
+   return asix_send_common(>ueth, priv, packet, length);
+}
+
+int ax88179_eth_recv(struct udevice *dev, int flags, uchar **packetp)
+{
+   struct asix_private *priv = dev_get_priv(dev);
+   struct ueth_data *ueth = >ueth;
+   int ret, len;
+   u16 pkt_len;
+
+   /* No packet left, get a new one */
+   if (priv->pkt_cnt == 0) {
+   uint8_t *ptr;
+   u16 pkt_cnt;
+   u16 hdr_off;
+   u32 rx_hdr;
+
+   len = usb_ether_get_rx_bytes(ueth, );
+   debug("%s: first try, len=%d\n", __func__, len);
+   if (!len) {
+   if (!(flags & ETH_RECV_CHECK_DEVICE))
+   return -EAGAIN;
+
+   ret = usb_ether_receive(ueth, priv->rx_urb_size);
+   if (ret < 0)
+   return ret;
+
+   len = usb_ether_get_rx_bytes(ueth, );
+   debug("%s: second try, len=%d\n", __func__, len);
+   }
+
+   if (len < 4) {
+   usb_ether_advance_rxbuf(ueth, -1);
+   return -EMSGSIZE;
+   }
+
+   rx_hdr = *(u32 *)(ptr + len - 4);
+   le32_to_cpus(_hdr);
+
+   pkt_cnt = (u16)rx_hdr;
+   if (pkt_cnt == 0) {
+   usb_ether_advance_rxbuf(ueth, -1);
+   return 0;
+   }
+
+   hdr_off = (u16)(rx_hdr >> 16);
+   if (hdr_off > len - 4) {
+   usb_ether_advance_rxbuf(ueth, -1);
+   return -EIO;
+   }
+
+   priv->pkt_cnt = pkt_cnt;
+   priv->pkt_data = ptr;
+   priv->pkt_hdr = (u32 *)(ptr + hdr_off);
+   debug("%s: %d packets received, pkt header at %d\n",
+ __func__, (int)priv->pkt_cnt, (int)hdr_off);
+   }
+
+   le32_to_cpus(priv->pkt_hdr);
+   pkt_len = (*priv->pkt_hdr >> 16) & 0x1fff;
+
+   *packetp = priv->pkt_data + 2;
+
+   priv->pkt_data += (pkt_len + 7) & 0xFFF8;
+   priv->pkt_cnt--;
+   priv->pkt_hdr++;
+
+   debug("%s: return packet of %d bytes (%d packets left)\n",
+ __func__, (int)pkt_len, priv->pkt_cnt);
+   return pkt_len;
+}
+
+static int ax88179_free_pkt(struct udevice *dev, uchar *packet, int packet_len)
+{
+   struct asix_private *priv = dev_get_priv(dev);
+   struct ueth_data *ueth = >ueth;
+
+   if (priv->pkt_cnt == 0)
+   usb_ether_advance_rxbuf(ueth, -1);
+
+   return 0;
+}
+
+int ax88179_write_hwaddr(struct udevice *dev)
+{
+   struct eth_pdata *pdata = dev_get_platdata(dev);
+   struct asix_private *priv = dev_get_priv(dev);
+   struct ueth_data *ueth = >ueth;
+
+   return asix_write_mac(ueth, pdata->enetaddr);
+}
+
+static int ax88179_eth_probe(struct udevice *dev)
+{
+   struct eth_pdata *pdata = dev_get_platdata(dev);
+   struct asix_private *priv = dev_get_priv(dev);
+   struct usb_device *usb_dev;
+   int ret;
+
+   priv->flags =