* [PATCH 4/4] sunrpc: use SKB fragment destructors to delay completion until page is released by network stack.
From: Ian Campbell @ 2011-11-09 15:02 UTC (permalink / raw)
To: netdev-u79uwXL29TY76Z2rM5mHXA
Cc: Ian Campbell, David S. Miller, Neil Brown, J. Bruce Fields,
linux-nfs-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <1320850895.955.172.camel-o4Be2W7LfRlXesXXhkcM7miJhflN2719@public.gmane.org>
This prevents an issue where an ACK is delayed, a retransmit is queued (either
at the RPC or TCP level) and the ACK arrives before the retransmission hits the
wire. If this happens to an NFS WRITE RPC then the write() system call
completes and the userspace process can continue, potentially modifying data
referenced by the retransmission before the retransmission occurs.
Signed-off-by: Ian Campbell <ian.campbell-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org>
Acked-by: Trond Myklebust <Trond.Myklebust-HgOvQuBEEgTQT0dZR+AlfA@public.gmane.org>
Cc: "David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
Cc: Neil Brown <neilb-l3A5Bk7waGM@public.gmane.org>
Cc: "J. Bruce Fields" <bfields-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
Cc: linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
---
include/linux/sunrpc/xdr.h | 2 ++
include/linux/sunrpc/xprt.h | 5 ++++-
net/sunrpc/clnt.c | 27 ++++++++++++++++++++++-----
net/sunrpc/svcsock.c | 3 ++-
net/sunrpc/xprt.c | 13 +++++++++++++
net/sunrpc/xprtsock.c | 3 ++-
6 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index a20970e..172f81e 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -16,6 +16,7 @@
#include <asm/byteorder.h>
#include <asm/unaligned.h>
#include <linux/scatterlist.h>
+#include <linux/skbuff.h>
/*
* Buffer adjustment
@@ -57,6 +58,7 @@ struct xdr_buf {
tail[1]; /* Appended after page data */
struct page ** pages; /* Array of contiguous pages */
+ struct skb_frag_destructor *destructor;
unsigned int page_base, /* Start of page data */
page_len, /* Length of page data */
flags; /* Flags for data disposition */
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 15518a1..75131eb 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -92,7 +92,10 @@ struct rpc_rqst {
/* A cookie used to track the
state of the transport
connection */
-
+ struct skb_frag_destructor destructor; /* SKB paged fragment
+ * destructor for
+ * transmitted pages*/
+
/*
* Partial send handling
*/
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index c5347d2..919538d 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -61,6 +61,7 @@ static void call_reserve(struct rpc_task *task);
static void call_reserveresult(struct rpc_task *task);
static void call_allocate(struct rpc_task *task);
static void call_decode(struct rpc_task *task);
+static void call_complete(struct rpc_task *task);
static void call_bind(struct rpc_task *task);
static void call_bind_status(struct rpc_task *task);
static void call_transmit(struct rpc_task *task);
@@ -1113,6 +1114,8 @@ rpc_xdr_encode(struct rpc_task *task)
(char *)req->rq_buffer + req->rq_callsize,
req->rq_rcvsize);
+ req->rq_snd_buf.destructor = &req->destructor;
+
p = rpc_encode_header(task);
if (p == NULL) {
printk(KERN_INFO "RPC: couldn't encode RPC header, exit EIO\n");
@@ -1276,6 +1279,7 @@ call_connect_status(struct rpc_task *task)
static void
call_transmit(struct rpc_task *task)
{
+ struct rpc_rqst *req = task->tk_rqstp;
dprint_status(task);
task->tk_action = call_status;
@@ -1309,8 +1313,8 @@ call_transmit(struct rpc_task *task)
call_transmit_status(task);
if (rpc_reply_expected(task))
return;
- task->tk_action = rpc_exit_task;
- rpc_wake_up_queued_task(&task->tk_xprt->pending, task);
+ task->tk_action = call_complete;
+ skb_frag_destructor_unref(&req->destructor);
}
/*
@@ -1383,7 +1387,8 @@ call_bc_transmit(struct rpc_task *task)
return;
}
- task->tk_action = rpc_exit_task;
+ task->tk_action = call_complete;
+ skb_frag_destructor_unref(&req->destructor);
if (task->tk_status < 0) {
printk(KERN_NOTICE "RPC: Could not send backchannel reply "
"error: %d\n", task->tk_status);
@@ -1423,7 +1428,6 @@ call_bc_transmit(struct rpc_task *task)
"error: %d\n", task->tk_status);
break;
}
- rpc_wake_up_queued_task(&req->rq_xprt->pending, task);
}
#endif /* CONFIG_SUNRPC_BACKCHANNEL */
@@ -1589,12 +1593,14 @@ call_decode(struct rpc_task *task)
return;
}
- task->tk_action = rpc_exit_task;
+ task->tk_action = call_complete;
if (decode) {
task->tk_status = rpcauth_unwrap_resp(task, decode, req, p,
task->tk_msg.rpc_resp);
}
+ rpc_sleep_on(&req->rq_xprt->pending, task, NULL);
+ skb_frag_destructor_unref(&req->destructor);
dprintk("RPC: %5u call_decode result %d\n", task->tk_pid,
task->tk_status);
return;
@@ -1609,6 +1615,17 @@ out_retry:
}
}
+/*
+ * 8. Wait for pages to be released by the network stack.
+ */
+static void
+call_complete(struct rpc_task *task)
+{
+ dprintk("RPC: %5u call_complete result %d\n",
+ task->tk_pid, task->tk_status);
+ task->tk_action = rpc_exit_task;
+}
+
static __be32 *
rpc_encode_header(struct rpc_task *task)
{
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 852a258..3685cad 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -196,7 +196,8 @@ int svc_send_common(struct socket *sock, struct xdr_buf *xdr,
while (pglen > 0) {
if (slen == size)
flags = 0;
- result = kernel_sendpage(sock, *ppage, NULL, base, size, flags);
+ result = kernel_sendpage(sock, *ppage, xdr->destructor,
+ base, size, flags);
if (result > 0)
len += result;
if (result != size)
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index f4385e4..925aa0c 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -1103,6 +1103,16 @@ static inline void xprt_init_xid(struct rpc_xprt *xprt)
xprt->xid = net_random();
}
+static int xprt_complete_skb_pages(void *calldata)
+{
+ struct rpc_task *task = calldata;
+ struct rpc_rqst *req = task->tk_rqstp;
+
+ dprintk("RPC: %5u completing skb pages\n", task->tk_pid);
+ rpc_wake_up_queued_task(&req->rq_xprt->pending, task);
+ return 0;
+}
+
static void xprt_request_init(struct rpc_task *task, struct rpc_xprt *xprt)
{
struct rpc_rqst *req = task->tk_rqstp;
@@ -1115,6 +1125,9 @@ static void xprt_request_init(struct rpc_task *task, struct rpc_xprt *xprt)
req->rq_xid = xprt_alloc_xid(xprt);
req->rq_release_snd_buf = NULL;
xprt_reset_majortimeo(req);
+ atomic_set(&req->destructor.ref, 1);
+ req->destructor.destroy = &xprt_complete_skb_pages;
+ req->destructor.data = task;
dprintk("RPC: %5u reserved req %p xid %08x\n", task->tk_pid,
req, ntohl(req->rq_xid));
}
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index f79e40e9..af3a106 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -408,7 +408,8 @@ static int xs_send_pagedata(struct socket *sock, struct xdr_buf *xdr, unsigned i
remainder -= len;
if (remainder != 0 || more)
flags |= MSG_MORE;
- err = sock->ops->sendpage(sock, *ppage, NULL, base, len, flags);
+ err = sock->ops->sendpage(sock, *ppage, xdr->destructor,
+ base, len, flags);
if (remainder == 0 || err != len)
break;
sent += err;
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related
* [PATCH 1/4] net: add support for per-paged-fragment destructors
From: Ian Campbell @ 2011-11-09 15:02 UTC (permalink / raw)
To: netdev
Cc: Ian Campbell, David S. Miller, Eric Dumazet,
Michał Mirosław
In-Reply-To: <1320850895.955.172.camel@zakaz.uk.xensource.com>
Entities which care about the complete lifecycle of pages which they inject
into the network stack via an skb paged fragment can choose to set this
destructor in order to receive a callback when the stack is really finished
with a page (including all clones, retransmits, pull-ups etc etc).
This destructor will always be propagated alongside the struct page when
copying skb_frag_t->page. This is the reason I chose to embed the destructor in
a "struct { } page" within the skb_frag_t, rather than as a separate field,
since it allows existing code which propagates ->frags[N].page to Just
Work(tm).
When the destructor is present the page reference counting is done slightly
differently. No references are held by the network stack on the struct page (it
is up to the caller to manage this as necessary) instead the network stack will
track references via the count embedded in the destructor structure. When this
reference count reaches zero then the destructor will be called and the caller
can take the necesary steps to release the page (i.e. release the struct page
reference itself).
The intention is that callers can use this callback to delay completion to
_their_ callers until the network stack has completely released the page, in
order to prevent use-after-free or modification of data pages which are still
in use by the stack.
It is allowable (indeed expected) for a caller to share a single destructor
instance between multiple pages injected into the stack e.g. a group of pages
included in a single higher level operation might share a destructor which is
used to complete that higher level operation.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
Cc: netdev@vger.kernel.org
---
include/linux/skbuff.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
net/core/skbuff.c | 17 +++++++++++++++++
2 files changed, 61 insertions(+), 0 deletions(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 6a6b352..5bdb74d 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -139,9 +139,16 @@ struct sk_buff;
typedef struct skb_frag_struct skb_frag_t;
+struct skb_frag_destructor {
+ atomic_t ref;
+ int (*destroy)(void *data);
+ void *data;
+};
+
struct skb_frag_struct {
struct {
struct page *p;
+ struct skb_frag_destructor *destructor;
} page;
#if (BITS_PER_LONG > 32) || (PAGE_SIZE >= 65536)
__u32 page_offset;
@@ -1160,6 +1167,31 @@ static inline int skb_pagelen(const struct sk_buff *skb)
}
/**
+ * skb_frag_set_destructor - set destructor for a paged fragment
+ * @skb: buffer containing fragment to be initialised
+ * @i: paged fragment index to initialise
+ * @destroy: the destructor to use for this fragment
+ *
+ * Sets @destroy as the destructor to be called when all references to
+ * the frag @i in @skb (tracked over skb_clone, retransmit, pull-ups,
+ * etc) are released.
+ *
+ * When a destructor is set then reference counting is performed on
+ * @destroy->ref. When the ref reaches zero then @destroy->destroy
+ * will be called. The caller is responsible for holding and managing
+ * any other references (such a the struct page reference count).
+ *
+ * This function must be called before any use of skb_frag_ref() or
+ * skb_frag_unref().
+ */
+static inline void skb_frag_set_destructor(struct sk_buff *skb, int i,
+ struct skb_frag_destructor *destroy)
+{
+ skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
+ frag->page.destructor = destroy;
+}
+
+/**
* __skb_fill_page_desc - initialise a paged fragment in an skb
* @skb: buffer containing fragment to be initialised
* @i: paged fragment index to initialise
@@ -1178,6 +1210,7 @@ static inline void __skb_fill_page_desc(struct sk_buff *skb, int i,
skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
frag->page.p = page;
+ frag->page.destructor = NULL;
frag->page_offset = off;
skb_frag_size_set(frag, size);
}
@@ -1704,6 +1737,9 @@ static inline struct page *skb_frag_page(const skb_frag_t *frag)
return frag->page.p;
}
+extern void skb_frag_destructor_ref(struct skb_frag_destructor *destroy);
+extern void skb_frag_destructor_unref(struct skb_frag_destructor *destroy);
+
/**
* __skb_frag_ref - take an addition reference on a paged fragment.
* @frag: the paged fragment
@@ -1712,6 +1748,10 @@ static inline struct page *skb_frag_page(const skb_frag_t *frag)
*/
static inline void __skb_frag_ref(skb_frag_t *frag)
{
+ if (unlikely(frag->page.destructor)) {
+ skb_frag_destructor_ref(frag->page.destructor);
+ return;
+ }
get_page(skb_frag_page(frag));
}
@@ -1735,6 +1775,10 @@ static inline void skb_frag_ref(struct sk_buff *skb, int f)
*/
static inline void __skb_frag_unref(skb_frag_t *frag)
{
+ if (unlikely(frag->page.destructor)) {
+ skb_frag_destructor_unref(frag->page.destructor);
+ return;
+ }
put_page(skb_frag_page(frag));
}
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index ca4db40..1c5cc05 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -302,6 +302,23 @@ struct sk_buff *dev_alloc_skb(unsigned int length)
}
EXPORT_SYMBOL(dev_alloc_skb);
+void skb_frag_destructor_ref(struct skb_frag_destructor *destroy)
+{
+ BUG_ON(destroy == NULL);
+ atomic_inc(&destroy->ref);
+}
+EXPORT_SYMBOL(skb_frag_destructor_ref);
+
+void skb_frag_destructor_unref(struct skb_frag_destructor *destroy)
+{
+ if (destroy == NULL)
+ return;
+
+ if (atomic_dec_and_test(&destroy->ref))
+ destroy->destroy(destroy->data);
+}
+EXPORT_SYMBOL(skb_frag_destructor_unref);
+
static void skb_drop_list(struct sk_buff **listp)
{
struct sk_buff *list = *listp;
--
1.7.2.5
^ permalink raw reply related
* [PATCH 2/4] net: only allow paged fragments with the same destructor to be coalesced.
From: Ian Campbell @ 2011-11-09 15:02 UTC (permalink / raw)
To: netdev
Cc: Ian Campbell, David S. Miller, Alexey Kuznetsov,
Pekka Savola (ipv6), James Morris, Hideaki YOSHIFUJI,
Patrick McHardy, Eric Dumazet, Michał Mirosław
In-Reply-To: <1320850895.955.172.camel@zakaz.uk.xensource.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: "Pekka Savola (ipv6)" <pekkas@netcore.fi>
Cc: James Morris <jmorris@namei.org>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: Patrick McHardy <kaber@trash.net>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
Cc: netdev@vger.kernel.org
---
include/linux/skbuff.h | 7 +++++--
net/core/skbuff.c | 1 +
net/ipv4/ip_output.c | 2 +-
net/ipv4/tcp.c | 4 ++--
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 5bdb74d..3ba6f58 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1970,13 +1970,16 @@ static inline int skb_add_data(struct sk_buff *skb,
}
static inline int skb_can_coalesce(struct sk_buff *skb, int i,
- const struct page *page, int off)
+ const struct page *page,
+ const struct skb_frag_destructor *destroy,
+ int off)
{
if (i) {
const struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i - 1];
return page == skb_frag_page(frag) &&
- off == frag->page_offset + skb_frag_size(frag);
+ off == frag->page_offset + skb_frag_size(frag) &&
+ frag->page.destructor == destroy;
}
return 0;
}
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 1c5cc05..c510740 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2275,6 +2275,7 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen)
*/
if (!to ||
!skb_can_coalesce(tgt, to, skb_frag_page(fragfrom),
+ fragfrom->page.destructor,
fragfrom->page_offset)) {
merge = -1;
} else {
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 0bc95f3..3252e06 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1229,7 +1229,7 @@ ssize_t ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page,
i = skb_shinfo(skb)->nr_frags;
if (len > size)
len = size;
- if (skb_can_coalesce(skb, i, page, offset)) {
+ if (skb_can_coalesce(skb, i, page, NULL, offset)) {
skb_frag_size_add(&skb_shinfo(skb)->frags[i-1], len);
} else if (i < MAX_SKB_FRAGS) {
get_page(page);
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 34f5db1..018de0c 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -804,7 +804,7 @@ new_segment:
copy = size;
i = skb_shinfo(skb)->nr_frags;
- can_coalesce = skb_can_coalesce(skb, i, page, offset);
+ can_coalesce = skb_can_coalesce(skb, i, page, NULL, offset);
if (!can_coalesce && i >= MAX_SKB_FRAGS) {
tcp_mark_push(tp, skb);
goto new_segment;
@@ -1008,7 +1008,7 @@ new_segment:
struct page *page = TCP_PAGE(sk);
int off = TCP_OFF(sk);
- if (skb_can_coalesce(skb, i, page, off) &&
+ if (skb_can_coalesce(skb, i, page, NULL, off) &&
off != PAGE_SIZE) {
/* We can extend the last page
* fragment. */
--
1.7.2.5
^ permalink raw reply related
* Re: [PATCH 1/4] net: add support for per-paged-fragment destructors
From: Michał Mirosław @ 2011-11-09 15:33 UTC (permalink / raw)
To: Ian Campbell; +Cc: netdev, David S. Miller, Eric Dumazet
In-Reply-To: <1320850927-30240-1-git-send-email-ian.campbell@citrix.com>
On Wed, Nov 09, 2011 at 03:02:04PM +0000, Ian Campbell wrote:
> Entities which care about the complete lifecycle of pages which they inject
> into the network stack via an skb paged fragment can choose to set this
> destructor in order to receive a callback when the stack is really finished
> with a page (including all clones, retransmits, pull-ups etc etc).
[...]
> --- a/include/linux/skbuff.h
> +++ b/include/linux/skbuff.h
> @@ -139,9 +139,16 @@ struct sk_buff;
>
> typedef struct skb_frag_struct skb_frag_t;
>
> +struct skb_frag_destructor {
> + atomic_t ref;
> + int (*destroy)(void *data);
> + void *data;
> +};
> +
> struct skb_frag_struct {
> struct {
> struct page *p;
> + struct skb_frag_destructor *destructor;
> } page;
You can get rid of the data field of skb_frag_destructor: if destroy() gets
pointer to the destroyed struct skb_frag_set_destructor, its users can
get at containing struct via container_of() if needed and the memory
pointed to by data won't have to be managed separately.
Nice work, BTW!
Best Regards,
Michał Mirosław
^ permalink raw reply
* Re: [PATCH net-next 0/2] 802.1ad S-VLAN support
From: David Lamparter @ 2011-11-09 15:34 UTC (permalink / raw)
To: Ben Hutchings; +Cc: David Lamparter, netdev
In-Reply-To: <1320711393.3020.89.camel@bwh-desktop>
On Tue, Nov 08, 2011 at 12:16:33AM +0000, Ben Hutchings wrote:
> > Hmm. I think we need to cleanly separate MTU and MFS. MTU is used for
> > upper layer stuff like setting TCP MSS, IP fragment size, etc.
> >
> > MFS is the actual ethernet thing, and it's quite independent from the
> > MTU. Imagine the following example case:
>
> I was proposing to make a distinction between the 'untagged' MTU
> (dev->mtu) that would continue to be used by layer 3 and the physical
> MTU that would take into account the needs of any related VLAN devices.
Ah. I think we're saying the same thing with different words.
> > How about instead of propagating the MFS up, we provide an user knob to
> > adjust the MFS (on physical devices)?
>
> I suppose that may be necessary - unfortunately.
Hm. Basically, the current ndo_change_mtu call is severely misnamed, it
actually changes the MFS. MTU isn't even relevant for the driver.
With that premise, it boils down to creating new "MFS" attributes for
userspace, and cleanly splitting L2/L3 values inside the kernel.
ndo_change_mtu would become ndo_change_mfs; there'd be a MFS_CHANGED
notifier call; "mtu" becomes an IP-level thing.
While MFS constrains MTU, I'd prefer to avoid "automatic" functions like
raising MFS to make the MTU fit. (Or, worse, lowering MTU if MFS gets
changed. I'd return error instead and have the user fix his config.)
> > I admit ignorance and am duly reading code - in fact, I should probably
> > not use vlan_features for 802.1ad S-VLANs and instead force the features
> > to 0 to be on the safe side...
>
> You shouldn't mask out all features. I think it should be OK to copy
> NETIF_F_NO_CSUM, NETIF_F_HW_CUSM, NETIF_F_SG, NETIF_F_FRAGLIST and
> NETIF_F_HIGHDMA if those are in real_dev->vlan_features, as none of
> those are dependent on header parsing.
I'm spinning a patch introducing NETIF_F_HDR_AGNOSTIC as |ing for those.
I'll use them both for stacked VLANs (which have no features currently...)
and 802.1ad S-VLANs (and 802.1ah later).
Resending patch group tomorrow-ish,
-David
^ permalink raw reply
* Re: [PATCH] net/can/mscan: add listen only mode
From: Marc Kleine-Budde @ 2011-11-09 15:52 UTC (permalink / raw)
To: Marc Kleine-Budde; +Cc: linux-can, netdev
In-Reply-To: <1320325243-24907-1-git-send-email-mkl@pengutronix.de>
[-- Attachment #1: Type: text/plain, Size: 2002 bytes --]
On 11/03/2011 02:00 PM, Marc Kleine-Budde wrote:
> This patch adds listen only mode to the mscan controller.
>
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
ping, any comments?
Marc
> ---
>
> ...can be pulled via:
>
> The following changes since commit 8b3408f8ee994973869d8ba32c5bf482bc4ddca4:
>
> dp83640: free packet queues on remove (2011-10-24 19:14:50 -0400)
>
> are available in the git repository at:
> git://git.pengutronix.de/git/mkl/linux-2.6.git can/mscan-listen-only-for-net-next
>
> Marc Kleine-Budde (1):
> net/can/mscan: add listen only mode
>
> drivers/net/can/mscan/mscan.c | 8 ++++++--
> 1 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c
> index ec4a311..74f3b18 100644
> --- a/drivers/net/can/mscan/mscan.c
> +++ b/drivers/net/can/mscan/mscan.c
> @@ -581,7 +581,10 @@ static int mscan_open(struct net_device *dev)
>
> priv->open_time = jiffies;
>
> - clrbits8(®s->canctl1, MSCAN_LISTEN);
> + if (ctrlmode.flags & CAN_CTRLMODE_LISTENONLY)
> + setbits8(®s->canctl1, MSCAN_LISTEN);
> + else
> + clrbits8(®s->canctl1, MSCAN_LISTEN);
>
> ret = mscan_start(dev);
> if (ret)
> @@ -690,7 +693,8 @@ struct net_device *alloc_mscandev(void)
> priv->can.bittiming_const = &mscan_bittiming_const;
> priv->can.do_set_bittiming = mscan_do_set_bittiming;
> priv->can.do_set_mode = mscan_do_set_mode;
> - priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;
> + priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES |
> + CAN_CTRLMODE_LISTENONLY;
>
> for (i = 0; i < TX_QUEUE_SIZE; i++) {
> priv->tx_queue[i].id = i;
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]
^ permalink raw reply
* Re: [PATCH] net/can/mscan: add listen only mode
From: Wolfgang Grandegger @ 2011-11-09 16:01 UTC (permalink / raw)
To: Marc Kleine-Budde; +Cc: linux-can, netdev
In-Reply-To: <4EBAA1C6.8080503@pengutronix.de>
On 11/09/2011 04:52 PM, Marc Kleine-Budde wrote:
> On 11/03/2011 02:00 PM, Marc Kleine-Budde wrote:
>> This patch adds listen only mode to the mscan controller.
>>
>> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
>
> ping, any comments?
Looks good, therefore:
Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Thanks,
Wolfgang.
^ permalink raw reply
* Re: [PATCH] drivers/net/usb/asix: resync from vendor's copy
From: Mark Lord @ 2011-11-09 16:25 UTC (permalink / raw)
To: Ben Hutchings; +Cc: David Miller, netdev, linux-kernel
In-Reply-To: <1320266549.2782.21.camel@bwh-desktop>
On 11-11-02 04:42 PM, Ben Hutchings wrote:
> On Wed, 2011-11-02 at 15:36 -0400, Mark Lord wrote:
> [...]
>> First cut (for review) at updating the in-kernel asix usb/network driver
>> from the latest vendor GPL version of the driver, obtained from here:
>>
>> http://www.asix.com.tw/download.php?sub=searchresult&PItemID=84&download=driver
..
>> --- linux-3.0/drivers/net/usb/asix.c 2011-10-12 17:59:03.000000000 -0400
>> +++ linux/drivers/net/usb/asix.c 2011-11-01 19:00:50.051289683 -0400
> [...]
...
>> + .set_tx_csum = ax88772b_set_tx_csum,
>> + .get_tx_csum = ax88772b_get_tx_csum,
>> + .get_rx_csum = ax88772b_get_rx_csum,
>> + .set_rx_csum = ax88772b_set_rx_csum,
>> +};
>
> The various ethtool operations for offload flags are being (or have
> been) removed. The driver must set net_device::hw_features and
> implement net_device_ops::ndo_set_features instead.
Okay, I see what to do for the rx_csum stuff, based on other drivers.
But is there anything to replace the tx_csum stuff,
or should I just remove it entirely without a substitute?
(thanks).
^ permalink raw reply
* Re: [PATCH 1/4] net: add support for per-paged-fragment destructors
From: Ian Campbell @ 2011-11-09 16:25 UTC (permalink / raw)
To: Michał Mirosław
Cc: netdev@vger.kernel.org, David S. Miller, Eric Dumazet
In-Reply-To: <20111109153300.GA11617@rere.qmqm.pl>
On Wed, 2011-11-09 at 15:33 +0000, Michał Mirosław wrote:
> On Wed, Nov 09, 2011 at 03:02:04PM +0000, Ian Campbell wrote:
> > Entities which care about the complete lifecycle of pages which they inject
> > into the network stack via an skb paged fragment can choose to set this
> > destructor in order to receive a callback when the stack is really finished
> > with a page (including all clones, retransmits, pull-ups etc etc).
> [...]
> > --- a/include/linux/skbuff.h
> > +++ b/include/linux/skbuff.h
> > @@ -139,9 +139,16 @@ struct sk_buff;
> >
> > typedef struct skb_frag_struct skb_frag_t;
> >
> > +struct skb_frag_destructor {
> > + atomic_t ref;
> > + int (*destroy)(void *data);
> > + void *data;
> > +};
> > +
> > struct skb_frag_struct {
> > struct {
> > struct page *p;
> > + struct skb_frag_destructor *destructor;
> > } page;
>
> You can get rid of the data field of skb_frag_destructor: if destroy() gets
> pointer to the destroyed struct skb_frag_set_destructor, its users can
> get at containing struct via container_of() if needed and the memory
> pointed to by data won't have to be managed separately.
At the moment you can share one destructor between all the frags,
whereas data is specific to the frag. At the moment the only user is the
rpc patch which doesn't make use of this capability (i.e. it could use
container_of) but I'm not sure about other potential users yet.
> Nice work, BTW!
Thanks.
>
> Best Regards,
> Michał Mirosław
^ permalink raw reply
* Re: [PATCH] drivers/net/usb/asix: resync from vendor's copy
From: Ben Hutchings @ 2011-11-09 16:34 UTC (permalink / raw)
To: Mark Lord; +Cc: David Miller, netdev, linux-kernel
In-Reply-To: <4EBAA967.10403@teksavvy.com>
On Wed, 2011-11-09 at 11:25 -0500, Mark Lord wrote:
> On 11-11-02 04:42 PM, Ben Hutchings wrote:
> > On Wed, 2011-11-02 at 15:36 -0400, Mark Lord wrote:
> > [...]
> >> First cut (for review) at updating the in-kernel asix usb/network driver
> >> from the latest vendor GPL version of the driver, obtained from here:
> >>
> >> http://www.asix.com.tw/download.php?sub=searchresult&PItemID=84&download=driver
> ..
> >> --- linux-3.0/drivers/net/usb/asix.c 2011-10-12 17:59:03.000000000 -0400
> >> +++ linux/drivers/net/usb/asix.c 2011-11-01 19:00:50.051289683 -0400
> > [...]
> ...
> >> + .set_tx_csum = ax88772b_set_tx_csum,
> >> + .get_tx_csum = ax88772b_get_tx_csum,
> >> + .get_rx_csum = ax88772b_get_rx_csum,
> >> + .set_rx_csum = ax88772b_set_rx_csum,
> >> +};
> >
> > The various ethtool operations for offload flags are being (or have
> > been) removed. The driver must set net_device::hw_features and
> > implement net_device_ops::ndo_set_features instead.
>
> Okay, I see what to do for the rx_csum stuff, based on other drivers.
>
> But is there anything to replace the tx_csum stuff,
> or should I just remove it entirely without a substitute?
If TX checksum offload only needs to be requested in TX descriptors and
not in a configuration register, then you don't need to do anything when
it's enabled or disabled.
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply
* Re: [PATCH] drivers/net/usb/asix: resync from vendor's copy
From: Mark Lord @ 2011-11-09 16:47 UTC (permalink / raw)
To: Ben Hutchings; +Cc: David Miller, netdev, linux-kernel
In-Reply-To: <1320856444.18929.78.camel@deadeye>
On 11-11-09 11:34 AM, Ben Hutchings wrote:
> On Wed, 2011-11-09 at 11:25 -0500, Mark Lord wrote:
>> On 11-11-02 04:42 PM, Ben Hutchings wrote:
>>> On Wed, 2011-11-02 at 15:36 -0400, Mark Lord wrote:
>>> [...]
>>>> First cut (for review) at updating the in-kernel asix usb/network driver
>>>> from the latest vendor GPL version of the driver, obtained from here:
>>>>
>>>> http://www.asix.com.tw/download.php?sub=searchresult&PItemID=84&download=driver
>> ..
>>>> --- linux-3.0/drivers/net/usb/asix.c 2011-10-12 17:59:03.000000000 -0400
>>>> +++ linux/drivers/net/usb/asix.c 2011-11-01 19:00:50.051289683 -0400
>>> [...]
>> ...
>>>> + .set_tx_csum = ax88772b_set_tx_csum,
>>>> + .get_tx_csum = ax88772b_get_tx_csum,
>>>> + .get_rx_csum = ax88772b_get_rx_csum,
>>>> + .set_rx_csum = ax88772b_set_rx_csum,
>>>> +};
>>>
>>> The various ethtool operations for offload flags are being (or have
>>> been) removed. The driver must set net_device::hw_features and
>>> implement net_device_ops::ndo_set_features instead.
>>
>> Okay, I see what to do for the rx_csum stuff, based on other drivers.
>>
>> But is there anything to replace the tx_csum stuff,
>> or should I just remove it entirely without a substitute?
>
> If TX checksum offload only needs to be requested in TX descriptors and
> not in a configuration register, then you don't need to do anything when
> it's enabled or disabled.
It's in a config register too. But I've now just noticed "NETIF_F_HW_CSUM",
which seems to be what I was missing earlier.
So I can now treat the tx_csums similarly to the rx_csums again.
Note: I'm looking at smsc95xx.c and smsc75xx.c for examples,
and they both have the same problem I'll have here:
How to update the csum settings atomically.
A spinlock is no good, because config register access is over USB.
Is it safe to use a mutex in set_features, or can that be invoked
from atomic code? Or perhaps just not worry about it, since its only
an issue when somebody plays with two instances of ethtool simultaneously
on the same device?
Thanks for your help.
^ permalink raw reply
* Re: [PATCH] drivers/net/usb/asix: resync from vendor's copy
From: Mark Lord @ 2011-11-09 16:57 UTC (permalink / raw)
To: Ben Hutchings; +Cc: David Miller, netdev, linux-kernel
In-Reply-To: <4EBAAEA5.1060408@teksavvy.com>
On 11-11-09 11:47 AM, Mark Lord wrote:
..
> Note: I'm looking at smsc95xx.c and smsc75xx.c for examples,
> and they both have the same problem I'll have here:
>
> How to update the csum settings atomically.
> A spinlock is no good, because config register access is over USB.
Nevermind.. a slight change in the logic and all is well again.
static int ax88772b_set_features(struct net_device *netdev, u32 features)
{
struct usbnet *dev = netdev_priv(netdev);
struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
unsigned long flags;
u16 tx_csum = 0, rx_csum = 0;
spin_lock_irqsave(&priv->features_lock, flags);
if (features & NETIF_F_HW_CSUM) {
priv->checksum |= AX_TX_CHECKSUM;
tx_csum = AX_TXCOE_DEF_CSUM;
} else
priv->checksum &= ~AX_TX_CHECKSUM;
if (features & NETIF_F_RXCSUM) {
priv->checksum |= AX_RX_CHECKSUM;
rx_csum = AX_RXCOE_DEF_CSUM;
} else
priv->checksum &= ~AX_RX_CHECKSUM;
spin_unlock_irqrestore(&priv->features_lock, flags);
ax8817x_write_cmd(dev, AX_CMD_WRITE_RXCOE_CTL,
rx_csum, 0, 0, NULL);
ax8817x_write_cmd(dev, AX_CMD_WRITE_TXCOE_CTL,
tx_csum, 0, 0, NULL);
return 0;
}
^ permalink raw reply
* Re: [PATCH] staging: octeon-ethernet: Fix compile error caused by changed to struct skb_frag_struct.
From: Ralf Baechle @ 2011-11-09 17:17 UTC (permalink / raw)
To: David Daney; +Cc: linux-mips, netdev, gregkh, devel, ddaney.cavm
In-Reply-To: <1320698970-1854-1-git-send-email-david.daney@cavium.com>
On Mon, Nov 07, 2011 at 12:49:30PM -0800, David Daney wrote:
> Evidently the definition of struct skb_frag_struct has changed, so we
> need to change to match it.
>
> Signed-off-by: David Daney <david.daney@cavium.com>
> ---
As usual for this drive I've applied this to the MIPS tree and will
send it to Linus in a few days unless somebody objects.
Thanks,
Ralf
^ permalink raw reply
* Re: [PATCH] drivers/net/usb/asix: resync from vendor's copy
From: Mark Lord @ 2011-11-09 17:20 UTC (permalink / raw)
To: Ben Hutchings; +Cc: David Miller, netdev, linux-kernel
In-Reply-To: <4EBAB0EA.1050102@teksavvy.com>
On 11-11-09 11:57 AM, Mark Lord wrote:
> On 11-11-09 11:47 AM, Mark Lord wrote:
> ..
>> Note: I'm looking at smsc95xx.c and smsc75xx.c for examples,
>> and they both have the same problem I'll have here:
>>
>> How to update the csum settings atomically.
>> A spinlock is no good, because config register access is over USB.
>
> Nevermind.. a slight change in the logic and all is well again.
..
Or even simpler (below). I don't think this method requires any
extra locking, but I'm still open to persuasion. :)
static int ax88772b_set_features(struct net_device *netdev, u32 features)
{
struct usbnet *dev = netdev_priv(netdev);
struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
u16 tx_csum = 0, rx_csum = 0;
priv->features = features & (NETIF_F_HW_CSUM | NETIF_F_RXCSUM);
if (features & NETIF_F_HW_CSUM)
tx_csum = AX_TXCOE_DEF_CSUM;
if (features & NETIF_F_RXCSUM)
rx_csum = AX_RXCOE_DEF_CSUM;
ax8817x_write_cmd(dev, AX_CMD_WRITE_RXCOE_CTL, rx_csum, 0, 0, NULL);
ax8817x_write_cmd(dev, AX_CMD_WRITE_TXCOE_CTL, tx_csum, 0, 0, NULL);
return 0;
}
^ permalink raw reply
* [PATCH net-next] ipv4: PKTINFO doesnt need dst reference
From: Eric Dumazet @ 2011-11-09 17:24 UTC (permalink / raw)
To: Ben Hutchings, David Miller
Cc: Paweł Staszewski, Linux Network Development list
In-Reply-To: <1320676422.2361.18.camel@edumazet-HP-Compaq-6005-Pro-SFF-PC>
Le lundi 07 novembre 2011 à 15:33 +0100, Eric Dumazet a écrit :
> At least, in recent kernels we dont change dst->refcnt in forwarding
> patch (usinf NOREF skb->dst)
>
> One particular point is the atomic_inc(dst->refcnt) we have to perform
> when queuing an UDP packet if socket asked PKTINFO stuff (for example a
> typical DNS server has to setup this option)
>
> I have one patch somewhere that stores the information in skb->cb[] and
> avoid the atomic_{inc|dec}(dst->refcnt).
>
OK I found it, I did some extra tests and believe its ready.
[PATCH net-next] ipv4: IP_PKTINFO doesnt need dst reference
When a socket uses IP_PKTINFO notifications, we currently force a dst
reference for each received skb. Reader has to access dst to get needed
information (rt_iif & rt_spec_dst) and must release dst reference.
We also forced a dst reference if skb was put in socket backlog, even
without IP_PKTINFO handling. This happens under stress/load.
We can instead store the needed information in skb->cb[], so that only
softirq handler really access dst, improving cache hit ratios.
This removes two atomic operations per packet, and false sharing as
well.
On a benchmark using a mono threaded receiver (doing only recvmsg()
calls), I can reach 720.000 pps instead of 570.000 pps.
IP_PKTINFO is typically used by DNS servers, and any multihomed aware
UDP application.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
---
include/net/ip.h | 2 +-
net/ipv4/ip_sockglue.c | 37 +++++++++++++++++++------------------
net/ipv4/raw.c | 3 ++-
net/ipv4/udp.c | 3 ++-
net/ipv6/raw.c | 3 ++-
net/ipv6/udp.c | 4 +++-
6 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/include/net/ip.h b/include/net/ip.h
index eca0ef7..fd1561e 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -450,7 +450,7 @@ extern int ip_options_rcv_srr(struct sk_buff *skb);
* Functions provided by ip_sockglue.c
*/
-extern int ip_queue_rcv_skb(struct sock *sk, struct sk_buff *skb);
+extern void ipv4_pktinfo_prepare(struct sk_buff *skb);
extern void ip_cmsg_recv(struct msghdr *msg, struct sk_buff *skb);
extern int ip_cmsg_send(struct net *net,
struct msghdr *msg, struct ipcm_cookie *ipc);
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 09ff51b..b516030 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -55,20 +55,13 @@
/*
* SOL_IP control messages.
*/
+#define PKTINFO_SKB_CB(__skb) ((struct in_pktinfo *)((__skb)->cb))
static void ip_cmsg_recv_pktinfo(struct msghdr *msg, struct sk_buff *skb)
{
- struct in_pktinfo info;
- struct rtable *rt = skb_rtable(skb);
-
+ struct in_pktinfo info = *PKTINFO_SKB_CB(skb);
+
info.ipi_addr.s_addr = ip_hdr(skb)->daddr;
- if (rt) {
- info.ipi_ifindex = rt->rt_iif;
- info.ipi_spec_dst.s_addr = rt->rt_spec_dst;
- } else {
- info.ipi_ifindex = 0;
- info.ipi_spec_dst.s_addr = 0;
- }
put_cmsg(msg, SOL_IP, IP_PKTINFO, sizeof(info), &info);
}
@@ -992,20 +985,28 @@ e_inval:
}
/**
- * ip_queue_rcv_skb - Queue an skb into sock receive queue
+ * ipv4_pktinfo_prepare - transfert some info from rtable to skb
* @sk: socket
* @skb: buffer
*
- * Queues an skb into socket receive queue. If IP_CMSG_PKTINFO option
- * is not set, we drop skb dst entry now, while dst cache line is hot.
+ * To support IP_CMSG_PKTINFO option, we store rt_iif and rt_spec_dst
+ * in skb->cb[] before dst drop.
+ * This way, receiver doesnt make cache line misses to read rtable.
*/
-int ip_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+void ipv4_pktinfo_prepare(struct sk_buff *skb)
{
- if (!(inet_sk(sk)->cmsg_flags & IP_CMSG_PKTINFO))
- skb_dst_drop(skb);
- return sock_queue_rcv_skb(sk, skb);
+ struct in_pktinfo *pktinfo = PKTINFO_SKB_CB(skb);
+ const struct rtable *rt = skb_rtable(skb);
+
+ if (rt) {
+ pktinfo->ipi_ifindex = rt->rt_iif;
+ pktinfo->ipi_spec_dst.s_addr = rt->rt_spec_dst;
+ } else {
+ pktinfo->ipi_ifindex = 0;
+ pktinfo->ipi_spec_dst.s_addr = 0;
+ }
+ skb_dst_drop(skb);
}
-EXPORT_SYMBOL(ip_queue_rcv_skb);
int ip_setsockopt(struct sock *sk, int level,
int optname, char __user *optval, unsigned int optlen)
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 007e2eb..7a8410d 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -292,7 +292,8 @@ static int raw_rcv_skb(struct sock * sk, struct sk_buff * skb)
{
/* Charge it to the socket. */
- if (ip_queue_rcv_skb(sk, skb) < 0) {
+ ipv4_pktinfo_prepare(skb);
+ if (sock_queue_rcv_skb(sk, skb) < 0) {
kfree_skb(skb);
return NET_RX_DROP;
}
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index ab0966d..6854f58 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1357,7 +1357,7 @@ static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
if (inet_sk(sk)->inet_daddr)
sock_rps_save_rxhash(sk, skb);
- rc = ip_queue_rcv_skb(sk, skb);
+ rc = sock_queue_rcv_skb(sk, skb);
if (rc < 0) {
int is_udplite = IS_UDPLITE(sk);
@@ -1473,6 +1473,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
rc = 0;
+ ipv4_pktinfo_prepare(skb);
bh_lock_sock(sk);
if (!sock_owned_by_user(sk))
rc = __udp_queue_rcv_skb(sk, skb);
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 331af3b..204f2e8 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -383,7 +383,8 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
}
/* Charge it to the socket. */
- if (ip_queue_rcv_skb(sk, skb) < 0) {
+ skb_dst_drop(skb);
+ if (sock_queue_rcv_skb(sk, skb) < 0) {
kfree_skb(skb);
return NET_RX_DROP;
}
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 846f475..b4a4a15 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -538,7 +538,9 @@ int udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
goto drop;
}
- if ((rc = ip_queue_rcv_skb(sk, skb)) < 0) {
+ skb_dst_drop(skb);
+ rc = sock_queue_rcv_skb(sk, skb);
+ if (rc < 0) {
/* Note that an ENOMEM error is charged twice */
if (rc == -ENOMEM)
UDP6_INC_STATS_BH(sock_net(sk),
^ permalink raw reply related
* Re: [PATCH 1/4] net: add support for per-paged-fragment destructors
From: Michał Mirosław @ 2011-11-09 17:24 UTC (permalink / raw)
To: Ian Campbell; +Cc: netdev@vger.kernel.org, David S. Miller, Eric Dumazet
In-Reply-To: <1320855914.955.184.camel@zakaz.uk.xensource.com>
On Wed, Nov 09, 2011 at 04:25:14PM +0000, Ian Campbell wrote:
> On Wed, 2011-11-09 at 15:33 +0000, Michał Mirosław wrote:
> > On Wed, Nov 09, 2011 at 03:02:04PM +0000, Ian Campbell wrote:
> > > Entities which care about the complete lifecycle of pages which they inject
> > > into the network stack via an skb paged fragment can choose to set this
> > > destructor in order to receive a callback when the stack is really finished
> > > with a page (including all clones, retransmits, pull-ups etc etc).
> > [...]
> > > --- a/include/linux/skbuff.h
> > > +++ b/include/linux/skbuff.h
> > > @@ -139,9 +139,16 @@ struct sk_buff;
> > >
> > > typedef struct skb_frag_struct skb_frag_t;
> > >
> > > +struct skb_frag_destructor {
> > > + atomic_t ref;
> > > + int (*destroy)(void *data);
> > > + void *data;
> > > +};
> > > +
> > > struct skb_frag_struct {
> > > struct {
> > > struct page *p;
> > > + struct skb_frag_destructor *destructor;
> > > } page;
> >
> > You can get rid of the data field of skb_frag_destructor: if destroy() gets
> > pointer to the destroyed struct skb_frag_set_destructor, its users can
> > get at containing struct via container_of() if needed and the memory
> > pointed to by data won't have to be managed separately.
> At the moment you can share one destructor between all the frags,
> whereas data is specific to the frag.
[...]
If you want distinct data pointers then you need to also have per-frag
skb_frag_destructor as you wrote in this patch. So removing 'data' field
saves memory but doesn't change anything else except the way to reference
the data (container_of() instead of pointer dereference).
Best Regards,
Michał Mirosław
^ permalink raw reply
* Re: [PATCH 1/4] net: add support for per-paged-fragment destructors
From: Ian Campbell @ 2011-11-09 17:28 UTC (permalink / raw)
To: Michał Mirosław
Cc: netdev@vger.kernel.org, David S. Miller, Eric Dumazet
In-Reply-To: <20111109172459.GA13134@rere.qmqm.pl>
On Wed, 2011-11-09 at 17:24 +0000, Michał Mirosław wrote:
> On Wed, Nov 09, 2011 at 04:25:14PM +0000, Ian Campbell wrote:
> > On Wed, 2011-11-09 at 15:33 +0000, Michał Mirosław wrote:
> > > On Wed, Nov 09, 2011 at 03:02:04PM +0000, Ian Campbell wrote:
> > > > Entities which care about the complete lifecycle of pages which they inject
> > > > into the network stack via an skb paged fragment can choose to set this
> > > > destructor in order to receive a callback when the stack is really finished
> > > > with a page (including all clones, retransmits, pull-ups etc etc).
> > > [...]
> > > > --- a/include/linux/skbuff.h
> > > > +++ b/include/linux/skbuff.h
> > > > @@ -139,9 +139,16 @@ struct sk_buff;
> > > >
> > > > typedef struct skb_frag_struct skb_frag_t;
> > > >
> > > > +struct skb_frag_destructor {
> > > > + atomic_t ref;
> > > > + int (*destroy)(void *data);
> > > > + void *data;
> > > > +};
> > > > +
> > > > struct skb_frag_struct {
> > > > struct {
> > > > struct page *p;
> > > > + struct skb_frag_destructor *destructor;
> > > > } page;
> > >
> > > You can get rid of the data field of skb_frag_destructor: if destroy() gets
> > > pointer to the destroyed struct skb_frag_set_destructor, its users can
> > > get at containing struct via container_of() if needed and the memory
> > > pointed to by data won't have to be managed separately.
> > At the moment you can share one destructor between all the frags,
> > whereas data is specific to the frag.
> [...]
>
> If you want distinct data pointers then you need to also have per-frag
> skb_frag_destructor as you wrote in this patch. So removing 'data' field
> saves memory but doesn't change anything else except the way to reference
> the data (container_of() instead of pointer dereference).
Oh yes, you are absolutely right.
Ian.
>
> Best Regards,
> Michał Mirosław
^ permalink raw reply
* [PATCH v2] drivers/net/usb/asix: resync from vendor's copy
From: Mark Lord @ 2011-11-09 17:31 UTC (permalink / raw)
To: David Miller; +Cc: netdev, linux-kernel, Ben Hutchings, Michal Marek
In-Reply-To: <4EB19BBE.5050602@teksavvy.com>
[-- Attachment #1: Type: text/plain, Size: 134114 bytes --]
Second pass (for review) at updating the in-kernel asix usb/network driver
from the v4.1.0 vendor GPL version of the driver, obtained from here:
http://www.asix.com.tw/download.php?sub=searchresult&PItemID=84&download=driver
The original vendor copy used a local "axusbnet" middleware (rather than "usbnet").
I've converted it back to using "usbnet", made a ton of cosmetic changes
to get it to pass checkpatch.pl, and removed a small amount of code duplication.
The tx/rx checksum code has been updated per Ben's comments,
and the duplicated MII_* definitions have been removed.
I've changed the version string to be "4.1.0-kernel",
to reflect the vendor's code version while also distinguishing
this port from the original vendor code.
It can use more work going forward, but it is important to get it upstream
sooner than later -- the current in-kernel driver fails with many devices,
both old and new. This updated version works with everything I have available
to test with, and also handles suspend / resume (unlike the in-kernel one).
Signed-off-by: Mark Lord <mlord@pobox.com>
---
Note that the vendor now has a v4.2.0 version available,
but for now I'm concentrating on the original v4.1.0 code.
After review/discussion of this patch, I will update for Linux-3.2-rc
and resubmit for inclusion in the eventual linux-3.3 kernel.
Patch included below, and also attached to bypass mailer mangling.
--- old/drivers/net/usb/asix.c 2011-10-12 17:59:03.000000000 -0400
+++ linux-3.0.8/drivers/net/usb/asix.c 2011-11-09 12:07:24.840032594 -0500
@@ -20,11 +20,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-// #define DEBUG // error path messages, extra info
-// #define VERBOSE // more; success messages
-
#include <linux/module.h>
#include <linux/kmod.h>
+#include <linux/sched.h>
#include <linux/init.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
@@ -34,404 +32,116 @@
#include <linux/usb.h>
#include <linux/crc32.h>
#include <linux/usb/usbnet.h>
-#include <linux/slab.h>
+#include "asix.h"
-#define DRIVER_VERSION "14-Jun-2006"
-static const char driver_name [] = "asix";
+#define DRIVER_VERSION "4.1.0-kernel"
+static const char driver_name[] = "asix";
-/* ASIX AX8817X based USB 2.0 Ethernet Devices */
+static char driver_version[] =
+ "ASIX USB Ethernet Adapter: v" DRIVER_VERSION "\n";
-#define AX_CMD_SET_SW_MII 0x06
-#define AX_CMD_READ_MII_REG 0x07
-#define AX_CMD_WRITE_MII_REG 0x08
-#define AX_CMD_SET_HW_MII 0x0a
-#define AX_CMD_READ_EEPROM 0x0b
-#define AX_CMD_WRITE_EEPROM 0x0c
-#define AX_CMD_WRITE_ENABLE 0x0d
-#define AX_CMD_WRITE_DISABLE 0x0e
-#define AX_CMD_READ_RX_CTL 0x0f
-#define AX_CMD_WRITE_RX_CTL 0x10
-#define AX_CMD_READ_IPG012 0x11
-#define AX_CMD_WRITE_IPG0 0x12
-#define AX_CMD_WRITE_IPG1 0x13
-#define AX_CMD_READ_NODE_ID 0x13
-#define AX_CMD_WRITE_NODE_ID 0x14
-#define AX_CMD_WRITE_IPG2 0x14
-#define AX_CMD_WRITE_MULTI_FILTER 0x16
-#define AX88172_CMD_READ_NODE_ID 0x17
-#define AX_CMD_READ_PHY_ID 0x19
-#define AX_CMD_READ_MEDIUM_STATUS 0x1a
-#define AX_CMD_WRITE_MEDIUM_MODE 0x1b
-#define AX_CMD_READ_MONITOR_MODE 0x1c
-#define AX_CMD_WRITE_MONITOR_MODE 0x1d
-#define AX_CMD_READ_GPIOS 0x1e
-#define AX_CMD_WRITE_GPIOS 0x1f
-#define AX_CMD_SW_RESET 0x20
-#define AX_CMD_SW_PHY_STATUS 0x21
-#define AX_CMD_SW_PHY_SELECT 0x22
-
-#define AX_MONITOR_MODE 0x01
-#define AX_MONITOR_LINK 0x02
-#define AX_MONITOR_MAGIC 0x04
-#define AX_MONITOR_HSFS 0x10
-
-/* AX88172 Medium Status Register values */
-#define AX88172_MEDIUM_FD 0x02
-#define AX88172_MEDIUM_TX 0x04
-#define AX88172_MEDIUM_FC 0x10
-#define AX88172_MEDIUM_DEFAULT \
- ( AX88172_MEDIUM_FD | AX88172_MEDIUM_TX | AX88172_MEDIUM_FC )
-
-#define AX_MCAST_FILTER_SIZE 8
-#define AX_MAX_MCAST 64
-
-#define AX_SWRESET_CLEAR 0x00
-#define AX_SWRESET_RR 0x01
-#define AX_SWRESET_RT 0x02
-#define AX_SWRESET_PRTE 0x04
-#define AX_SWRESET_PRL 0x08
-#define AX_SWRESET_BZ 0x10
-#define AX_SWRESET_IPRL 0x20
-#define AX_SWRESET_IPPD 0x40
-
-#define AX88772_IPG0_DEFAULT 0x15
-#define AX88772_IPG1_DEFAULT 0x0c
-#define AX88772_IPG2_DEFAULT 0x12
-
-/* AX88772 & AX88178 Medium Mode Register */
-#define AX_MEDIUM_PF 0x0080
-#define AX_MEDIUM_JFE 0x0040
-#define AX_MEDIUM_TFC 0x0020
-#define AX_MEDIUM_RFC 0x0010
-#define AX_MEDIUM_ENCK 0x0008
-#define AX_MEDIUM_AC 0x0004
-#define AX_MEDIUM_FD 0x0002
-#define AX_MEDIUM_GM 0x0001
-#define AX_MEDIUM_SM 0x1000
-#define AX_MEDIUM_SBP 0x0800
-#define AX_MEDIUM_PS 0x0200
-#define AX_MEDIUM_RE 0x0100
-
-#define AX88178_MEDIUM_DEFAULT \
- (AX_MEDIUM_PS | AX_MEDIUM_FD | AX_MEDIUM_AC | \
- AX_MEDIUM_RFC | AX_MEDIUM_TFC | AX_MEDIUM_JFE | \
- AX_MEDIUM_RE )
-
-#define AX88772_MEDIUM_DEFAULT \
- (AX_MEDIUM_FD | AX_MEDIUM_RFC | \
- AX_MEDIUM_TFC | AX_MEDIUM_PS | \
- AX_MEDIUM_AC | AX_MEDIUM_RE )
-
-/* AX88772 & AX88178 RX_CTL values */
-#define AX_RX_CTL_SO 0x0080
-#define AX_RX_CTL_AP 0x0020
-#define AX_RX_CTL_AM 0x0010
-#define AX_RX_CTL_AB 0x0008
-#define AX_RX_CTL_SEP 0x0004
-#define AX_RX_CTL_AMALL 0x0002
-#define AX_RX_CTL_PRO 0x0001
-#define AX_RX_CTL_MFB_2048 0x0000
-#define AX_RX_CTL_MFB_4096 0x0100
-#define AX_RX_CTL_MFB_8192 0x0200
-#define AX_RX_CTL_MFB_16384 0x0300
-
-#define AX_DEFAULT_RX_CTL \
- (AX_RX_CTL_SO | AX_RX_CTL_AB )
-
-/* GPIO 0 .. 2 toggles */
-#define AX_GPIO_GPO0EN 0x01 /* GPIO0 Output enable */
-#define AX_GPIO_GPO_0 0x02 /* GPIO0 Output value */
-#define AX_GPIO_GPO1EN 0x04 /* GPIO1 Output enable */
-#define AX_GPIO_GPO_1 0x08 /* GPIO1 Output value */
-#define AX_GPIO_GPO2EN 0x10 /* GPIO2 Output enable */
-#define AX_GPIO_GPO_2 0x20 /* GPIO2 Output value */
-#define AX_GPIO_RESERVED 0x40 /* Reserved */
-#define AX_GPIO_RSE 0x80 /* Reload serial EEPROM */
-
-#define AX_EEPROM_MAGIC 0xdeadbeef
-#define AX88172_EEPROM_LEN 0x40
-#define AX88772_EEPROM_LEN 0xff
-
-#define PHY_MODE_MARVELL 0x0000
-#define MII_MARVELL_LED_CTRL 0x0018
-#define MII_MARVELL_STATUS 0x001b
-#define MII_MARVELL_CTRL 0x0014
-
-#define MARVELL_LED_MANUAL 0x0019
-
-#define MARVELL_STATUS_HWCFG 0x0004
-
-#define MARVELL_CTRL_TXDELAY 0x0002
-#define MARVELL_CTRL_RXDELAY 0x0080
-
-/* This structure cannot exceed sizeof(unsigned long [5]) AKA 20 bytes */
-struct asix_data {
- u8 multi_filter[AX_MCAST_FILTER_SIZE];
- u8 mac_addr[ETH_ALEN];
- u8 phymode;
- u8 ledmode;
- u8 eeprom_len;
-};
+/* configuration of maximum bulk in size */
+static int bsize = AX88772B_MAX_BULKIN_16K;
+module_param(bsize, int, 0);
+MODULE_PARM_DESC(bsize, "Maximum transfer size per bulk");
+
+static void ax88772b_link_reset(struct work_struct *work);
+static void ax88772a_link_reset(struct work_struct *work);
+static void ax88772_link_reset(struct work_struct *work);
+static int ax88772a_phy_powerup(struct usbnet *dev);
-struct ax88172_int_data {
- __le16 res1;
- u8 link;
- __le16 res2;
- u8 status;
- __le16 res3;
-} __packed;
+/* ASIX AX8817X based USB 2.0 Ethernet Devices */
-static int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
+static int ax8817x_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
u16 size, void *data)
{
- void *buf;
- int err = -ENOMEM;
-
- netdev_dbg(dev->net, "asix_read_cmd() cmd=0x%02x value=0x%04x index=0x%04x
size=%d\n",
- cmd, value, index, size);
-
- buf = kmalloc(size, GFP_KERNEL);
- if (!buf)
- goto out;
-
- err = usb_control_msg(
+ return usb_control_msg(
dev->udev,
usb_rcvctrlpipe(dev->udev, 0),
cmd,
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
value,
index,
- buf,
+ data,
size,
USB_CTRL_GET_TIMEOUT);
- if (err == size)
- memcpy(data, buf, size);
- else if (err >= 0)
- err = -EINVAL;
- kfree(buf);
-
-out:
- return err;
}
-static int asix_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
+static int ax8817x_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
u16 size, void *data)
{
- void *buf = NULL;
- int err = -ENOMEM;
-
- netdev_dbg(dev->net, "asix_write_cmd() cmd=0x%02x value=0x%04x index=0x%04x
size=%d\n",
- cmd, value, index, size);
-
- if (data) {
- buf = kmemdup(data, size, GFP_KERNEL);
- if (!buf)
- goto out;
- }
-
- err = usb_control_msg(
+ return usb_control_msg(
dev->udev,
usb_sndctrlpipe(dev->udev, 0),
cmd,
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
value,
index,
- buf,
+ data,
size,
USB_CTRL_SET_TIMEOUT);
- kfree(buf);
-
-out:
- return err;
}
-static void asix_async_cmd_callback(struct urb *urb)
+static void ax8817x_async_cmd_callback(struct urb *urb)
{
struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context;
- int status = urb->status;
- if (status < 0)
- printk(KERN_DEBUG "asix_async_cmd_callback() failed with %d",
- status);
+ if (urb->status < 0)
+ printk(KERN_DEBUG "ax8817x_async_cmd_callback() failed with %d",
+ urb->status);
kfree(req);
usb_free_urb(urb);
}
-static void
-asix_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 index,
- u16 size, void *data)
+static int ax8817x_set_mac_addr(struct net_device *net, void *p)
{
- struct usb_ctrlrequest *req;
- int status;
- struct urb *urb;
-
- netdev_dbg(dev->net, "asix_write_cmd_async() cmd=0x%02x value=0x%04x
index=0x%04x size=%d\n",
- cmd, value, index, size);
- if ((urb = usb_alloc_urb(0, GFP_ATOMIC)) == NULL) {
- netdev_err(dev->net, "Error allocating URB in write_cmd_async!\n");
- return;
- }
-
- if ((req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC)) == NULL) {
- netdev_err(dev->net, "Failed to allocate memory for control request\n");
- usb_free_urb(urb);
- return;
- }
+ struct usbnet *dev = netdev_priv(net);
+ struct sockaddr *addr = p;
- req->bRequestType = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE;
- req->bRequest = cmd;
- req->wValue = cpu_to_le16(value);
- req->wIndex = cpu_to_le16(index);
- req->wLength = cpu_to_le16(size);
+ memcpy(net->dev_addr, addr->sa_data, ETH_ALEN);
- usb_fill_control_urb(urb, dev->udev,
- usb_sndctrlpipe(dev->udev, 0),
- (void *)req, data, size,
- asix_async_cmd_callback, req);
+ /* Set the MAC address */
+ return ax8817x_write_cmd(dev, AX88772_CMD_WRITE_NODE_ID,
+ 0, 0, ETH_ALEN, net->dev_addr);
- if((status = usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
- netdev_err(dev->net, "Error submitting the control message: status=%d\n",
- status);
- kfree(req);
- usb_free_urb(urb);
- }
}
-static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
+static void ax8817x_status(struct usbnet *dev, struct urb *urb)
{
- u8 *head;
- u32 header;
- char *packet;
- struct sk_buff *ax_skb;
- u16 size;
-
- head = (u8 *) skb->data;
- memcpy(&header, head, sizeof(header));
- le32_to_cpus(&header);
- packet = head + sizeof(header);
-
- skb_pull(skb, 4);
-
- while (skb->len > 0) {
- if ((short)(header & 0x0000ffff) !=
- ~((short)((header & 0xffff0000) >> 16))) {
- netdev_err(dev->net, "asix_rx_fixup() Bad Header Length\n");
- }
- /* get the packet length */
- size = (u16) (header & 0x0000ffff);
-
- if ((skb->len) - ((size + 1) & 0xfffe) == 0) {
- u8 alignment = (unsigned long)skb->data & 0x3;
- if (alignment != 0x2) {
- /*
- * not 16bit aligned so use the room provided by
- * the 32 bit header to align the data
- *
- * note we want 16bit alignment as MAC header is
- * 14bytes thus ip header will be aligned on
- * 32bit boundary so accessing ipheader elements
- * using a cast to struct ip header wont cause
- * an unaligned accesses.
- */
- u8 realignment = (alignment + 2) & 0x3;
- memmove(skb->data - realignment,
- skb->data,
- size);
- skb->data -= realignment;
- skb_set_tail_pointer(skb, size);
- }
- return 2;
- }
-
- if (size > dev->net->mtu + ETH_HLEN) {
- netdev_err(dev->net, "asix_rx_fixup() Bad RX Length %d\n",
- size);
- return 0;
- }
- ax_skb = skb_clone(skb, GFP_ATOMIC);
- if (ax_skb) {
- u8 alignment = (unsigned long)packet & 0x3;
- ax_skb->len = size;
-
- if (alignment != 0x2) {
- /*
- * not 16bit aligned use the room provided by
- * the 32 bit header to align the data
- */
- u8 realignment = (alignment + 2) & 0x3;
- memmove(packet - realignment, packet, size);
- packet -= realignment;
- }
- ax_skb->data = packet;
- skb_set_tail_pointer(ax_skb, size);
- usbnet_skb_return(dev, ax_skb);
- } else {
- return 0;
- }
-
- skb_pull(skb, (size + 1) & 0xfffe);
+ struct ax88172_int_data *event;
+ int link;
- if (skb->len == 0)
- break;
+ if (urb->actual_length < 8)
+ return;
- head = (u8 *) skb->data;
- memcpy(&header, head, sizeof(header));
- le32_to_cpus(&header);
- packet = head + sizeof(header);
- skb_pull(skb, 4);
- }
+ event = urb->transfer_buffer;
+ link = event->link & 0x01;
- if (skb->len < 0) {
- netdev_err(dev->net, "asix_rx_fixup() Bad SKB Length %d\n",
- skb->len);
- return 0;
+ if (netif_carrier_ok(dev->net) != link) {
+ if (link) {
+ netif_carrier_on(dev->net);
+ usbnet_defer_kevent(dev, EVENT_LINK_RESET);
+ } else
+ netif_carrier_off(dev->net);
+ netdev_warn(dev->net, "%s: link status is: %d\n",
+ __func__, link);
}
- return 1;
}
-static struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
- gfp_t flags)
+static void ax88178_status(struct usbnet *dev, struct urb *urb)
{
- int padlen;
- int headroom = skb_headroom(skb);
- int tailroom = skb_tailroom(skb);
- u32 packet_len;
- u32 padbytes = 0xffff0000;
-
- padlen = ((skb->len + 4) % 512) ? 0 : 4;
-
- if ((!skb_cloned(skb)) &&
- ((headroom + tailroom) >= (4 + padlen))) {
- if ((headroom < 4) || (tailroom < padlen)) {
- skb->data = memmove(skb->head + 4, skb->data, skb->len);
- skb_set_tail_pointer(skb, skb->len);
- }
- } else {
- struct sk_buff *skb2;
- skb2 = skb_copy_expand(skb, 4, padlen, flags);
- dev_kfree_skb_any(skb);
- skb = skb2;
- if (!skb)
- return NULL;
- }
-
- skb_push(skb, 4);
- packet_len = (((skb->len - 4) ^ 0x0000ffff) << 16) + (skb->len - 4);
- cpu_to_le32s(&packet_len);
- skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len));
+ struct ax88178_data *priv = (struct ax88178_data *)dev->driver_priv;
- if ((skb->len % 512) == 0) {
- cpu_to_le32s(&padbytes);
- memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes));
- skb_put(skb, sizeof(padbytes));
- }
- return skb;
+ if (priv->EepromData == PHY_MODE_MAC_TO_MAC_GMII)
+ return;
+ ax8817x_status(dev, urb);
}
-static void asix_status(struct usbnet *dev, struct urb *urb)
+static void ax88772_status(struct usbnet *dev, struct urb *urb)
{
struct ax88172_int_data *event;
+ struct ax88772_data *priv = (struct ax88772_data *)dev->driver_priv;
int link;
if (urb->actual_length < 8)
@@ -439,285 +149,538 @@
event = urb->transfer_buffer;
link = event->link & 0x01;
+
if (netif_carrier_ok(dev->net) != link) {
if (link) {
netif_carrier_on(dev->net);
- usbnet_defer_kevent (dev, EVENT_LINK_RESET );
- } else
+ priv->Event = AX_SET_RX_CFG;
+ } else {
netif_carrier_off(dev->net);
- netdev_dbg(dev->net, "Link Status is: %d\n", link);
+ if (priv->Event == AX_NOP) {
+ priv->Event = PHY_POWER_DOWN;
+ priv->TickToExpire = 25;
+ }
+ }
+ netdev_warn(dev->net, "%s: link status is: %d\n",
+ __func__, link);
}
-}
-static inline int asix_set_sw_mii(struct usbnet *dev)
-{
- int ret;
- ret = asix_write_cmd(dev, AX_CMD_SET_SW_MII, 0x0000, 0, 0, NULL);
- if (ret < 0)
- netdev_err(dev->net, "Failed to enable software MII access\n");
- return ret;
+ if (priv->Event)
+ queue_work(priv->ax_work, &priv->check_link);
}
-static inline int asix_set_hw_mii(struct usbnet *dev)
+static void ax88772a_status(struct usbnet *dev, struct urb *urb)
{
- int ret;
- ret = asix_write_cmd(dev, AX_CMD_SET_HW_MII, 0x0000, 0, 0, NULL);
- if (ret < 0)
- netdev_err(dev->net, "Failed to enable hardware MII access\n");
- return ret;
-}
+ struct ax88172_int_data *event;
+ struct ax88772a_data *priv = (struct ax88772a_data *)dev->driver_priv;
+ int link;
+ int PowSave = (priv->EepromData >> 14);
-static inline int asix_get_phy_addr(struct usbnet *dev)
-{
- u8 buf[2];
- int ret = asix_read_cmd(dev, AX_CMD_READ_PHY_ID, 0, 0, 2, buf);
+ if (urb->actual_length < 8)
+ return;
- netdev_dbg(dev->net, "asix_get_phy_addr()\n");
+ event = urb->transfer_buffer;
+ link = event->link & 0x01;
- if (ret < 0) {
- netdev_err(dev->net, "Error reading PHYID register: %02x\n", ret);
- goto out;
+ if (netif_carrier_ok(dev->net) != link) {
+
+ if (link) {
+ netif_carrier_on(dev->net);
+ priv->Event = AX_SET_RX_CFG;
+ } else if ((PowSave == 0x3) || (PowSave == 0x1)) {
+ netif_carrier_off(dev->net);
+ if (priv->Event == AX_NOP) {
+ priv->Event = CHK_CABLE_EXIST;
+ priv->TickToExpire = 14;
+ }
+ } else {
+ netif_carrier_off(dev->net);
+ priv->Event = AX_NOP;
+ }
+ netdev_warn(dev->net, "%s: link status is: %d\n",
+ __func__, link);
}
- netdev_dbg(dev->net, "asix_get_phy_addr() returning 0x%04x\n",
- *((__le16 *)buf));
- ret = buf[1];
-out:
- return ret;
+ if (priv->Event)
+ queue_work(priv->ax_work, &priv->check_link);
}
-static int asix_sw_reset(struct usbnet *dev, u8 flags)
+static void ax88772b_status(struct usbnet *dev, struct urb *urb)
{
- int ret;
-
- ret = asix_write_cmd(dev, AX_CMD_SW_RESET, flags, 0, 0, NULL);
- if (ret < 0)
- netdev_err(dev->net, "Failed to send software reset: %02x\n", ret);
-
- return ret;
-}
+ struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
+ struct ax88172_int_data *event;
+ int link;
-static u16 asix_read_rx_ctl(struct usbnet *dev)
-{
- __le16 v;
- int ret = asix_read_cmd(dev, AX_CMD_READ_RX_CTL, 0, 0, 2, &v);
+ if (urb->actual_length < 8)
+ return;
- if (ret < 0) {
- netdev_err(dev->net, "Error reading RX_CTL register: %02x\n", ret);
- goto out;
+ event = urb->transfer_buffer;
+ link = event->link & AX_INT_PPLS_LINK;
+ if (netif_carrier_ok(dev->net) != link) {
+ if (link) {
+ netif_carrier_on(dev->net);
+ priv->Event = AX_SET_RX_CFG;
+ } else {
+ netif_carrier_off(dev->net);
+ priv->time_to_chk = jiffies;
+ }
+ netdev_warn(dev->net, "%s: link status is: %d\n",
+ __func__, link);
}
- ret = le16_to_cpu(v);
-out:
- return ret;
-}
-
-static int asix_write_rx_ctl(struct usbnet *dev, u16 mode)
-{
- int ret;
-
- netdev_dbg(dev->net, "asix_write_rx_ctl() - mode = 0x%04x\n", mode);
- ret = asix_write_cmd(dev, AX_CMD_WRITE_RX_CTL, mode, 0, 0, NULL);
- if (ret < 0)
- netdev_err(dev->net, "Failed to write RX_CTL mode to 0x%04x: %02x\n",
- mode, ret);
- return ret;
-}
+ if (!link) {
+ int no_cable = (event->link & AX_INT_CABOFF_UNPLUG) ? 1 : 0;
-static u16 asix_read_medium_status(struct usbnet *dev)
-{
- __le16 v;
- int ret = asix_read_cmd(dev, AX_CMD_READ_MEDIUM_STATUS, 0, 0, 2, &v);
+ if (no_cable) {
+ if ((priv->psc &
+ (AX_SWRESET_IPPSL_0 | AX_SWRESET_IPPSL_1)) &&
+ !priv->pw_enabled) {
+ /*
+ * AX88772B already entered power saving state
+ */
+ priv->pw_enabled = 1;
+ }
- if (ret < 0) {
- netdev_err(dev->net, "Error reading Medium Status register: %02x\n",
- ret);
- goto out;
+ } else {
+ /* AX88772B resumed from power saving state */
+ if (priv->pw_enabled ||
+ (jiffies >
+ (priv->time_to_chk + AX88772B_WATCHDOG))) {
+ if (priv->pw_enabled)
+ priv->pw_enabled = 0;
+ priv->Event = PHY_POWER_UP;
+ priv->time_to_chk = jiffies;
+ }
+ }
}
- ret = le16_to_cpu(v);
-out:
- return ret;
+
+ if (priv->Event)
+ queue_work(priv->ax_work, &priv->check_link);
}
-static int asix_write_medium_mode(struct usbnet *dev, u16 mode)
+static void
+ax8817x_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 index,
+ u16 size, void *data)
{
- int ret;
-
- netdev_dbg(dev->net, "asix_write_medium_mode() - mode = 0x%04x\n", mode);
- ret = asix_write_cmd(dev, AX_CMD_WRITE_MEDIUM_MODE, mode, 0, 0, NULL);
- if (ret < 0)
- netdev_err(dev->net, "Failed to write Medium Mode mode to 0x%04x: %02x\n",
- mode, ret);
+ struct usb_ctrlrequest *req;
+ int status;
+ struct urb *urb;
- return ret;
-}
+ urb = usb_alloc_urb(0, GFP_ATOMIC);
+ if (urb == NULL) {
+ netdev_err(dev->net, "%s: usb_alloc_urb() failed\n", __func__);
+ return;
+ }
-static int asix_write_gpio(struct usbnet *dev, u16 value, int sleep)
-{
- int ret;
+ req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC);
+ if (req == NULL) {
+ netdev_err(dev->net, "%s: kmalloc() failed\n", __func__);
+ usb_free_urb(urb);
+ return;
+ }
- netdev_dbg(dev->net, "asix_write_gpio() - value = 0x%04x\n", value);
- ret = asix_write_cmd(dev, AX_CMD_WRITE_GPIOS, value, 0, 0, NULL);
- if (ret < 0)
- netdev_err(dev->net, "Failed to write GPIO value 0x%04x: %02x\n",
- value, ret);
+ req->bRequestType = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE;
+ req->bRequest = cmd;
+ req->wValue = cpu_to_le16(value);
+ req->wIndex = cpu_to_le16(index);
+ req->wLength = cpu_to_le16(size);
- if (sleep)
- msleep(sleep);
+ usb_fill_control_urb(urb, dev->udev,
+ usb_sndctrlpipe(dev->udev, 0),
+ (void *)req, data, size,
+ ax8817x_async_cmd_callback, req);
- return ret;
+ status = usb_submit_urb(urb, GFP_ATOMIC);
+ if (status < 0) {
+ netdev_err(dev->net, "%s: usb_submit_urb() failed, err=%d\n",
+ __func__, status);
+ kfree(req);
+ usb_free_urb(urb);
+ }
}
-/*
- * AX88772 & AX88178 have a 16-bit RX_CTL value
- */
-static void asix_set_multicast(struct net_device *net)
+static void ax8817x_set_multicast(struct net_device *net)
{
struct usbnet *dev = netdev_priv(net);
- struct asix_data *data = (struct asix_data *)&dev->data;
- u16 rx_ctl = AX_DEFAULT_RX_CTL;
+ struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
+ u8 rx_ctl = AX_RX_CTL_START | AX_RX_CTL_AB;
+ int mc_count;
+
+ mc_count = netdev_mc_count(net);
if (net->flags & IFF_PROMISC) {
rx_ctl |= AX_RX_CTL_PRO;
- } else if (net->flags & IFF_ALLMULTI ||
- netdev_mc_count(net) > AX_MAX_MCAST) {
+ } else if (net->flags & IFF_ALLMULTI
+ || mc_count > AX_MAX_MCAST) {
rx_ctl |= AX_RX_CTL_AMALL;
- } else if (netdev_mc_empty(net)) {
+ } else if (mc_count == 0) {
/* just broadcast and directed */
} else {
/* We use the 20 byte dev->data
* for our 8 byte filter buffer
* to avoid allocating memory that
* is tricky to free later */
- struct netdev_hw_addr *ha;
u32 crc_bits;
-
+ struct netdev_hw_addr *ha;
memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE);
-
- /* Build the multicast hash filter. */
netdev_for_each_mc_addr(ha, net) {
crc_bits = ether_crc(ETH_ALEN, ha->addr) >> 26;
data->multi_filter[crc_bits >> 3] |=
- 1 << (crc_bits & 7);
+ 1 << (crc_bits & 7);
}
-
- asix_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,
+ ax8817x_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,
AX_MCAST_FILTER_SIZE, data->multi_filter);
rx_ctl |= AX_RX_CTL_AM;
}
- asix_write_cmd_async(dev, AX_CMD_WRITE_RX_CTL, rx_ctl, 0, 0, NULL);
-}
-
-static int asix_mdio_read(struct net_device *netdev, int phy_id, int loc)
-{
- struct usbnet *dev = netdev_priv(netdev);
- __le16 res;
-
- mutex_lock(&dev->phy_mutex);
- asix_set_sw_mii(dev);
- asix_read_cmd(dev, AX_CMD_READ_MII_REG, phy_id,
- (__u16)loc, 2, &res);
- asix_set_hw_mii(dev);
- mutex_unlock(&dev->phy_mutex);
-
- netdev_dbg(dev->net, "asix_mdio_read() phy_id=0x%02x, loc=0x%02x,
returns=0x%04x\n",
- phy_id, loc, le16_to_cpu(res));
-
- return le16_to_cpu(res);
+ ax8817x_write_cmd_async(dev, AX_CMD_WRITE_RX_CTL, rx_ctl, 0, 0, NULL);
}
-static void
-asix_mdio_write(struct net_device *netdev, int phy_id, int loc, int val)
+static void ax88772b_set_multicast(struct net_device *net)
{
- struct usbnet *dev = netdev_priv(netdev);
- __le16 res = cpu_to_le16(val);
+ struct usbnet *dev = netdev_priv(net);
+ struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
+ u16 rx_ctl = (AX_RX_CTL_START | AX_RX_CTL_AB | AX_RX_HEADER_DEFAULT);
+ int mc_count;
- netdev_dbg(dev->net, "asix_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x\n",
- phy_id, loc, val);
- mutex_lock(&dev->phy_mutex);
- asix_set_sw_mii(dev);
- asix_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id, (__u16)loc, 2, &res);
- asix_set_hw_mii(dev);
- mutex_unlock(&dev->phy_mutex);
-}
+ mc_count = netdev_mc_count(net);
-/* Get the PHY Identifier from the PHYSID1 & PHYSID2 MII registers */
-static u32 asix_get_phyid(struct usbnet *dev)
+ if (net->flags & IFF_PROMISC) {
+ rx_ctl |= AX_RX_CTL_PRO;
+ } else if (net->flags & IFF_ALLMULTI
+ || mc_count > AX_MAX_MCAST) {
+ rx_ctl |= AX_RX_CTL_AMALL;
+ } else if (mc_count == 0) {
+ /* just broadcast and directed */
+ } else {
+ /* We use the 20 byte dev->data
+ * for our 8 byte filter buffer
+ * to avoid allocating memory that
+ * is tricky to free later */
+ u32 crc_bits;
+
+ struct netdev_hw_addr *ha;
+ memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE);
+ netdev_for_each_mc_addr(ha, net) {
+ crc_bits = ether_crc(ETH_ALEN, ha->addr) >> 26;
+ data->multi_filter[crc_bits >> 3] |=
+ 1 << (crc_bits & 7);
+ }
+ ax8817x_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,
+ AX_MCAST_FILTER_SIZE, data->multi_filter);
+
+ rx_ctl |= AX_RX_CTL_AM;
+ }
+
+ ax8817x_write_cmd_async(dev, AX_CMD_WRITE_RX_CTL, rx_ctl, 0, 0, NULL);
+}
+
+static int ax8817x_mdio_read(struct net_device *netdev, int phy_id, int loc)
{
- int phy_reg;
- u32 phy_id;
+ struct usbnet *dev = netdev_priv(netdev);
+ u16 *res;
+ u16 ret;
- phy_reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_PHYSID1);
- if (phy_reg < 0)
+ res = kmalloc(2, GFP_ATOMIC);
+ if (!res)
return 0;
- phy_id = (phy_reg & 0xffff) << 16;
+ ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0, 0, 0, NULL);
+ ax8817x_read_cmd(dev, AX_CMD_READ_MII_REG, phy_id, (__u16)loc, 2, res);
+ ax8817x_write_cmd(dev, AX_CMD_SET_HW_MII, 0, 0, 0, NULL);
+
+ ret = *res & 0xffff;
+ kfree(res);
+
+ return ret;
+}
+
+static int
+ax8817x_swmii_mdio_read(struct net_device *netdev, int phy_id, int loc)
+{
+ struct usbnet *dev = netdev_priv(netdev);
+ u16 *res;
+ u16 ret;
- phy_reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_PHYSID2);
- if (phy_reg < 0)
+ res = kmalloc(2, GFP_ATOMIC);
+ if (!res)
return 0;
- phy_id |= (phy_reg & 0xffff);
+ ax8817x_read_cmd(dev, AX_CMD_READ_MII_REG, phy_id,
+ (__u16)loc, 2, res);
+
+ ret = *res & 0xffff;
+ kfree(res);
+
+ return ret;
+}
+
+/* same as above, but converts resulting value to cpu byte order */
+static int ax8817x_mdio_read_le(struct net_device *netdev, int phy_id, int loc)
+{
+ return le16_to_cpu(ax8817x_mdio_read(netdev, phy_id, loc));
+}
- return phy_id;
+static int
+ax8817x_swmii_mdio_read_le(struct net_device *netdev, int phy_id, int loc)
+{
+ return le16_to_cpu(ax8817x_swmii_mdio_read(netdev, phy_id, loc));
}
static void
-asix_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
+ax8817x_mdio_write(struct net_device *netdev, int phy_id, int loc, int val)
{
- struct usbnet *dev = netdev_priv(net);
- u8 opt;
+ struct usbnet *dev = netdev_priv(netdev);
+ u16 *res;
+
+ res = kmalloc(2, GFP_ATOMIC);
+ if (!res)
+ return;
+ *res = val;
+
+ ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0, 0, 0, NULL);
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id,
+ (__u16)loc, 2, res);
+ ax8817x_write_cmd(dev, AX_CMD_SET_HW_MII, 0, 0, 0, NULL);
+
+ kfree(res);
+}
+
+static void ax8817x_swmii_mdio_write(struct net_device *netdev,
+ int phy_id, int loc, int val)
+{
+ struct usbnet *dev = netdev_priv(netdev);
+ u16 *res;
+
+ res = kmalloc(2, GFP_ATOMIC);
+ if (!res)
+ return;
+ *res = val;
+
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id,
+ (__u16)loc, 2, res);
+
+ kfree(res);
+}
+
+static void
+ax88772b_mdio_write(struct net_device *netdev, int phy_id, int loc, int val)
+{
+ struct usbnet *dev = netdev_priv(netdev);
+ u16 *res;
- if (asix_read_cmd(dev, AX_CMD_READ_MONITOR_MODE, 0, 0, 1, &opt) < 0) {
- wolinfo->supported = 0;
- wolinfo->wolopts = 0;
+ res = kmalloc(2, GFP_ATOMIC);
+ if (!res)
return;
+ *res = val;
+
+ ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0, 0, 0, NULL);
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id,
+ (__u16)loc, 2, res);
+
+ if (loc == MII_ADVERTISE) {
+ *res = cpu_to_le16(BMCR_ANENABLE | BMCR_ANRESTART);
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id,
+ (__u16)MII_BMCR, 2, res);
}
- wolinfo->supported = WAKE_PHY | WAKE_MAGIC;
- wolinfo->wolopts = 0;
- if (opt & AX_MONITOR_MODE) {
- if (opt & AX_MONITOR_LINK)
- wolinfo->wolopts |= WAKE_PHY;
- if (opt & AX_MONITOR_MAGIC)
- wolinfo->wolopts |= WAKE_MAGIC;
+
+ ax8817x_write_cmd(dev, AX_CMD_SET_HW_MII, 0, 0, 0, NULL);
+
+ kfree(res);
+}
+
+/* same as above, but converts new value to le16 byte order before writing */
+static void
+ax8817x_mdio_write_le(struct net_device *netdev, int phy_id, int loc, int val)
+{
+ ax8817x_mdio_write(netdev, phy_id, loc, cpu_to_le16(val));
+}
+
+static void ax8817x_swmii_mdio_write_le(struct net_device *netdev,
+ int phy_id, int loc, int val)
+{
+ ax8817x_swmii_mdio_write(netdev, phy_id, loc, cpu_to_le16(val));
+}
+
+static void
+ax88772b_mdio_write_le(struct net_device *netdev, int phy_id, int loc, int val)
+{
+ ax88772b_mdio_write(netdev, phy_id, loc, cpu_to_le16(val));
+}
+
+static int asix_write_medium_mode(struct usbnet *dev, u16 value)
+{
+ int ret;
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_MEDIUM_MODE,
+ value, 0, 0, NULL);
+ if (ret < 0)
+ netdev_err(dev->net, "%s (0x%04x) failed, err=%d\n",
+ __func__, value, ret);
+ return ret;
+}
+
+static int ax88772_suspend(struct usb_interface *intf,
+ pm_message_t message)
+{
+ struct usbnet *dev = usb_get_intfdata(intf);
+ u16 *medium;
+
+ medium = kmalloc(2, GFP_ATOMIC);
+ if (!medium)
+ return usbnet_suspend(intf, message);
+
+ ax8817x_read_cmd(dev, AX_CMD_READ_MEDIUM_MODE, 0, 0, 2, medium);
+ asix_write_medium_mode(dev, *medium & ~AX88772_MEDIUM_RX_ENABLE);
+
+ kfree(medium);
+ return usbnet_suspend(intf, message);
+}
+
+static int ax88772b_suspend(struct usb_interface *intf,
+ pm_message_t message)
+{
+ struct usbnet *dev = usb_get_intfdata(intf);
+ struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
+ u16 *tmp16;
+ u8 *opt;
+
+ tmp16 = kmalloc(2, GFP_ATOMIC);
+ if (!tmp16)
+ return usbnet_suspend(intf, message);
+ opt = (u8 *)tmp16;
+
+ ax8817x_read_cmd(dev, AX_CMD_READ_MEDIUM_MODE, 0, 0, 2, tmp16);
+ asix_write_medium_mode(dev, *tmp16 & ~AX88772_MEDIUM_RX_ENABLE);
+
+ ax8817x_read_cmd(dev, AX_CMD_READ_MONITOR_MODE, 0, 0, 1, opt);
+ if (!(*opt & AX_MONITOR_LINK) && !(*opt & AX_MONITOR_MAGIC)) {
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPRL | AX_SWRESET_IPPD, 0, 0, NULL);
+ } else {
+
+ if (priv->psc & AX_SWRESET_WOLLP) {
+ *tmp16 = ax8817x_mdio_read_le(dev->net,
+ dev->mii.phy_id, MII_BMCR);
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id,
+ MII_BMCR, *tmp16 | BMCR_ANENABLE);
+
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPRL | priv->psc, 0, 0, NULL);
+ }
+
+ if (priv->psc &
+ (AX_SWRESET_IPPSL_0 | AX_SWRESET_IPPSL_1)) {
+ *opt |= AX_MONITOR_LINK;
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_MONITOR_MODE,
+ *opt, 0, 0, NULL);
+ }
+ }
+
+ kfree(tmp16);
+ return usbnet_suspend(intf, message);
+}
+
+static int ax88772_resume(struct usb_interface *intf)
+{
+ struct usbnet *dev = usb_get_intfdata(intf);
+
+ netif_carrier_off(dev->net);
+ return usbnet_resume(intf);
+}
+
+static int ax88772b_resume(struct usb_interface *intf)
+{
+ struct usbnet *dev = usb_get_intfdata(intf);
+ struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
+
+ if (priv->psc & AX_SWRESET_WOLLP) {
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPRL | (priv->psc & 0x7FFF),
+ 0, 0, NULL);
}
+ if (priv->psc & (AX_SWRESET_IPPSL_0 | AX_SWRESET_IPPSL_1))
+ ax88772a_phy_powerup(dev);
+ netif_carrier_off(dev->net);
+ return usbnet_resume(intf);
+}
+
+static int ax88172_link_reset(struct usbnet *dev)
+{
+ u16 lpa;
+ u16 adv;
+ u16 res;
+ u8 mode;
+
+ mode = AX_MEDIUM_TX_ABORT_ALLOW | AX_MEDIUM_FLOW_CONTROL_EN;
+ lpa = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, MII_LPA);
+ adv = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, MII_ADVERTISE);
+ res = mii_nway_result(lpa|adv);
+ if (res & LPA_DUPLEX)
+ mode |= AX_MEDIUM_FULL_DUPLEX;
+ asix_write_medium_mode(dev, mode);
+ return 0;
+}
+
+static void
+ax8817x_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
+{
+ struct usbnet *dev = netdev_priv(net);
+ u8 *opt;
+
+ wolinfo->supported = 0;
+ wolinfo->wolopts = 0;
+
+ opt = kmalloc(1, GFP_KERNEL);
+ if (!opt)
+ return;
+
+ if (ax8817x_read_cmd(dev, AX_CMD_READ_MONITOR_MODE, 0, 0, 1, opt) < 0)
+ return;
+
+ wolinfo->supported = WAKE_PHY | WAKE_MAGIC;
+
+ if (*opt & AX_MONITOR_LINK)
+ wolinfo->wolopts |= WAKE_PHY;
+ if (*opt & AX_MONITOR_MAGIC)
+ wolinfo->wolopts |= WAKE_MAGIC;
+
+ kfree(opt);
}
static int
-asix_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
+ax8817x_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
{
struct usbnet *dev = netdev_priv(net);
- u8 opt = 0;
+ u8 *opt;
+ opt = kmalloc(1, GFP_KERNEL);
+ if (!opt)
+ return -ENOMEM;
+
+ *opt = 0;
if (wolinfo->wolopts & WAKE_PHY)
- opt |= AX_MONITOR_LINK;
+ *opt |= AX_MONITOR_LINK;
if (wolinfo->wolopts & WAKE_MAGIC)
- opt |= AX_MONITOR_MAGIC;
- if (opt != 0)
- opt |= AX_MONITOR_MODE;
+ *opt |= AX_MONITOR_MAGIC;
- if (asix_write_cmd(dev, AX_CMD_WRITE_MONITOR_MODE,
- opt, 0, 0, NULL) < 0)
- return -EINVAL;
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_MONITOR_MODE, *opt, 0, 0, NULL);
+ kfree(opt);
return 0;
}
-static int asix_get_eeprom_len(struct net_device *net)
+static int ax8817x_get_eeprom_len(struct net_device *net)
{
- struct usbnet *dev = netdev_priv(net);
- struct asix_data *data = (struct asix_data *)&dev->data;
-
- return data->eeprom_len;
+ return AX_EEPROM_LEN;
}
-static int asix_get_eeprom(struct net_device *net,
+static int ax8817x_get_eeprom(struct net_device *net,
struct ethtool_eeprom *eeprom, u8 *data)
{
struct usbnet *dev = netdev_priv(net);
- __le16 *ebuf = (__le16 *)data;
+ u16 *ebuf = (u16 *)data;
int i;
/* Crude hack to ensure that we don't overwrite memory
@@ -729,862 +692,2433 @@
eeprom->magic = AX_EEPROM_MAGIC;
/* ax8817x returns 2 bytes from eeprom on read */
- for (i=0; i < eeprom->len / 2; i++) {
- if (asix_read_cmd(dev, AX_CMD_READ_EEPROM,
+ for (i = 0; i < eeprom->len / 2; i++) {
+ if (ax8817x_read_cmd(dev, AX_CMD_READ_EEPROM,
eeprom->offset + i, 0, 2, &ebuf[i]) < 0)
return -EINVAL;
}
return 0;
}
-static void asix_get_drvinfo (struct net_device *net,
+static void ax8817x_get_drvinfo(struct net_device *net,
struct ethtool_drvinfo *info)
{
- struct usbnet *dev = netdev_priv(net);
- struct asix_data *data = (struct asix_data *)&dev->data;
-
/* Inherit standard device info */
usbnet_get_drvinfo(net, info);
- strncpy (info->driver, driver_name, sizeof info->driver);
- strncpy (info->version, DRIVER_VERSION, sizeof info->version);
- info->eedump_len = data->eeprom_len;
+ info->eedump_len = 0x3e;
}
-static u32 asix_get_link(struct net_device *net)
+static int ax8817x_get_settings(struct net_device *net, struct ethtool_cmd *cmd)
{
struct usbnet *dev = netdev_priv(net);
-
- return mii_link_ok(&dev->mii);
+ return mii_ethtool_gset(&dev->mii, cmd);
}
-static int asix_ioctl (struct net_device *net, struct ifreq *rq, int cmd)
+static int ax8817x_set_settings(struct net_device *net, struct ethtool_cmd *cmd)
{
struct usbnet *dev = netdev_priv(net);
-
- return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
+ return mii_ethtool_sset(&dev->mii, cmd);
}
-static int asix_set_mac_address(struct net_device *net, void *p)
+/*
+ * We need to override some ethtool_ops so we require our
+ * own structure so we don't interfere with other usbnet
+ * devices that may be connected at the same time.
+ */
+static struct ethtool_ops ax8817x_ethtool_ops = {
+ .get_drvinfo = ax8817x_get_drvinfo,
+ .get_link = ethtool_op_get_link,
+ .get_msglevel = usbnet_get_msglevel,
+ .set_msglevel = usbnet_set_msglevel,
+ .get_wol = ax8817x_get_wol,
+ .set_wol = ax8817x_set_wol,
+ .get_eeprom_len = ax8817x_get_eeprom_len,
+ .get_eeprom = ax8817x_get_eeprom,
+ .get_settings = ax8817x_get_settings,
+ .set_settings = ax8817x_set_settings,
+};
+
+static int ax8817x_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
{
struct usbnet *dev = netdev_priv(net);
- struct asix_data *data = (struct asix_data *)&dev->data;
- struct sockaddr *addr = p;
- if (netif_running(net))
- return -EBUSY;
- if (!is_valid_ether_addr(addr->sa_data))
- return -EADDRNOTAVAIL;
-
- memcpy(net->dev_addr, addr->sa_data, ETH_ALEN);
-
- /* We use the 20 byte dev->data
- * for our 6 byte mac buffer
- * to avoid allocating memory that
- * is tricky to free later */
- memcpy(data->mac_addr, addr->sa_data, ETH_ALEN);
- asix_write_cmd_async(dev, AX_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,
- data->mac_addr);
-
- return 0;
+ return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
}
-/* We need to override some ethtool_ops so we require our
- own structure so we don't interfere with other usbnet
- devices that may be connected at the same time. */
-static const struct ethtool_ops ax88172_ethtool_ops = {
- .get_drvinfo = asix_get_drvinfo,
- .get_link = asix_get_link,
- .get_msglevel = usbnet_get_msglevel,
- .set_msglevel = usbnet_set_msglevel,
- .get_wol = asix_get_wol,
- .set_wol = asix_set_wol,
- .get_eeprom_len = asix_get_eeprom_len,
- .get_eeprom = asix_get_eeprom,
- .get_settings = usbnet_get_settings,
- .set_settings = usbnet_set_settings,
- .nway_reset = usbnet_nway_reset,
+static const struct net_device_ops ax88x72_netdev_ops = {
+ .ndo_open = usbnet_open,
+ .ndo_stop = usbnet_stop,
+ .ndo_start_xmit = usbnet_start_xmit,
+ .ndo_tx_timeout = usbnet_tx_timeout,
+ .ndo_change_mtu = usbnet_change_mtu,
+ .ndo_do_ioctl = ax8817x_ioctl,
+ .ndo_set_mac_address = ax8817x_set_mac_addr,
+ .ndo_validate_addr = eth_validate_addr,
+ .ndo_set_multicast_list = ax8817x_set_multicast,
};
-static void ax88172_set_multicast(struct net_device *net)
+static int asix_read_mac(struct usbnet *dev, u8 op)
{
- struct usbnet *dev = netdev_priv(net);
- struct asix_data *data = (struct asix_data *)&dev->data;
- u8 rx_ctl = 0x8c;
+ u8 *buf;
+ int ret, len = ETH_ALEN;
- if (net->flags & IFF_PROMISC) {
- rx_ctl |= 0x01;
- } else if (net->flags & IFF_ALLMULTI ||
- netdev_mc_count(net) > AX_MAX_MCAST) {
- rx_ctl |= 0x02;
- } else if (netdev_mc_empty(net)) {
- /* just broadcast and directed */
+ buf = kzalloc(len, GFP_KERNEL);
+ if (!buf) {
+ netdev_err(dev->net, "%s kzalloc failed\n", __func__);
+ return -ENOMEM;
+ }
+ ret = ax8817x_read_cmd(dev, op, 0, 0, len, buf);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s failed, err=%d\n", __func__, ret);
} else {
- /* We use the 20 byte dev->data
- * for our 8 byte filter buffer
- * to avoid allocating memory that
- * is tricky to free later */
- struct netdev_hw_addr *ha;
- u32 crc_bits;
+ memcpy(dev->net->dev_addr, buf, len);
+ ret = 0;
+ }
+ kfree(buf);
+ return ret;
+}
- memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE);
+static int asix_read_phyid(struct usbnet *dev, u8 op)
+{
+ u8 *buf;
+ int ret, len = 2;
- /* Build the multicast hash filter. */
- netdev_for_each_mc_addr(ha, net) {
- crc_bits = ether_crc(ETH_ALEN, ha->addr) >> 26;
- data->multi_filter[crc_bits >> 3] |=
- 1 << (crc_bits & 7);
- }
+ buf = kzalloc(len, GFP_KERNEL);
+ if (!buf) {
+ netdev_err(dev->net, "%s kzalloc failed\n", __func__);
+ return -ENOMEM;
+ }
+ ret = ax8817x_read_cmd(dev, op, 0, 0, len, buf);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s failed, err=%d\n", __func__, ret);
+ } else if (ret < len) {
+ netdev_err(dev->net, "%s read only %d/%d bytes\n",
+ __func__, ret, len);
+ ret = -EIO;
+ } else {
+ dev->mii.phy_id = buf[1];
+ ret = 0;
+ }
+ kfree(buf);
+ return ret;
+}
- asix_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,
- AX_MCAST_FILTER_SIZE, data->multi_filter);
+static int asix_read_eeprom_le16(struct usbnet *dev, u8 offset, u16 *data)
+{
+ u16 *buf;
+ int ret, len = 2;
- rx_ctl |= 0x10;
+ buf = kzalloc(len, GFP_KERNEL);
+ if (!buf) {
+ netdev_err(dev->net, "%s kzalloc failed\n", __func__);
+ return -ENOMEM;
}
- asix_write_cmd_async(dev, AX_CMD_WRITE_RX_CTL, rx_ctl, 0, 0, NULL);
+ ret = ax8817x_read_cmd(dev, AX_CMD_READ_EEPROM, offset, 0, len, buf);
+ if (ret != 2) {
+ netdev_err(dev->net, "%s failed offset 0x%02x, err=%d\n",
+ __func__, offset, ret);
+ } else {
+ le16_to_cpus(buf);
+ *data = *buf;
+ ret = 0;
+ }
+ kfree(buf);
+ return ret;
}
-static int ax88172_link_reset(struct usbnet *dev)
+static int asix_read_mac_from_eeprom(struct usbnet *dev)
{
- u8 mode;
- struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
+ u16 buf[ETH_ALEN / 2];
+ int i, ret;
- mii_check_media(&dev->mii, 1, 1);
- mii_ethtool_gset(&dev->mii, &ecmd);
- mode = AX88172_MEDIUM_DEFAULT;
+ memset(buf, 0, sizeof(buf));
+ for (i = 0; i < ETH_ALEN; i += 2) {
+ ret = asix_read_eeprom_le16(dev, i + 4, buf + i);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s failed\n", __func__);
+ return ret;
+ }
+ }
+ memcpy(dev->net->dev_addr, buf, ETH_ALEN);
+ return 0;
+}
- if (ecmd.duplex != DUPLEX_FULL)
- mode |= ~AX88172_MEDIUM_FD;
+static int asix_phy_select(struct usbnet *dev, u16 physel)
+{
+ int ret;
- netdev_dbg(dev->net, "ax88172_link_reset() speed: %u duplex: %d setting mode
to 0x%04x\n",
- ethtool_cmd_speed(&ecmd), ecmd.duplex, mode);
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_PHY_SELECT, physel, 0, 0, NULL);
+ if (ret < 0)
+ netdev_err(dev->net, "%s (0x%04x) failed, err=%d\n",
+ __func__, physel, ret);
+ return ret;
+}
- asix_write_medium_mode(dev, mode);
+static int asix_write_gpio(struct usbnet *dev, unsigned int wait, u16 value)
+{
+ int ret;
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_GPIOS, value, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s (0x%x) failed\n", __func__, value);
+ return ret;
+ }
+ if (!wait)
+ wait = 5;
+ if (wait < 20)
+ usleep_range(wait * 1000, wait * (1000 * 2));
+ else
+ msleep(wait);
return 0;
}
-static const struct net_device_ops ax88172_netdev_ops = {
- .ndo_open = usbnet_open,
- .ndo_stop = usbnet_stop,
- .ndo_start_xmit = usbnet_start_xmit,
- .ndo_tx_timeout = usbnet_tx_timeout,
- .ndo_change_mtu = usbnet_change_mtu,
- .ndo_set_mac_address = eth_mac_addr,
- .ndo_validate_addr = eth_validate_addr,
- .ndo_do_ioctl = asix_ioctl,
- .ndo_set_multicast_list = ax88172_set_multicast,
-};
-
-static int ax88172_bind(struct usbnet *dev, struct usb_interface *intf)
+static int ax8817x_bind(struct usbnet *dev, struct usb_interface *intf)
{
int ret = 0;
- u8 buf[ETH_ALEN];
int i;
unsigned long gpio_bits = dev->driver_info->data;
- struct asix_data *data = (struct asix_data *)&dev->data;
+ struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
- data->eeprom_len = AX88172_EEPROM_LEN;
-
- usbnet_get_endpoints(dev,intf);
+ usbnet_get_endpoints(dev, intf);
/* Toggle the GPIOs in a manufacturer/model specific way */
for (i = 2; i >= 0; i--) {
- if ((ret = asix_write_cmd(dev, AX_CMD_WRITE_GPIOS,
- (gpio_bits >> (i * 8)) & 0xff, 0, 0,
- NULL)) < 0)
- goto out;
- msleep(5);
+ ret = asix_write_gpio(dev, 0, (gpio_bits >> (i * 8)) & 0xff);
+ if (ret)
+ goto err_out;
}
- if ((ret = asix_write_rx_ctl(dev, 0x80)) < 0)
- goto out;
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL, 0x80, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: WRITE_RX_CTL failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
/* Get the MAC address */
- if ((ret = asix_read_cmd(dev, AX88172_CMD_READ_NODE_ID,
- 0, 0, ETH_ALEN, buf)) < 0) {
- dbg("read AX_CMD_READ_NODE_ID failed: %d", ret);
- goto out;
- }
- memcpy(dev->net->dev_addr, buf, ETH_ALEN);
+ ret = asix_read_mac(dev, AX_CMD_READ_NODE_ID);
+ if (ret < 0)
+ goto err_out;
+
+ /* Get the PHY id */
+ ret = asix_read_phyid(dev, AX_CMD_READ_PHY_ID);
+ if (ret < 0)
+ goto err_out;
/* Initialize MII structure */
dev->mii.dev = dev->net;
- dev->mii.mdio_read = asix_mdio_read;
- dev->mii.mdio_write = asix_mdio_write;
+ dev->mii.mdio_read = ax8817x_mdio_read_le;
+ dev->mii.mdio_write = ax8817x_mdio_write_le;
dev->mii.phy_id_mask = 0x3f;
dev->mii.reg_num_mask = 0x1f;
- dev->mii.phy_id = asix_get_phy_addr(dev);
+ dev->net->netdev_ops = &ax88x72_netdev_ops;
+ dev->net->ethtool_ops = &ax8817x_ethtool_ops;
- dev->net->netdev_ops = &ax88172_netdev_ops;
- dev->net->ethtool_ops = &ax88172_ethtool_ops;
+ /* Register suspend and resume functions */
+ data->suspend = usbnet_suspend;
+ data->resume = usbnet_resume;
- asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
- asix_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
mii_nway_restart(&dev->mii);
+ printk(KERN_INFO "%s\n", driver_version);
return 0;
-out:
+err_out:
return ret;
}
-static const struct ethtool_ops ax88772_ethtool_ops = {
- .get_drvinfo = asix_get_drvinfo,
- .get_link = asix_get_link,
+static struct ethtool_ops ax88772_ethtool_ops = {
+ .get_drvinfo = ax8817x_get_drvinfo,
+ .get_link = ethtool_op_get_link,
.get_msglevel = usbnet_get_msglevel,
.set_msglevel = usbnet_set_msglevel,
- .get_wol = asix_get_wol,
- .set_wol = asix_set_wol,
- .get_eeprom_len = asix_get_eeprom_len,
- .get_eeprom = asix_get_eeprom,
- .get_settings = usbnet_get_settings,
- .set_settings = usbnet_set_settings,
- .nway_reset = usbnet_nway_reset,
+ .get_wol = ax8817x_get_wol,
+ .set_wol = ax8817x_set_wol,
+ .get_eeprom_len = ax8817x_get_eeprom_len,
+ .get_eeprom = ax8817x_get_eeprom,
+ .get_settings = ax8817x_get_settings,
+ .set_settings = ax8817x_set_settings,
};
-static int ax88772_link_reset(struct usbnet *dev)
+static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
{
- u16 mode;
- struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
+ int ret;
+ struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
+ struct ax88772_data *priv;
- mii_check_media(&dev->mii, 1, 1);
- mii_ethtool_gset(&dev->mii, &ecmd);
- mode = AX88772_MEDIUM_DEFAULT;
+ usbnet_get_endpoints(dev, intf);
- if (ethtool_cmd_speed(&ecmd) != SPEED_100)
- mode &= ~AX_MEDIUM_PS;
+ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+ if (!priv) {
+ netdev_err(dev->net, "%s: kzalloc(priv) failed\n", __func__);
+ return -ENOMEM;
+ }
+ dev->driver_priv = priv;
- if (ecmd.duplex != DUPLEX_FULL)
- mode &= ~AX_MEDIUM_FD;
+ priv->ax_work = create_singlethread_workqueue("ax88772");
+ if (!priv->ax_work) {
+ netdev_err(dev->net, "%s: create workqueue failed\n", __func__);
+ kfree(priv);
+ return -ENOMEM;
+ }
- netdev_dbg(dev->net, "ax88772_link_reset() speed: %u duplex: %d setting mode
to 0x%04x\n",
- ethtool_cmd_speed(&ecmd), ecmd.duplex, mode);
+ priv->dev = dev;
+ INIT_WORK(&priv->check_link, ax88772_link_reset);
- asix_write_medium_mode(dev, mode);
+ /* reload eeprom data */
+ ret = asix_write_gpio(dev, 0, AXGPIOS_RSE|AXGPIOS_GPO2|AXGPIOS_GPO2EN);
+ if (ret)
+ goto err_out;
- return 0;
-}
+ /* Initialize MII structure */
+ dev->mii.dev = dev->net;
+ dev->mii.mdio_read = ax8817x_mdio_read_le;
+ dev->mii.mdio_write = ax8817x_mdio_write_le;
+ dev->mii.phy_id_mask = 0xff;
+ dev->mii.reg_num_mask = 0xff;
-static const struct net_device_ops ax88772_netdev_ops = {
- .ndo_open = usbnet_open,
- .ndo_stop = usbnet_stop,
- .ndo_start_xmit = usbnet_start_xmit,
- .ndo_tx_timeout = usbnet_tx_timeout,
- .ndo_change_mtu = usbnet_change_mtu,
- .ndo_set_mac_address = asix_set_mac_address,
- .ndo_validate_addr = eth_validate_addr,
- .ndo_do_ioctl = asix_ioctl,
- .ndo_set_multicast_list = asix_set_multicast,
-};
+ /* Get the PHY id */
+ ret = asix_read_phyid(dev, AX_CMD_READ_PHY_ID);
+ if (ret < 0)
+ goto err_out;
+ if (dev->mii.phy_id == 0x10) {
+ ret = asix_phy_select(dev, 0x0001);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: Failed to power down PHY"
+ ", err=%d\n", __func__, ret);
+ goto err_out;
+ }
-static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
-{
- int ret, embd_phy;
- u16 rx_ctl;
- struct asix_data *data = (struct asix_data *)&dev->data;
- u8 buf[ETH_ALEN];
- u32 phyid;
-
- data->eeprom_len = AX88772_EEPROM_LEN;
-
- usbnet_get_endpoints(dev,intf);
-
- if ((ret = asix_write_gpio(dev,
- AX_GPIO_RSE | AX_GPIO_GPO_2 | AX_GPIO_GPO2EN, 5)) < 0)
- goto out;
-
- /* 0x10 is the phy id of the embedded 10/100 ethernet phy */
- embd_phy = ((asix_get_phy_addr(dev) & 0x1f) == 0x10 ? 1 : 0);
- if ((ret = asix_write_cmd(dev, AX_CMD_SW_PHY_SELECT,
- embd_phy, 0, 0, NULL)) < 0) {
- dbg("Select PHY #1 failed: %d", ret);
- goto out;
- }
+ msleep(150);
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_CLEAR, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: SW_RESET failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
- if ((ret = asix_sw_reset(dev, AX_SWRESET_IPPD | AX_SWRESET_PRL)) < 0)
- goto out;
+ msleep(150);
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPRL | AX_SWRESET_PRL, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: Failed to set PHY reset "
+ "control, err=%d\n", __func__, ret);
+ goto err_out;
+ }
+ } else {
+ ret = asix_phy_select(dev, 0x0000);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD | AX_SWRESET_PRL, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: Failed to power down "
+ "internal PHY, err=%d\n", __func__, ret);
+ goto err_out;
+ }
+ }
msleep(150);
- if ((ret = asix_sw_reset(dev, AX_SWRESET_CLEAR)) < 0)
- goto out;
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL, 0x0000, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: Failed to reset RX_CTL, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
- msleep(150);
- if (embd_phy) {
- if ((ret = asix_sw_reset(dev, AX_SWRESET_IPRL)) < 0)
- goto out;
- }
- else {
- if ((ret = asix_sw_reset(dev, AX_SWRESET_PRTE)) < 0)
- goto out;
+ /* Get the MAC address */
+ ret = asix_read_mac(dev, AX88772_CMD_READ_NODE_ID);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: Failed to enable software MII"
+ ", err=%d\n", __func__, ret);
+ goto err_out;
}
- msleep(150);
- rx_ctl = asix_read_rx_ctl(dev);
- dbg("RX_CTL is 0x%04x after software reset", rx_ctl);
- if ((ret = asix_write_rx_ctl(dev, 0x0000)) < 0)
- goto out;
+ if (dev->mii.phy_id == 0x10) {
+ ret = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, 2);
+ if (ret != 0x003b) {
+ netdev_err(dev->net, "%s: PHY reg 2 not 0x3b00: 0x%x\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_PRL, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: Failed to set "
+ "external PHY reset pin level, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+ msleep(150);
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPRL | AX_SWRESET_PRL, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: Failed to set "
+ "internal/external PHY reset control, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+ msleep(150);
+ }
+
+ dev->net->netdev_ops = &ax88x72_netdev_ops;
+ dev->net->ethtool_ops = &ax88772_ethtool_ops;
+
+ /* Register suspend and resume functions */
+ data->suspend = ax88772_suspend;
+ data->resume = ax88772_resume;
+
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
+ ADVERTISE_ALL | ADVERTISE_CSMA);
+
+ mii_nway_restart(&dev->mii);
+ priv->autoneg_start = jiffies;
+ priv->Event = WAIT_AUTONEG_COMPLETE;
+
+ ret = asix_write_medium_mode(dev, AX88772_MEDIUM_DEFAULT);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_IPG0,
+ AX88772_IPG0_DEFAULT | AX88772_IPG1_DEFAULT << 8,
+ AX88772_IPG2_DEFAULT, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: WRITE_IPG0/1/2 failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+ ret = ax8817x_write_cmd(dev, AX_CMD_SET_HW_MII, 0, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: SET_HW_MII failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ /* Set RX_CTL to default values with 2k buffer, and enable cactus */
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL, 0x0088, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: WRITE_RX_CTL failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ /* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
+ if (dev->driver_info->flags & FLAG_FRAMING_AX) {
+ /*
+ * hard_mtu is still the default;
+ * the device does not support jumbo eth frames
+ */
+ dev->rx_urb_size = 2048;
+ }
+
+ printk(KERN_INFO "%s\n", driver_version);
+ return 0;
+
+err_out:
+ destroy_workqueue(priv->ax_work);
+ kfree(priv);
+ return ret;
+}
- rx_ctl = asix_read_rx_ctl(dev);
- dbg("RX_CTL is 0x%04x setting to 0x0000", rx_ctl);
+static void ax88772_unbind(struct usbnet *dev, struct usb_interface *intf)
+{
+ struct ax88772_data *priv = (struct ax88772_data *)dev->driver_priv;
+
+ if (priv) {
+
+ flush_workqueue(priv->ax_work);
+ destroy_workqueue(priv->ax_work);
+
+ /* stop MAC operation */
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
+ AX_RX_CTL_STOP, 0, 0, NULL);
+
+ /* Power down PHY */
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD, 0, 0, NULL);
+ kfree(priv);
+ }
+}
+
+static int ax88772a_phy_powerup(struct usbnet *dev)
+{
+ int ret;
+ /* set the embedded Ethernet PHY in power-down state */
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD | AX_SWRESET_IPRL, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: power down PHY failed, err=%d\n",
+ __func__, ret);
+ return ret;
+ }
+
+ msleep(20); /* was 10ms */
+
+
+ /* set the embedded Ethernet PHY in power-up state */
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET, AX_SWRESET_IPRL,
+ 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: reset PHY failed, err=%d\n",
+ __func__, ret);
+ return ret;
+ }
+
+ msleep(600);
+
+ /* set the embedded Ethernet PHY in reset state */
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET, AX_SWRESET_CLEAR,
+ 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: power up PHY failed, err=%d\n",
+ __func__, ret);
+ return ret;
+ }
+
+ /* set the embedded Ethernet PHY in power-up state */
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET, AX_SWRESET_IPRL,
+ 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: second reset PHY failed, err=%d\n",
+ __func__, ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int ax88772a_bind(struct usbnet *dev, struct usb_interface *intf)
+{
+ int ret = -EIO;
+ struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
+ struct ax88772a_data *priv;
+
+ usbnet_get_endpoints(dev, intf);
+
+ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+ if (!priv) {
+ netdev_err(dev->net, "%s: kzalloc(priv) failed\n", __func__);
+ return -ENOMEM;
+ }
+ dev->driver_priv = priv;
+
+ priv->ax_work = create_singlethread_workqueue("ax88772a");
+ if (!priv->ax_work) {
+ netdev_err(dev->net, "%s: create workqueue failed\n", __func__);
+ kfree(priv);
+ return -ENOMEM;
+ }
+
+ priv->dev = dev;
+ INIT_WORK(&priv->check_link, ax88772a_link_reset);
+
+ /* Get the EEPROM data*/
+ ret = asix_read_eeprom_le16(dev, 0x17, &priv->EepromData);
+ if (ret < 0)
+ goto err_out;
+
+ /* reload eeprom data */
+ ret = asix_write_gpio(dev, 0, AXGPIOS_RSE);
+ if (ret)
+ goto err_out;
+
+ /* Initialize MII structure */
+ dev->mii.dev = dev->net;
+ dev->mii.mdio_read = ax8817x_mdio_read_le;
+ dev->mii.mdio_write = ax8817x_mdio_write_le;
+ dev->mii.phy_id_mask = 0xff;
+ dev->mii.reg_num_mask = 0xff;
+
+ /* Get the PHY id */
+ ret = asix_read_phyid(dev, AX_CMD_READ_PHY_ID);
+ if (ret < 0)
+ goto err_out;
+ if (dev->mii.phy_id != 0x10) {
+ netdev_err(dev->net, "%s: Got wrong PHY_ID: 0x%02x\n",
+ __func__, dev->mii.phy_id);
+ ret = -EIO;
+ goto err_out;
+ }
+
+ /* select the embedded 10/100 Ethernet PHY */
+ ret = asix_phy_select(dev,
+ AX_PHYSEL_SSEN | AX_PHYSEL_PSEL | AX_PHYSEL_SSMII);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax88772a_phy_powerup(dev);
+ if (ret < 0)
+ goto err_out;
+
+ /* stop MAC operation */
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
+ AX_RX_CTL_STOP, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: reset RX_CTL failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
/* Get the MAC address */
- if ((ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID,
- 0, 0, ETH_ALEN, buf)) < 0) {
- dbg("Failed to read MAC address: %d", ret);
- goto out;
+ ret = asix_read_mac(dev, AX88772_CMD_READ_NODE_ID);
+ if (ret < 0)
+ goto err_out;
+
+ /* make sure the driver can enable sw mii operation */
+ ret = ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: enable software MII failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ dev->net->netdev_ops = &ax88x72_netdev_ops;
+ dev->net->ethtool_ops = &ax88772_ethtool_ops;
+
+ /* Register suspend and resume functions */
+ data->suspend = ax88772_suspend;
+ data->resume = ax88772_resume;
+
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
+ ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
+
+ mii_nway_restart(&dev->mii);
+ priv->autoneg_start = jiffies;
+ priv->Event = WAIT_AUTONEG_COMPLETE;
+
+ ret = asix_write_medium_mode(dev, AX88772_MEDIUM_DEFAULT);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_IPG0,
+ AX88772A_IPG0_DEFAULT | AX88772A_IPG1_DEFAULT << 8,
+ AX88772A_IPG2_DEFAULT, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: write IPG,IPG1,IPG2 failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ /* Set RX_CTL to default values with 2k buffer, and enable cactus */
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
+ AX_RX_CTL_START | AX_RX_CTL_AB, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: Reset RX_CTL failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ /* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
+ if (dev->driver_info->flags & FLAG_FRAMING_AX) {
+ /*
+ * hard_mtu is still the default;
+ * the device does not support jumbo eth frames
+ */
+ dev->rx_urb_size = 2048;
+ }
+
+ printk(KERN_INFO "%s\n", driver_version);
+ return ret;
+
+err_out:
+ destroy_workqueue(priv->ax_work);
+ kfree(priv);
+ return ret;
+}
+
+static void ax88772a_unbind(struct usbnet *dev, struct usb_interface *intf)
+{
+ struct ax88772a_data *priv = (struct ax88772a_data *)dev->driver_priv;
+
+ if (priv) {
+
+ flush_workqueue(priv->ax_work);
+ destroy_workqueue(priv->ax_work);
+
+ /* stop MAC operation */
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
+ AX_RX_CTL_STOP, 0, 0, NULL);
+
+ /* Power down PHY */
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD, 0, 0, NULL);
+ kfree(priv);
+ }
+}
+
+static int ax88772b_set_csums(struct usbnet *dev)
+{
+ struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
+ u16 checksum;
+
+ if (priv->checksum & AX_RX_CHECKSUM)
+ checksum = AX_RXCOE_DEF_CSUM;
+ else
+ checksum = 0;
+
+ if (priv->checksum & AX_TX_CHECKSUM)
+ checksum = AX_TXCOE_DEF_CSUM;
+ else
+ checksum = 0;
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_RXCOE_CTL,
+ checksum, 0, 0, NULL);
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_TXCOE_CTL,
+ checksum, 0, 0, NULL);
+
+ return 0;
+}
+
+static int ax88772b_set_features(struct net_device *netdev, u32 features)
+{
+ struct usbnet *dev = netdev_priv(netdev);
+ struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
+ unsigned long flags;
+ u16 tx_csum = 0, rx_csum = 0;
+
+ spin_lock_irqsave(&priv->checksum_lock, flags);
+ if (features & NETIF_F_HW_CSUM) {
+ priv->checksum |= AX_TX_CHECKSUM;
+ tx_csum = AX_TXCOE_DEF_CSUM;
+ } else
+ priv->checksum &= ~AX_TX_CHECKSUM;
+ if (features & NETIF_F_RXCSUM) {
+ priv->checksum |= AX_RX_CHECKSUM;
+ rx_csum = AX_RXCOE_DEF_CSUM;
+ } else
+ priv->checksum &= ~AX_RX_CHECKSUM;
+ spin_unlock_irqrestore(&priv->checksum_lock, flags);
+
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_RXCOE_CTL,
+ rx_csum, 0, 0, NULL);
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_TXCOE_CTL,
+ tx_csum, 0, 0, NULL);
+ return 0;
+}
+
+static struct ethtool_ops ax88772b_ethtool_ops = {
+ .get_drvinfo = ax8817x_get_drvinfo,
+ .get_link = ethtool_op_get_link,
+ .get_msglevel = usbnet_get_msglevel,
+ .set_msglevel = usbnet_set_msglevel,
+ .get_wol = ax8817x_get_wol,
+ .set_wol = ax8817x_set_wol,
+ .get_eeprom_len = ax8817x_get_eeprom_len,
+ .get_eeprom = ax8817x_get_eeprom,
+ .get_settings = ax8817x_get_settings,
+ .set_settings = ax8817x_set_settings,
+};
+
+static const struct net_device_ops ax88772b_netdev_ops = {
+ .ndo_open = usbnet_open,
+ .ndo_stop = usbnet_stop,
+ .ndo_start_xmit = usbnet_start_xmit,
+ .ndo_tx_timeout = usbnet_tx_timeout,
+ .ndo_change_mtu = usbnet_change_mtu,
+ .ndo_do_ioctl = ax8817x_ioctl,
+ .ndo_set_mac_address = ax8817x_set_mac_addr,
+ .ndo_validate_addr = eth_validate_addr,
+ .ndo_set_multicast_list = ax88772b_set_multicast,
+ .ndo_set_features = ax88772b_set_features,
+};
+
+static int ax88772b_bind(struct usbnet *dev, struct usb_interface *intf)
+{
+ int ret;
+ struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
+ struct ax88772b_data *priv;
+ int rx_size;
+ u16 tmp16;
+
+ usbnet_get_endpoints(dev, intf);
+
+ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+ if (!priv) {
+ netdev_err(dev->net, "%s: kzalloc(priv) failed\n", __func__);
+ return -ENOMEM;
+ }
+ spin_lock_init(&priv->checksum_lock);
+ dev->driver_priv = priv;
+
+ priv->ax_work = create_singlethread_workqueue("ax88772b");
+ if (!priv->ax_work) {
+ netdev_err(dev->net, "%s: create workqueue failed\n", __func__);
+ kfree(priv);
+ return -ENOMEM;
+ }
+
+ priv->dev = dev;
+ INIT_WORK(&priv->check_link, ax88772b_link_reset);
+
+ /* reload eeprom data */
+ ret = asix_write_gpio(dev, 0, AXGPIOS_RSE);
+ if (ret)
+ goto err_out;
+
+ /* Get the EEPROM data*/
+ ret = asix_read_eeprom_le16(dev, 0x18, &priv->psc);
+ if (ret < 0)
+ goto err_out;
+ priv->psc &= 0xFF00;
+
+ /* Get the MAC address from the eeprom */
+ ret = asix_read_mac_from_eeprom(dev);
+ if (ret < 0)
+ goto err_out;
+
+ /* Set the MAC address */
+ ret = ax8817x_write_cmd(dev, AX88772_CMD_WRITE_NODE_ID,
+ 0, 0, ETH_ALEN, dev->net->dev_addr);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: set mac addr failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
}
- memcpy(dev->net->dev_addr, buf, ETH_ALEN);
/* Initialize MII structure */
dev->mii.dev = dev->net;
- dev->mii.mdio_read = asix_mdio_read;
- dev->mii.mdio_write = asix_mdio_write;
- dev->mii.phy_id_mask = 0x1f;
+ dev->mii.mdio_read = ax8817x_mdio_read_le;
+ dev->mii.mdio_write = ax88772b_mdio_write_le;
+ dev->mii.phy_id_mask = 0xff;
+ dev->mii.reg_num_mask = 0xff;
+
+ /* Get the PHY id */
+ ret = asix_read_phyid(dev, AX_CMD_READ_PHY_ID);
+ if (ret < 0)
+ goto err_out;
+ if (dev->mii.phy_id != 0x10) {
+ netdev_err(dev->net, "%s: Got wrong PHY_ID: 0x%02x\n",
+ __func__, dev->mii.phy_id);
+ ret = -EIO;
+ goto err_out;
+ }
+
+ /* select the embedded 10/100 Ethernet PHY */
+ ret = asix_phy_select(dev,
+ AX_PHYSEL_SSEN | AX_PHYSEL_PSEL | AX_PHYSEL_SSMII);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax88772a_phy_powerup(dev);
+ if (ret < 0)
+ goto err_out;
+
+ /* stop MAC operation */
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
+ AX_RX_CTL_STOP, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: reset RX_CTL failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ /* make sure the driver can enable sw mii operation */
+ ret = ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: enable software MII failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ dev->net->netdev_ops = &ax88772b_netdev_ops;
+ dev->net->ethtool_ops = &ax88772b_ethtool_ops;
+
+ /* Register suspend and resume functions */
+ data->suspend = ax88772b_suspend;
+ data->resume = ax88772b_resume;
+
+ tmp16 = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, 0x12);
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, 0x12,
+ ((tmp16 & 0xFF9F) | 0x0040));
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
+ ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
+ mii_nway_restart(&dev->mii);
+
+ ret = asix_write_medium_mode(dev, AX88772_MEDIUM_DEFAULT);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_IPG0,
+ AX88772A_IPG0_DEFAULT | AX88772A_IPG1_DEFAULT << 8,
+ AX88772A_IPG2_DEFAULT, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: write interfram gap failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ dev->net->features |= NETIF_F_IP_CSUM;
+ dev->net->features |= NETIF_F_IPV6_CSUM;
+
+ priv->checksum = AX_RX_CHECKSUM | AX_TX_CHECKSUM;
+ ret = ax88772b_set_csums(dev);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: write RX_COE/TX_COE failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ rx_size = bsize & 0x07;
+ if (dev->udev->speed == USB_SPEED_HIGH) {
+ ret = ax8817x_write_cmd(dev, 0x2A,
+ AX88772B_BULKIN_SIZE[rx_size].byte_cnt,
+ AX88772B_BULKIN_SIZE[rx_size].threshold,
+ 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: set rx_size failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+ dev->rx_urb_size = AX88772B_BULKIN_SIZE[rx_size].size;
+ } else {
+ ret = ax8817x_write_cmd(dev, 0x2A, 0x8000, 0x8001, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: set rx_size failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+ dev->rx_urb_size = 2048;
+ }
+
+ /* Configure RX header type */
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
+ (AX_RX_CTL_START | AX_RX_CTL_AB | AX_RX_HEADER_DEFAULT),
+ 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: reset RX_CTL failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ /* Overwrite power saving configuration from eeprom */
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPRL | (priv->psc & 0x7FFF), 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: set phy power saving failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ printk(KERN_INFO "%s\n", driver_version);
+ return ret;
+
+err_out:
+ destroy_workqueue(priv->ax_work);
+ kfree(priv);
+ return ret;
+}
+
+static void ax88772b_unbind(struct usbnet *dev, struct usb_interface *intf)
+{
+ struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
+
+ if (priv) {
+
+ flush_workqueue(priv->ax_work);
+ destroy_workqueue(priv->ax_work);
+
+ /* stop MAC operation */
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
+ AX_RX_CTL_STOP, 0, 0, NULL);
+
+ /* Power down PHY */
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD, 0, 0, NULL);
+ kfree(priv);
+ }
+}
+
+static int
+ax88178_media_check(struct usbnet *dev, struct ax88178_data *priv)
+{
+ int fullduplex;
+ u16 tempshort = 0;
+ u16 media;
+ u16 advertise, lpa, result, stat1000;
+
+ advertise = ax8817x_mdio_read_le(dev->net,
+ dev->mii.phy_id, MII_ADVERTISE);
+ lpa = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, MII_LPA);
+ result = advertise & lpa;
+
+ stat1000 = ax8817x_mdio_read_le(dev->net,
+ dev->mii.phy_id, MII_STAT1000);
+
+ if ((priv->PhyMode == PHY_MODE_MARVELL) &&
+ (priv->LedMode == 1)) {
+ tempshort = ax8817x_mdio_read_le(dev->net,
+ dev->mii.phy_id, MARVELL_MANUAL_LED) & 0xfc0f;
+ }
+
+ fullduplex = 1;
+ if (stat1000 & LPA_1000FULL) {
+ media = MEDIUM_GIGA_MODE | MEDIUM_FULL_DUPLEX_MODE |
+ MEDIUM_ENABLE_125MHZ | MEDIUM_ENABLE_RECEIVE;
+ if ((priv->PhyMode == PHY_MODE_MARVELL) &&
+ (priv->LedMode == 1))
+ tempshort |= 0x3e0;
+ } else if (result & LPA_100FULL) {
+ media = MEDIUM_FULL_DUPLEX_MODE | MEDIUM_ENABLE_RECEIVE |
+ MEDIUM_MII_100M_MODE;
+ if ((priv->PhyMode == PHY_MODE_MARVELL) &&
+ (priv->LedMode == 1))
+ tempshort |= 0x3b0;
+ } else if (result & LPA_100HALF) {
+ fullduplex = 0;
+ media = MEDIUM_ENABLE_RECEIVE | MEDIUM_MII_100M_MODE;
+ if ((priv->PhyMode == PHY_MODE_MARVELL) &&
+ (priv->LedMode == 1))
+ tempshort |= 0x3b0;
+ } else if (result & LPA_10FULL) {
+ media = MEDIUM_FULL_DUPLEX_MODE | MEDIUM_ENABLE_RECEIVE;
+ if ((priv->PhyMode == PHY_MODE_MARVELL) &&
+ (priv->LedMode == 1))
+ tempshort |= 0x2f0;
+ } else {
+ media = MEDIUM_ENABLE_RECEIVE;
+ fullduplex = 0;
+ if ((priv->PhyMode == PHY_MODE_MARVELL) &&
+ (priv->LedMode == 1))
+ tempshort |= 0x02f0;
+ }
+
+ if ((priv->PhyMode == PHY_MODE_MARVELL) &&
+ (priv->LedMode == 1)) {
+ ax8817x_mdio_write_le(dev->net,
+ dev->mii.phy_id, MARVELL_MANUAL_LED, tempshort);
+ }
+
+ media |= 0x0004;
+ if (priv->UseRgmii)
+ media |= 0x0008;
+ if (fullduplex) {
+ media |= 0x0020; /* enable tx flow control as default */
+ media |= 0x0010; /* enable rx flow control as default */
+ }
+
+ return media;
+}
+
+static void Vitess_8601_Init(struct usbnet *dev, int State)
+{
+ u16 reg;
+
+ switch (State) {
+ case 0: /* tx, rx clock skew */
+ ax8817x_swmii_mdio_write_le(dev->net, dev->mii.phy_id, 31, 1);
+ ax8817x_swmii_mdio_write_le(dev->net, dev->mii.phy_id, 28, 0);
+ ax8817x_swmii_mdio_write_le(dev->net, dev->mii.phy_id, 31, 0);
+ break;
+
+ case 1:
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 31, 0x52B5);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18, 0x009E);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, 0xDD39);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x87AA);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0xA7B4);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18,
+ ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 18));
+
+ reg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 17) & ~0x003f) | 0x003c;
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, reg);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x87B4);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0xa794);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18,
+ ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 18));
+
+ reg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 17) & ~0x003f) | 0x003e;
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, reg);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x8794);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18, 0x00f7);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, 0xbe36);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x879e);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0xa7a0);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18,
+ ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 18));
+
+ reg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 17) & ~0x003f) | 0x0034;
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, reg);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x87a0);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18, 0x003c);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, 0xf3cf);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x87a2);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18, 0x003c);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, 0xf3cf);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x87a4);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18, 0x003c);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, 0xd287);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x87a6);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0xa7a8);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18,
+ ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 18));
+
+ reg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 17) & ~0x0fff) | 0x0125;
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, reg);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x87a8);
+
+ /* Enable Smart Pre-emphasis */
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0xa7fa);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18,
+ ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 18));
+
+ reg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 17) & ~0x0008) | 0x0008;
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, reg);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x87fa);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 31, 0);
+
+ break;
+ }
+}
+
+static int
+ax88178_phy_init(struct usbnet *dev, struct ax88178_data *priv)
+{
+ int i;
+ u16 PhyAnar, PhyAuxCtrl, PhyCtrl, TempShort, PhyID1;
+ u16 PhyReg = 0;
+
+ /* Disable MII operation of AX88178 Hardware */
+ ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0x0000, 0, 0, NULL);
+
+
+ /* Read SROM - MiiPhy Address (ID) */
+ ax8817x_read_cmd(dev, AX_CMD_READ_PHY_ID, 0, 0, 2, &dev->mii.phy_id);
+ le16_to_cpus(&dev->mii.phy_id);
+
+ /* Initialize MII structure */
+ dev->mii.phy_id >>= 8;
+ dev->mii.phy_id &= PHY_ID_MASK;
+ dev->mii.dev = dev->net;
+ dev->mii.mdio_read = ax8817x_mdio_read_le;
+ dev->mii.mdio_write = ax8817x_mdio_write_le;
+ dev->mii.phy_id_mask = 0x3f;
dev->mii.reg_num_mask = 0x1f;
- dev->mii.phy_id = asix_get_phy_addr(dev);
+ dev->mii.supports_gmii = 1;
- phyid = asix_get_phyid(dev);
- dbg("PHYID=0x%08x", phyid);
+ if (priv->PhyMode == PHY_MODE_MAC_TO_MAC_GMII) {
+ priv->UseRgmii = 0;
+ priv->MediaLink = MEDIUM_GIGA_MODE |
+ MEDIUM_FULL_DUPLEX_MODE |
+ MEDIUM_ENABLE_125MHZ |
+ MEDIUM_ENABLE_RECEIVE |
+ MEDIUM_ENABLE_RX_FLOWCTRL |
+ MEDIUM_ENABLE_TX_FLOWCTRL;
+
+ goto SkipPhySetting;
+ }
+
+ /* test read phy register 2 */
+ if (!priv->UseGpio0) {
+ i = 1000;
+ while (i--) {
+ PhyID1 = ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, MII_PHYSID1);
+ if ((PhyID1 == 0x000f) || (PhyID1 == 0x0141) ||
+ (PhyID1 == 0x0282) || (PhyID1 == 0x004d) ||
+ (PhyID1 == 0x0243) || (PhyID1 == 0x001C) ||
+ (PhyID1 == 0x0007))
+ break;
+ usleep_range(5, 20);
+ }
+ if (i < 0)
+ return -EIO;
+ }
- if ((ret = asix_sw_reset(dev, AX_SWRESET_PRL)) < 0)
- goto out;
+ priv->UseRgmii = 0;
+ if (priv->PhyMode == PHY_MODE_MARVELL) {
+ PhyReg = ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 27);
+ if (!(PhyReg & 4)) {
+ priv->UseRgmii = 1;
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 20, 0x82);
+ priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
+ }
+ } else if ((priv->PhyMode == PHY_MODE_AGERE_V0) ||
+ (priv->PhyMode == PHY_MODE_AGERE_V0_GMII)) {
+ if (priv->PhyMode == PHY_MODE_AGERE_V0) {
+ priv->UseRgmii = 1;
+ priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
+ }
+ } else if (priv->PhyMode == PHY_MODE_CICADA_V1) {
+ /* not Cameo */
+ if (!priv->UseGpio0 || priv->LedMode) {
+ priv->UseRgmii = 1;
+ priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
+ }
- msleep(150);
+ for (i = 0; i < (sizeof(CICADA_FAMILY_HWINIT) /
+ sizeof(CICADA_FAMILY_HWINIT[0])); i++) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id,
+ CICADA_FAMILY_HWINIT[i].offset,
+ CICADA_FAMILY_HWINIT[i].value);
+ }
+
+ } else if (priv->PhyMode == PHY_MODE_CICADA_V2) {
+ /* not Cameo */
+ if (!priv->UseGpio0 || priv->LedMode) {
+ priv->UseRgmii = 1;
+ priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
+ }
+
+ for (i = 0; i < (sizeof(CICADA_V2_HWINIT) /
+ sizeof(CICADA_V2_HWINIT[0])); i++) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, CICADA_V2_HWINIT[i].offset,
+ CICADA_V2_HWINIT[i].value);
+ }
+ } else if (priv->PhyMode == PHY_MODE_CICADA_V2_ASIX) {
+ /* not Cameo */
+ if (!priv->UseGpio0 || priv->LedMode) {
+ priv->UseRgmii = 1;
+ priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
+ }
+
+ for (i = 0; i < (sizeof(CICADA_V2_HWINIT) /
+ sizeof(CICADA_V2_HWINIT[0])); i++) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, CICADA_V2_HWINIT[i].offset,
+ CICADA_V2_HWINIT[i].value);
+ }
+ } else if (priv->PhyMode == PHY_MODE_RTL8211CL) {
+ priv->UseRgmii = 1;
+ priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
+ } else if (priv->PhyMode == PHY_MODE_RTL8211BN) {
+ priv->UseRgmii = 1;
+ priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
+ } else if (priv->PhyMode == PHY_MODE_RTL8251CL) {
+ priv->UseRgmii = 1;
+ priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
+ } else if (priv->PhyMode == PHY_MODE_VSC8601) {
+ priv->UseRgmii = 1;
+ priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
+ /* Vitess_8601_Init(dev, 0); */
+ }
+
+ if (priv->PhyMode != PHY_MODE_ATTANSIC_V0) {
+ /* software reset */
+ ax8817x_swmii_mdio_write_le(
+ dev->net, dev->mii.phy_id, MII_BMCR,
+ ax8817x_swmii_mdio_read_le(
+ dev->net, dev->mii.phy_id, MII_BMCR)
+ | BMCR_RESET);
+ usleep_range(1000, 2000);
+ }
+
+ if ((priv->PhyMode == PHY_MODE_AGERE_V0) ||
+ (priv->PhyMode == PHY_MODE_AGERE_V0_GMII)) {
+ if (priv->PhyMode == PHY_MODE_AGERE_V0) {
+ i = 1000;
+ while (i--) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 21, 0x1001);
+
+ PhyReg = ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 21);
+ if ((PhyReg & 0xf00f) == 0x1001)
+ break;
+ }
+ if (i < 0)
+ return -EIO;
+ }
+
+ if (priv->LedMode == 4) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 28, 0x7417);
+ } else if (priv->LedMode == 9) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 28, 0x7a10);
+ } else if (priv->LedMode == 10) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 28, 0x7a13);
+ }
+
+ for (i = 0; i < (sizeof(AGERE_FAMILY_HWINIT) /
+ sizeof(AGERE_FAMILY_HWINIT[0])); i++) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, AGERE_FAMILY_HWINIT[i].offset,
+ AGERE_FAMILY_HWINIT[i].value);
+ }
+ } else if (priv->PhyMode == PHY_MODE_RTL8211CL) {
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 0x1f, 0x0005);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 0x0c, 0);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 0x01,
+ (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 0x01) | 0x0080));
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 0x1f, 0);
+
+ if (priv->LedMode == 12) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 0x1f, 0x0002);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 0x1a, 0x00cb);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 0x1f, 0);
+ }
+ } else if (priv->PhyMode == PHY_MODE_VSC8601) {
+ Vitess_8601_Init(dev, 1);
+ }
+
+ /* read phy register 0 */
+ PhyCtrl = ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, MII_BMCR);
+ TempShort = PhyCtrl;
+ PhyCtrl &= ~(BMCR_PDOWN | BMCR_ISOLATE);
+ if (PhyCtrl != TempShort) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, MII_BMCR, PhyCtrl);
+ }
+
+ /* led */
+ if (priv->PhyMode == PHY_MODE_MARVELL) {
+ if (priv->LedMode == 1) {
+
+ PhyReg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 24) & 0xf8ff) | (1 + 0x100);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 24, PhyReg);
+ PhyReg = ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 25) & 0xfc0f;
+
+ } else if (priv->LedMode == 2) {
+
+ PhyReg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 24) & 0xf886) |
+ (1 + 0x10 + 0x300);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 24, PhyReg);
+
+ } else if (priv->LedMode == 5) {
+
+ PhyReg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 24) & 0xf8be) |
+ (1 + 0x40 + 0x300);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 24, PhyReg);
+
+ } else if (priv->LedMode == 7) {
+
+ PhyReg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 24) & 0xf8ff) |
+ (1 + 0x100);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 24, PhyReg);
+
+ } else if (priv->LedMode == 8) {
+
+ PhyReg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 24) & 0xf8be) |
+ (1 + 0x40 + 0x100);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 24, PhyReg);
+
+ } else if (priv->LedMode == 11) {
+
+ PhyReg = ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 24) & 0x4106;
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 24, PhyReg);
+
+ }
+ } else if ((priv->PhyMode == PHY_MODE_CICADA_V1) ||
+ (priv->PhyMode == PHY_MODE_CICADA_V2) ||
+ (priv->PhyMode == PHY_MODE_CICADA_V2_ASIX)) {
+
+ if (priv->LedMode == 3) {
+
+ PhyReg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 27) & 0xFCFF) | 0x0100;
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 27, PhyReg);
+ }
+
+ }
+
+ if (priv->PhyMode == PHY_MODE_MARVELL) {
+ if (priv->LedMode == 1)
+ PhyReg |= 0x3f0;
+ }
+ PhyAnar = ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP |
+ ADVERTISE_100FULL | ADVERTISE_100HALF |
+ ADVERTISE_10FULL | ADVERTISE_10HALF |
+ ADVERTISE_PAUSE_ASYM;
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, MII_ADVERTISE, PhyAnar);
+ PhyAuxCtrl = ADVERTISE_1000FULL;
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, MII_CTRL1000, PhyAuxCtrl);
+
+ if (priv->PhyMode == PHY_MODE_VSC8601) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 31, 0x52B5);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0xA7F8);
+ TempShort = ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 17) & (~0x0018);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, TempShort);
+ TempShort = ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 18);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18, TempShort);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x87F8);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 31, 0);
+ }
+
+ if (priv->PhyMode == PHY_MODE_ATTANSIC_V0) {
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, MII_BMCR, 0x9000);
+
+ } else {
+ PhyCtrl &= ~BMCR_LOOPBACK;
+ PhyCtrl |= (BMCR_ANENABLE | BMCR_ANRESTART);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, MII_BMCR, PhyCtrl);
+ }
+
+ if (priv->PhyMode == PHY_MODE_MARVELL) {
+ if (priv->LedMode == 1)
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 25, PhyReg);
+ }
+
+SkipPhySetting:
+
+ asix_write_medium_mode(dev, priv->MediaLink);
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_IPG0,
+ AX88772_IPG0_DEFAULT | (AX88772_IPG1_DEFAULT << 8),
+ AX88772_IPG2_DEFAULT, 0, NULL);
+ usleep_range(1000, 2000);
+ ax8817x_write_cmd(dev, AX_CMD_SET_HW_MII, 0, 0, 0, NULL);
+ return 0;
+}
+
+static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
+{
+ int ret;
+ struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
+ struct ax88178_data *priv;
+
+ usbnet_get_endpoints(dev, intf);
+
+ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+ if (!priv) {
+ netdev_err(dev->net, "%s: kzalloc(priv) failed\n", __func__);
+ return -ENOMEM;
+ }
+ dev->driver_priv = priv;
+
+ /* Get the EEPROM data*/
+ ret = asix_read_eeprom_le16(dev, 0x17, &priv->EepromData);
+ if (ret < 0)
+ goto err_out;
+
+ if (priv->EepromData == 0xffff) {
+ priv->PhyMode = PHY_MODE_MARVELL;
+ priv->LedMode = 0;
+ priv->UseGpio0 = 1;
+ } else {
+ priv->PhyMode = (u8)(priv->EepromData & EEPROMMASK);
+ priv->LedMode = (u8)(priv->EepromData >> 8);
+ if (priv->LedMode == 6) /* for buffalo new (use gpio2) */
+ priv->LedMode = 1;
+ else if (priv->LedMode == 1)
+ priv->BuffaloOld = 1;
+
+
+ if (priv->EepromData & 0x80)
+ priv->UseGpio0 = 0; /* MARVEL se and other */
+ else
+ priv->UseGpio0 = 1; /* cameo */
+ }
+
+ if (priv->UseGpio0) {
+
+ if (priv->PhyMode == PHY_MODE_MARVELL) {
+
+ ret = asix_write_gpio(dev, 25,
+ AXGPIOS_GPO0EN | AXGPIOS_RSE);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 15,
+ AXGPIOS_GPO2 | AXGPIOS_GPO2EN |
+ AXGPIOS_GPO0EN);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 245,
+ AXGPIOS_GPO2EN | AXGPIOS_GPO0EN);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 0,
+ AXGPIOS_GPO2 | AXGPIOS_GPO2EN |
+ AXGPIOS_GPO0EN);
+ if (ret)
+ goto err_out;
+
+ } else { /* vitesse */
+
+ ret = asix_write_gpio(dev, 25,
+ AXGPIOS_RSE | AXGPIOS_GPO0EN |
+ AXGPIOS_GPO0);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 25,
+ AXGPIOS_GPO0EN | AXGPIOS_GPO0 |
+ AXGPIOS_GPO2EN | AXGPIOS_GPO2);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 245,
+ AXGPIOS_GPO0EN | AXGPIOS_GPO0 |
+ AXGPIOS_GPO2EN);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 0,
+ AXGPIOS_GPO0EN | AXGPIOS_GPO0 |
+ AXGPIOS_GPO2EN | AXGPIOS_GPO2);
+ if (ret)
+ goto err_out;
+ }
+
+ } else { /* use gpio1 */
+
+ if (priv->BuffaloOld) {
+ ret = asix_write_gpio(dev, 350,
+ AXGPIOS_GPO1 | AXGPIOS_GPO1EN |
+ AXGPIOS_RSE);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 350,
+ AXGPIOS_GPO1EN);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 0,
+ AXGPIOS_GPO1EN | AXGPIOS_GPO1);
+ if (ret)
+ goto err_out;
+ } else {
+ ret = asix_write_gpio(dev, 25,
+ AXGPIOS_GPO1 | AXGPIOS_GPO1EN |
+ AXGPIOS_RSE);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 25,
+ AXGPIOS_GPO1EN | AXGPIOS_GPO1 |
+ AXGPIOS_GPO2EN | AXGPIOS_GPO2);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 245,
+ AXGPIOS_GPO1EN | AXGPIOS_GPO1 |
+ AXGPIOS_GPO2EN);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 0,
+ AXGPIOS_GPO1EN | AXGPIOS_GPO1 |
+ AXGPIOS_GPO2EN | AXGPIOS_GPO2);
+ if (ret)
+ goto err_out;
+ }
+ }
+
+ ret = asix_phy_select(dev, 0);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD | AX_SWRESET_PRL, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: SW_RESET failed\n", __func__);
+ goto err_out;
+ }
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL, 0, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: RX_CTL failed\n", __func__);
+ goto err_out;
+ }
+
+ /* Get the MAC address */
+ ret = asix_read_mac(dev, AX88772_CMD_READ_NODE_ID);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax88178_phy_init(dev, priv);
+ if (ret < 0)
+ goto err_out;
+
+ dev->net->netdev_ops = &ax88x72_netdev_ops;
+ dev->net->ethtool_ops = &ax8817x_ethtool_ops;
+
+ /* Register suspend and resume functions */
+ data->suspend = ax88772_suspend;
+ data->resume = ax88772_resume;
+
+ if (dev->driver_info->flags & FLAG_FRAMING_AX)
+ dev->rx_urb_size = 16384;
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
+ (AX_RX_CTL_MFB | AX_RX_CTL_START | AX_RX_CTL_AB),
+ 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: RX_CTL failed\n", __func__);
+ goto err_out;
+ }
+
+ printk(KERN_INFO "%s\n", driver_version);
+ return ret;
+
+err_out:
+ kfree(priv);
+ return ret;
+}
+
+static void ax88178_unbind(struct usbnet *dev, struct usb_interface *intf)
+{
+ struct ax88178_data *priv = (struct ax88178_data *)dev->driver_priv;
+
+ if (priv) {
+
+ /* stop MAC operation */
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
+ AX_RX_CTL_STOP, 0, 0, NULL);
+ kfree(priv);
+ }
+}
+
+static int ax88772_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
+{
+ u8 *head;
+ u32 header;
+ char *packet;
+ struct sk_buff *ax_skb;
+ u16 size;
+
+ head = (u8 *) skb->data;
+ memcpy(&header, head, sizeof(header));
+ le32_to_cpus(&header);
+ packet = head + sizeof(header);
- if ((ret = asix_sw_reset(dev, AX_SWRESET_IPRL | AX_SWRESET_PRL)) < 0)
- goto out;
+ skb_pull(skb, 4);
- msleep(150);
+ while (skb->len > 0) {
+ if ((short)(header & 0x0000ffff) !=
+ ~((short)((header & 0xffff0000) >> 16))) {
+ netdev_err(dev->net,
+ "%s: header length data is error 0x%08x, %d\n",
+ __func__, header, skb->len);
+ }
+ /* get the packet length */
+ size = (u16) (header & 0x0000ffff);
- dev->net->netdev_ops = &ax88772_netdev_ops;
- dev->net->ethtool_ops = &ax88772_ethtool_ops;
+ if ((skb->len) - ((size + 1) & 0xfffe) == 0) {
- asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
- asix_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
- ADVERTISE_ALL | ADVERTISE_CSMA);
- mii_nway_restart(&dev->mii);
+ /* Make sure ip header is aligned on 32-bit boundary */
+ if (!((unsigned long)skb->data & 0x02)) {
+ memmove(skb->data - 2, skb->data, size);
+ skb->data -= 2;
+ skb_set_tail_pointer(skb, size);
+ }
+ skb->truesize = size + sizeof(struct sk_buff);
+ return 2;
+ }
- if ((ret = asix_write_medium_mode(dev, AX88772_MEDIUM_DEFAULT)) < 0)
- goto out;
+ if (size > ETH_FRAME_LEN) {
+ netdev_err(dev->net, "%s: invalid rx length %d\n",
+ __func__, size);
+ return 0;
+ }
+ ax_skb = skb_clone(skb, GFP_ATOMIC);
+ if (ax_skb) {
- if ((ret = asix_write_cmd(dev, AX_CMD_WRITE_IPG0,
- AX88772_IPG0_DEFAULT | AX88772_IPG1_DEFAULT,
- AX88772_IPG2_DEFAULT, 0, NULL)) < 0) {
- dbg("Write IPG,IPG1,IPG2 failed: %d", ret);
- goto out;
- }
+ /* Make sure ip header is aligned on 32-bit boundary */
+ if (!((unsigned long)packet & 0x02)) {
+ memmove(packet - 2, packet, size);
+ packet -= 2;
+ }
+ ax_skb->data = packet;
+ skb_set_tail_pointer(ax_skb, size);
+ ax_skb->truesize = size + sizeof(struct sk_buff);
+ usbnet_skb_return(dev, ax_skb);
- /* Set RX_CTL to default values with 2k buffer, and enable cactus */
- if ((ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL)) < 0)
- goto out;
+ } else {
+ return 0;
+ }
- rx_ctl = asix_read_rx_ctl(dev);
- dbg("RX_CTL is 0x%04x after all initializations", rx_ctl);
+ skb_pull(skb, (size + 1) & 0xfffe);
- rx_ctl = asix_read_medium_status(dev);
- dbg("Medium Status is 0x%04x after all initializations", rx_ctl);
+ if (skb->len == 0)
+ break;
- /* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
- if (dev->driver_info->flags & FLAG_FRAMING_AX) {
- /* hard_mtu is still the default - the device does not support
- jumbo eth frames */
- dev->rx_urb_size = 2048;
+ head = (u8 *) skb->data;
+ memcpy(&header, head, sizeof(header));
+ le32_to_cpus(&header);
+ packet = head + sizeof(header);
+ skb_pull(skb, 4);
}
- return 0;
-out:
- return ret;
+ if (skb->len < 0) {
+ netdev_err(dev->net, "%s: invalid rx length %d\n",
+ __func__, skb->len);
+ return 0;
+ }
+ return 1;
}
-static struct ethtool_ops ax88178_ethtool_ops = {
- .get_drvinfo = asix_get_drvinfo,
- .get_link = asix_get_link,
- .get_msglevel = usbnet_get_msglevel,
- .set_msglevel = usbnet_set_msglevel,
- .get_wol = asix_get_wol,
- .set_wol = asix_set_wol,
- .get_eeprom_len = asix_get_eeprom_len,
- .get_eeprom = asix_get_eeprom,
- .get_settings = usbnet_get_settings,
- .set_settings = usbnet_set_settings,
- .nway_reset = usbnet_nway_reset,
-};
-
-static int marvell_phy_init(struct usbnet *dev)
+static struct sk_buff *ax88772_tx_fixup(struct usbnet *dev,
+ struct sk_buff *skb, gfp_t flags)
{
- struct asix_data *data = (struct asix_data *)&dev->data;
- u16 reg;
-
- netdev_dbg(dev->net, "marvell_phy_init()\n");
+ int padlen = ((skb->len + 4) % 512) ? 0 : 4;
+ u32 packet_len;
+ u32 padbytes = 0xffff0000;
+ int headroom = skb_headroom(skb);
+ int tailroom = skb_tailroom(skb);
- reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_MARVELL_STATUS);
- netdev_dbg(dev->net, "MII_MARVELL_STATUS = 0x%04x\n", reg);
+ if ((!skb_cloned(skb))
+ && ((headroom + tailroom) >= (4 + padlen))) {
+ if ((headroom < 4) || (tailroom < padlen)) {
+ skb->data = memmove(skb->head + 4, skb->data, skb->len);
+ skb_set_tail_pointer(skb, skb->len);
+ }
+ } else {
+ struct sk_buff *skb2;
+ skb2 = skb_copy_expand(skb, 4, padlen, flags);
+ dev_kfree_skb_any(skb);
+ skb = skb2;
+ if (!skb)
+ return NULL;
+ }
- asix_mdio_write(dev->net, dev->mii.phy_id, MII_MARVELL_CTRL,
- MARVELL_CTRL_RXDELAY | MARVELL_CTRL_TXDELAY);
+ skb_push(skb, 4);
+ packet_len = (((skb->len - 4) ^ 0x0000ffff) << 16) + (skb->len - 4);
+ cpu_to_le32s(&packet_len);
+ skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len));
- if (data->ledmode) {
- reg = asix_mdio_read(dev->net, dev->mii.phy_id,
- MII_MARVELL_LED_CTRL);
- netdev_dbg(dev->net, "MII_MARVELL_LED_CTRL (1) = 0x%04x\n", reg);
-
- reg &= 0xf8ff;
- reg |= (1 + 0x0100);
- asix_mdio_write(dev->net, dev->mii.phy_id,
- MII_MARVELL_LED_CTRL, reg);
-
- reg = asix_mdio_read(dev->net, dev->mii.phy_id,
- MII_MARVELL_LED_CTRL);
- netdev_dbg(dev->net, "MII_MARVELL_LED_CTRL (2) = 0x%04x\n", reg);
- reg &= 0xfc0f;
+ if ((skb->len % 512) == 0) {
+ cpu_to_le32s(&padbytes);
+ memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes));
+ skb_put(skb, sizeof(padbytes));
}
-
- return 0;
+ return skb;
}
-static int marvell_led_status(struct usbnet *dev, u16 speed)
+static void
+ax88772b_rx_checksum(struct sk_buff *skb, struct ax88772b_rx_header *rx_hdr)
{
- u16 reg = asix_mdio_read(dev->net, dev->mii.phy_id, MARVELL_LED_MANUAL);
-
- netdev_dbg(dev->net, "marvell_led_status() read 0x%04x\n", reg);
+ skb->ip_summed = CHECKSUM_NONE;
- /* Clear out the center LED bits - 0x03F0 */
- reg &= 0xfc0f;
+ /* checksum error bit is set */
+ if (rx_hdr->l3_csum_err || rx_hdr->l4_csum_err)
+ return;
- switch (speed) {
- case SPEED_1000:
- reg |= 0x03e0;
- break;
- case SPEED_100:
- reg |= 0x03b0;
- break;
- default:
- reg |= 0x02f0;
+ /* It must be a TCP or UDP packet with a valid checksum */
+ if ((rx_hdr->l4_type == AX_RXHDR_L4_TYPE_TCP) ||
+ (rx_hdr->l4_type == AX_RXHDR_L4_TYPE_UDP)) {
+ skb->ip_summed = CHECKSUM_UNNECESSARY;
}
-
- netdev_dbg(dev->net, "marvell_led_status() writing 0x%04x\n", reg);
- asix_mdio_write(dev->net, dev->mii.phy_id, MARVELL_LED_MANUAL, reg);
-
- return 0;
}
-static int ax88178_link_reset(struct usbnet *dev)
+static int ax88772b_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
{
- u16 mode;
- struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
- struct asix_data *data = (struct asix_data *)&dev->data;
- u32 speed;
-
- netdev_dbg(dev->net, "ax88178_link_reset()\n");
-
- mii_check_media(&dev->mii, 1, 1);
- mii_ethtool_gset(&dev->mii, &ecmd);
- mode = AX88178_MEDIUM_DEFAULT;
- speed = ethtool_cmd_speed(&ecmd);
-
- if (speed == SPEED_1000)
- mode |= AX_MEDIUM_GM;
- else if (speed == SPEED_100)
- mode |= AX_MEDIUM_PS;
- else
- mode &= ~(AX_MEDIUM_PS | AX_MEDIUM_GM);
+ struct ax88772b_rx_header rx_hdr;
+ struct sk_buff *ax_skb;
+ struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
- mode |= AX_MEDIUM_ENCK;
+ while (skb->len > 0) {
- if (ecmd.duplex == DUPLEX_FULL)
- mode |= AX_MEDIUM_FD;
- else
- mode &= ~AX_MEDIUM_FD;
+ memcpy(&rx_hdr, skb->data, sizeof(struct ax88772b_rx_header));
- netdev_dbg(dev->net, "ax88178_link_reset() speed: %u duplex: %d setting mode
to 0x%04x\n",
- speed, ecmd.duplex, mode);
+ if ((short)rx_hdr.len != (~((short)rx_hdr.len_bar) & 0x7FF))
+ return 0;
+ if (rx_hdr.len > (ETH_FRAME_LEN + 4)) {
+ netdev_err(dev->net, "%s: invalid rx length %d\n",
+ __func__, rx_hdr.len);
+ return 0;
+ }
- asix_write_medium_mode(dev, mode);
+ if (skb->len - ((rx_hdr.len +
+ sizeof(struct ax88772b_rx_header) + 3) &
+ 0xfffc) == 0) {
+ skb_pull(skb, sizeof(struct ax88772b_rx_header));
+ skb->len = rx_hdr.len;
- if (data->phymode == PHY_MODE_MARVELL && data->ledmode)
- marvell_led_status(dev, speed);
+ skb_set_tail_pointer(skb, rx_hdr.len);
+ skb->truesize = rx_hdr.len + sizeof(struct sk_buff);
- return 0;
-}
+ if (priv->checksum & AX_RX_CHECKSUM)
+ ax88772b_rx_checksum(skb, &rx_hdr);
-static void ax88178_set_mfb(struct usbnet *dev)
-{
- u16 mfb = AX_RX_CTL_MFB_16384;
- u16 rxctl;
- u16 medium;
- int old_rx_urb_size = dev->rx_urb_size;
+ return 2;
+ }
- if (dev->hard_mtu < 2048) {
- dev->rx_urb_size = 2048;
- mfb = AX_RX_CTL_MFB_2048;
- } else if (dev->hard_mtu < 4096) {
- dev->rx_urb_size = 4096;
- mfb = AX_RX_CTL_MFB_4096;
- } else if (dev->hard_mtu < 8192) {
- dev->rx_urb_size = 8192;
- mfb = AX_RX_CTL_MFB_8192;
- } else if (dev->hard_mtu < 16384) {
- dev->rx_urb_size = 16384;
- mfb = AX_RX_CTL_MFB_16384;
- }
+ ax_skb = skb_clone(skb, GFP_ATOMIC);
+ if (ax_skb) {
+ ax_skb->len = rx_hdr.len;
+ ax_skb->data = skb->data +
+ sizeof(struct ax88772b_rx_header);
+ skb_set_tail_pointer(ax_skb, rx_hdr.len);
+ ax_skb->truesize = rx_hdr.len + sizeof(struct sk_buff);
+ if (priv->checksum & AX_RX_CHECKSUM)
+ ax88772b_rx_checksum(ax_skb, &rx_hdr);
+ usbnet_skb_return(dev, ax_skb);
- rxctl = asix_read_rx_ctl(dev);
- asix_write_rx_ctl(dev, (rxctl & ~AX_RX_CTL_MFB_16384) | mfb);
+ } else {
+ return 0;
+ }
- medium = asix_read_medium_status(dev);
- if (dev->net->mtu > 1500)
- medium |= AX_MEDIUM_JFE;
- else
- medium &= ~AX_MEDIUM_JFE;
- asix_write_medium_mode(dev, medium);
+ skb_pull(skb, ((rx_hdr.len +
+ sizeof(struct ax88772b_rx_header) + 3)
+ & 0xfffc));
+ }
- if (dev->rx_urb_size > old_rx_urb_size)
- usbnet_unlink_rx_urbs(dev);
+ if (skb->len < 0) {
+ netdev_err(dev->net, "%s: invalid rx length %d\n",
+ __func__, skb->len);
+ return 0;
+ }
+ return 1;
}
-static int ax88178_change_mtu(struct net_device *net, int new_mtu)
+static struct sk_buff *
+ax88772b_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
{
- struct usbnet *dev = netdev_priv(net);
- int ll_mtu = new_mtu + net->hard_header_len + 4;
+ int padlen = ((skb->len + 4) % 512) ? 0 : 4;
+ u32 packet_len;
+ u32 padbytes = 0xffff0000;
+ int headroom = skb_headroom(skb);
+ int tailroom = skb_tailroom(skb);
- netdev_dbg(dev->net, "ax88178_change_mtu() new_mtu=%d\n", new_mtu);
+ if ((!skb_cloned(skb))
+ && ((headroom + tailroom) >= (4 + padlen))) {
+ if ((headroom < 4) || (tailroom < padlen)) {
+ skb->data = memmove(skb->head + 4, skb->data, skb->len);
+ skb_set_tail_pointer(skb, skb->len);
+ }
+ } else {
+ struct sk_buff *skb2;
+ skb2 = skb_copy_expand(skb, 4, padlen, flags);
+ dev_kfree_skb_any(skb);
+ skb = skb2;
+ if (!skb)
+ return NULL;
+ }
- if (new_mtu <= 0 || ll_mtu > 16384)
- return -EINVAL;
+ skb_push(skb, 4);
+ packet_len = (((skb->len - 4) ^ 0x0000ffff) << 16) + (skb->len - 4);
- if ((ll_mtu % dev->maxpacket) == 0)
- return -EDOM;
+ cpu_to_le32s(&packet_len);
+ skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len));
- net->mtu = new_mtu;
- dev->hard_mtu = net->mtu + net->hard_header_len;
- ax88178_set_mfb(dev);
+ if ((skb->len % 512) == 0) {
+ cpu_to_le32s(&padbytes);
+ memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes));
+ skb_put(skb, sizeof(padbytes));
+ }
- return 0;
+ return skb;
}
-static const struct net_device_ops ax88178_netdev_ops = {
- .ndo_open = usbnet_open,
- .ndo_stop = usbnet_stop,
- .ndo_start_xmit = usbnet_start_xmit,
- .ndo_tx_timeout = usbnet_tx_timeout,
- .ndo_set_mac_address = asix_set_mac_address,
- .ndo_validate_addr = eth_validate_addr,
- .ndo_set_multicast_list = asix_set_multicast,
- .ndo_do_ioctl = asix_ioctl,
- .ndo_change_mtu = ax88178_change_mtu,
+static const u8 ChkCntSel[6][3] = {
+ {12, 23, 31},
+ {12, 31, 23},
+ {23, 31, 12},
+ {23, 12, 31},
+ {31, 12, 23},
+ {31, 23, 12}
};
-static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
+static void ax88772_link_reset(struct work_struct *work)
{
- struct asix_data *data = (struct asix_data *)&dev->data;
- int ret;
- u8 buf[ETH_ALEN];
- __le16 eeprom;
- u8 status;
- int gpio0 = 0;
- u32 phyid;
-
- usbnet_get_endpoints(dev,intf);
-
- asix_read_cmd(dev, AX_CMD_READ_GPIOS, 0, 0, 1, &status);
- dbg("GPIO Status: 0x%04x", status);
-
- asix_write_cmd(dev, AX_CMD_WRITE_ENABLE, 0, 0, 0, NULL);
- asix_read_cmd(dev, AX_CMD_READ_EEPROM, 0x0017, 0, 2, &eeprom);
- asix_write_cmd(dev, AX_CMD_WRITE_DISABLE, 0, 0, 0, NULL);
-
- dbg("EEPROM index 0x17 is 0x%04x", eeprom);
-
- if (eeprom == cpu_to_le16(0xffff)) {
- data->phymode = PHY_MODE_MARVELL;
- data->ledmode = 0;
- gpio0 = 1;
- } else {
- data->phymode = le16_to_cpu(eeprom) & 7;
- data->ledmode = le16_to_cpu(eeprom) >> 8;
- gpio0 = (le16_to_cpu(eeprom) & 0x80) ? 0 : 1;
- }
- dbg("GPIO0: %d, PhyMode: %d", gpio0, data->phymode);
-
- asix_write_gpio(dev, AX_GPIO_RSE | AX_GPIO_GPO_1 | AX_GPIO_GPO1EN, 40);
- if ((le16_to_cpu(eeprom) >> 8) != 1) {
- asix_write_gpio(dev, 0x003c, 30);
- asix_write_gpio(dev, 0x001c, 300);
- asix_write_gpio(dev, 0x003c, 30);
- } else {
- dbg("gpio phymode == 1 path");
- asix_write_gpio(dev, AX_GPIO_GPO1EN, 30);
- asix_write_gpio(dev, AX_GPIO_GPO1EN | AX_GPIO_GPO_1, 30);
+ struct ax88772_data *priv = container_of(work,
+ struct ax88772_data, check_link);
+ struct usbnet *dev = priv->dev;
+
+ if (priv->Event == AX_SET_RX_CFG) {
+ u16 bmcr;
+ u16 mode;
+
+ priv->Event = AX_NOP;
+
+ mode = AX88772_MEDIUM_DEFAULT;
+
+ bmcr = ax8817x_mdio_read_le(dev->net,
+ dev->mii.phy_id, MII_BMCR);
+ if (!(bmcr & BMCR_FULLDPLX))
+ mode &= ~AX88772_MEDIUM_FULL_DUPLEX;
+ if (!(bmcr & BMCR_SPEED100))
+ mode &= ~AX88772_MEDIUM_100MB;
+ asix_write_medium_mode(dev, mode);
+ return;
}
- asix_sw_reset(dev, 0);
- msleep(150);
-
- asix_sw_reset(dev, AX_SWRESET_PRL | AX_SWRESET_IPPD);
- msleep(150);
-
- asix_write_rx_ctl(dev, 0);
+ switch (priv->Event) {
+ case WAIT_AUTONEG_COMPLETE:
+ if (jiffies > (priv->autoneg_start + 5 * HZ)) {
+ priv->Event = PHY_POWER_DOWN;
+ priv->TickToExpire = 23;
+ }
+ break;
+ case PHY_POWER_DOWN:
+ if (priv->TickToExpire == 23) {
+ /* Set Phy Power Down */
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD,
+ 0, 0, NULL);
+ --priv->TickToExpire;
+ } else if (--priv->TickToExpire == 0) {
+ /* Set Phy Power Up */
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPRL, 0, 0, NULL);
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD | AX_SWRESET_IPRL, 0, 0, NULL);
+ usleep_range(10000, 20000);
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPRL, 0, 0, NULL);
+ msleep(60);
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_CLEAR, 0, 0, NULL);
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPRL, 0, 0, NULL);
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id,
+ MII_ADVERTISE,
+ ADVERTISE_ALL | ADVERTISE_CSMA |
+ ADVERTISE_PAUSE_CAP);
+ mii_nway_restart(&dev->mii);
- /* Get the MAC address */
- if ((ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID,
- 0, 0, ETH_ALEN, buf)) < 0) {
- dbg("Failed to read MAC address: %d", ret);
- goto out;
+ priv->Event = PHY_POWER_UP;
+ priv->TickToExpire = 47;
+ }
+ break;
+ case PHY_POWER_UP:
+ if (--priv->TickToExpire == 0) {
+ priv->Event = PHY_POWER_DOWN;
+ priv->TickToExpire = 23;
+ }
+ break;
+ default:
+ break;
}
- memcpy(dev->net->dev_addr, buf, ETH_ALEN);
+ return;
+}
- /* Initialize MII structure */
- dev->mii.dev = dev->net;
- dev->mii.mdio_read = asix_mdio_read;
- dev->mii.mdio_write = asix_mdio_write;
- dev->mii.phy_id_mask = 0x1f;
- dev->mii.reg_num_mask = 0xff;
- dev->mii.supports_gmii = 1;
- dev->mii.phy_id = asix_get_phy_addr(dev);
+static void ax88772a_link_reset(struct work_struct *work)
+{
+ struct ax88772a_data *priv = container_of(work,
+ struct ax88772a_data, check_link);
+ struct usbnet *dev = priv->dev;
+ int PowSave = (priv->EepromData >> 14);
+ u16 phy_reg;
+
+ if (priv->Event == AX_SET_RX_CFG) {
+ u16 bmcr;
+ u16 mode;
- dev->net->netdev_ops = &ax88178_netdev_ops;
- dev->net->ethtool_ops = &ax88178_ethtool_ops;
+ priv->Event = AX_NOP;
- phyid = asix_get_phyid(dev);
- dbg("PHYID=0x%08x", phyid);
+ mode = AX88772_MEDIUM_DEFAULT;
- if (data->phymode == PHY_MODE_MARVELL) {
- marvell_phy_init(dev);
- msleep(60);
+ bmcr = ax8817x_mdio_read_le(dev->net,
+ dev->mii.phy_id, MII_BMCR);
+ if (!(bmcr & BMCR_FULLDPLX))
+ mode &= ~AX88772_MEDIUM_FULL_DUPLEX;
+ if (!(bmcr & BMCR_SPEED100))
+ mode &= ~AX88772_MEDIUM_100MB;
+ asix_write_medium_mode(dev, mode);
+ return;
}
- asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR,
- BMCR_RESET | BMCR_ANENABLE);
- asix_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
+ switch (priv->Event) {
+ case WAIT_AUTONEG_COMPLETE:
+ if (jiffies > (priv->autoneg_start + 5 * HZ)) {
+ priv->Event = CHK_CABLE_EXIST;
+ priv->TickToExpire = 14;
+ }
+ break;
+ case CHK_CABLE_EXIST:
+ phy_reg = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, 0x12);
+ if ((phy_reg != 0x8012) && (phy_reg != 0x8013)) {
+ ax8817x_mdio_write_le(dev->net,
+ dev->mii.phy_id, 0x16, 0x4040);
+ mii_nway_restart(&dev->mii);
+ priv->Event = CHK_CABLE_STATUS;
+ priv->TickToExpire = 31;
+ } else if (--priv->TickToExpire == 0) {
+ mii_nway_restart(&dev->mii);
+ priv->Event = CHK_CABLE_EXIST_AGAIN;
+ if (PowSave == 0x03) {
+ priv->TickToExpire = 47;
+ } else if (PowSave == 0x01) {
+ priv->DlyIndex = (u8)(jiffies % 6);
+ priv->DlySel = 0;
+ priv->TickToExpire =
+ ChkCntSel[priv->DlyIndex][priv->DlySel];
+ }
+ }
+ break;
+ case CHK_CABLE_EXIST_AGAIN:
+ /* if cable disconnected */
+ phy_reg = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, 0x12);
+ if ((phy_reg != 0x8012) && (phy_reg != 0x8013)) {
+ mii_nway_restart(&dev->mii);
+ priv->Event = CHK_CABLE_STATUS;
+ priv->TickToExpire = 31;
+ } else if (--priv->TickToExpire == 0) {
+ /* Power down PHY */
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD,
+ 0, 0, NULL);
+ priv->Event = PHY_POWER_DOWN;
+ if (PowSave == 0x03)
+ priv->TickToExpire = 23;
+ else if (PowSave == 0x01)
+ priv->TickToExpire = 31;
+ }
+ break;
+ case PHY_POWER_DOWN:
+ if (--priv->TickToExpire == 0)
+ priv->Event = PHY_POWER_UP;
+ break;
+ case CHK_CABLE_STATUS:
+ if (--priv->TickToExpire == 0) {
+ ax8817x_mdio_write_le(dev->net,
+ dev->mii.phy_id, 0x16, 0x4040);
+ mii_nway_restart(&dev->mii);
+ priv->Event = CHK_CABLE_EXIST_AGAIN;
+ if (PowSave == 0x03) {
+ priv->TickToExpire = 47;
+ } else if (PowSave == 0x01) {
+ priv->DlyIndex = (u8)(jiffies % 6);
+ priv->DlySel = 0;
+ priv->TickToExpire =
+ ChkCntSel[priv->DlyIndex][priv->DlySel];
+ }
+ }
+ break;
+ case PHY_POWER_UP:
+ ax88772a_phy_powerup(dev);
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
+ ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
+ mii_nway_restart(&dev->mii);
+ priv->Event = CHK_CABLE_EXIST_AGAIN;
+ if (PowSave == 0x03) {
+ priv->TickToExpire = 47;
+ } else if (PowSave == 0x01) {
+ if (++priv->DlySel >= 3) {
+ priv->DlyIndex = (u8)(jiffies % 6);
+ priv->DlySel = 0;
+ }
+ priv->TickToExpire =
+ ChkCntSel[priv->DlyIndex][priv->DlySel];
+ }
+ break;
+ default:
+ break;
+ }
+
+ return;
+}
+
+static void ax88772b_link_reset(struct work_struct *work)
+{
+ struct ax88772b_data *priv = container_of(work,
+ struct ax88772b_data, check_link);
+ struct usbnet *dev = priv->dev;
+
+ switch (priv->Event) {
+ case AX_SET_RX_CFG:
+ {
+ u16 bmcr = ax8817x_mdio_read_le(dev->net,
+ dev->mii.phy_id, MII_BMCR);
+ u16 mode = AX88772_MEDIUM_DEFAULT;
+
+ if (!(bmcr & BMCR_FULLDPLX))
+ mode &= ~AX88772_MEDIUM_FULL_DUPLEX;
+ if (!(bmcr & BMCR_SPEED100))
+ mode &= ~AX88772_MEDIUM_100MB;
+ asix_write_medium_mode(dev, mode);
+ break;
+ }
+ case PHY_POWER_UP:
+ {
+ u16 tmp16;
+
+ ax88772a_phy_powerup(dev);
+ tmp16 = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, 0x12);
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, 0x12,
+ ((tmp16 & 0xFF9F) | 0x0040));
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
- asix_mdio_write(dev->net, dev->mii.phy_id, MII_CTRL1000,
- ADVERTISE_1000FULL);
+ break;
+ }
+ default:
+ break;
+ }
- mii_nway_restart(&dev->mii);
+ priv->Event = AX_NOP;
- if ((ret = asix_write_medium_mode(dev, AX88178_MEDIUM_DEFAULT)) < 0)
- goto out;
+ return;
+}
- if ((ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL)) < 0)
- goto out;
+static int ax88178_set_media(struct usbnet *dev)
+{
+ int ret;
+ struct ax88178_data *priv = (struct ax88178_data *)dev->driver_priv;
+ int media;
- /* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
- if (dev->driver_info->flags & FLAG_FRAMING_AX) {
- /* hard_mtu is still the default - the device does not support
- jumbo eth frames */
- dev->rx_urb_size = 2048;
- }
+ media = ax88178_media_check(dev, priv);
+ if (media < 0)
+ return media;
+ ret = asix_write_medium_mode(dev, media);
+ if (ret < 0)
+ return ret;
return 0;
+}
-out:
- return ret;
+static int ax88178_link_reset(struct usbnet *dev)
+{
+ return ax88178_set_media(dev);
+}
+
+static int ax_suspend(struct usb_interface *intf,
+ pm_message_t message)
+{
+ struct usbnet *dev = usb_get_intfdata(intf);
+ struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
+
+ return data->suspend(intf, message);
+}
+
+static int ax_resume(struct usb_interface *intf)
+{
+ struct usbnet *dev = usb_get_intfdata(intf);
+ struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
+
+ return data->resume(intf);
}
+static const struct driver_info ax88178_info = {
+ .description = "ASIX AX88178 USB 2.0 Ethernet",
+ .bind = ax88178_bind,
+ .unbind = ax88178_unbind,
+ .status = ax88178_status,
+ .link_reset = ax88178_link_reset,
+ .reset = ax88178_link_reset,
+ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
+ .rx_fixup = ax88772_rx_fixup,
+ .tx_fixup = ax88772_tx_fixup,
+};
+
+static const struct driver_info belkin178_info = {
+ .description = "Belkin Gigabit USB 2.0 Network Adapter",
+ .bind = ax88178_bind,
+ .unbind = ax88178_unbind,
+ .status = ax8817x_status,
+ .link_reset = ax88178_link_reset,
+ .reset = ax88178_link_reset,
+ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
+ .rx_fixup = ax88772_rx_fixup,
+ .tx_fixup = ax88772_tx_fixup,
+};
+
static const struct driver_info ax8817x_info = {
.description = "ASIX AX8817x USB 2.0 Ethernet",
- .bind = ax88172_bind,
- .status = asix_status,
+ .bind = ax8817x_bind,
+ .status = ax8817x_status,
.link_reset = ax88172_link_reset,
.reset = ax88172_link_reset,
- .flags = FLAG_ETHER | FLAG_LINK_INTR,
- .data = 0x00130103,
+ .flags = FLAG_ETHER,
};
static const struct driver_info dlink_dub_e100_info = {
.description = "DLink DUB-E100 USB Ethernet",
- .bind = ax88172_bind,
- .status = asix_status,
+ .bind = ax8817x_bind,
+ .status = ax8817x_status,
.link_reset = ax88172_link_reset,
.reset = ax88172_link_reset,
- .flags = FLAG_ETHER | FLAG_LINK_INTR,
- .data = 0x009f9d9f,
+ .flags = FLAG_ETHER,
};
static const struct driver_info netgear_fa120_info = {
.description = "Netgear FA-120 USB Ethernet",
- .bind = ax88172_bind,
- .status = asix_status,
+ .bind = ax8817x_bind,
+ .status = ax8817x_status,
.link_reset = ax88172_link_reset,
.reset = ax88172_link_reset,
- .flags = FLAG_ETHER | FLAG_LINK_INTR,
- .data = 0x00130103,
+ .flags = FLAG_ETHER,
};
static const struct driver_info hawking_uf200_info = {
.description = "Hawking UF200 USB Ethernet",
- .bind = ax88172_bind,
- .status = asix_status,
+ .bind = ax8817x_bind,
+ .status = ax8817x_status,
.link_reset = ax88172_link_reset,
.reset = ax88172_link_reset,
- .flags = FLAG_ETHER | FLAG_LINK_INTR,
- .data = 0x001f1d1f,
+ .flags = FLAG_ETHER,
};
static const struct driver_info ax88772_info = {
.description = "ASIX AX88772 USB 2.0 Ethernet",
.bind = ax88772_bind,
- .status = asix_status,
- .link_reset = ax88772_link_reset,
- .reset = ax88772_link_reset,
- .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR,
- .rx_fixup = asix_rx_fixup,
- .tx_fixup = asix_tx_fixup,
+ .unbind = ax88772_unbind,
+ .status = ax88772_status,
+ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
+ .rx_fixup = ax88772_rx_fixup,
+ .tx_fixup = ax88772_tx_fixup,
};
-static const struct driver_info ax88178_info = {
- .description = "ASIX AX88178 USB 2.0 Ethernet",
- .bind = ax88178_bind,
- .status = asix_status,
- .link_reset = ax88178_link_reset,
- .reset = ax88178_link_reset,
- .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR,
- .rx_fixup = asix_rx_fixup,
- .tx_fixup = asix_tx_fixup,
+static const struct driver_info dlink_dub_e100b_info = {
+ .description = "D-Link DUB-E100 USB 2.0 Fast Ethernet Adapter",
+ .bind = ax88772_bind,
+ .unbind = ax88772_unbind,
+ .status = ax88772_status,
+ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
+ .rx_fixup = ax88772_rx_fixup,
+ .tx_fixup = ax88772_tx_fixup,
};
-static const struct usb_device_id products [] = {
+static const struct driver_info ax88772a_info = {
+ .description = "ASIX AX88772A USB 2.0 Ethernet",
+ .bind = ax88772a_bind,
+ .unbind = ax88772a_unbind,
+ .status = ax88772a_status,
+ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
+ .rx_fixup = ax88772_rx_fixup,
+ .tx_fixup = ax88772_tx_fixup,
+};
+
+static const struct driver_info ax88772b_info = {
+ .description = "ASIX AX88772B USB 2.0 Ethernet",
+ .bind = ax88772b_bind,
+ .unbind = ax88772b_unbind,
+ .status = ax88772b_status,
+ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
+ .rx_fixup = ax88772b_rx_fixup,
+ .tx_fixup = ax88772b_tx_fixup,
+};
+
+static const struct usb_device_id products[] = {
{
- // Linksys USB200M
- USB_DEVICE (0x077b, 0x2226),
+ /* 88178 */
+ USB_DEVICE(0x0b95, 0x1780),
+ .driver_info = (unsigned long) &ax88178_info,
+}, {
+ /* 88178 for billianton linksys */
+ USB_DEVICE(0x077b, 0x2226),
+ .driver_info = (unsigned long) &ax88178_info,
+}, {
+ /* ABOCOM for linksys */
+ USB_DEVICE(0x1737, 0x0039),
+ .driver_info = (unsigned long) &ax88178_info,
+}, {
+ /* ABOCOM for pci */
+ USB_DEVICE(0x14ea, 0xab11),
+ .driver_info = (unsigned long) &ax88178_info,
+}, {
+ /* Belkin */
+ USB_DEVICE(0x050d, 0x5055),
+ .driver_info = (unsigned long) &belkin178_info,
+}, {
+ /* Linksys USB200M */
+ USB_DEVICE(0x077b, 0x2226),
.driver_info = (unsigned long) &ax8817x_info,
}, {
- // Netgear FA120
- USB_DEVICE (0x0846, 0x1040),
+ /* Netgear FA120 */
+ USB_DEVICE(0x0846, 0x1040),
.driver_info = (unsigned long) &netgear_fa120_info,
}, {
- // DLink DUB-E100
- USB_DEVICE (0x2001, 0x1a00),
+ /* DLink DUB-E100 */
+ USB_DEVICE(0x2001, 0x1a00),
.driver_info = (unsigned long) &dlink_dub_e100_info,
}, {
- // Intellinet, ST Lab USB Ethernet
- USB_DEVICE (0x0b95, 0x1720),
+ /* DLink DUB-E100B */
+ USB_DEVICE(0x2001, 0x3c05),
+ .driver_info = (unsigned long) &dlink_dub_e100b_info,
+}, {
+ /* DLink DUB-E100B */
+ USB_DEVICE(0x07d1, 0x3c05),
+ .driver_info = (unsigned long) &dlink_dub_e100b_info,
+}, {
+ /* Intellinet, ST Lab USB Ethernet */
+ USB_DEVICE(0x0b95, 0x1720),
.driver_info = (unsigned long) &ax8817x_info,
}, {
- // Hawking UF200, TrendNet TU2-ET100
- USB_DEVICE (0x07b8, 0x420a),
+ /* Hawking UF200, TrendNet TU2-ET100 */
+ USB_DEVICE(0x07b8, 0x420a),
.driver_info = (unsigned long) &hawking_uf200_info,
}, {
- // Billionton Systems, USB2AR
- USB_DEVICE (0x08dd, 0x90ff),
+ /* Billionton Systems, USB2AR */
+ USB_DEVICE(0x08dd, 0x90ff),
.driver_info = (unsigned long) &ax8817x_info,
}, {
- // ATEN UC210T
- USB_DEVICE (0x0557, 0x2009),
+ /* ATEN UC210T */
+ USB_DEVICE(0x0557, 0x2009),
.driver_info = (unsigned long) &ax8817x_info,
}, {
- // Buffalo LUA-U2-KTX
- USB_DEVICE (0x0411, 0x003d),
+ /* Buffalo LUA-U2-KTX */
+ USB_DEVICE(0x0411, 0x003d),
.driver_info = (unsigned long) &ax8817x_info,
}, {
- // Buffalo LUA-U2-GT 10/100/1000
- USB_DEVICE (0x0411, 0x006e),
- .driver_info = (unsigned long) &ax88178_info,
-}, {
- // Sitecom LN-029 "USB 2.0 10/100 Ethernet adapter"
- USB_DEVICE (0x6189, 0x182d),
+ /* Sitecom LN-029 "USB 2.0 10/100 Ethernet adapter" */
+ USB_DEVICE(0x6189, 0x182d),
.driver_info = (unsigned long) &ax8817x_info,
}, {
- // corega FEther USB2-TX
- USB_DEVICE (0x07aa, 0x0017),
+ /* corega FEther USB2-TX */
+ USB_DEVICE(0x07aa, 0x0017),
.driver_info = (unsigned long) &ax8817x_info,
}, {
- // Surecom EP-1427X-2
- USB_DEVICE (0x1189, 0x0893),
- .driver_info = (unsigned long) &ax8817x_info,
-}, {
- // goodway corp usb gwusb2e
- USB_DEVICE (0x1631, 0x6200),
+ /* Surecom EP-1427X-2 */
+ USB_DEVICE(0x1189, 0x0893),
.driver_info = (unsigned long) &ax8817x_info,
}, {
- // JVC MP-PRX1 Port Replicator
- USB_DEVICE (0x04f1, 0x3008),
+ /* goodway corp usb gwusb2e */
+ USB_DEVICE(0x1631, 0x6200),
.driver_info = (unsigned long) &ax8817x_info,
}, {
- // ASIX AX88772B 10/100
- USB_DEVICE (0x0b95, 0x772b),
- .driver_info = (unsigned long) &ax88772_info,
-}, {
- // ASIX AX88772 10/100
- USB_DEVICE (0x0b95, 0x7720),
- .driver_info = (unsigned long) &ax88772_info,
-}, {
- // ASIX AX88178 10/100/1000
- USB_DEVICE (0x0b95, 0x1780),
- .driver_info = (unsigned long) &ax88178_info,
-}, {
- // Logitec LAN-GTJ/U2A
- USB_DEVICE (0x0789, 0x0160),
- .driver_info = (unsigned long) &ax88178_info,
-}, {
- // Linksys USB200M Rev 2
- USB_DEVICE (0x13b1, 0x0018),
- .driver_info = (unsigned long) &ax88772_info,
-}, {
- // 0Q0 cable ethernet
- USB_DEVICE (0x1557, 0x7720),
- .driver_info = (unsigned long) &ax88772_info,
-}, {
- // DLink DUB-E100 H/W Ver B1
- USB_DEVICE (0x07d1, 0x3c05),
+ /* ASIX AX88772 10/100 */
+ USB_DEVICE(0x0b95, 0x7720),
.driver_info = (unsigned long) &ax88772_info,
}, {
- // DLink DUB-E100 H/W Ver B1 Alternate
- USB_DEVICE (0x2001, 0x3c05),
+ /* ASIX AX88772 10/100 */
+ USB_DEVICE(0x125E, 0x180D),
.driver_info = (unsigned long) &ax88772_info,
}, {
- // Linksys USB1000
- USB_DEVICE (0x1737, 0x0039),
- .driver_info = (unsigned long) &ax88178_info,
-}, {
- // IO-DATA ETG-US2
- USB_DEVICE (0x04bb, 0x0930),
- .driver_info = (unsigned long) &ax88178_info,
+ /* ASIX AX88772A 10/100 */
+ USB_DEVICE(0x0b95, 0x772A),
+ .driver_info = (unsigned long) &ax88772a_info,
+}, {
+ /* ASIX AX88772A 10/100 */
+ USB_DEVICE(0x0db0, 0xA877),
+ .driver_info = (unsigned long) &ax88772a_info,
+}, {
+ /* ASIX AX88772A 10/100 */
+ USB_DEVICE(0x0421, 0x772A),
+ .driver_info = (unsigned long) &ax88772a_info,
+}, {
+ /* Linksys 200M */
+ USB_DEVICE(0x13B1, 0x0018),
+ .driver_info = (unsigned long) &ax88772a_info,
}, {
- // Belkin F5D5055
- USB_DEVICE(0x050d, 0x5055),
- .driver_info = (unsigned long) &ax88178_info,
-}, {
- // Apple USB Ethernet Adapter
USB_DEVICE(0x05ac, 0x1402),
- .driver_info = (unsigned long) &ax88772_info,
-}, {
- // Cables-to-Go USB Ethernet Adapter
- USB_DEVICE(0x0b95, 0x772a),
- .driver_info = (unsigned long) &ax88772_info,
-}, {
- // ABOCOM for pci
- USB_DEVICE(0x14ea, 0xab11),
- .driver_info = (unsigned long) &ax88178_info,
+ .driver_info = (unsigned long) &ax88772a_info,
}, {
- // ASIX 88772a
- USB_DEVICE(0x0db0, 0xa877),
- .driver_info = (unsigned long) &ax88772_info,
+ /* ASIX AX88772B 10/100 */
+ USB_DEVICE(0x0b95, 0x772B),
+ .driver_info = (unsigned long) &ax88772b_info,
+}, {
+ /* ASIX AX88772B 10/100 */
+ USB_DEVICE(0x0b95, 0x7E2B),
+ .driver_info = (unsigned long) &ax88772b_info,
},
- { }, // END
+ { }, /* END */
};
MODULE_DEVICE_TABLE(usb, products);
static struct usb_driver asix_driver = {
- .name = "asix",
+ .name = driver_name,
.id_table = products,
.probe = usbnet_probe,
- .suspend = usbnet_suspend,
- .resume = usbnet_resume,
+ .suspend = ax_suspend,
+ .resume = ax_resume,
.disconnect = usbnet_disconnect,
- .supports_autosuspend = 1,
};
static int __init asix_init(void)
{
- return usb_register(&asix_driver);
+ return usb_register(&asix_driver);
}
module_init(asix_init);
static void __exit asix_exit(void)
{
- usb_deregister(&asix_driver);
+ usb_deregister(&asix_driver);
}
module_exit(asix_exit);
--- old/drivers/net/usb/asix.h 1969-12-31 19:00:00.000000000 -0500
+++ linux-3.0.8/drivers/net/usb/asix.h 2011-11-09 12:00:58.048107035 -0500
@@ -0,0 +1,439 @@
+#ifndef __LINUX_USBNET_ASIX_H
+#define __LINUX_USBNET_ASIX_H
+
+/*
+ * Turn on this flag if the implementation of your USB host controller
+ * cannot handle non-double word aligned buffer.
+ * When turn on this flag, driver will fixup egress packet aligned on double
+ * word boundary before deliver to USB host controller. And will Disable the
+ * function "skb_reserve (skb, NET_IP_ALIGN)" to retain the buffer aligned on
+ * double word alignment for ingress packets.
+ */
+#define AX_FORCE_BUFF_ALIGN 0
+
+#define AX_MONITOR_MODE 0x01
+#define AX_MONITOR_LINK 0x02
+#define AX_MONITOR_MAGIC 0x04
+#define AX_MONITOR_HSFS 0x10
+
+/* AX88172 Medium Status Register values */
+#define AX_MEDIUM_FULL_DUPLEX 0x02
+#define AX_MEDIUM_TX_ABORT_ALLOW 0x04
+#define AX_MEDIUM_FLOW_CONTROL_EN 0x10
+#define AX_MCAST_FILTER_SIZE 8
+#define AX_MAX_MCAST 64
+
+#define AX_EEPROM_LEN 0x40
+
+#define AX_SWRESET_CLEAR 0x00
+#define AX_SWRESET_RR 0x01
+#define AX_SWRESET_RT 0x02
+#define AX_SWRESET_PRTE 0x04
+#define AX_SWRESET_PRL 0x08
+#define AX_SWRESET_BZ 0x10
+#define AX_SWRESET_IPRL 0x20
+#define AX_SWRESET_IPPD 0x40
+#define AX_SWRESET_IPOSC 0x0080
+#define AX_SWRESET_IPPSL_0 0x0100
+#define AX_SWRESET_IPPSL_1 0x0200
+#define AX_SWRESET_IPCOPS 0x0400
+#define AX_SWRESET_IPCOPSC 0x0800
+#define AX_SWRESET_AUTODETACH 0x1000
+#define AX_SWRESET_WOLLP 0x8000
+
+#define AX88772_IPG0_DEFAULT 0x15
+#define AX88772_IPG1_DEFAULT 0x0c
+#define AX88772_IPG2_DEFAULT 0x0E
+
+#define AX88772A_IPG0_DEFAULT 0x15
+#define AX88772A_IPG1_DEFAULT 0x16
+#define AX88772A_IPG2_DEFAULT 0x1A
+
+#define AX88772_MEDIUM_FULL_DUPLEX 0x0002
+#define AX88772_MEDIUM_RESERVED 0x0004
+#define AX88772_MEDIUM_RX_FC_ENABLE 0x0010
+#define AX88772_MEDIUM_TX_FC_ENABLE 0x0020
+#define AX88772_MEDIUM_PAUSE_FORMAT 0x0080
+#define AX88772_MEDIUM_RX_ENABLE 0x0100
+#define AX88772_MEDIUM_100MB 0x0200
+#define AX88772_MEDIUM_DEFAULT \
+ (AX88772_MEDIUM_FULL_DUPLEX | AX88772_MEDIUM_RX_FC_ENABLE | \
+ AX88772_MEDIUM_TX_FC_ENABLE | AX88772_MEDIUM_100MB | \
+ AX88772_MEDIUM_RESERVED | AX88772_MEDIUM_RX_ENABLE)
+
+#define AX_CMD_SET_SW_MII 0x06
+#define AX_CMD_READ_MII_REG 0x07
+#define AX_CMD_WRITE_MII_REG 0x08
+#define AX_CMD_SET_HW_MII 0x0a
+#define AX_CMD_READ_EEPROM 0x0b
+#define AX_CMD_WRITE_EEPROM 0x0c
+#define AX_CMD_WRITE_EEPROM_EN 0x0d
+#define AX_CMD_WRITE_EEPROM_DIS 0x0e
+#define AX_CMD_WRITE_RX_CTL 0x10
+#define AX_CMD_READ_IPG012 0x11
+#define AX_CMD_WRITE_IPG0 0x12
+#define AX_CMD_WRITE_IPG1 0x13
+#define AX_CMD_WRITE_IPG2 0x14
+#define AX_CMD_WRITE_MULTI_FILTER 0x16
+#define AX_CMD_READ_NODE_ID 0x17
+#define AX_CMD_READ_PHY_ID 0x19
+#define AX_CMD_READ_MEDIUM_MODE 0x1a
+#define AX_CMD_WRITE_MEDIUM_MODE 0x1b
+#define AX_CMD_READ_MONITOR_MODE 0x1c
+#define AX_CMD_WRITE_MONITOR_MODE 0x1d
+#define AX_CMD_WRITE_GPIOS 0x1f
+#define AX_CMD_SW_RESET 0x20
+#define AX_CMD_SW_PHY_STATUS 0x21
+#define AX_CMD_SW_PHY_SELECT 0x22
+ #define AX_PHYSEL_PSEL (1 << 0)
+ #define AX_PHYSEL_ASEL (1 << 1)
+ #define AX_PHYSEL_SSMII (1 << 2)
+ #define AX_PHYSEL_SSRMII (2 << 2)
+ #define AX_PHYSEL_SSRRMII (3 << 2)
+ #define AX_PHYSEL_SSEN (1 << 4)
+#define AX88772_CMD_READ_NODE_ID 0x13
+#define AX88772_CMD_WRITE_NODE_ID 0x14
+#define AX_CMD_READ_RXCOE_CTL 0x2b
+#define AX_CMD_WRITE_RXCOE_CTL 0x2c
+#define AX_CMD_READ_TXCOE_CTL 0x2d
+#define AX_CMD_WRITE_TXCOE_CTL 0x2e
+
+#define REG_LENGTH 2
+#define PHY_ID_MASK 0x1f
+
+#define AX_RXCOE_IPCE 0x0001
+#define AX_RXCOE_IPVE 0x0002
+#define AX_RXCOE_V6VE 0x0004
+#define AX_RXCOE_TCPE 0x0008
+#define AX_RXCOE_UDPE 0x0010
+#define AX_RXCOE_ICMP 0x0020
+#define AX_RXCOE_IGMP 0x0040
+#define AX_RXCOE_ICV6 0x0080
+#define AX_RXCOE_TCPV6 0x0100
+#define AX_RXCOE_UDPV6 0x0200
+#define AX_RXCOE_ICMV6 0x0400
+#define AX_RXCOE_IGMV6 0x0800
+#define AX_RXCOE_ICV6V6 0x1000
+#define AX_RXCOE_FOPC 0x8000
+#define AX_RXCOE_DEF_CSUM (AX_RXCOE_IPCE | AX_RXCOE_IPVE | \
+ AX_RXCOE_V6VE | AX_RXCOE_TCPE | \
+ AX_RXCOE_UDPE | AX_RXCOE_ICV6 | \
+ AX_RXCOE_TCPV6 | AX_RXCOE_UDPV6)
+
+#define AX_RXCOE_64TE 0x0100
+#define AX_RXCOE_PPPOE 0x0200
+#define AX_RXCOE_RPCE 0x8000
+
+#define AX_TXCOE_IP 0x0001
+#define AX_TXCOE_TCP 0x0002
+#define AX_TXCOE_UDP 0x0004
+#define AX_TXCOE_ICMP 0x0008
+#define AX_TXCOE_IGMP 0x0010
+#define AX_TXCOE_ICV6 0x0020
+
+#define AX_TXCOE_TCPV6 0x0100
+#define AX_TXCOE_UDPV6 0x0200
+#define AX_TXCOE_ICMV6 0x0400
+#define AX_TXCOE_IGMV6 0x0800
+#define AX_TXCOE_ICV6V6 0x1000
+#define AX_TXCOE_DEF_CSUM (AX_TXCOE_TCP | AX_TXCOE_UDP | \
+ AX_TXCOE_TCPV6 | AX_TXCOE_UDPV6)
+
+#define AX_TXCOE_64TE 0x0001
+#define AX_TXCOE_PPPE 0x0002
+
+#define AX88772B_MAX_BULKIN_2K 0
+#define AX88772B_MAX_BULKIN_4K 1
+#define AX88772B_MAX_BULKIN_6K 2
+#define AX88772B_MAX_BULKIN_8K 3
+#define AX88772B_MAX_BULKIN_16K 4
+#define AX88772B_MAX_BULKIN_20K 5
+#define AX88772B_MAX_BULKIN_24K 6
+#define AX88772B_MAX_BULKIN_32K 7
+
+struct {unsigned short size, byte_cnt, threshold; } AX88772B_BULKIN_SIZE[] = {
+ {2048, 0x8000, 0x8001}, /* 2k */
+ {4096, 0x8100, 0x8147}, /* 4k */
+ {6144, 0x8200, 0x81EB}, /* 6k */
+ {8192, 0x8300, 0x83D7}, /* 8k */
+ {16384, 0x8400, 0x851E}, /* 16 */
+ {20480, 0x8500, 0x8666}, /* 20k */
+ {24576, 0x8600, 0x87AE}, /* 24k */
+ {32768, 0x8700, 0x8A3D}, /* 32k */
+};
+
+
+#define AX_RX_CTL_RH1M 0x0100 /* Enable RX-Header mode 0 */
+#define AX_RX_CTL_RH2M 0x0200 /* Enable IP header in receive buffer
+ aligned on 32-bit aligment */
+#define AX_RX_CTL_RH3M 0x0400 /* checksum value in rx header 3 */
+#define AX_RX_HEADER_DEFAULT (AX_RX_CTL_RH1M | AX_RX_CTL_RH2M)
+
+#define AX_RX_CTL_MFB 0x0300 /* Maximum Frame size 16384bytes */
+#define AX_RX_CTL_START 0x0080 /* Ethernet MAC start */
+#define AX_RX_CTL_AP 0x0020 /* Accept phys addr from mcast array */
+#define AX_RX_CTL_AM 0x0010
+#define AX_RX_CTL_AB 0x0008 /* Accetp Brocadcast frames*/
+#define AX_RX_CTL_SEP 0x0004 /* Save error packets */
+#define AX_RX_CTL_AMALL 0x0002 /* Accetp all multicast frames */
+#define AX_RX_CTL_PRO 0x0001 /* Promiscuous Mode */
+#define AX_RX_CTL_STOP 0x0000 /* Stop MAC */
+
+#define AX_MONITOR_MODE 0x01
+#define AX_MONITOR_LINK 0x02
+#define AX_MONITOR_MAGIC 0x04
+#define AX_MONITOR_HSFS 0x10
+
+#define AX_MCAST_FILTER_SIZE 8
+#define AX_MAX_MCAST 64
+#define AX_INTERRUPT_BUFSIZE 8
+
+#define AX_EEPROM_LEN 0x40
+#define AX_EEPROM_MAGIC 0xdeadbeef
+#define EEPROMMASK 0x7f
+
+/* GPIO REGISTER */
+#define AXGPIOS_GPO0EN (1 << 0)
+#define AXGPIOS_GPO0 (1 << 1)
+#define AXGPIOS_GPO1EN (1 << 2)
+#define AXGPIOS_GPO1 (1 << 3)
+#define AXGPIOS_GPO2EN (1 << 4)
+#define AXGPIOS_GPO2 (1 << 5)
+#define AXGPIOS_RSE (1 << 7)
+
+/* TX-header format */
+#define AX_TX_HDR_CPHI 0x4000
+#define AX_TX_HDR_DICF 0x8000
+
+/* medium mode register */
+#define MEDIUM_GIGA_MODE 0x0001
+#define MEDIUM_FULL_DUPLEX_MODE 0x0002
+#define MEDIUM_TX_ABORT_MODE 0x0004
+#define MEDIUM_ENABLE_125MHZ 0x0008
+#define MEDIUM_ENABLE_RX_FLOWCTRL 0x0010
+#define MEDIUM_ENABLE_TX_FLOWCTRL 0x0020
+#define MEDIUM_ENABLE_JUMBO_FRAME 0x0040
+#define MEDIUM_CHECK_PAUSE_FRAME_MODE 0x0080
+#define MEDIUM_ENABLE_RECEIVE 0x0100
+#define MEDIUM_MII_100M_MODE 0x0200
+#define MEDIUM_ENABLE_JAM_PATTERN 0x0400
+#define MEDIUM_ENABLE_STOP_BACKPRESSURE 0x0800
+#define MEDIUM_ENABLE_SUPPER_MAC_SUPPORT 0x1000
+
+/* PHY mode */
+#define PHY_MODE_MARVELL 0
+#define PHY_MODE_CICADA_FAMILY 1
+#define PHY_MODE_CICADA_V1 1
+#define PHY_MODE_AGERE_FAMILY 2
+#define PHY_MODE_AGERE_V0 2
+#define PHY_MODE_CICADA_V2 5
+#define PHY_MODE_AGERE_V0_GMII 6
+#define PHY_MODE_CICADA_V2_ASIX 9
+#define PHY_MODE_VSC8601 10
+#define PHY_MODE_RTL8211CL 12
+#define PHY_MODE_RTL8211BN 13
+#define PHY_MODE_RTL8251CL 14
+#define PHY_MODE_ATTANSIC_V0 0x40
+#define PHY_MODE_ATTANSIC_FAMILY 0x40
+#define PHY_MODE_MAC_TO_MAC_GMII 0x7C
+
+/* */
+#define LED_MODE_MARVELL 0
+#define LED_MODE_CAMEO 1
+
+#define MARVELL_LED_CTRL 0x18
+#define MARVELL_MANUAL_LED 0x19
+
+#define PHY_IDENTIFIER 0x0002
+#define PHY_AGERE_IDENTIFIER 0x0282
+#define PHY_CICADA_IDENTIFIER 0x000f
+#define PHY_MARVELL_IDENTIFIER 0x0141
+
+#define PHY_MARVELL_STATUS 0x001b
+#define MARVELL_STATUS_HWCFG 0x0004 /* SGMII without clock */
+
+#define PHY_MARVELL_CTRL 0x0014
+#define MARVELL_CTRL_RXDELAY 0x0080
+#define MARVELL_CTRL_TXDELAY 0x0002
+
+#define PHY_CICADA_EXTPAGE 0x001f
+#define CICADA_EXTPAGE_EN 0x0001
+#define CICADA_EXTPAGE_DIS 0x0000
+
+
+struct {unsigned short value, offset; } CICADA_FAMILY_HWINIT[] = {
+ {0x0001, 0x001f}, {0x1c25, 0x0017}, {0x2a30, 0x001f}, {0x234c, 0x0010},
+ {0x2a30, 0x001f}, {0x0212, 0x0008}, {0x52b5, 0x001f}, {0xa7fa, 0x0000},
+ {0x0012, 0x0002}, {0x3002, 0x0001}, {0x87fa, 0x0000}, {0x52b5, 0x001f},
+ {0xafac, 0x0000}, {0x000d, 0x0002}, {0x001c, 0x0001}, {0x8fac, 0x0000},
+ {0x2a30, 0x001f}, {0x0012, 0x0008}, {0x2a30, 0x001f}, {0x0400, 0x0014},
+ {0x2a30, 0x001f}, {0x0212, 0x0008}, {0x52b5, 0x001f}, {0xa760, 0x0000},
+ {0x0000, 0x0002}, {0xfaff, 0x0001}, {0x8760, 0x0000}, {0x52b5, 0x001f},
+ {0xa760, 0x0000}, {0x0000, 0x0002}, {0xfaff, 0x0001}, {0x8760, 0x0000},
+ {0x52b5, 0x001f}, {0xafae, 0x0000}, {0x0004, 0x0002}, {0x0671, 0x0001},
+ {0x8fae, 0x0000}, {0x2a30, 0x001f}, {0x0012, 0x0008}, {0x0000, 0x001f},
+};
+
+struct {unsigned short value, offset; } CICADA_V2_HWINIT[] = {
+ {0x2a30, 0x001f}, {0x0212, 0x0008}, {0x52b5, 0x001f}, {0x000f, 0x0002},
+ {0x472a, 0x0001}, {0x8fa4, 0x0000}, {0x2a30, 0x001f}, {0x0212, 0x0008},
+ {0x0000, 0x001f},
+};
+
+struct {unsigned short value, offset; } CICADA_V2_ASIX_HWINIT[] = {
+ {0x2a30, 0x001f}, {0x0212, 0x0008}, {0x52b5, 0x001f}, {0x0012, 0x0002},
+ {0x3002, 0x0001}, {0x87fa, 0x0000}, {0x52b5, 0x001f}, {0x000f, 0x0002},
+ {0x472a, 0x0001}, {0x8fa4, 0x0000}, {0x2a30, 0x001f}, {0x0212, 0x0008},
+ {0x0000, 0x001f},
+};
+
+struct {unsigned short value, offset; } AGERE_FAMILY_HWINIT[] = {
+ {0x0800, 0x0000}, {0x0007, 0x0012}, {0x8805, 0x0010}, {0xb03e, 0x0011},
+ {0x8808, 0x0010}, {0xe110, 0x0011}, {0x8806, 0x0010}, {0xb03e, 0x0011},
+ {0x8807, 0x0010}, {0xff00, 0x0011}, {0x880e, 0x0010}, {0xb4d3, 0x0011},
+ {0x880f, 0x0010}, {0xb4d3, 0x0011}, {0x8810, 0x0010}, {0xb4d3, 0x0011},
+ {0x8817, 0x0010}, {0x1c00, 0x0011}, {0x300d, 0x0010}, {0x0001, 0x0011},
+ {0x0002, 0x0012},
+};
+
+struct ax88178_data {
+ u16 EepromData;
+ u16 MediaLink;
+ int UseGpio0;
+ int UseRgmii;
+ u8 PhyMode;
+ u8 LedMode;
+ u8 BuffaloOld;
+};
+
+enum watchdog_state {
+ AX_NOP = 0,
+ CHK_LINK, /* Routine A */
+ CHK_CABLE_EXIST, /* Called by A */
+ CHK_CABLE_EXIST_AGAIN, /* Routine B */
+ PHY_POWER_UP, /* Called by B */
+ PHY_POWER_UP_BH,
+ PHY_POWER_DOWN,
+ CHK_CABLE_STATUS, /* Routine C */
+ WAIT_AUTONEG_COMPLETE,
+ AX_SET_RX_CFG,
+};
+
+struct ax88772b_data {
+ struct usbnet *dev;
+ struct workqueue_struct *ax_work;
+ struct work_struct check_link;
+ spinlock_t checksum_lock; /* protects checksum flags */
+ unsigned long time_to_chk;
+ u16 psc;
+ u8 pw_enabled;
+ u8 Event;
+ u8 checksum;
+};
+
+struct ax88772a_data {
+ struct usbnet *dev;
+ struct workqueue_struct *ax_work;
+ struct work_struct check_link;
+ unsigned long autoneg_start;
+#define AX88772B_WATCHDOG (6 * HZ)
+ u8 Event;
+ u8 TickToExpire;
+ u8 DlyIndex;
+ u8 DlySel;
+ u16 EepromData;
+};
+
+struct ax88772_data {
+ struct usbnet *dev;
+ struct workqueue_struct *ax_work;
+ struct work_struct check_link;
+ unsigned long autoneg_start;
+ u8 Event;
+ u8 TickToExpire;
+};
+
+#define AX_RX_CHECKSUM (1 << 0)
+#define AX_TX_CHECKSUM (1 << 1)
+
+/* This structure cannot exceed sizeof(unsigned long [5]) AKA 20 bytes */
+struct ax8817x_data {
+ u8 multi_filter[AX_MCAST_FILTER_SIZE];
+ int (*resume) (struct usb_interface *intf);
+ int (*suspend) (struct usb_interface *intf, pm_message_t message);
+};
+
+struct __packed ax88172_int_data {
+ u16 res1;
+#define AX_INT_PPLS_LINK (1 << 0)
+#define AX_INT_SPLS_LINK (1 << 1)
+#define AX_INT_CABOFF_UNPLUG (1 << 7)
+ u8 link;
+ u16 res2;
+ u8 status;
+ u16 res3;
+};
+
+#define AX_RXHDR_L4_ERR (1 << 8)
+#define AX_RXHDR_L3_ERR (1 << 9)
+
+#define AX_RXHDR_L4_TYPE_UDP 1
+#define AX_RXHDR_L4_TYPE_ICMP 2
+#define AX_RXHDR_L4_TYPE_IGMP 3
+#define AX_RXHDR_L4_TYPE_TCP 4
+#define AX_RXHDR_L4_TYPE_TCMPV6 5
+#define AX_RXHDR_L4_TYPE_MASK 7
+
+#define AX_RXHDR_L3_TYPE_IP 1
+#define AX_RXHDR_L3_TYPE_IPV6 2
+
+struct __packed ax88772b_rx_header {
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+ u16 len:11,
+ res1:1,
+ crc:1,
+ mii:1,
+ runt:1,
+ mc_bc:1;
+
+ u16 len_bar:11,
+ res2:5;
+
+ u8 vlan_ind:3,
+ vlan_tag_striped:1,
+ pri:3,
+ res3:1;
+
+ u8 l4_csum_err:1,
+ l3_csum_err:1,
+ l4_type:3,
+ l3_type:2,
+ ce:1;
+#elif defined(__BIG_ENDIAN_BITFIELD)
+ u16 mc_bc:1,
+ runt:1,
+ mii:1,
+ crc:1,
+ res1:1,
+ len:11;
+
+ u16 res2:5,
+ len_bar:11;
+
+ u8 res3:1,
+ pri:3,
+ vlan_tag_striped:1,
+ vlan_ind:3;
+
+ u8 ce:1,
+ l3_type:2,
+ l4_type:3,
+ l3_csum_err:1,
+ l4_csum_err:1;
+#else
+#error "Please fix <asm/byteorder.h>"
+#endif
+};
+
+#endif /* __LINUX_USBNET_ASIX_H */
+
[-- Attachment #2: 30_asix_vendor_driver.patch --]
[-- Type: text/x-patch, Size: 134287 bytes --]
Second pass (for review) at updating the in-kernel asix usb/network driver
from the v4.1.0 vendor GPL version of the driver, obtained from here:
http://www.asix.com.tw/download.php?sub=searchresult&PItemID=84&download=driver
The original vendor copy used a local "axusbnet" middleware (rather than "usbnet").
I've converted it back to using "usbnet", made a ton of cosmetic changes
to get it to pass checkpatch.pl, and removed a small amount of code duplication.
The tx/rx checksum code has been updated per Ben's comments,
and the duplicated MII_* definitions have been removed.
I've changed the version string to be "4.1.0-kernel",
to reflect the vendor's code version while also distinguishing
this port from the original vendor code.
It can use more work going forward, but it is important to get it upstream
sooner than later -- the current in-kernel driver fails with many devices,
both old and new. This updated version works with everything I have available
to test with, and also handles suspend / resume (unlike the in-kernel one).
Signed-off-by: Mark Lord <mlord@pobox.com>
---
Note that the vendor now has a v4.2.0 version available,
but for now I'm concentrating on the original v4.1.0 code.
After review/discussion of this patch, I will update for Linux-3.2-rc
and resubmit for inclusion in the eventual linux-3.3 kernel.
Patch included below, and also attached to bypass mailer mangling.
--- old/drivers/net/usb/asix.c 2011-10-12 17:59:03.000000000 -0400
+++ linux-3.0.8/drivers/net/usb/asix.c 2011-11-09 12:07:24.840032594 -0500
@@ -20,11 +20,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-// #define DEBUG // error path messages, extra info
-// #define VERBOSE // more; success messages
-
#include <linux/module.h>
#include <linux/kmod.h>
+#include <linux/sched.h>
#include <linux/init.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
@@ -34,404 +32,116 @@
#include <linux/usb.h>
#include <linux/crc32.h>
#include <linux/usb/usbnet.h>
-#include <linux/slab.h>
+#include "asix.h"
-#define DRIVER_VERSION "14-Jun-2006"
-static const char driver_name [] = "asix";
+#define DRIVER_VERSION "4.1.0-kernel"
+static const char driver_name[] = "asix";
-/* ASIX AX8817X based USB 2.0 Ethernet Devices */
+static char driver_version[] =
+ "ASIX USB Ethernet Adapter: v" DRIVER_VERSION "\n";
-#define AX_CMD_SET_SW_MII 0x06
-#define AX_CMD_READ_MII_REG 0x07
-#define AX_CMD_WRITE_MII_REG 0x08
-#define AX_CMD_SET_HW_MII 0x0a
-#define AX_CMD_READ_EEPROM 0x0b
-#define AX_CMD_WRITE_EEPROM 0x0c
-#define AX_CMD_WRITE_ENABLE 0x0d
-#define AX_CMD_WRITE_DISABLE 0x0e
-#define AX_CMD_READ_RX_CTL 0x0f
-#define AX_CMD_WRITE_RX_CTL 0x10
-#define AX_CMD_READ_IPG012 0x11
-#define AX_CMD_WRITE_IPG0 0x12
-#define AX_CMD_WRITE_IPG1 0x13
-#define AX_CMD_READ_NODE_ID 0x13
-#define AX_CMD_WRITE_NODE_ID 0x14
-#define AX_CMD_WRITE_IPG2 0x14
-#define AX_CMD_WRITE_MULTI_FILTER 0x16
-#define AX88172_CMD_READ_NODE_ID 0x17
-#define AX_CMD_READ_PHY_ID 0x19
-#define AX_CMD_READ_MEDIUM_STATUS 0x1a
-#define AX_CMD_WRITE_MEDIUM_MODE 0x1b
-#define AX_CMD_READ_MONITOR_MODE 0x1c
-#define AX_CMD_WRITE_MONITOR_MODE 0x1d
-#define AX_CMD_READ_GPIOS 0x1e
-#define AX_CMD_WRITE_GPIOS 0x1f
-#define AX_CMD_SW_RESET 0x20
-#define AX_CMD_SW_PHY_STATUS 0x21
-#define AX_CMD_SW_PHY_SELECT 0x22
-
-#define AX_MONITOR_MODE 0x01
-#define AX_MONITOR_LINK 0x02
-#define AX_MONITOR_MAGIC 0x04
-#define AX_MONITOR_HSFS 0x10
-
-/* AX88172 Medium Status Register values */
-#define AX88172_MEDIUM_FD 0x02
-#define AX88172_MEDIUM_TX 0x04
-#define AX88172_MEDIUM_FC 0x10
-#define AX88172_MEDIUM_DEFAULT \
- ( AX88172_MEDIUM_FD | AX88172_MEDIUM_TX | AX88172_MEDIUM_FC )
-
-#define AX_MCAST_FILTER_SIZE 8
-#define AX_MAX_MCAST 64
-
-#define AX_SWRESET_CLEAR 0x00
-#define AX_SWRESET_RR 0x01
-#define AX_SWRESET_RT 0x02
-#define AX_SWRESET_PRTE 0x04
-#define AX_SWRESET_PRL 0x08
-#define AX_SWRESET_BZ 0x10
-#define AX_SWRESET_IPRL 0x20
-#define AX_SWRESET_IPPD 0x40
-
-#define AX88772_IPG0_DEFAULT 0x15
-#define AX88772_IPG1_DEFAULT 0x0c
-#define AX88772_IPG2_DEFAULT 0x12
-
-/* AX88772 & AX88178 Medium Mode Register */
-#define AX_MEDIUM_PF 0x0080
-#define AX_MEDIUM_JFE 0x0040
-#define AX_MEDIUM_TFC 0x0020
-#define AX_MEDIUM_RFC 0x0010
-#define AX_MEDIUM_ENCK 0x0008
-#define AX_MEDIUM_AC 0x0004
-#define AX_MEDIUM_FD 0x0002
-#define AX_MEDIUM_GM 0x0001
-#define AX_MEDIUM_SM 0x1000
-#define AX_MEDIUM_SBP 0x0800
-#define AX_MEDIUM_PS 0x0200
-#define AX_MEDIUM_RE 0x0100
-
-#define AX88178_MEDIUM_DEFAULT \
- (AX_MEDIUM_PS | AX_MEDIUM_FD | AX_MEDIUM_AC | \
- AX_MEDIUM_RFC | AX_MEDIUM_TFC | AX_MEDIUM_JFE | \
- AX_MEDIUM_RE )
-
-#define AX88772_MEDIUM_DEFAULT \
- (AX_MEDIUM_FD | AX_MEDIUM_RFC | \
- AX_MEDIUM_TFC | AX_MEDIUM_PS | \
- AX_MEDIUM_AC | AX_MEDIUM_RE )
-
-/* AX88772 & AX88178 RX_CTL values */
-#define AX_RX_CTL_SO 0x0080
-#define AX_RX_CTL_AP 0x0020
-#define AX_RX_CTL_AM 0x0010
-#define AX_RX_CTL_AB 0x0008
-#define AX_RX_CTL_SEP 0x0004
-#define AX_RX_CTL_AMALL 0x0002
-#define AX_RX_CTL_PRO 0x0001
-#define AX_RX_CTL_MFB_2048 0x0000
-#define AX_RX_CTL_MFB_4096 0x0100
-#define AX_RX_CTL_MFB_8192 0x0200
-#define AX_RX_CTL_MFB_16384 0x0300
-
-#define AX_DEFAULT_RX_CTL \
- (AX_RX_CTL_SO | AX_RX_CTL_AB )
-
-/* GPIO 0 .. 2 toggles */
-#define AX_GPIO_GPO0EN 0x01 /* GPIO0 Output enable */
-#define AX_GPIO_GPO_0 0x02 /* GPIO0 Output value */
-#define AX_GPIO_GPO1EN 0x04 /* GPIO1 Output enable */
-#define AX_GPIO_GPO_1 0x08 /* GPIO1 Output value */
-#define AX_GPIO_GPO2EN 0x10 /* GPIO2 Output enable */
-#define AX_GPIO_GPO_2 0x20 /* GPIO2 Output value */
-#define AX_GPIO_RESERVED 0x40 /* Reserved */
-#define AX_GPIO_RSE 0x80 /* Reload serial EEPROM */
-
-#define AX_EEPROM_MAGIC 0xdeadbeef
-#define AX88172_EEPROM_LEN 0x40
-#define AX88772_EEPROM_LEN 0xff
-
-#define PHY_MODE_MARVELL 0x0000
-#define MII_MARVELL_LED_CTRL 0x0018
-#define MII_MARVELL_STATUS 0x001b
-#define MII_MARVELL_CTRL 0x0014
-
-#define MARVELL_LED_MANUAL 0x0019
-
-#define MARVELL_STATUS_HWCFG 0x0004
-
-#define MARVELL_CTRL_TXDELAY 0x0002
-#define MARVELL_CTRL_RXDELAY 0x0080
-
-/* This structure cannot exceed sizeof(unsigned long [5]) AKA 20 bytes */
-struct asix_data {
- u8 multi_filter[AX_MCAST_FILTER_SIZE];
- u8 mac_addr[ETH_ALEN];
- u8 phymode;
- u8 ledmode;
- u8 eeprom_len;
-};
+/* configuration of maximum bulk in size */
+static int bsize = AX88772B_MAX_BULKIN_16K;
+module_param(bsize, int, 0);
+MODULE_PARM_DESC(bsize, "Maximum transfer size per bulk");
+
+static void ax88772b_link_reset(struct work_struct *work);
+static void ax88772a_link_reset(struct work_struct *work);
+static void ax88772_link_reset(struct work_struct *work);
+static int ax88772a_phy_powerup(struct usbnet *dev);
-struct ax88172_int_data {
- __le16 res1;
- u8 link;
- __le16 res2;
- u8 status;
- __le16 res3;
-} __packed;
+/* ASIX AX8817X based USB 2.0 Ethernet Devices */
-static int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
+static int ax8817x_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
u16 size, void *data)
{
- void *buf;
- int err = -ENOMEM;
-
- netdev_dbg(dev->net, "asix_read_cmd() cmd=0x%02x value=0x%04x index=0x%04x size=%d\n",
- cmd, value, index, size);
-
- buf = kmalloc(size, GFP_KERNEL);
- if (!buf)
- goto out;
-
- err = usb_control_msg(
+ return usb_control_msg(
dev->udev,
usb_rcvctrlpipe(dev->udev, 0),
cmd,
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
value,
index,
- buf,
+ data,
size,
USB_CTRL_GET_TIMEOUT);
- if (err == size)
- memcpy(data, buf, size);
- else if (err >= 0)
- err = -EINVAL;
- kfree(buf);
-
-out:
- return err;
}
-static int asix_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
+static int ax8817x_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
u16 size, void *data)
{
- void *buf = NULL;
- int err = -ENOMEM;
-
- netdev_dbg(dev->net, "asix_write_cmd() cmd=0x%02x value=0x%04x index=0x%04x size=%d\n",
- cmd, value, index, size);
-
- if (data) {
- buf = kmemdup(data, size, GFP_KERNEL);
- if (!buf)
- goto out;
- }
-
- err = usb_control_msg(
+ return usb_control_msg(
dev->udev,
usb_sndctrlpipe(dev->udev, 0),
cmd,
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
value,
index,
- buf,
+ data,
size,
USB_CTRL_SET_TIMEOUT);
- kfree(buf);
-
-out:
- return err;
}
-static void asix_async_cmd_callback(struct urb *urb)
+static void ax8817x_async_cmd_callback(struct urb *urb)
{
struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context;
- int status = urb->status;
- if (status < 0)
- printk(KERN_DEBUG "asix_async_cmd_callback() failed with %d",
- status);
+ if (urb->status < 0)
+ printk(KERN_DEBUG "ax8817x_async_cmd_callback() failed with %d",
+ urb->status);
kfree(req);
usb_free_urb(urb);
}
-static void
-asix_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 index,
- u16 size, void *data)
+static int ax8817x_set_mac_addr(struct net_device *net, void *p)
{
- struct usb_ctrlrequest *req;
- int status;
- struct urb *urb;
-
- netdev_dbg(dev->net, "asix_write_cmd_async() cmd=0x%02x value=0x%04x index=0x%04x size=%d\n",
- cmd, value, index, size);
- if ((urb = usb_alloc_urb(0, GFP_ATOMIC)) == NULL) {
- netdev_err(dev->net, "Error allocating URB in write_cmd_async!\n");
- return;
- }
-
- if ((req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC)) == NULL) {
- netdev_err(dev->net, "Failed to allocate memory for control request\n");
- usb_free_urb(urb);
- return;
- }
+ struct usbnet *dev = netdev_priv(net);
+ struct sockaddr *addr = p;
- req->bRequestType = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE;
- req->bRequest = cmd;
- req->wValue = cpu_to_le16(value);
- req->wIndex = cpu_to_le16(index);
- req->wLength = cpu_to_le16(size);
+ memcpy(net->dev_addr, addr->sa_data, ETH_ALEN);
- usb_fill_control_urb(urb, dev->udev,
- usb_sndctrlpipe(dev->udev, 0),
- (void *)req, data, size,
- asix_async_cmd_callback, req);
+ /* Set the MAC address */
+ return ax8817x_write_cmd(dev, AX88772_CMD_WRITE_NODE_ID,
+ 0, 0, ETH_ALEN, net->dev_addr);
- if((status = usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
- netdev_err(dev->net, "Error submitting the control message: status=%d\n",
- status);
- kfree(req);
- usb_free_urb(urb);
- }
}
-static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
+static void ax8817x_status(struct usbnet *dev, struct urb *urb)
{
- u8 *head;
- u32 header;
- char *packet;
- struct sk_buff *ax_skb;
- u16 size;
-
- head = (u8 *) skb->data;
- memcpy(&header, head, sizeof(header));
- le32_to_cpus(&header);
- packet = head + sizeof(header);
-
- skb_pull(skb, 4);
-
- while (skb->len > 0) {
- if ((short)(header & 0x0000ffff) !=
- ~((short)((header & 0xffff0000) >> 16))) {
- netdev_err(dev->net, "asix_rx_fixup() Bad Header Length\n");
- }
- /* get the packet length */
- size = (u16) (header & 0x0000ffff);
-
- if ((skb->len) - ((size + 1) & 0xfffe) == 0) {
- u8 alignment = (unsigned long)skb->data & 0x3;
- if (alignment != 0x2) {
- /*
- * not 16bit aligned so use the room provided by
- * the 32 bit header to align the data
- *
- * note we want 16bit alignment as MAC header is
- * 14bytes thus ip header will be aligned on
- * 32bit boundary so accessing ipheader elements
- * using a cast to struct ip header wont cause
- * an unaligned accesses.
- */
- u8 realignment = (alignment + 2) & 0x3;
- memmove(skb->data - realignment,
- skb->data,
- size);
- skb->data -= realignment;
- skb_set_tail_pointer(skb, size);
- }
- return 2;
- }
-
- if (size > dev->net->mtu + ETH_HLEN) {
- netdev_err(dev->net, "asix_rx_fixup() Bad RX Length %d\n",
- size);
- return 0;
- }
- ax_skb = skb_clone(skb, GFP_ATOMIC);
- if (ax_skb) {
- u8 alignment = (unsigned long)packet & 0x3;
- ax_skb->len = size;
-
- if (alignment != 0x2) {
- /*
- * not 16bit aligned use the room provided by
- * the 32 bit header to align the data
- */
- u8 realignment = (alignment + 2) & 0x3;
- memmove(packet - realignment, packet, size);
- packet -= realignment;
- }
- ax_skb->data = packet;
- skb_set_tail_pointer(ax_skb, size);
- usbnet_skb_return(dev, ax_skb);
- } else {
- return 0;
- }
-
- skb_pull(skb, (size + 1) & 0xfffe);
+ struct ax88172_int_data *event;
+ int link;
- if (skb->len == 0)
- break;
+ if (urb->actual_length < 8)
+ return;
- head = (u8 *) skb->data;
- memcpy(&header, head, sizeof(header));
- le32_to_cpus(&header);
- packet = head + sizeof(header);
- skb_pull(skb, 4);
- }
+ event = urb->transfer_buffer;
+ link = event->link & 0x01;
- if (skb->len < 0) {
- netdev_err(dev->net, "asix_rx_fixup() Bad SKB Length %d\n",
- skb->len);
- return 0;
+ if (netif_carrier_ok(dev->net) != link) {
+ if (link) {
+ netif_carrier_on(dev->net);
+ usbnet_defer_kevent(dev, EVENT_LINK_RESET);
+ } else
+ netif_carrier_off(dev->net);
+ netdev_warn(dev->net, "%s: link status is: %d\n",
+ __func__, link);
}
- return 1;
}
-static struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
- gfp_t flags)
+static void ax88178_status(struct usbnet *dev, struct urb *urb)
{
- int padlen;
- int headroom = skb_headroom(skb);
- int tailroom = skb_tailroom(skb);
- u32 packet_len;
- u32 padbytes = 0xffff0000;
-
- padlen = ((skb->len + 4) % 512) ? 0 : 4;
-
- if ((!skb_cloned(skb)) &&
- ((headroom + tailroom) >= (4 + padlen))) {
- if ((headroom < 4) || (tailroom < padlen)) {
- skb->data = memmove(skb->head + 4, skb->data, skb->len);
- skb_set_tail_pointer(skb, skb->len);
- }
- } else {
- struct sk_buff *skb2;
- skb2 = skb_copy_expand(skb, 4, padlen, flags);
- dev_kfree_skb_any(skb);
- skb = skb2;
- if (!skb)
- return NULL;
- }
-
- skb_push(skb, 4);
- packet_len = (((skb->len - 4) ^ 0x0000ffff) << 16) + (skb->len - 4);
- cpu_to_le32s(&packet_len);
- skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len));
+ struct ax88178_data *priv = (struct ax88178_data *)dev->driver_priv;
- if ((skb->len % 512) == 0) {
- cpu_to_le32s(&padbytes);
- memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes));
- skb_put(skb, sizeof(padbytes));
- }
- return skb;
+ if (priv->EepromData == PHY_MODE_MAC_TO_MAC_GMII)
+ return;
+ ax8817x_status(dev, urb);
}
-static void asix_status(struct usbnet *dev, struct urb *urb)
+static void ax88772_status(struct usbnet *dev, struct urb *urb)
{
struct ax88172_int_data *event;
+ struct ax88772_data *priv = (struct ax88772_data *)dev->driver_priv;
int link;
if (urb->actual_length < 8)
@@ -439,285 +149,538 @@
event = urb->transfer_buffer;
link = event->link & 0x01;
+
if (netif_carrier_ok(dev->net) != link) {
if (link) {
netif_carrier_on(dev->net);
- usbnet_defer_kevent (dev, EVENT_LINK_RESET );
- } else
+ priv->Event = AX_SET_RX_CFG;
+ } else {
netif_carrier_off(dev->net);
- netdev_dbg(dev->net, "Link Status is: %d\n", link);
+ if (priv->Event == AX_NOP) {
+ priv->Event = PHY_POWER_DOWN;
+ priv->TickToExpire = 25;
+ }
+ }
+ netdev_warn(dev->net, "%s: link status is: %d\n",
+ __func__, link);
}
-}
-static inline int asix_set_sw_mii(struct usbnet *dev)
-{
- int ret;
- ret = asix_write_cmd(dev, AX_CMD_SET_SW_MII, 0x0000, 0, 0, NULL);
- if (ret < 0)
- netdev_err(dev->net, "Failed to enable software MII access\n");
- return ret;
+ if (priv->Event)
+ queue_work(priv->ax_work, &priv->check_link);
}
-static inline int asix_set_hw_mii(struct usbnet *dev)
+static void ax88772a_status(struct usbnet *dev, struct urb *urb)
{
- int ret;
- ret = asix_write_cmd(dev, AX_CMD_SET_HW_MII, 0x0000, 0, 0, NULL);
- if (ret < 0)
- netdev_err(dev->net, "Failed to enable hardware MII access\n");
- return ret;
-}
+ struct ax88172_int_data *event;
+ struct ax88772a_data *priv = (struct ax88772a_data *)dev->driver_priv;
+ int link;
+ int PowSave = (priv->EepromData >> 14);
-static inline int asix_get_phy_addr(struct usbnet *dev)
-{
- u8 buf[2];
- int ret = asix_read_cmd(dev, AX_CMD_READ_PHY_ID, 0, 0, 2, buf);
+ if (urb->actual_length < 8)
+ return;
- netdev_dbg(dev->net, "asix_get_phy_addr()\n");
+ event = urb->transfer_buffer;
+ link = event->link & 0x01;
- if (ret < 0) {
- netdev_err(dev->net, "Error reading PHYID register: %02x\n", ret);
- goto out;
+ if (netif_carrier_ok(dev->net) != link) {
+
+ if (link) {
+ netif_carrier_on(dev->net);
+ priv->Event = AX_SET_RX_CFG;
+ } else if ((PowSave == 0x3) || (PowSave == 0x1)) {
+ netif_carrier_off(dev->net);
+ if (priv->Event == AX_NOP) {
+ priv->Event = CHK_CABLE_EXIST;
+ priv->TickToExpire = 14;
+ }
+ } else {
+ netif_carrier_off(dev->net);
+ priv->Event = AX_NOP;
+ }
+ netdev_warn(dev->net, "%s: link status is: %d\n",
+ __func__, link);
}
- netdev_dbg(dev->net, "asix_get_phy_addr() returning 0x%04x\n",
- *((__le16 *)buf));
- ret = buf[1];
-out:
- return ret;
+ if (priv->Event)
+ queue_work(priv->ax_work, &priv->check_link);
}
-static int asix_sw_reset(struct usbnet *dev, u8 flags)
+static void ax88772b_status(struct usbnet *dev, struct urb *urb)
{
- int ret;
-
- ret = asix_write_cmd(dev, AX_CMD_SW_RESET, flags, 0, 0, NULL);
- if (ret < 0)
- netdev_err(dev->net, "Failed to send software reset: %02x\n", ret);
-
- return ret;
-}
+ struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
+ struct ax88172_int_data *event;
+ int link;
-static u16 asix_read_rx_ctl(struct usbnet *dev)
-{
- __le16 v;
- int ret = asix_read_cmd(dev, AX_CMD_READ_RX_CTL, 0, 0, 2, &v);
+ if (urb->actual_length < 8)
+ return;
- if (ret < 0) {
- netdev_err(dev->net, "Error reading RX_CTL register: %02x\n", ret);
- goto out;
+ event = urb->transfer_buffer;
+ link = event->link & AX_INT_PPLS_LINK;
+ if (netif_carrier_ok(dev->net) != link) {
+ if (link) {
+ netif_carrier_on(dev->net);
+ priv->Event = AX_SET_RX_CFG;
+ } else {
+ netif_carrier_off(dev->net);
+ priv->time_to_chk = jiffies;
+ }
+ netdev_warn(dev->net, "%s: link status is: %d\n",
+ __func__, link);
}
- ret = le16_to_cpu(v);
-out:
- return ret;
-}
-
-static int asix_write_rx_ctl(struct usbnet *dev, u16 mode)
-{
- int ret;
-
- netdev_dbg(dev->net, "asix_write_rx_ctl() - mode = 0x%04x\n", mode);
- ret = asix_write_cmd(dev, AX_CMD_WRITE_RX_CTL, mode, 0, 0, NULL);
- if (ret < 0)
- netdev_err(dev->net, "Failed to write RX_CTL mode to 0x%04x: %02x\n",
- mode, ret);
- return ret;
-}
+ if (!link) {
+ int no_cable = (event->link & AX_INT_CABOFF_UNPLUG) ? 1 : 0;
-static u16 asix_read_medium_status(struct usbnet *dev)
-{
- __le16 v;
- int ret = asix_read_cmd(dev, AX_CMD_READ_MEDIUM_STATUS, 0, 0, 2, &v);
+ if (no_cable) {
+ if ((priv->psc &
+ (AX_SWRESET_IPPSL_0 | AX_SWRESET_IPPSL_1)) &&
+ !priv->pw_enabled) {
+ /*
+ * AX88772B already entered power saving state
+ */
+ priv->pw_enabled = 1;
+ }
- if (ret < 0) {
- netdev_err(dev->net, "Error reading Medium Status register: %02x\n",
- ret);
- goto out;
+ } else {
+ /* AX88772B resumed from power saving state */
+ if (priv->pw_enabled ||
+ (jiffies >
+ (priv->time_to_chk + AX88772B_WATCHDOG))) {
+ if (priv->pw_enabled)
+ priv->pw_enabled = 0;
+ priv->Event = PHY_POWER_UP;
+ priv->time_to_chk = jiffies;
+ }
+ }
}
- ret = le16_to_cpu(v);
-out:
- return ret;
+
+ if (priv->Event)
+ queue_work(priv->ax_work, &priv->check_link);
}
-static int asix_write_medium_mode(struct usbnet *dev, u16 mode)
+static void
+ax8817x_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 index,
+ u16 size, void *data)
{
- int ret;
-
- netdev_dbg(dev->net, "asix_write_medium_mode() - mode = 0x%04x\n", mode);
- ret = asix_write_cmd(dev, AX_CMD_WRITE_MEDIUM_MODE, mode, 0, 0, NULL);
- if (ret < 0)
- netdev_err(dev->net, "Failed to write Medium Mode mode to 0x%04x: %02x\n",
- mode, ret);
+ struct usb_ctrlrequest *req;
+ int status;
+ struct urb *urb;
- return ret;
-}
+ urb = usb_alloc_urb(0, GFP_ATOMIC);
+ if (urb == NULL) {
+ netdev_err(dev->net, "%s: usb_alloc_urb() failed\n", __func__);
+ return;
+ }
-static int asix_write_gpio(struct usbnet *dev, u16 value, int sleep)
-{
- int ret;
+ req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC);
+ if (req == NULL) {
+ netdev_err(dev->net, "%s: kmalloc() failed\n", __func__);
+ usb_free_urb(urb);
+ return;
+ }
- netdev_dbg(dev->net, "asix_write_gpio() - value = 0x%04x\n", value);
- ret = asix_write_cmd(dev, AX_CMD_WRITE_GPIOS, value, 0, 0, NULL);
- if (ret < 0)
- netdev_err(dev->net, "Failed to write GPIO value 0x%04x: %02x\n",
- value, ret);
+ req->bRequestType = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE;
+ req->bRequest = cmd;
+ req->wValue = cpu_to_le16(value);
+ req->wIndex = cpu_to_le16(index);
+ req->wLength = cpu_to_le16(size);
- if (sleep)
- msleep(sleep);
+ usb_fill_control_urb(urb, dev->udev,
+ usb_sndctrlpipe(dev->udev, 0),
+ (void *)req, data, size,
+ ax8817x_async_cmd_callback, req);
- return ret;
+ status = usb_submit_urb(urb, GFP_ATOMIC);
+ if (status < 0) {
+ netdev_err(dev->net, "%s: usb_submit_urb() failed, err=%d\n",
+ __func__, status);
+ kfree(req);
+ usb_free_urb(urb);
+ }
}
-/*
- * AX88772 & AX88178 have a 16-bit RX_CTL value
- */
-static void asix_set_multicast(struct net_device *net)
+static void ax8817x_set_multicast(struct net_device *net)
{
struct usbnet *dev = netdev_priv(net);
- struct asix_data *data = (struct asix_data *)&dev->data;
- u16 rx_ctl = AX_DEFAULT_RX_CTL;
+ struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
+ u8 rx_ctl = AX_RX_CTL_START | AX_RX_CTL_AB;
+ int mc_count;
+
+ mc_count = netdev_mc_count(net);
if (net->flags & IFF_PROMISC) {
rx_ctl |= AX_RX_CTL_PRO;
- } else if (net->flags & IFF_ALLMULTI ||
- netdev_mc_count(net) > AX_MAX_MCAST) {
+ } else if (net->flags & IFF_ALLMULTI
+ || mc_count > AX_MAX_MCAST) {
rx_ctl |= AX_RX_CTL_AMALL;
- } else if (netdev_mc_empty(net)) {
+ } else if (mc_count == 0) {
/* just broadcast and directed */
} else {
/* We use the 20 byte dev->data
* for our 8 byte filter buffer
* to avoid allocating memory that
* is tricky to free later */
- struct netdev_hw_addr *ha;
u32 crc_bits;
-
+ struct netdev_hw_addr *ha;
memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE);
-
- /* Build the multicast hash filter. */
netdev_for_each_mc_addr(ha, net) {
crc_bits = ether_crc(ETH_ALEN, ha->addr) >> 26;
data->multi_filter[crc_bits >> 3] |=
- 1 << (crc_bits & 7);
+ 1 << (crc_bits & 7);
}
-
- asix_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,
+ ax8817x_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,
AX_MCAST_FILTER_SIZE, data->multi_filter);
rx_ctl |= AX_RX_CTL_AM;
}
- asix_write_cmd_async(dev, AX_CMD_WRITE_RX_CTL, rx_ctl, 0, 0, NULL);
-}
-
-static int asix_mdio_read(struct net_device *netdev, int phy_id, int loc)
-{
- struct usbnet *dev = netdev_priv(netdev);
- __le16 res;
-
- mutex_lock(&dev->phy_mutex);
- asix_set_sw_mii(dev);
- asix_read_cmd(dev, AX_CMD_READ_MII_REG, phy_id,
- (__u16)loc, 2, &res);
- asix_set_hw_mii(dev);
- mutex_unlock(&dev->phy_mutex);
-
- netdev_dbg(dev->net, "asix_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x\n",
- phy_id, loc, le16_to_cpu(res));
-
- return le16_to_cpu(res);
+ ax8817x_write_cmd_async(dev, AX_CMD_WRITE_RX_CTL, rx_ctl, 0, 0, NULL);
}
-static void
-asix_mdio_write(struct net_device *netdev, int phy_id, int loc, int val)
+static void ax88772b_set_multicast(struct net_device *net)
{
- struct usbnet *dev = netdev_priv(netdev);
- __le16 res = cpu_to_le16(val);
+ struct usbnet *dev = netdev_priv(net);
+ struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
+ u16 rx_ctl = (AX_RX_CTL_START | AX_RX_CTL_AB | AX_RX_HEADER_DEFAULT);
+ int mc_count;
- netdev_dbg(dev->net, "asix_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x\n",
- phy_id, loc, val);
- mutex_lock(&dev->phy_mutex);
- asix_set_sw_mii(dev);
- asix_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id, (__u16)loc, 2, &res);
- asix_set_hw_mii(dev);
- mutex_unlock(&dev->phy_mutex);
-}
+ mc_count = netdev_mc_count(net);
-/* Get the PHY Identifier from the PHYSID1 & PHYSID2 MII registers */
-static u32 asix_get_phyid(struct usbnet *dev)
+ if (net->flags & IFF_PROMISC) {
+ rx_ctl |= AX_RX_CTL_PRO;
+ } else if (net->flags & IFF_ALLMULTI
+ || mc_count > AX_MAX_MCAST) {
+ rx_ctl |= AX_RX_CTL_AMALL;
+ } else if (mc_count == 0) {
+ /* just broadcast and directed */
+ } else {
+ /* We use the 20 byte dev->data
+ * for our 8 byte filter buffer
+ * to avoid allocating memory that
+ * is tricky to free later */
+ u32 crc_bits;
+
+ struct netdev_hw_addr *ha;
+ memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE);
+ netdev_for_each_mc_addr(ha, net) {
+ crc_bits = ether_crc(ETH_ALEN, ha->addr) >> 26;
+ data->multi_filter[crc_bits >> 3] |=
+ 1 << (crc_bits & 7);
+ }
+ ax8817x_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,
+ AX_MCAST_FILTER_SIZE, data->multi_filter);
+
+ rx_ctl |= AX_RX_CTL_AM;
+ }
+
+ ax8817x_write_cmd_async(dev, AX_CMD_WRITE_RX_CTL, rx_ctl, 0, 0, NULL);
+}
+
+static int ax8817x_mdio_read(struct net_device *netdev, int phy_id, int loc)
{
- int phy_reg;
- u32 phy_id;
+ struct usbnet *dev = netdev_priv(netdev);
+ u16 *res;
+ u16 ret;
- phy_reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_PHYSID1);
- if (phy_reg < 0)
+ res = kmalloc(2, GFP_ATOMIC);
+ if (!res)
return 0;
- phy_id = (phy_reg & 0xffff) << 16;
+ ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0, 0, 0, NULL);
+ ax8817x_read_cmd(dev, AX_CMD_READ_MII_REG, phy_id, (__u16)loc, 2, res);
+ ax8817x_write_cmd(dev, AX_CMD_SET_HW_MII, 0, 0, 0, NULL);
+
+ ret = *res & 0xffff;
+ kfree(res);
+
+ return ret;
+}
+
+static int
+ax8817x_swmii_mdio_read(struct net_device *netdev, int phy_id, int loc)
+{
+ struct usbnet *dev = netdev_priv(netdev);
+ u16 *res;
+ u16 ret;
- phy_reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_PHYSID2);
- if (phy_reg < 0)
+ res = kmalloc(2, GFP_ATOMIC);
+ if (!res)
return 0;
- phy_id |= (phy_reg & 0xffff);
+ ax8817x_read_cmd(dev, AX_CMD_READ_MII_REG, phy_id,
+ (__u16)loc, 2, res);
+
+ ret = *res & 0xffff;
+ kfree(res);
+
+ return ret;
+}
+
+/* same as above, but converts resulting value to cpu byte order */
+static int ax8817x_mdio_read_le(struct net_device *netdev, int phy_id, int loc)
+{
+ return le16_to_cpu(ax8817x_mdio_read(netdev, phy_id, loc));
+}
- return phy_id;
+static int
+ax8817x_swmii_mdio_read_le(struct net_device *netdev, int phy_id, int loc)
+{
+ return le16_to_cpu(ax8817x_swmii_mdio_read(netdev, phy_id, loc));
}
static void
-asix_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
+ax8817x_mdio_write(struct net_device *netdev, int phy_id, int loc, int val)
{
- struct usbnet *dev = netdev_priv(net);
- u8 opt;
+ struct usbnet *dev = netdev_priv(netdev);
+ u16 *res;
+
+ res = kmalloc(2, GFP_ATOMIC);
+ if (!res)
+ return;
+ *res = val;
+
+ ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0, 0, 0, NULL);
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id,
+ (__u16)loc, 2, res);
+ ax8817x_write_cmd(dev, AX_CMD_SET_HW_MII, 0, 0, 0, NULL);
+
+ kfree(res);
+}
+
+static void ax8817x_swmii_mdio_write(struct net_device *netdev,
+ int phy_id, int loc, int val)
+{
+ struct usbnet *dev = netdev_priv(netdev);
+ u16 *res;
+
+ res = kmalloc(2, GFP_ATOMIC);
+ if (!res)
+ return;
+ *res = val;
+
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id,
+ (__u16)loc, 2, res);
+
+ kfree(res);
+}
+
+static void
+ax88772b_mdio_write(struct net_device *netdev, int phy_id, int loc, int val)
+{
+ struct usbnet *dev = netdev_priv(netdev);
+ u16 *res;
- if (asix_read_cmd(dev, AX_CMD_READ_MONITOR_MODE, 0, 0, 1, &opt) < 0) {
- wolinfo->supported = 0;
- wolinfo->wolopts = 0;
+ res = kmalloc(2, GFP_ATOMIC);
+ if (!res)
return;
+ *res = val;
+
+ ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0, 0, 0, NULL);
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id,
+ (__u16)loc, 2, res);
+
+ if (loc == MII_ADVERTISE) {
+ *res = cpu_to_le16(BMCR_ANENABLE | BMCR_ANRESTART);
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id,
+ (__u16)MII_BMCR, 2, res);
}
- wolinfo->supported = WAKE_PHY | WAKE_MAGIC;
- wolinfo->wolopts = 0;
- if (opt & AX_MONITOR_MODE) {
- if (opt & AX_MONITOR_LINK)
- wolinfo->wolopts |= WAKE_PHY;
- if (opt & AX_MONITOR_MAGIC)
- wolinfo->wolopts |= WAKE_MAGIC;
+
+ ax8817x_write_cmd(dev, AX_CMD_SET_HW_MII, 0, 0, 0, NULL);
+
+ kfree(res);
+}
+
+/* same as above, but converts new value to le16 byte order before writing */
+static void
+ax8817x_mdio_write_le(struct net_device *netdev, int phy_id, int loc, int val)
+{
+ ax8817x_mdio_write(netdev, phy_id, loc, cpu_to_le16(val));
+}
+
+static void ax8817x_swmii_mdio_write_le(struct net_device *netdev,
+ int phy_id, int loc, int val)
+{
+ ax8817x_swmii_mdio_write(netdev, phy_id, loc, cpu_to_le16(val));
+}
+
+static void
+ax88772b_mdio_write_le(struct net_device *netdev, int phy_id, int loc, int val)
+{
+ ax88772b_mdio_write(netdev, phy_id, loc, cpu_to_le16(val));
+}
+
+static int asix_write_medium_mode(struct usbnet *dev, u16 value)
+{
+ int ret;
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_MEDIUM_MODE,
+ value, 0, 0, NULL);
+ if (ret < 0)
+ netdev_err(dev->net, "%s (0x%04x) failed, err=%d\n",
+ __func__, value, ret);
+ return ret;
+}
+
+static int ax88772_suspend(struct usb_interface *intf,
+ pm_message_t message)
+{
+ struct usbnet *dev = usb_get_intfdata(intf);
+ u16 *medium;
+
+ medium = kmalloc(2, GFP_ATOMIC);
+ if (!medium)
+ return usbnet_suspend(intf, message);
+
+ ax8817x_read_cmd(dev, AX_CMD_READ_MEDIUM_MODE, 0, 0, 2, medium);
+ asix_write_medium_mode(dev, *medium & ~AX88772_MEDIUM_RX_ENABLE);
+
+ kfree(medium);
+ return usbnet_suspend(intf, message);
+}
+
+static int ax88772b_suspend(struct usb_interface *intf,
+ pm_message_t message)
+{
+ struct usbnet *dev = usb_get_intfdata(intf);
+ struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
+ u16 *tmp16;
+ u8 *opt;
+
+ tmp16 = kmalloc(2, GFP_ATOMIC);
+ if (!tmp16)
+ return usbnet_suspend(intf, message);
+ opt = (u8 *)tmp16;
+
+ ax8817x_read_cmd(dev, AX_CMD_READ_MEDIUM_MODE, 0, 0, 2, tmp16);
+ asix_write_medium_mode(dev, *tmp16 & ~AX88772_MEDIUM_RX_ENABLE);
+
+ ax8817x_read_cmd(dev, AX_CMD_READ_MONITOR_MODE, 0, 0, 1, opt);
+ if (!(*opt & AX_MONITOR_LINK) && !(*opt & AX_MONITOR_MAGIC)) {
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPRL | AX_SWRESET_IPPD, 0, 0, NULL);
+ } else {
+
+ if (priv->psc & AX_SWRESET_WOLLP) {
+ *tmp16 = ax8817x_mdio_read_le(dev->net,
+ dev->mii.phy_id, MII_BMCR);
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id,
+ MII_BMCR, *tmp16 | BMCR_ANENABLE);
+
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPRL | priv->psc, 0, 0, NULL);
+ }
+
+ if (priv->psc &
+ (AX_SWRESET_IPPSL_0 | AX_SWRESET_IPPSL_1)) {
+ *opt |= AX_MONITOR_LINK;
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_MONITOR_MODE,
+ *opt, 0, 0, NULL);
+ }
+ }
+
+ kfree(tmp16);
+ return usbnet_suspend(intf, message);
+}
+
+static int ax88772_resume(struct usb_interface *intf)
+{
+ struct usbnet *dev = usb_get_intfdata(intf);
+
+ netif_carrier_off(dev->net);
+ return usbnet_resume(intf);
+}
+
+static int ax88772b_resume(struct usb_interface *intf)
+{
+ struct usbnet *dev = usb_get_intfdata(intf);
+ struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
+
+ if (priv->psc & AX_SWRESET_WOLLP) {
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPRL | (priv->psc & 0x7FFF),
+ 0, 0, NULL);
}
+ if (priv->psc & (AX_SWRESET_IPPSL_0 | AX_SWRESET_IPPSL_1))
+ ax88772a_phy_powerup(dev);
+ netif_carrier_off(dev->net);
+ return usbnet_resume(intf);
+}
+
+static int ax88172_link_reset(struct usbnet *dev)
+{
+ u16 lpa;
+ u16 adv;
+ u16 res;
+ u8 mode;
+
+ mode = AX_MEDIUM_TX_ABORT_ALLOW | AX_MEDIUM_FLOW_CONTROL_EN;
+ lpa = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, MII_LPA);
+ adv = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, MII_ADVERTISE);
+ res = mii_nway_result(lpa|adv);
+ if (res & LPA_DUPLEX)
+ mode |= AX_MEDIUM_FULL_DUPLEX;
+ asix_write_medium_mode(dev, mode);
+ return 0;
+}
+
+static void
+ax8817x_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
+{
+ struct usbnet *dev = netdev_priv(net);
+ u8 *opt;
+
+ wolinfo->supported = 0;
+ wolinfo->wolopts = 0;
+
+ opt = kmalloc(1, GFP_KERNEL);
+ if (!opt)
+ return;
+
+ if (ax8817x_read_cmd(dev, AX_CMD_READ_MONITOR_MODE, 0, 0, 1, opt) < 0)
+ return;
+
+ wolinfo->supported = WAKE_PHY | WAKE_MAGIC;
+
+ if (*opt & AX_MONITOR_LINK)
+ wolinfo->wolopts |= WAKE_PHY;
+ if (*opt & AX_MONITOR_MAGIC)
+ wolinfo->wolopts |= WAKE_MAGIC;
+
+ kfree(opt);
}
static int
-asix_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
+ax8817x_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
{
struct usbnet *dev = netdev_priv(net);
- u8 opt = 0;
+ u8 *opt;
+ opt = kmalloc(1, GFP_KERNEL);
+ if (!opt)
+ return -ENOMEM;
+
+ *opt = 0;
if (wolinfo->wolopts & WAKE_PHY)
- opt |= AX_MONITOR_LINK;
+ *opt |= AX_MONITOR_LINK;
if (wolinfo->wolopts & WAKE_MAGIC)
- opt |= AX_MONITOR_MAGIC;
- if (opt != 0)
- opt |= AX_MONITOR_MODE;
+ *opt |= AX_MONITOR_MAGIC;
- if (asix_write_cmd(dev, AX_CMD_WRITE_MONITOR_MODE,
- opt, 0, 0, NULL) < 0)
- return -EINVAL;
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_MONITOR_MODE, *opt, 0, 0, NULL);
+ kfree(opt);
return 0;
}
-static int asix_get_eeprom_len(struct net_device *net)
+static int ax8817x_get_eeprom_len(struct net_device *net)
{
- struct usbnet *dev = netdev_priv(net);
- struct asix_data *data = (struct asix_data *)&dev->data;
-
- return data->eeprom_len;
+ return AX_EEPROM_LEN;
}
-static int asix_get_eeprom(struct net_device *net,
+static int ax8817x_get_eeprom(struct net_device *net,
struct ethtool_eeprom *eeprom, u8 *data)
{
struct usbnet *dev = netdev_priv(net);
- __le16 *ebuf = (__le16 *)data;
+ u16 *ebuf = (u16 *)data;
int i;
/* Crude hack to ensure that we don't overwrite memory
@@ -729,862 +692,2433 @@
eeprom->magic = AX_EEPROM_MAGIC;
/* ax8817x returns 2 bytes from eeprom on read */
- for (i=0; i < eeprom->len / 2; i++) {
- if (asix_read_cmd(dev, AX_CMD_READ_EEPROM,
+ for (i = 0; i < eeprom->len / 2; i++) {
+ if (ax8817x_read_cmd(dev, AX_CMD_READ_EEPROM,
eeprom->offset + i, 0, 2, &ebuf[i]) < 0)
return -EINVAL;
}
return 0;
}
-static void asix_get_drvinfo (struct net_device *net,
+static void ax8817x_get_drvinfo(struct net_device *net,
struct ethtool_drvinfo *info)
{
- struct usbnet *dev = netdev_priv(net);
- struct asix_data *data = (struct asix_data *)&dev->data;
-
/* Inherit standard device info */
usbnet_get_drvinfo(net, info);
- strncpy (info->driver, driver_name, sizeof info->driver);
- strncpy (info->version, DRIVER_VERSION, sizeof info->version);
- info->eedump_len = data->eeprom_len;
+ info->eedump_len = 0x3e;
}
-static u32 asix_get_link(struct net_device *net)
+static int ax8817x_get_settings(struct net_device *net, struct ethtool_cmd *cmd)
{
struct usbnet *dev = netdev_priv(net);
-
- return mii_link_ok(&dev->mii);
+ return mii_ethtool_gset(&dev->mii, cmd);
}
-static int asix_ioctl (struct net_device *net, struct ifreq *rq, int cmd)
+static int ax8817x_set_settings(struct net_device *net, struct ethtool_cmd *cmd)
{
struct usbnet *dev = netdev_priv(net);
-
- return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
+ return mii_ethtool_sset(&dev->mii, cmd);
}
-static int asix_set_mac_address(struct net_device *net, void *p)
+/*
+ * We need to override some ethtool_ops so we require our
+ * own structure so we don't interfere with other usbnet
+ * devices that may be connected at the same time.
+ */
+static struct ethtool_ops ax8817x_ethtool_ops = {
+ .get_drvinfo = ax8817x_get_drvinfo,
+ .get_link = ethtool_op_get_link,
+ .get_msglevel = usbnet_get_msglevel,
+ .set_msglevel = usbnet_set_msglevel,
+ .get_wol = ax8817x_get_wol,
+ .set_wol = ax8817x_set_wol,
+ .get_eeprom_len = ax8817x_get_eeprom_len,
+ .get_eeprom = ax8817x_get_eeprom,
+ .get_settings = ax8817x_get_settings,
+ .set_settings = ax8817x_set_settings,
+};
+
+static int ax8817x_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
{
struct usbnet *dev = netdev_priv(net);
- struct asix_data *data = (struct asix_data *)&dev->data;
- struct sockaddr *addr = p;
- if (netif_running(net))
- return -EBUSY;
- if (!is_valid_ether_addr(addr->sa_data))
- return -EADDRNOTAVAIL;
-
- memcpy(net->dev_addr, addr->sa_data, ETH_ALEN);
-
- /* We use the 20 byte dev->data
- * for our 6 byte mac buffer
- * to avoid allocating memory that
- * is tricky to free later */
- memcpy(data->mac_addr, addr->sa_data, ETH_ALEN);
- asix_write_cmd_async(dev, AX_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,
- data->mac_addr);
-
- return 0;
+ return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
}
-/* We need to override some ethtool_ops so we require our
- own structure so we don't interfere with other usbnet
- devices that may be connected at the same time. */
-static const struct ethtool_ops ax88172_ethtool_ops = {
- .get_drvinfo = asix_get_drvinfo,
- .get_link = asix_get_link,
- .get_msglevel = usbnet_get_msglevel,
- .set_msglevel = usbnet_set_msglevel,
- .get_wol = asix_get_wol,
- .set_wol = asix_set_wol,
- .get_eeprom_len = asix_get_eeprom_len,
- .get_eeprom = asix_get_eeprom,
- .get_settings = usbnet_get_settings,
- .set_settings = usbnet_set_settings,
- .nway_reset = usbnet_nway_reset,
+static const struct net_device_ops ax88x72_netdev_ops = {
+ .ndo_open = usbnet_open,
+ .ndo_stop = usbnet_stop,
+ .ndo_start_xmit = usbnet_start_xmit,
+ .ndo_tx_timeout = usbnet_tx_timeout,
+ .ndo_change_mtu = usbnet_change_mtu,
+ .ndo_do_ioctl = ax8817x_ioctl,
+ .ndo_set_mac_address = ax8817x_set_mac_addr,
+ .ndo_validate_addr = eth_validate_addr,
+ .ndo_set_multicast_list = ax8817x_set_multicast,
};
-static void ax88172_set_multicast(struct net_device *net)
+static int asix_read_mac(struct usbnet *dev, u8 op)
{
- struct usbnet *dev = netdev_priv(net);
- struct asix_data *data = (struct asix_data *)&dev->data;
- u8 rx_ctl = 0x8c;
+ u8 *buf;
+ int ret, len = ETH_ALEN;
- if (net->flags & IFF_PROMISC) {
- rx_ctl |= 0x01;
- } else if (net->flags & IFF_ALLMULTI ||
- netdev_mc_count(net) > AX_MAX_MCAST) {
- rx_ctl |= 0x02;
- } else if (netdev_mc_empty(net)) {
- /* just broadcast and directed */
+ buf = kzalloc(len, GFP_KERNEL);
+ if (!buf) {
+ netdev_err(dev->net, "%s kzalloc failed\n", __func__);
+ return -ENOMEM;
+ }
+ ret = ax8817x_read_cmd(dev, op, 0, 0, len, buf);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s failed, err=%d\n", __func__, ret);
} else {
- /* We use the 20 byte dev->data
- * for our 8 byte filter buffer
- * to avoid allocating memory that
- * is tricky to free later */
- struct netdev_hw_addr *ha;
- u32 crc_bits;
+ memcpy(dev->net->dev_addr, buf, len);
+ ret = 0;
+ }
+ kfree(buf);
+ return ret;
+}
- memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE);
+static int asix_read_phyid(struct usbnet *dev, u8 op)
+{
+ u8 *buf;
+ int ret, len = 2;
- /* Build the multicast hash filter. */
- netdev_for_each_mc_addr(ha, net) {
- crc_bits = ether_crc(ETH_ALEN, ha->addr) >> 26;
- data->multi_filter[crc_bits >> 3] |=
- 1 << (crc_bits & 7);
- }
+ buf = kzalloc(len, GFP_KERNEL);
+ if (!buf) {
+ netdev_err(dev->net, "%s kzalloc failed\n", __func__);
+ return -ENOMEM;
+ }
+ ret = ax8817x_read_cmd(dev, op, 0, 0, len, buf);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s failed, err=%d\n", __func__, ret);
+ } else if (ret < len) {
+ netdev_err(dev->net, "%s read only %d/%d bytes\n",
+ __func__, ret, len);
+ ret = -EIO;
+ } else {
+ dev->mii.phy_id = buf[1];
+ ret = 0;
+ }
+ kfree(buf);
+ return ret;
+}
- asix_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,
- AX_MCAST_FILTER_SIZE, data->multi_filter);
+static int asix_read_eeprom_le16(struct usbnet *dev, u8 offset, u16 *data)
+{
+ u16 *buf;
+ int ret, len = 2;
- rx_ctl |= 0x10;
+ buf = kzalloc(len, GFP_KERNEL);
+ if (!buf) {
+ netdev_err(dev->net, "%s kzalloc failed\n", __func__);
+ return -ENOMEM;
}
- asix_write_cmd_async(dev, AX_CMD_WRITE_RX_CTL, rx_ctl, 0, 0, NULL);
+ ret = ax8817x_read_cmd(dev, AX_CMD_READ_EEPROM, offset, 0, len, buf);
+ if (ret != 2) {
+ netdev_err(dev->net, "%s failed offset 0x%02x, err=%d\n",
+ __func__, offset, ret);
+ } else {
+ le16_to_cpus(buf);
+ *data = *buf;
+ ret = 0;
+ }
+ kfree(buf);
+ return ret;
}
-static int ax88172_link_reset(struct usbnet *dev)
+static int asix_read_mac_from_eeprom(struct usbnet *dev)
{
- u8 mode;
- struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
+ u16 buf[ETH_ALEN / 2];
+ int i, ret;
- mii_check_media(&dev->mii, 1, 1);
- mii_ethtool_gset(&dev->mii, &ecmd);
- mode = AX88172_MEDIUM_DEFAULT;
+ memset(buf, 0, sizeof(buf));
+ for (i = 0; i < ETH_ALEN; i += 2) {
+ ret = asix_read_eeprom_le16(dev, i + 4, buf + i);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s failed\n", __func__);
+ return ret;
+ }
+ }
+ memcpy(dev->net->dev_addr, buf, ETH_ALEN);
+ return 0;
+}
- if (ecmd.duplex != DUPLEX_FULL)
- mode |= ~AX88172_MEDIUM_FD;
+static int asix_phy_select(struct usbnet *dev, u16 physel)
+{
+ int ret;
- netdev_dbg(dev->net, "ax88172_link_reset() speed: %u duplex: %d setting mode to 0x%04x\n",
- ethtool_cmd_speed(&ecmd), ecmd.duplex, mode);
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_PHY_SELECT, physel, 0, 0, NULL);
+ if (ret < 0)
+ netdev_err(dev->net, "%s (0x%04x) failed, err=%d\n",
+ __func__, physel, ret);
+ return ret;
+}
- asix_write_medium_mode(dev, mode);
+static int asix_write_gpio(struct usbnet *dev, unsigned int wait, u16 value)
+{
+ int ret;
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_GPIOS, value, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s (0x%x) failed\n", __func__, value);
+ return ret;
+ }
+ if (!wait)
+ wait = 5;
+ if (wait < 20)
+ usleep_range(wait * 1000, wait * (1000 * 2));
+ else
+ msleep(wait);
return 0;
}
-static const struct net_device_ops ax88172_netdev_ops = {
- .ndo_open = usbnet_open,
- .ndo_stop = usbnet_stop,
- .ndo_start_xmit = usbnet_start_xmit,
- .ndo_tx_timeout = usbnet_tx_timeout,
- .ndo_change_mtu = usbnet_change_mtu,
- .ndo_set_mac_address = eth_mac_addr,
- .ndo_validate_addr = eth_validate_addr,
- .ndo_do_ioctl = asix_ioctl,
- .ndo_set_multicast_list = ax88172_set_multicast,
-};
-
-static int ax88172_bind(struct usbnet *dev, struct usb_interface *intf)
+static int ax8817x_bind(struct usbnet *dev, struct usb_interface *intf)
{
int ret = 0;
- u8 buf[ETH_ALEN];
int i;
unsigned long gpio_bits = dev->driver_info->data;
- struct asix_data *data = (struct asix_data *)&dev->data;
+ struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
- data->eeprom_len = AX88172_EEPROM_LEN;
-
- usbnet_get_endpoints(dev,intf);
+ usbnet_get_endpoints(dev, intf);
/* Toggle the GPIOs in a manufacturer/model specific way */
for (i = 2; i >= 0; i--) {
- if ((ret = asix_write_cmd(dev, AX_CMD_WRITE_GPIOS,
- (gpio_bits >> (i * 8)) & 0xff, 0, 0,
- NULL)) < 0)
- goto out;
- msleep(5);
+ ret = asix_write_gpio(dev, 0, (gpio_bits >> (i * 8)) & 0xff);
+ if (ret)
+ goto err_out;
}
- if ((ret = asix_write_rx_ctl(dev, 0x80)) < 0)
- goto out;
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL, 0x80, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: WRITE_RX_CTL failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
/* Get the MAC address */
- if ((ret = asix_read_cmd(dev, AX88172_CMD_READ_NODE_ID,
- 0, 0, ETH_ALEN, buf)) < 0) {
- dbg("read AX_CMD_READ_NODE_ID failed: %d", ret);
- goto out;
- }
- memcpy(dev->net->dev_addr, buf, ETH_ALEN);
+ ret = asix_read_mac(dev, AX_CMD_READ_NODE_ID);
+ if (ret < 0)
+ goto err_out;
+
+ /* Get the PHY id */
+ ret = asix_read_phyid(dev, AX_CMD_READ_PHY_ID);
+ if (ret < 0)
+ goto err_out;
/* Initialize MII structure */
dev->mii.dev = dev->net;
- dev->mii.mdio_read = asix_mdio_read;
- dev->mii.mdio_write = asix_mdio_write;
+ dev->mii.mdio_read = ax8817x_mdio_read_le;
+ dev->mii.mdio_write = ax8817x_mdio_write_le;
dev->mii.phy_id_mask = 0x3f;
dev->mii.reg_num_mask = 0x1f;
- dev->mii.phy_id = asix_get_phy_addr(dev);
+ dev->net->netdev_ops = &ax88x72_netdev_ops;
+ dev->net->ethtool_ops = &ax8817x_ethtool_ops;
- dev->net->netdev_ops = &ax88172_netdev_ops;
- dev->net->ethtool_ops = &ax88172_ethtool_ops;
+ /* Register suspend and resume functions */
+ data->suspend = usbnet_suspend;
+ data->resume = usbnet_resume;
- asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
- asix_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
mii_nway_restart(&dev->mii);
+ printk(KERN_INFO "%s\n", driver_version);
return 0;
-out:
+err_out:
return ret;
}
-static const struct ethtool_ops ax88772_ethtool_ops = {
- .get_drvinfo = asix_get_drvinfo,
- .get_link = asix_get_link,
+static struct ethtool_ops ax88772_ethtool_ops = {
+ .get_drvinfo = ax8817x_get_drvinfo,
+ .get_link = ethtool_op_get_link,
.get_msglevel = usbnet_get_msglevel,
.set_msglevel = usbnet_set_msglevel,
- .get_wol = asix_get_wol,
- .set_wol = asix_set_wol,
- .get_eeprom_len = asix_get_eeprom_len,
- .get_eeprom = asix_get_eeprom,
- .get_settings = usbnet_get_settings,
- .set_settings = usbnet_set_settings,
- .nway_reset = usbnet_nway_reset,
+ .get_wol = ax8817x_get_wol,
+ .set_wol = ax8817x_set_wol,
+ .get_eeprom_len = ax8817x_get_eeprom_len,
+ .get_eeprom = ax8817x_get_eeprom,
+ .get_settings = ax8817x_get_settings,
+ .set_settings = ax8817x_set_settings,
};
-static int ax88772_link_reset(struct usbnet *dev)
+static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
{
- u16 mode;
- struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
+ int ret;
+ struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
+ struct ax88772_data *priv;
- mii_check_media(&dev->mii, 1, 1);
- mii_ethtool_gset(&dev->mii, &ecmd);
- mode = AX88772_MEDIUM_DEFAULT;
+ usbnet_get_endpoints(dev, intf);
- if (ethtool_cmd_speed(&ecmd) != SPEED_100)
- mode &= ~AX_MEDIUM_PS;
+ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+ if (!priv) {
+ netdev_err(dev->net, "%s: kzalloc(priv) failed\n", __func__);
+ return -ENOMEM;
+ }
+ dev->driver_priv = priv;
- if (ecmd.duplex != DUPLEX_FULL)
- mode &= ~AX_MEDIUM_FD;
+ priv->ax_work = create_singlethread_workqueue("ax88772");
+ if (!priv->ax_work) {
+ netdev_err(dev->net, "%s: create workqueue failed\n", __func__);
+ kfree(priv);
+ return -ENOMEM;
+ }
- netdev_dbg(dev->net, "ax88772_link_reset() speed: %u duplex: %d setting mode to 0x%04x\n",
- ethtool_cmd_speed(&ecmd), ecmd.duplex, mode);
+ priv->dev = dev;
+ INIT_WORK(&priv->check_link, ax88772_link_reset);
- asix_write_medium_mode(dev, mode);
+ /* reload eeprom data */
+ ret = asix_write_gpio(dev, 0, AXGPIOS_RSE|AXGPIOS_GPO2|AXGPIOS_GPO2EN);
+ if (ret)
+ goto err_out;
- return 0;
-}
+ /* Initialize MII structure */
+ dev->mii.dev = dev->net;
+ dev->mii.mdio_read = ax8817x_mdio_read_le;
+ dev->mii.mdio_write = ax8817x_mdio_write_le;
+ dev->mii.phy_id_mask = 0xff;
+ dev->mii.reg_num_mask = 0xff;
-static const struct net_device_ops ax88772_netdev_ops = {
- .ndo_open = usbnet_open,
- .ndo_stop = usbnet_stop,
- .ndo_start_xmit = usbnet_start_xmit,
- .ndo_tx_timeout = usbnet_tx_timeout,
- .ndo_change_mtu = usbnet_change_mtu,
- .ndo_set_mac_address = asix_set_mac_address,
- .ndo_validate_addr = eth_validate_addr,
- .ndo_do_ioctl = asix_ioctl,
- .ndo_set_multicast_list = asix_set_multicast,
-};
+ /* Get the PHY id */
+ ret = asix_read_phyid(dev, AX_CMD_READ_PHY_ID);
+ if (ret < 0)
+ goto err_out;
+ if (dev->mii.phy_id == 0x10) {
+ ret = asix_phy_select(dev, 0x0001);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: Failed to power down PHY"
+ ", err=%d\n", __func__, ret);
+ goto err_out;
+ }
-static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
-{
- int ret, embd_phy;
- u16 rx_ctl;
- struct asix_data *data = (struct asix_data *)&dev->data;
- u8 buf[ETH_ALEN];
- u32 phyid;
-
- data->eeprom_len = AX88772_EEPROM_LEN;
-
- usbnet_get_endpoints(dev,intf);
-
- if ((ret = asix_write_gpio(dev,
- AX_GPIO_RSE | AX_GPIO_GPO_2 | AX_GPIO_GPO2EN, 5)) < 0)
- goto out;
-
- /* 0x10 is the phy id of the embedded 10/100 ethernet phy */
- embd_phy = ((asix_get_phy_addr(dev) & 0x1f) == 0x10 ? 1 : 0);
- if ((ret = asix_write_cmd(dev, AX_CMD_SW_PHY_SELECT,
- embd_phy, 0, 0, NULL)) < 0) {
- dbg("Select PHY #1 failed: %d", ret);
- goto out;
- }
+ msleep(150);
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_CLEAR, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: SW_RESET failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
- if ((ret = asix_sw_reset(dev, AX_SWRESET_IPPD | AX_SWRESET_PRL)) < 0)
- goto out;
+ msleep(150);
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPRL | AX_SWRESET_PRL, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: Failed to set PHY reset "
+ "control, err=%d\n", __func__, ret);
+ goto err_out;
+ }
+ } else {
+ ret = asix_phy_select(dev, 0x0000);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD | AX_SWRESET_PRL, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: Failed to power down "
+ "internal PHY, err=%d\n", __func__, ret);
+ goto err_out;
+ }
+ }
msleep(150);
- if ((ret = asix_sw_reset(dev, AX_SWRESET_CLEAR)) < 0)
- goto out;
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL, 0x0000, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: Failed to reset RX_CTL, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
- msleep(150);
- if (embd_phy) {
- if ((ret = asix_sw_reset(dev, AX_SWRESET_IPRL)) < 0)
- goto out;
- }
- else {
- if ((ret = asix_sw_reset(dev, AX_SWRESET_PRTE)) < 0)
- goto out;
+ /* Get the MAC address */
+ ret = asix_read_mac(dev, AX88772_CMD_READ_NODE_ID);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: Failed to enable software MII"
+ ", err=%d\n", __func__, ret);
+ goto err_out;
}
- msleep(150);
- rx_ctl = asix_read_rx_ctl(dev);
- dbg("RX_CTL is 0x%04x after software reset", rx_ctl);
- if ((ret = asix_write_rx_ctl(dev, 0x0000)) < 0)
- goto out;
+ if (dev->mii.phy_id == 0x10) {
+ ret = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, 2);
+ if (ret != 0x003b) {
+ netdev_err(dev->net, "%s: PHY reg 2 not 0x3b00: 0x%x\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_PRL, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: Failed to set "
+ "external PHY reset pin level, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+ msleep(150);
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPRL | AX_SWRESET_PRL, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: Failed to set "
+ "internal/external PHY reset control, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+ msleep(150);
+ }
+
+ dev->net->netdev_ops = &ax88x72_netdev_ops;
+ dev->net->ethtool_ops = &ax88772_ethtool_ops;
+
+ /* Register suspend and resume functions */
+ data->suspend = ax88772_suspend;
+ data->resume = ax88772_resume;
+
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
+ ADVERTISE_ALL | ADVERTISE_CSMA);
+
+ mii_nway_restart(&dev->mii);
+ priv->autoneg_start = jiffies;
+ priv->Event = WAIT_AUTONEG_COMPLETE;
+
+ ret = asix_write_medium_mode(dev, AX88772_MEDIUM_DEFAULT);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_IPG0,
+ AX88772_IPG0_DEFAULT | AX88772_IPG1_DEFAULT << 8,
+ AX88772_IPG2_DEFAULT, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: WRITE_IPG0/1/2 failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+ ret = ax8817x_write_cmd(dev, AX_CMD_SET_HW_MII, 0, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: SET_HW_MII failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ /* Set RX_CTL to default values with 2k buffer, and enable cactus */
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL, 0x0088, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: WRITE_RX_CTL failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ /* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
+ if (dev->driver_info->flags & FLAG_FRAMING_AX) {
+ /*
+ * hard_mtu is still the default;
+ * the device does not support jumbo eth frames
+ */
+ dev->rx_urb_size = 2048;
+ }
+
+ printk(KERN_INFO "%s\n", driver_version);
+ return 0;
+
+err_out:
+ destroy_workqueue(priv->ax_work);
+ kfree(priv);
+ return ret;
+}
- rx_ctl = asix_read_rx_ctl(dev);
- dbg("RX_CTL is 0x%04x setting to 0x0000", rx_ctl);
+static void ax88772_unbind(struct usbnet *dev, struct usb_interface *intf)
+{
+ struct ax88772_data *priv = (struct ax88772_data *)dev->driver_priv;
+
+ if (priv) {
+
+ flush_workqueue(priv->ax_work);
+ destroy_workqueue(priv->ax_work);
+
+ /* stop MAC operation */
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
+ AX_RX_CTL_STOP, 0, 0, NULL);
+
+ /* Power down PHY */
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD, 0, 0, NULL);
+ kfree(priv);
+ }
+}
+
+static int ax88772a_phy_powerup(struct usbnet *dev)
+{
+ int ret;
+ /* set the embedded Ethernet PHY in power-down state */
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD | AX_SWRESET_IPRL, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: power down PHY failed, err=%d\n",
+ __func__, ret);
+ return ret;
+ }
+
+ msleep(20); /* was 10ms */
+
+
+ /* set the embedded Ethernet PHY in power-up state */
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET, AX_SWRESET_IPRL,
+ 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: reset PHY failed, err=%d\n",
+ __func__, ret);
+ return ret;
+ }
+
+ msleep(600);
+
+ /* set the embedded Ethernet PHY in reset state */
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET, AX_SWRESET_CLEAR,
+ 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: power up PHY failed, err=%d\n",
+ __func__, ret);
+ return ret;
+ }
+
+ /* set the embedded Ethernet PHY in power-up state */
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET, AX_SWRESET_IPRL,
+ 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: second reset PHY failed, err=%d\n",
+ __func__, ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int ax88772a_bind(struct usbnet *dev, struct usb_interface *intf)
+{
+ int ret = -EIO;
+ struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
+ struct ax88772a_data *priv;
+
+ usbnet_get_endpoints(dev, intf);
+
+ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+ if (!priv) {
+ netdev_err(dev->net, "%s: kzalloc(priv) failed\n", __func__);
+ return -ENOMEM;
+ }
+ dev->driver_priv = priv;
+
+ priv->ax_work = create_singlethread_workqueue("ax88772a");
+ if (!priv->ax_work) {
+ netdev_err(dev->net, "%s: create workqueue failed\n", __func__);
+ kfree(priv);
+ return -ENOMEM;
+ }
+
+ priv->dev = dev;
+ INIT_WORK(&priv->check_link, ax88772a_link_reset);
+
+ /* Get the EEPROM data*/
+ ret = asix_read_eeprom_le16(dev, 0x17, &priv->EepromData);
+ if (ret < 0)
+ goto err_out;
+
+ /* reload eeprom data */
+ ret = asix_write_gpio(dev, 0, AXGPIOS_RSE);
+ if (ret)
+ goto err_out;
+
+ /* Initialize MII structure */
+ dev->mii.dev = dev->net;
+ dev->mii.mdio_read = ax8817x_mdio_read_le;
+ dev->mii.mdio_write = ax8817x_mdio_write_le;
+ dev->mii.phy_id_mask = 0xff;
+ dev->mii.reg_num_mask = 0xff;
+
+ /* Get the PHY id */
+ ret = asix_read_phyid(dev, AX_CMD_READ_PHY_ID);
+ if (ret < 0)
+ goto err_out;
+ if (dev->mii.phy_id != 0x10) {
+ netdev_err(dev->net, "%s: Got wrong PHY_ID: 0x%02x\n",
+ __func__, dev->mii.phy_id);
+ ret = -EIO;
+ goto err_out;
+ }
+
+ /* select the embedded 10/100 Ethernet PHY */
+ ret = asix_phy_select(dev,
+ AX_PHYSEL_SSEN | AX_PHYSEL_PSEL | AX_PHYSEL_SSMII);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax88772a_phy_powerup(dev);
+ if (ret < 0)
+ goto err_out;
+
+ /* stop MAC operation */
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
+ AX_RX_CTL_STOP, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: reset RX_CTL failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
/* Get the MAC address */
- if ((ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID,
- 0, 0, ETH_ALEN, buf)) < 0) {
- dbg("Failed to read MAC address: %d", ret);
- goto out;
+ ret = asix_read_mac(dev, AX88772_CMD_READ_NODE_ID);
+ if (ret < 0)
+ goto err_out;
+
+ /* make sure the driver can enable sw mii operation */
+ ret = ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: enable software MII failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ dev->net->netdev_ops = &ax88x72_netdev_ops;
+ dev->net->ethtool_ops = &ax88772_ethtool_ops;
+
+ /* Register suspend and resume functions */
+ data->suspend = ax88772_suspend;
+ data->resume = ax88772_resume;
+
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
+ ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
+
+ mii_nway_restart(&dev->mii);
+ priv->autoneg_start = jiffies;
+ priv->Event = WAIT_AUTONEG_COMPLETE;
+
+ ret = asix_write_medium_mode(dev, AX88772_MEDIUM_DEFAULT);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_IPG0,
+ AX88772A_IPG0_DEFAULT | AX88772A_IPG1_DEFAULT << 8,
+ AX88772A_IPG2_DEFAULT, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: write IPG,IPG1,IPG2 failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ /* Set RX_CTL to default values with 2k buffer, and enable cactus */
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
+ AX_RX_CTL_START | AX_RX_CTL_AB, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: Reset RX_CTL failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ /* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
+ if (dev->driver_info->flags & FLAG_FRAMING_AX) {
+ /*
+ * hard_mtu is still the default;
+ * the device does not support jumbo eth frames
+ */
+ dev->rx_urb_size = 2048;
+ }
+
+ printk(KERN_INFO "%s\n", driver_version);
+ return ret;
+
+err_out:
+ destroy_workqueue(priv->ax_work);
+ kfree(priv);
+ return ret;
+}
+
+static void ax88772a_unbind(struct usbnet *dev, struct usb_interface *intf)
+{
+ struct ax88772a_data *priv = (struct ax88772a_data *)dev->driver_priv;
+
+ if (priv) {
+
+ flush_workqueue(priv->ax_work);
+ destroy_workqueue(priv->ax_work);
+
+ /* stop MAC operation */
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
+ AX_RX_CTL_STOP, 0, 0, NULL);
+
+ /* Power down PHY */
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD, 0, 0, NULL);
+ kfree(priv);
+ }
+}
+
+static int ax88772b_set_csums(struct usbnet *dev)
+{
+ struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
+ u16 checksum;
+
+ if (priv->checksum & AX_RX_CHECKSUM)
+ checksum = AX_RXCOE_DEF_CSUM;
+ else
+ checksum = 0;
+
+ if (priv->checksum & AX_TX_CHECKSUM)
+ checksum = AX_TXCOE_DEF_CSUM;
+ else
+ checksum = 0;
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_RXCOE_CTL,
+ checksum, 0, 0, NULL);
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_TXCOE_CTL,
+ checksum, 0, 0, NULL);
+
+ return 0;
+}
+
+static int ax88772b_set_features(struct net_device *netdev, u32 features)
+{
+ struct usbnet *dev = netdev_priv(netdev);
+ struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
+ unsigned long flags;
+ u16 tx_csum = 0, rx_csum = 0;
+
+ spin_lock_irqsave(&priv->checksum_lock, flags);
+ if (features & NETIF_F_HW_CSUM) {
+ priv->checksum |= AX_TX_CHECKSUM;
+ tx_csum = AX_TXCOE_DEF_CSUM;
+ } else
+ priv->checksum &= ~AX_TX_CHECKSUM;
+ if (features & NETIF_F_RXCSUM) {
+ priv->checksum |= AX_RX_CHECKSUM;
+ rx_csum = AX_RXCOE_DEF_CSUM;
+ } else
+ priv->checksum &= ~AX_RX_CHECKSUM;
+ spin_unlock_irqrestore(&priv->checksum_lock, flags);
+
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_RXCOE_CTL,
+ rx_csum, 0, 0, NULL);
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_TXCOE_CTL,
+ tx_csum, 0, 0, NULL);
+ return 0;
+}
+
+static struct ethtool_ops ax88772b_ethtool_ops = {
+ .get_drvinfo = ax8817x_get_drvinfo,
+ .get_link = ethtool_op_get_link,
+ .get_msglevel = usbnet_get_msglevel,
+ .set_msglevel = usbnet_set_msglevel,
+ .get_wol = ax8817x_get_wol,
+ .set_wol = ax8817x_set_wol,
+ .get_eeprom_len = ax8817x_get_eeprom_len,
+ .get_eeprom = ax8817x_get_eeprom,
+ .get_settings = ax8817x_get_settings,
+ .set_settings = ax8817x_set_settings,
+};
+
+static const struct net_device_ops ax88772b_netdev_ops = {
+ .ndo_open = usbnet_open,
+ .ndo_stop = usbnet_stop,
+ .ndo_start_xmit = usbnet_start_xmit,
+ .ndo_tx_timeout = usbnet_tx_timeout,
+ .ndo_change_mtu = usbnet_change_mtu,
+ .ndo_do_ioctl = ax8817x_ioctl,
+ .ndo_set_mac_address = ax8817x_set_mac_addr,
+ .ndo_validate_addr = eth_validate_addr,
+ .ndo_set_multicast_list = ax88772b_set_multicast,
+ .ndo_set_features = ax88772b_set_features,
+};
+
+static int ax88772b_bind(struct usbnet *dev, struct usb_interface *intf)
+{
+ int ret;
+ struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
+ struct ax88772b_data *priv;
+ int rx_size;
+ u16 tmp16;
+
+ usbnet_get_endpoints(dev, intf);
+
+ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+ if (!priv) {
+ netdev_err(dev->net, "%s: kzalloc(priv) failed\n", __func__);
+ return -ENOMEM;
+ }
+ spin_lock_init(&priv->checksum_lock);
+ dev->driver_priv = priv;
+
+ priv->ax_work = create_singlethread_workqueue("ax88772b");
+ if (!priv->ax_work) {
+ netdev_err(dev->net, "%s: create workqueue failed\n", __func__);
+ kfree(priv);
+ return -ENOMEM;
+ }
+
+ priv->dev = dev;
+ INIT_WORK(&priv->check_link, ax88772b_link_reset);
+
+ /* reload eeprom data */
+ ret = asix_write_gpio(dev, 0, AXGPIOS_RSE);
+ if (ret)
+ goto err_out;
+
+ /* Get the EEPROM data*/
+ ret = asix_read_eeprom_le16(dev, 0x18, &priv->psc);
+ if (ret < 0)
+ goto err_out;
+ priv->psc &= 0xFF00;
+
+ /* Get the MAC address from the eeprom */
+ ret = asix_read_mac_from_eeprom(dev);
+ if (ret < 0)
+ goto err_out;
+
+ /* Set the MAC address */
+ ret = ax8817x_write_cmd(dev, AX88772_CMD_WRITE_NODE_ID,
+ 0, 0, ETH_ALEN, dev->net->dev_addr);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: set mac addr failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
}
- memcpy(dev->net->dev_addr, buf, ETH_ALEN);
/* Initialize MII structure */
dev->mii.dev = dev->net;
- dev->mii.mdio_read = asix_mdio_read;
- dev->mii.mdio_write = asix_mdio_write;
- dev->mii.phy_id_mask = 0x1f;
+ dev->mii.mdio_read = ax8817x_mdio_read_le;
+ dev->mii.mdio_write = ax88772b_mdio_write_le;
+ dev->mii.phy_id_mask = 0xff;
+ dev->mii.reg_num_mask = 0xff;
+
+ /* Get the PHY id */
+ ret = asix_read_phyid(dev, AX_CMD_READ_PHY_ID);
+ if (ret < 0)
+ goto err_out;
+ if (dev->mii.phy_id != 0x10) {
+ netdev_err(dev->net, "%s: Got wrong PHY_ID: 0x%02x\n",
+ __func__, dev->mii.phy_id);
+ ret = -EIO;
+ goto err_out;
+ }
+
+ /* select the embedded 10/100 Ethernet PHY */
+ ret = asix_phy_select(dev,
+ AX_PHYSEL_SSEN | AX_PHYSEL_PSEL | AX_PHYSEL_SSMII);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax88772a_phy_powerup(dev);
+ if (ret < 0)
+ goto err_out;
+
+ /* stop MAC operation */
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
+ AX_RX_CTL_STOP, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: reset RX_CTL failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ /* make sure the driver can enable sw mii operation */
+ ret = ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: enable software MII failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ dev->net->netdev_ops = &ax88772b_netdev_ops;
+ dev->net->ethtool_ops = &ax88772b_ethtool_ops;
+
+ /* Register suspend and resume functions */
+ data->suspend = ax88772b_suspend;
+ data->resume = ax88772b_resume;
+
+ tmp16 = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, 0x12);
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, 0x12,
+ ((tmp16 & 0xFF9F) | 0x0040));
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
+ ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
+ mii_nway_restart(&dev->mii);
+
+ ret = asix_write_medium_mode(dev, AX88772_MEDIUM_DEFAULT);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_IPG0,
+ AX88772A_IPG0_DEFAULT | AX88772A_IPG1_DEFAULT << 8,
+ AX88772A_IPG2_DEFAULT, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: write interfram gap failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ dev->net->features |= NETIF_F_IP_CSUM;
+ dev->net->features |= NETIF_F_IPV6_CSUM;
+
+ priv->checksum = AX_RX_CHECKSUM | AX_TX_CHECKSUM;
+ ret = ax88772b_set_csums(dev);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: write RX_COE/TX_COE failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ rx_size = bsize & 0x07;
+ if (dev->udev->speed == USB_SPEED_HIGH) {
+ ret = ax8817x_write_cmd(dev, 0x2A,
+ AX88772B_BULKIN_SIZE[rx_size].byte_cnt,
+ AX88772B_BULKIN_SIZE[rx_size].threshold,
+ 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: set rx_size failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+ dev->rx_urb_size = AX88772B_BULKIN_SIZE[rx_size].size;
+ } else {
+ ret = ax8817x_write_cmd(dev, 0x2A, 0x8000, 0x8001, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: set rx_size failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+ dev->rx_urb_size = 2048;
+ }
+
+ /* Configure RX header type */
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
+ (AX_RX_CTL_START | AX_RX_CTL_AB | AX_RX_HEADER_DEFAULT),
+ 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: reset RX_CTL failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ /* Overwrite power saving configuration from eeprom */
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPRL | (priv->psc & 0x7FFF), 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: set phy power saving failed, err=%d\n",
+ __func__, ret);
+ goto err_out;
+ }
+
+ printk(KERN_INFO "%s\n", driver_version);
+ return ret;
+
+err_out:
+ destroy_workqueue(priv->ax_work);
+ kfree(priv);
+ return ret;
+}
+
+static void ax88772b_unbind(struct usbnet *dev, struct usb_interface *intf)
+{
+ struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
+
+ if (priv) {
+
+ flush_workqueue(priv->ax_work);
+ destroy_workqueue(priv->ax_work);
+
+ /* stop MAC operation */
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
+ AX_RX_CTL_STOP, 0, 0, NULL);
+
+ /* Power down PHY */
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD, 0, 0, NULL);
+ kfree(priv);
+ }
+}
+
+static int
+ax88178_media_check(struct usbnet *dev, struct ax88178_data *priv)
+{
+ int fullduplex;
+ u16 tempshort = 0;
+ u16 media;
+ u16 advertise, lpa, result, stat1000;
+
+ advertise = ax8817x_mdio_read_le(dev->net,
+ dev->mii.phy_id, MII_ADVERTISE);
+ lpa = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, MII_LPA);
+ result = advertise & lpa;
+
+ stat1000 = ax8817x_mdio_read_le(dev->net,
+ dev->mii.phy_id, MII_STAT1000);
+
+ if ((priv->PhyMode == PHY_MODE_MARVELL) &&
+ (priv->LedMode == 1)) {
+ tempshort = ax8817x_mdio_read_le(dev->net,
+ dev->mii.phy_id, MARVELL_MANUAL_LED) & 0xfc0f;
+ }
+
+ fullduplex = 1;
+ if (stat1000 & LPA_1000FULL) {
+ media = MEDIUM_GIGA_MODE | MEDIUM_FULL_DUPLEX_MODE |
+ MEDIUM_ENABLE_125MHZ | MEDIUM_ENABLE_RECEIVE;
+ if ((priv->PhyMode == PHY_MODE_MARVELL) &&
+ (priv->LedMode == 1))
+ tempshort |= 0x3e0;
+ } else if (result & LPA_100FULL) {
+ media = MEDIUM_FULL_DUPLEX_MODE | MEDIUM_ENABLE_RECEIVE |
+ MEDIUM_MII_100M_MODE;
+ if ((priv->PhyMode == PHY_MODE_MARVELL) &&
+ (priv->LedMode == 1))
+ tempshort |= 0x3b0;
+ } else if (result & LPA_100HALF) {
+ fullduplex = 0;
+ media = MEDIUM_ENABLE_RECEIVE | MEDIUM_MII_100M_MODE;
+ if ((priv->PhyMode == PHY_MODE_MARVELL) &&
+ (priv->LedMode == 1))
+ tempshort |= 0x3b0;
+ } else if (result & LPA_10FULL) {
+ media = MEDIUM_FULL_DUPLEX_MODE | MEDIUM_ENABLE_RECEIVE;
+ if ((priv->PhyMode == PHY_MODE_MARVELL) &&
+ (priv->LedMode == 1))
+ tempshort |= 0x2f0;
+ } else {
+ media = MEDIUM_ENABLE_RECEIVE;
+ fullduplex = 0;
+ if ((priv->PhyMode == PHY_MODE_MARVELL) &&
+ (priv->LedMode == 1))
+ tempshort |= 0x02f0;
+ }
+
+ if ((priv->PhyMode == PHY_MODE_MARVELL) &&
+ (priv->LedMode == 1)) {
+ ax8817x_mdio_write_le(dev->net,
+ dev->mii.phy_id, MARVELL_MANUAL_LED, tempshort);
+ }
+
+ media |= 0x0004;
+ if (priv->UseRgmii)
+ media |= 0x0008;
+ if (fullduplex) {
+ media |= 0x0020; /* enable tx flow control as default */
+ media |= 0x0010; /* enable rx flow control as default */
+ }
+
+ return media;
+}
+
+static void Vitess_8601_Init(struct usbnet *dev, int State)
+{
+ u16 reg;
+
+ switch (State) {
+ case 0: /* tx, rx clock skew */
+ ax8817x_swmii_mdio_write_le(dev->net, dev->mii.phy_id, 31, 1);
+ ax8817x_swmii_mdio_write_le(dev->net, dev->mii.phy_id, 28, 0);
+ ax8817x_swmii_mdio_write_le(dev->net, dev->mii.phy_id, 31, 0);
+ break;
+
+ case 1:
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 31, 0x52B5);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18, 0x009E);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, 0xDD39);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x87AA);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0xA7B4);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18,
+ ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 18));
+
+ reg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 17) & ~0x003f) | 0x003c;
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, reg);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x87B4);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0xa794);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18,
+ ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 18));
+
+ reg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 17) & ~0x003f) | 0x003e;
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, reg);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x8794);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18, 0x00f7);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, 0xbe36);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x879e);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0xa7a0);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18,
+ ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 18));
+
+ reg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 17) & ~0x003f) | 0x0034;
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, reg);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x87a0);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18, 0x003c);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, 0xf3cf);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x87a2);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18, 0x003c);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, 0xf3cf);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x87a4);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18, 0x003c);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, 0xd287);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x87a6);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0xa7a8);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18,
+ ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 18));
+
+ reg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 17) & ~0x0fff) | 0x0125;
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, reg);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x87a8);
+
+ /* Enable Smart Pre-emphasis */
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0xa7fa);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18,
+ ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 18));
+
+ reg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 17) & ~0x0008) | 0x0008;
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, reg);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x87fa);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 31, 0);
+
+ break;
+ }
+}
+
+static int
+ax88178_phy_init(struct usbnet *dev, struct ax88178_data *priv)
+{
+ int i;
+ u16 PhyAnar, PhyAuxCtrl, PhyCtrl, TempShort, PhyID1;
+ u16 PhyReg = 0;
+
+ /* Disable MII operation of AX88178 Hardware */
+ ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0x0000, 0, 0, NULL);
+
+
+ /* Read SROM - MiiPhy Address (ID) */
+ ax8817x_read_cmd(dev, AX_CMD_READ_PHY_ID, 0, 0, 2, &dev->mii.phy_id);
+ le16_to_cpus(&dev->mii.phy_id);
+
+ /* Initialize MII structure */
+ dev->mii.phy_id >>= 8;
+ dev->mii.phy_id &= PHY_ID_MASK;
+ dev->mii.dev = dev->net;
+ dev->mii.mdio_read = ax8817x_mdio_read_le;
+ dev->mii.mdio_write = ax8817x_mdio_write_le;
+ dev->mii.phy_id_mask = 0x3f;
dev->mii.reg_num_mask = 0x1f;
- dev->mii.phy_id = asix_get_phy_addr(dev);
+ dev->mii.supports_gmii = 1;
- phyid = asix_get_phyid(dev);
- dbg("PHYID=0x%08x", phyid);
+ if (priv->PhyMode == PHY_MODE_MAC_TO_MAC_GMII) {
+ priv->UseRgmii = 0;
+ priv->MediaLink = MEDIUM_GIGA_MODE |
+ MEDIUM_FULL_DUPLEX_MODE |
+ MEDIUM_ENABLE_125MHZ |
+ MEDIUM_ENABLE_RECEIVE |
+ MEDIUM_ENABLE_RX_FLOWCTRL |
+ MEDIUM_ENABLE_TX_FLOWCTRL;
+
+ goto SkipPhySetting;
+ }
+
+ /* test read phy register 2 */
+ if (!priv->UseGpio0) {
+ i = 1000;
+ while (i--) {
+ PhyID1 = ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, MII_PHYSID1);
+ if ((PhyID1 == 0x000f) || (PhyID1 == 0x0141) ||
+ (PhyID1 == 0x0282) || (PhyID1 == 0x004d) ||
+ (PhyID1 == 0x0243) || (PhyID1 == 0x001C) ||
+ (PhyID1 == 0x0007))
+ break;
+ usleep_range(5, 20);
+ }
+ if (i < 0)
+ return -EIO;
+ }
- if ((ret = asix_sw_reset(dev, AX_SWRESET_PRL)) < 0)
- goto out;
+ priv->UseRgmii = 0;
+ if (priv->PhyMode == PHY_MODE_MARVELL) {
+ PhyReg = ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 27);
+ if (!(PhyReg & 4)) {
+ priv->UseRgmii = 1;
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 20, 0x82);
+ priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
+ }
+ } else if ((priv->PhyMode == PHY_MODE_AGERE_V0) ||
+ (priv->PhyMode == PHY_MODE_AGERE_V0_GMII)) {
+ if (priv->PhyMode == PHY_MODE_AGERE_V0) {
+ priv->UseRgmii = 1;
+ priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
+ }
+ } else if (priv->PhyMode == PHY_MODE_CICADA_V1) {
+ /* not Cameo */
+ if (!priv->UseGpio0 || priv->LedMode) {
+ priv->UseRgmii = 1;
+ priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
+ }
- msleep(150);
+ for (i = 0; i < (sizeof(CICADA_FAMILY_HWINIT) /
+ sizeof(CICADA_FAMILY_HWINIT[0])); i++) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id,
+ CICADA_FAMILY_HWINIT[i].offset,
+ CICADA_FAMILY_HWINIT[i].value);
+ }
+
+ } else if (priv->PhyMode == PHY_MODE_CICADA_V2) {
+ /* not Cameo */
+ if (!priv->UseGpio0 || priv->LedMode) {
+ priv->UseRgmii = 1;
+ priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
+ }
+
+ for (i = 0; i < (sizeof(CICADA_V2_HWINIT) /
+ sizeof(CICADA_V2_HWINIT[0])); i++) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, CICADA_V2_HWINIT[i].offset,
+ CICADA_V2_HWINIT[i].value);
+ }
+ } else if (priv->PhyMode == PHY_MODE_CICADA_V2_ASIX) {
+ /* not Cameo */
+ if (!priv->UseGpio0 || priv->LedMode) {
+ priv->UseRgmii = 1;
+ priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
+ }
+
+ for (i = 0; i < (sizeof(CICADA_V2_HWINIT) /
+ sizeof(CICADA_V2_HWINIT[0])); i++) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, CICADA_V2_HWINIT[i].offset,
+ CICADA_V2_HWINIT[i].value);
+ }
+ } else if (priv->PhyMode == PHY_MODE_RTL8211CL) {
+ priv->UseRgmii = 1;
+ priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
+ } else if (priv->PhyMode == PHY_MODE_RTL8211BN) {
+ priv->UseRgmii = 1;
+ priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
+ } else if (priv->PhyMode == PHY_MODE_RTL8251CL) {
+ priv->UseRgmii = 1;
+ priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
+ } else if (priv->PhyMode == PHY_MODE_VSC8601) {
+ priv->UseRgmii = 1;
+ priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
+ /* Vitess_8601_Init(dev, 0); */
+ }
+
+ if (priv->PhyMode != PHY_MODE_ATTANSIC_V0) {
+ /* software reset */
+ ax8817x_swmii_mdio_write_le(
+ dev->net, dev->mii.phy_id, MII_BMCR,
+ ax8817x_swmii_mdio_read_le(
+ dev->net, dev->mii.phy_id, MII_BMCR)
+ | BMCR_RESET);
+ usleep_range(1000, 2000);
+ }
+
+ if ((priv->PhyMode == PHY_MODE_AGERE_V0) ||
+ (priv->PhyMode == PHY_MODE_AGERE_V0_GMII)) {
+ if (priv->PhyMode == PHY_MODE_AGERE_V0) {
+ i = 1000;
+ while (i--) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 21, 0x1001);
+
+ PhyReg = ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 21);
+ if ((PhyReg & 0xf00f) == 0x1001)
+ break;
+ }
+ if (i < 0)
+ return -EIO;
+ }
+
+ if (priv->LedMode == 4) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 28, 0x7417);
+ } else if (priv->LedMode == 9) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 28, 0x7a10);
+ } else if (priv->LedMode == 10) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 28, 0x7a13);
+ }
+
+ for (i = 0; i < (sizeof(AGERE_FAMILY_HWINIT) /
+ sizeof(AGERE_FAMILY_HWINIT[0])); i++) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, AGERE_FAMILY_HWINIT[i].offset,
+ AGERE_FAMILY_HWINIT[i].value);
+ }
+ } else if (priv->PhyMode == PHY_MODE_RTL8211CL) {
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 0x1f, 0x0005);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 0x0c, 0);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 0x01,
+ (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 0x01) | 0x0080));
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 0x1f, 0);
+
+ if (priv->LedMode == 12) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 0x1f, 0x0002);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 0x1a, 0x00cb);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 0x1f, 0);
+ }
+ } else if (priv->PhyMode == PHY_MODE_VSC8601) {
+ Vitess_8601_Init(dev, 1);
+ }
+
+ /* read phy register 0 */
+ PhyCtrl = ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, MII_BMCR);
+ TempShort = PhyCtrl;
+ PhyCtrl &= ~(BMCR_PDOWN | BMCR_ISOLATE);
+ if (PhyCtrl != TempShort) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, MII_BMCR, PhyCtrl);
+ }
+
+ /* led */
+ if (priv->PhyMode == PHY_MODE_MARVELL) {
+ if (priv->LedMode == 1) {
+
+ PhyReg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 24) & 0xf8ff) | (1 + 0x100);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 24, PhyReg);
+ PhyReg = ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 25) & 0xfc0f;
+
+ } else if (priv->LedMode == 2) {
+
+ PhyReg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 24) & 0xf886) |
+ (1 + 0x10 + 0x300);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 24, PhyReg);
+
+ } else if (priv->LedMode == 5) {
+
+ PhyReg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 24) & 0xf8be) |
+ (1 + 0x40 + 0x300);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 24, PhyReg);
+
+ } else if (priv->LedMode == 7) {
+
+ PhyReg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 24) & 0xf8ff) |
+ (1 + 0x100);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 24, PhyReg);
+
+ } else if (priv->LedMode == 8) {
+
+ PhyReg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 24) & 0xf8be) |
+ (1 + 0x40 + 0x100);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 24, PhyReg);
+
+ } else if (priv->LedMode == 11) {
+
+ PhyReg = ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 24) & 0x4106;
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 24, PhyReg);
+
+ }
+ } else if ((priv->PhyMode == PHY_MODE_CICADA_V1) ||
+ (priv->PhyMode == PHY_MODE_CICADA_V2) ||
+ (priv->PhyMode == PHY_MODE_CICADA_V2_ASIX)) {
+
+ if (priv->LedMode == 3) {
+
+ PhyReg = (ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 27) & 0xFCFF) | 0x0100;
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 27, PhyReg);
+ }
+
+ }
+
+ if (priv->PhyMode == PHY_MODE_MARVELL) {
+ if (priv->LedMode == 1)
+ PhyReg |= 0x3f0;
+ }
+ PhyAnar = ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP |
+ ADVERTISE_100FULL | ADVERTISE_100HALF |
+ ADVERTISE_10FULL | ADVERTISE_10HALF |
+ ADVERTISE_PAUSE_ASYM;
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, MII_ADVERTISE, PhyAnar);
+ PhyAuxCtrl = ADVERTISE_1000FULL;
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, MII_CTRL1000, PhyAuxCtrl);
+
+ if (priv->PhyMode == PHY_MODE_VSC8601) {
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 31, 0x52B5);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0xA7F8);
+ TempShort = ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 17) & (~0x0018);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 17, TempShort);
+ TempShort = ax8817x_swmii_mdio_read_le(dev->net,
+ dev->mii.phy_id, 18);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 18, TempShort);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 16, 0x87F8);
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 31, 0);
+ }
+
+ if (priv->PhyMode == PHY_MODE_ATTANSIC_V0) {
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, MII_BMCR, 0x9000);
+
+ } else {
+ PhyCtrl &= ~BMCR_LOOPBACK;
+ PhyCtrl |= (BMCR_ANENABLE | BMCR_ANRESTART);
+
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, MII_BMCR, PhyCtrl);
+ }
+
+ if (priv->PhyMode == PHY_MODE_MARVELL) {
+ if (priv->LedMode == 1)
+ ax8817x_swmii_mdio_write_le(dev->net,
+ dev->mii.phy_id, 25, PhyReg);
+ }
+
+SkipPhySetting:
+
+ asix_write_medium_mode(dev, priv->MediaLink);
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_IPG0,
+ AX88772_IPG0_DEFAULT | (AX88772_IPG1_DEFAULT << 8),
+ AX88772_IPG2_DEFAULT, 0, NULL);
+ usleep_range(1000, 2000);
+ ax8817x_write_cmd(dev, AX_CMD_SET_HW_MII, 0, 0, 0, NULL);
+ return 0;
+}
+
+static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
+{
+ int ret;
+ struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
+ struct ax88178_data *priv;
+
+ usbnet_get_endpoints(dev, intf);
+
+ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+ if (!priv) {
+ netdev_err(dev->net, "%s: kzalloc(priv) failed\n", __func__);
+ return -ENOMEM;
+ }
+ dev->driver_priv = priv;
+
+ /* Get the EEPROM data*/
+ ret = asix_read_eeprom_le16(dev, 0x17, &priv->EepromData);
+ if (ret < 0)
+ goto err_out;
+
+ if (priv->EepromData == 0xffff) {
+ priv->PhyMode = PHY_MODE_MARVELL;
+ priv->LedMode = 0;
+ priv->UseGpio0 = 1;
+ } else {
+ priv->PhyMode = (u8)(priv->EepromData & EEPROMMASK);
+ priv->LedMode = (u8)(priv->EepromData >> 8);
+ if (priv->LedMode == 6) /* for buffalo new (use gpio2) */
+ priv->LedMode = 1;
+ else if (priv->LedMode == 1)
+ priv->BuffaloOld = 1;
+
+
+ if (priv->EepromData & 0x80)
+ priv->UseGpio0 = 0; /* MARVEL se and other */
+ else
+ priv->UseGpio0 = 1; /* cameo */
+ }
+
+ if (priv->UseGpio0) {
+
+ if (priv->PhyMode == PHY_MODE_MARVELL) {
+
+ ret = asix_write_gpio(dev, 25,
+ AXGPIOS_GPO0EN | AXGPIOS_RSE);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 15,
+ AXGPIOS_GPO2 | AXGPIOS_GPO2EN |
+ AXGPIOS_GPO0EN);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 245,
+ AXGPIOS_GPO2EN | AXGPIOS_GPO0EN);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 0,
+ AXGPIOS_GPO2 | AXGPIOS_GPO2EN |
+ AXGPIOS_GPO0EN);
+ if (ret)
+ goto err_out;
+
+ } else { /* vitesse */
+
+ ret = asix_write_gpio(dev, 25,
+ AXGPIOS_RSE | AXGPIOS_GPO0EN |
+ AXGPIOS_GPO0);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 25,
+ AXGPIOS_GPO0EN | AXGPIOS_GPO0 |
+ AXGPIOS_GPO2EN | AXGPIOS_GPO2);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 245,
+ AXGPIOS_GPO0EN | AXGPIOS_GPO0 |
+ AXGPIOS_GPO2EN);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 0,
+ AXGPIOS_GPO0EN | AXGPIOS_GPO0 |
+ AXGPIOS_GPO2EN | AXGPIOS_GPO2);
+ if (ret)
+ goto err_out;
+ }
+
+ } else { /* use gpio1 */
+
+ if (priv->BuffaloOld) {
+ ret = asix_write_gpio(dev, 350,
+ AXGPIOS_GPO1 | AXGPIOS_GPO1EN |
+ AXGPIOS_RSE);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 350,
+ AXGPIOS_GPO1EN);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 0,
+ AXGPIOS_GPO1EN | AXGPIOS_GPO1);
+ if (ret)
+ goto err_out;
+ } else {
+ ret = asix_write_gpio(dev, 25,
+ AXGPIOS_GPO1 | AXGPIOS_GPO1EN |
+ AXGPIOS_RSE);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 25,
+ AXGPIOS_GPO1EN | AXGPIOS_GPO1 |
+ AXGPIOS_GPO2EN | AXGPIOS_GPO2);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 245,
+ AXGPIOS_GPO1EN | AXGPIOS_GPO1 |
+ AXGPIOS_GPO2EN);
+ if (ret)
+ goto err_out;
+ ret = asix_write_gpio(dev, 0,
+ AXGPIOS_GPO1EN | AXGPIOS_GPO1 |
+ AXGPIOS_GPO2EN | AXGPIOS_GPO2);
+ if (ret)
+ goto err_out;
+ }
+ }
+
+ ret = asix_phy_select(dev, 0);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD | AX_SWRESET_PRL, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: SW_RESET failed\n", __func__);
+ goto err_out;
+ }
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL, 0, 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: RX_CTL failed\n", __func__);
+ goto err_out;
+ }
+
+ /* Get the MAC address */
+ ret = asix_read_mac(dev, AX88772_CMD_READ_NODE_ID);
+ if (ret < 0)
+ goto err_out;
+
+ ret = ax88178_phy_init(dev, priv);
+ if (ret < 0)
+ goto err_out;
+
+ dev->net->netdev_ops = &ax88x72_netdev_ops;
+ dev->net->ethtool_ops = &ax8817x_ethtool_ops;
+
+ /* Register suspend and resume functions */
+ data->suspend = ax88772_suspend;
+ data->resume = ax88772_resume;
+
+ if (dev->driver_info->flags & FLAG_FRAMING_AX)
+ dev->rx_urb_size = 16384;
+
+ ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
+ (AX_RX_CTL_MFB | AX_RX_CTL_START | AX_RX_CTL_AB),
+ 0, 0, NULL);
+ if (ret < 0) {
+ netdev_err(dev->net, "%s: RX_CTL failed\n", __func__);
+ goto err_out;
+ }
+
+ printk(KERN_INFO "%s\n", driver_version);
+ return ret;
+
+err_out:
+ kfree(priv);
+ return ret;
+}
+
+static void ax88178_unbind(struct usbnet *dev, struct usb_interface *intf)
+{
+ struct ax88178_data *priv = (struct ax88178_data *)dev->driver_priv;
+
+ if (priv) {
+
+ /* stop MAC operation */
+ ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
+ AX_RX_CTL_STOP, 0, 0, NULL);
+ kfree(priv);
+ }
+}
+
+static int ax88772_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
+{
+ u8 *head;
+ u32 header;
+ char *packet;
+ struct sk_buff *ax_skb;
+ u16 size;
+
+ head = (u8 *) skb->data;
+ memcpy(&header, head, sizeof(header));
+ le32_to_cpus(&header);
+ packet = head + sizeof(header);
- if ((ret = asix_sw_reset(dev, AX_SWRESET_IPRL | AX_SWRESET_PRL)) < 0)
- goto out;
+ skb_pull(skb, 4);
- msleep(150);
+ while (skb->len > 0) {
+ if ((short)(header & 0x0000ffff) !=
+ ~((short)((header & 0xffff0000) >> 16))) {
+ netdev_err(dev->net,
+ "%s: header length data is error 0x%08x, %d\n",
+ __func__, header, skb->len);
+ }
+ /* get the packet length */
+ size = (u16) (header & 0x0000ffff);
- dev->net->netdev_ops = &ax88772_netdev_ops;
- dev->net->ethtool_ops = &ax88772_ethtool_ops;
+ if ((skb->len) - ((size + 1) & 0xfffe) == 0) {
- asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
- asix_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
- ADVERTISE_ALL | ADVERTISE_CSMA);
- mii_nway_restart(&dev->mii);
+ /* Make sure ip header is aligned on 32-bit boundary */
+ if (!((unsigned long)skb->data & 0x02)) {
+ memmove(skb->data - 2, skb->data, size);
+ skb->data -= 2;
+ skb_set_tail_pointer(skb, size);
+ }
+ skb->truesize = size + sizeof(struct sk_buff);
+ return 2;
+ }
- if ((ret = asix_write_medium_mode(dev, AX88772_MEDIUM_DEFAULT)) < 0)
- goto out;
+ if (size > ETH_FRAME_LEN) {
+ netdev_err(dev->net, "%s: invalid rx length %d\n",
+ __func__, size);
+ return 0;
+ }
+ ax_skb = skb_clone(skb, GFP_ATOMIC);
+ if (ax_skb) {
- if ((ret = asix_write_cmd(dev, AX_CMD_WRITE_IPG0,
- AX88772_IPG0_DEFAULT | AX88772_IPG1_DEFAULT,
- AX88772_IPG2_DEFAULT, 0, NULL)) < 0) {
- dbg("Write IPG,IPG1,IPG2 failed: %d", ret);
- goto out;
- }
+ /* Make sure ip header is aligned on 32-bit boundary */
+ if (!((unsigned long)packet & 0x02)) {
+ memmove(packet - 2, packet, size);
+ packet -= 2;
+ }
+ ax_skb->data = packet;
+ skb_set_tail_pointer(ax_skb, size);
+ ax_skb->truesize = size + sizeof(struct sk_buff);
+ usbnet_skb_return(dev, ax_skb);
- /* Set RX_CTL to default values with 2k buffer, and enable cactus */
- if ((ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL)) < 0)
- goto out;
+ } else {
+ return 0;
+ }
- rx_ctl = asix_read_rx_ctl(dev);
- dbg("RX_CTL is 0x%04x after all initializations", rx_ctl);
+ skb_pull(skb, (size + 1) & 0xfffe);
- rx_ctl = asix_read_medium_status(dev);
- dbg("Medium Status is 0x%04x after all initializations", rx_ctl);
+ if (skb->len == 0)
+ break;
- /* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
- if (dev->driver_info->flags & FLAG_FRAMING_AX) {
- /* hard_mtu is still the default - the device does not support
- jumbo eth frames */
- dev->rx_urb_size = 2048;
+ head = (u8 *) skb->data;
+ memcpy(&header, head, sizeof(header));
+ le32_to_cpus(&header);
+ packet = head + sizeof(header);
+ skb_pull(skb, 4);
}
- return 0;
-out:
- return ret;
+ if (skb->len < 0) {
+ netdev_err(dev->net, "%s: invalid rx length %d\n",
+ __func__, skb->len);
+ return 0;
+ }
+ return 1;
}
-static struct ethtool_ops ax88178_ethtool_ops = {
- .get_drvinfo = asix_get_drvinfo,
- .get_link = asix_get_link,
- .get_msglevel = usbnet_get_msglevel,
- .set_msglevel = usbnet_set_msglevel,
- .get_wol = asix_get_wol,
- .set_wol = asix_set_wol,
- .get_eeprom_len = asix_get_eeprom_len,
- .get_eeprom = asix_get_eeprom,
- .get_settings = usbnet_get_settings,
- .set_settings = usbnet_set_settings,
- .nway_reset = usbnet_nway_reset,
-};
-
-static int marvell_phy_init(struct usbnet *dev)
+static struct sk_buff *ax88772_tx_fixup(struct usbnet *dev,
+ struct sk_buff *skb, gfp_t flags)
{
- struct asix_data *data = (struct asix_data *)&dev->data;
- u16 reg;
-
- netdev_dbg(dev->net, "marvell_phy_init()\n");
+ int padlen = ((skb->len + 4) % 512) ? 0 : 4;
+ u32 packet_len;
+ u32 padbytes = 0xffff0000;
+ int headroom = skb_headroom(skb);
+ int tailroom = skb_tailroom(skb);
- reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_MARVELL_STATUS);
- netdev_dbg(dev->net, "MII_MARVELL_STATUS = 0x%04x\n", reg);
+ if ((!skb_cloned(skb))
+ && ((headroom + tailroom) >= (4 + padlen))) {
+ if ((headroom < 4) || (tailroom < padlen)) {
+ skb->data = memmove(skb->head + 4, skb->data, skb->len);
+ skb_set_tail_pointer(skb, skb->len);
+ }
+ } else {
+ struct sk_buff *skb2;
+ skb2 = skb_copy_expand(skb, 4, padlen, flags);
+ dev_kfree_skb_any(skb);
+ skb = skb2;
+ if (!skb)
+ return NULL;
+ }
- asix_mdio_write(dev->net, dev->mii.phy_id, MII_MARVELL_CTRL,
- MARVELL_CTRL_RXDELAY | MARVELL_CTRL_TXDELAY);
+ skb_push(skb, 4);
+ packet_len = (((skb->len - 4) ^ 0x0000ffff) << 16) + (skb->len - 4);
+ cpu_to_le32s(&packet_len);
+ skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len));
- if (data->ledmode) {
- reg = asix_mdio_read(dev->net, dev->mii.phy_id,
- MII_MARVELL_LED_CTRL);
- netdev_dbg(dev->net, "MII_MARVELL_LED_CTRL (1) = 0x%04x\n", reg);
-
- reg &= 0xf8ff;
- reg |= (1 + 0x0100);
- asix_mdio_write(dev->net, dev->mii.phy_id,
- MII_MARVELL_LED_CTRL, reg);
-
- reg = asix_mdio_read(dev->net, dev->mii.phy_id,
- MII_MARVELL_LED_CTRL);
- netdev_dbg(dev->net, "MII_MARVELL_LED_CTRL (2) = 0x%04x\n", reg);
- reg &= 0xfc0f;
+ if ((skb->len % 512) == 0) {
+ cpu_to_le32s(&padbytes);
+ memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes));
+ skb_put(skb, sizeof(padbytes));
}
-
- return 0;
+ return skb;
}
-static int marvell_led_status(struct usbnet *dev, u16 speed)
+static void
+ax88772b_rx_checksum(struct sk_buff *skb, struct ax88772b_rx_header *rx_hdr)
{
- u16 reg = asix_mdio_read(dev->net, dev->mii.phy_id, MARVELL_LED_MANUAL);
-
- netdev_dbg(dev->net, "marvell_led_status() read 0x%04x\n", reg);
+ skb->ip_summed = CHECKSUM_NONE;
- /* Clear out the center LED bits - 0x03F0 */
- reg &= 0xfc0f;
+ /* checksum error bit is set */
+ if (rx_hdr->l3_csum_err || rx_hdr->l4_csum_err)
+ return;
- switch (speed) {
- case SPEED_1000:
- reg |= 0x03e0;
- break;
- case SPEED_100:
- reg |= 0x03b0;
- break;
- default:
- reg |= 0x02f0;
+ /* It must be a TCP or UDP packet with a valid checksum */
+ if ((rx_hdr->l4_type == AX_RXHDR_L4_TYPE_TCP) ||
+ (rx_hdr->l4_type == AX_RXHDR_L4_TYPE_UDP)) {
+ skb->ip_summed = CHECKSUM_UNNECESSARY;
}
-
- netdev_dbg(dev->net, "marvell_led_status() writing 0x%04x\n", reg);
- asix_mdio_write(dev->net, dev->mii.phy_id, MARVELL_LED_MANUAL, reg);
-
- return 0;
}
-static int ax88178_link_reset(struct usbnet *dev)
+static int ax88772b_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
{
- u16 mode;
- struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
- struct asix_data *data = (struct asix_data *)&dev->data;
- u32 speed;
-
- netdev_dbg(dev->net, "ax88178_link_reset()\n");
-
- mii_check_media(&dev->mii, 1, 1);
- mii_ethtool_gset(&dev->mii, &ecmd);
- mode = AX88178_MEDIUM_DEFAULT;
- speed = ethtool_cmd_speed(&ecmd);
-
- if (speed == SPEED_1000)
- mode |= AX_MEDIUM_GM;
- else if (speed == SPEED_100)
- mode |= AX_MEDIUM_PS;
- else
- mode &= ~(AX_MEDIUM_PS | AX_MEDIUM_GM);
+ struct ax88772b_rx_header rx_hdr;
+ struct sk_buff *ax_skb;
+ struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
- mode |= AX_MEDIUM_ENCK;
+ while (skb->len > 0) {
- if (ecmd.duplex == DUPLEX_FULL)
- mode |= AX_MEDIUM_FD;
- else
- mode &= ~AX_MEDIUM_FD;
+ memcpy(&rx_hdr, skb->data, sizeof(struct ax88772b_rx_header));
- netdev_dbg(dev->net, "ax88178_link_reset() speed: %u duplex: %d setting mode to 0x%04x\n",
- speed, ecmd.duplex, mode);
+ if ((short)rx_hdr.len != (~((short)rx_hdr.len_bar) & 0x7FF))
+ return 0;
+ if (rx_hdr.len > (ETH_FRAME_LEN + 4)) {
+ netdev_err(dev->net, "%s: invalid rx length %d\n",
+ __func__, rx_hdr.len);
+ return 0;
+ }
- asix_write_medium_mode(dev, mode);
+ if (skb->len - ((rx_hdr.len +
+ sizeof(struct ax88772b_rx_header) + 3) &
+ 0xfffc) == 0) {
+ skb_pull(skb, sizeof(struct ax88772b_rx_header));
+ skb->len = rx_hdr.len;
- if (data->phymode == PHY_MODE_MARVELL && data->ledmode)
- marvell_led_status(dev, speed);
+ skb_set_tail_pointer(skb, rx_hdr.len);
+ skb->truesize = rx_hdr.len + sizeof(struct sk_buff);
- return 0;
-}
+ if (priv->checksum & AX_RX_CHECKSUM)
+ ax88772b_rx_checksum(skb, &rx_hdr);
-static void ax88178_set_mfb(struct usbnet *dev)
-{
- u16 mfb = AX_RX_CTL_MFB_16384;
- u16 rxctl;
- u16 medium;
- int old_rx_urb_size = dev->rx_urb_size;
+ return 2;
+ }
- if (dev->hard_mtu < 2048) {
- dev->rx_urb_size = 2048;
- mfb = AX_RX_CTL_MFB_2048;
- } else if (dev->hard_mtu < 4096) {
- dev->rx_urb_size = 4096;
- mfb = AX_RX_CTL_MFB_4096;
- } else if (dev->hard_mtu < 8192) {
- dev->rx_urb_size = 8192;
- mfb = AX_RX_CTL_MFB_8192;
- } else if (dev->hard_mtu < 16384) {
- dev->rx_urb_size = 16384;
- mfb = AX_RX_CTL_MFB_16384;
- }
+ ax_skb = skb_clone(skb, GFP_ATOMIC);
+ if (ax_skb) {
+ ax_skb->len = rx_hdr.len;
+ ax_skb->data = skb->data +
+ sizeof(struct ax88772b_rx_header);
+ skb_set_tail_pointer(ax_skb, rx_hdr.len);
+ ax_skb->truesize = rx_hdr.len + sizeof(struct sk_buff);
+ if (priv->checksum & AX_RX_CHECKSUM)
+ ax88772b_rx_checksum(ax_skb, &rx_hdr);
+ usbnet_skb_return(dev, ax_skb);
- rxctl = asix_read_rx_ctl(dev);
- asix_write_rx_ctl(dev, (rxctl & ~AX_RX_CTL_MFB_16384) | mfb);
+ } else {
+ return 0;
+ }
- medium = asix_read_medium_status(dev);
- if (dev->net->mtu > 1500)
- medium |= AX_MEDIUM_JFE;
- else
- medium &= ~AX_MEDIUM_JFE;
- asix_write_medium_mode(dev, medium);
+ skb_pull(skb, ((rx_hdr.len +
+ sizeof(struct ax88772b_rx_header) + 3)
+ & 0xfffc));
+ }
- if (dev->rx_urb_size > old_rx_urb_size)
- usbnet_unlink_rx_urbs(dev);
+ if (skb->len < 0) {
+ netdev_err(dev->net, "%s: invalid rx length %d\n",
+ __func__, skb->len);
+ return 0;
+ }
+ return 1;
}
-static int ax88178_change_mtu(struct net_device *net, int new_mtu)
+static struct sk_buff *
+ax88772b_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
{
- struct usbnet *dev = netdev_priv(net);
- int ll_mtu = new_mtu + net->hard_header_len + 4;
+ int padlen = ((skb->len + 4) % 512) ? 0 : 4;
+ u32 packet_len;
+ u32 padbytes = 0xffff0000;
+ int headroom = skb_headroom(skb);
+ int tailroom = skb_tailroom(skb);
- netdev_dbg(dev->net, "ax88178_change_mtu() new_mtu=%d\n", new_mtu);
+ if ((!skb_cloned(skb))
+ && ((headroom + tailroom) >= (4 + padlen))) {
+ if ((headroom < 4) || (tailroom < padlen)) {
+ skb->data = memmove(skb->head + 4, skb->data, skb->len);
+ skb_set_tail_pointer(skb, skb->len);
+ }
+ } else {
+ struct sk_buff *skb2;
+ skb2 = skb_copy_expand(skb, 4, padlen, flags);
+ dev_kfree_skb_any(skb);
+ skb = skb2;
+ if (!skb)
+ return NULL;
+ }
- if (new_mtu <= 0 || ll_mtu > 16384)
- return -EINVAL;
+ skb_push(skb, 4);
+ packet_len = (((skb->len - 4) ^ 0x0000ffff) << 16) + (skb->len - 4);
- if ((ll_mtu % dev->maxpacket) == 0)
- return -EDOM;
+ cpu_to_le32s(&packet_len);
+ skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len));
- net->mtu = new_mtu;
- dev->hard_mtu = net->mtu + net->hard_header_len;
- ax88178_set_mfb(dev);
+ if ((skb->len % 512) == 0) {
+ cpu_to_le32s(&padbytes);
+ memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes));
+ skb_put(skb, sizeof(padbytes));
+ }
- return 0;
+ return skb;
}
-static const struct net_device_ops ax88178_netdev_ops = {
- .ndo_open = usbnet_open,
- .ndo_stop = usbnet_stop,
- .ndo_start_xmit = usbnet_start_xmit,
- .ndo_tx_timeout = usbnet_tx_timeout,
- .ndo_set_mac_address = asix_set_mac_address,
- .ndo_validate_addr = eth_validate_addr,
- .ndo_set_multicast_list = asix_set_multicast,
- .ndo_do_ioctl = asix_ioctl,
- .ndo_change_mtu = ax88178_change_mtu,
+static const u8 ChkCntSel[6][3] = {
+ {12, 23, 31},
+ {12, 31, 23},
+ {23, 31, 12},
+ {23, 12, 31},
+ {31, 12, 23},
+ {31, 23, 12}
};
-static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
+static void ax88772_link_reset(struct work_struct *work)
{
- struct asix_data *data = (struct asix_data *)&dev->data;
- int ret;
- u8 buf[ETH_ALEN];
- __le16 eeprom;
- u8 status;
- int gpio0 = 0;
- u32 phyid;
-
- usbnet_get_endpoints(dev,intf);
-
- asix_read_cmd(dev, AX_CMD_READ_GPIOS, 0, 0, 1, &status);
- dbg("GPIO Status: 0x%04x", status);
-
- asix_write_cmd(dev, AX_CMD_WRITE_ENABLE, 0, 0, 0, NULL);
- asix_read_cmd(dev, AX_CMD_READ_EEPROM, 0x0017, 0, 2, &eeprom);
- asix_write_cmd(dev, AX_CMD_WRITE_DISABLE, 0, 0, 0, NULL);
-
- dbg("EEPROM index 0x17 is 0x%04x", eeprom);
-
- if (eeprom == cpu_to_le16(0xffff)) {
- data->phymode = PHY_MODE_MARVELL;
- data->ledmode = 0;
- gpio0 = 1;
- } else {
- data->phymode = le16_to_cpu(eeprom) & 7;
- data->ledmode = le16_to_cpu(eeprom) >> 8;
- gpio0 = (le16_to_cpu(eeprom) & 0x80) ? 0 : 1;
- }
- dbg("GPIO0: %d, PhyMode: %d", gpio0, data->phymode);
-
- asix_write_gpio(dev, AX_GPIO_RSE | AX_GPIO_GPO_1 | AX_GPIO_GPO1EN, 40);
- if ((le16_to_cpu(eeprom) >> 8) != 1) {
- asix_write_gpio(dev, 0x003c, 30);
- asix_write_gpio(dev, 0x001c, 300);
- asix_write_gpio(dev, 0x003c, 30);
- } else {
- dbg("gpio phymode == 1 path");
- asix_write_gpio(dev, AX_GPIO_GPO1EN, 30);
- asix_write_gpio(dev, AX_GPIO_GPO1EN | AX_GPIO_GPO_1, 30);
+ struct ax88772_data *priv = container_of(work,
+ struct ax88772_data, check_link);
+ struct usbnet *dev = priv->dev;
+
+ if (priv->Event == AX_SET_RX_CFG) {
+ u16 bmcr;
+ u16 mode;
+
+ priv->Event = AX_NOP;
+
+ mode = AX88772_MEDIUM_DEFAULT;
+
+ bmcr = ax8817x_mdio_read_le(dev->net,
+ dev->mii.phy_id, MII_BMCR);
+ if (!(bmcr & BMCR_FULLDPLX))
+ mode &= ~AX88772_MEDIUM_FULL_DUPLEX;
+ if (!(bmcr & BMCR_SPEED100))
+ mode &= ~AX88772_MEDIUM_100MB;
+ asix_write_medium_mode(dev, mode);
+ return;
}
- asix_sw_reset(dev, 0);
- msleep(150);
-
- asix_sw_reset(dev, AX_SWRESET_PRL | AX_SWRESET_IPPD);
- msleep(150);
-
- asix_write_rx_ctl(dev, 0);
+ switch (priv->Event) {
+ case WAIT_AUTONEG_COMPLETE:
+ if (jiffies > (priv->autoneg_start + 5 * HZ)) {
+ priv->Event = PHY_POWER_DOWN;
+ priv->TickToExpire = 23;
+ }
+ break;
+ case PHY_POWER_DOWN:
+ if (priv->TickToExpire == 23) {
+ /* Set Phy Power Down */
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD,
+ 0, 0, NULL);
+ --priv->TickToExpire;
+ } else if (--priv->TickToExpire == 0) {
+ /* Set Phy Power Up */
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPRL, 0, 0, NULL);
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD | AX_SWRESET_IPRL, 0, 0, NULL);
+ usleep_range(10000, 20000);
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPRL, 0, 0, NULL);
+ msleep(60);
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_CLEAR, 0, 0, NULL);
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPRL, 0, 0, NULL);
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id,
+ MII_ADVERTISE,
+ ADVERTISE_ALL | ADVERTISE_CSMA |
+ ADVERTISE_PAUSE_CAP);
+ mii_nway_restart(&dev->mii);
- /* Get the MAC address */
- if ((ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID,
- 0, 0, ETH_ALEN, buf)) < 0) {
- dbg("Failed to read MAC address: %d", ret);
- goto out;
+ priv->Event = PHY_POWER_UP;
+ priv->TickToExpire = 47;
+ }
+ break;
+ case PHY_POWER_UP:
+ if (--priv->TickToExpire == 0) {
+ priv->Event = PHY_POWER_DOWN;
+ priv->TickToExpire = 23;
+ }
+ break;
+ default:
+ break;
}
- memcpy(dev->net->dev_addr, buf, ETH_ALEN);
+ return;
+}
- /* Initialize MII structure */
- dev->mii.dev = dev->net;
- dev->mii.mdio_read = asix_mdio_read;
- dev->mii.mdio_write = asix_mdio_write;
- dev->mii.phy_id_mask = 0x1f;
- dev->mii.reg_num_mask = 0xff;
- dev->mii.supports_gmii = 1;
- dev->mii.phy_id = asix_get_phy_addr(dev);
+static void ax88772a_link_reset(struct work_struct *work)
+{
+ struct ax88772a_data *priv = container_of(work,
+ struct ax88772a_data, check_link);
+ struct usbnet *dev = priv->dev;
+ int PowSave = (priv->EepromData >> 14);
+ u16 phy_reg;
+
+ if (priv->Event == AX_SET_RX_CFG) {
+ u16 bmcr;
+ u16 mode;
- dev->net->netdev_ops = &ax88178_netdev_ops;
- dev->net->ethtool_ops = &ax88178_ethtool_ops;
+ priv->Event = AX_NOP;
- phyid = asix_get_phyid(dev);
- dbg("PHYID=0x%08x", phyid);
+ mode = AX88772_MEDIUM_DEFAULT;
- if (data->phymode == PHY_MODE_MARVELL) {
- marvell_phy_init(dev);
- msleep(60);
+ bmcr = ax8817x_mdio_read_le(dev->net,
+ dev->mii.phy_id, MII_BMCR);
+ if (!(bmcr & BMCR_FULLDPLX))
+ mode &= ~AX88772_MEDIUM_FULL_DUPLEX;
+ if (!(bmcr & BMCR_SPEED100))
+ mode &= ~AX88772_MEDIUM_100MB;
+ asix_write_medium_mode(dev, mode);
+ return;
}
- asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR,
- BMCR_RESET | BMCR_ANENABLE);
- asix_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
+ switch (priv->Event) {
+ case WAIT_AUTONEG_COMPLETE:
+ if (jiffies > (priv->autoneg_start + 5 * HZ)) {
+ priv->Event = CHK_CABLE_EXIST;
+ priv->TickToExpire = 14;
+ }
+ break;
+ case CHK_CABLE_EXIST:
+ phy_reg = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, 0x12);
+ if ((phy_reg != 0x8012) && (phy_reg != 0x8013)) {
+ ax8817x_mdio_write_le(dev->net,
+ dev->mii.phy_id, 0x16, 0x4040);
+ mii_nway_restart(&dev->mii);
+ priv->Event = CHK_CABLE_STATUS;
+ priv->TickToExpire = 31;
+ } else if (--priv->TickToExpire == 0) {
+ mii_nway_restart(&dev->mii);
+ priv->Event = CHK_CABLE_EXIST_AGAIN;
+ if (PowSave == 0x03) {
+ priv->TickToExpire = 47;
+ } else if (PowSave == 0x01) {
+ priv->DlyIndex = (u8)(jiffies % 6);
+ priv->DlySel = 0;
+ priv->TickToExpire =
+ ChkCntSel[priv->DlyIndex][priv->DlySel];
+ }
+ }
+ break;
+ case CHK_CABLE_EXIST_AGAIN:
+ /* if cable disconnected */
+ phy_reg = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, 0x12);
+ if ((phy_reg != 0x8012) && (phy_reg != 0x8013)) {
+ mii_nway_restart(&dev->mii);
+ priv->Event = CHK_CABLE_STATUS;
+ priv->TickToExpire = 31;
+ } else if (--priv->TickToExpire == 0) {
+ /* Power down PHY */
+ ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
+ AX_SWRESET_IPPD,
+ 0, 0, NULL);
+ priv->Event = PHY_POWER_DOWN;
+ if (PowSave == 0x03)
+ priv->TickToExpire = 23;
+ else if (PowSave == 0x01)
+ priv->TickToExpire = 31;
+ }
+ break;
+ case PHY_POWER_DOWN:
+ if (--priv->TickToExpire == 0)
+ priv->Event = PHY_POWER_UP;
+ break;
+ case CHK_CABLE_STATUS:
+ if (--priv->TickToExpire == 0) {
+ ax8817x_mdio_write_le(dev->net,
+ dev->mii.phy_id, 0x16, 0x4040);
+ mii_nway_restart(&dev->mii);
+ priv->Event = CHK_CABLE_EXIST_AGAIN;
+ if (PowSave == 0x03) {
+ priv->TickToExpire = 47;
+ } else if (PowSave == 0x01) {
+ priv->DlyIndex = (u8)(jiffies % 6);
+ priv->DlySel = 0;
+ priv->TickToExpire =
+ ChkCntSel[priv->DlyIndex][priv->DlySel];
+ }
+ }
+ break;
+ case PHY_POWER_UP:
+ ax88772a_phy_powerup(dev);
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
+ ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
+ mii_nway_restart(&dev->mii);
+ priv->Event = CHK_CABLE_EXIST_AGAIN;
+ if (PowSave == 0x03) {
+ priv->TickToExpire = 47;
+ } else if (PowSave == 0x01) {
+ if (++priv->DlySel >= 3) {
+ priv->DlyIndex = (u8)(jiffies % 6);
+ priv->DlySel = 0;
+ }
+ priv->TickToExpire =
+ ChkCntSel[priv->DlyIndex][priv->DlySel];
+ }
+ break;
+ default:
+ break;
+ }
+
+ return;
+}
+
+static void ax88772b_link_reset(struct work_struct *work)
+{
+ struct ax88772b_data *priv = container_of(work,
+ struct ax88772b_data, check_link);
+ struct usbnet *dev = priv->dev;
+
+ switch (priv->Event) {
+ case AX_SET_RX_CFG:
+ {
+ u16 bmcr = ax8817x_mdio_read_le(dev->net,
+ dev->mii.phy_id, MII_BMCR);
+ u16 mode = AX88772_MEDIUM_DEFAULT;
+
+ if (!(bmcr & BMCR_FULLDPLX))
+ mode &= ~AX88772_MEDIUM_FULL_DUPLEX;
+ if (!(bmcr & BMCR_SPEED100))
+ mode &= ~AX88772_MEDIUM_100MB;
+ asix_write_medium_mode(dev, mode);
+ break;
+ }
+ case PHY_POWER_UP:
+ {
+ u16 tmp16;
+
+ ax88772a_phy_powerup(dev);
+ tmp16 = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, 0x12);
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, 0x12,
+ ((tmp16 & 0xFF9F) | 0x0040));
+ ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
- asix_mdio_write(dev->net, dev->mii.phy_id, MII_CTRL1000,
- ADVERTISE_1000FULL);
+ break;
+ }
+ default:
+ break;
+ }
- mii_nway_restart(&dev->mii);
+ priv->Event = AX_NOP;
- if ((ret = asix_write_medium_mode(dev, AX88178_MEDIUM_DEFAULT)) < 0)
- goto out;
+ return;
+}
- if ((ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL)) < 0)
- goto out;
+static int ax88178_set_media(struct usbnet *dev)
+{
+ int ret;
+ struct ax88178_data *priv = (struct ax88178_data *)dev->driver_priv;
+ int media;
- /* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
- if (dev->driver_info->flags & FLAG_FRAMING_AX) {
- /* hard_mtu is still the default - the device does not support
- jumbo eth frames */
- dev->rx_urb_size = 2048;
- }
+ media = ax88178_media_check(dev, priv);
+ if (media < 0)
+ return media;
+ ret = asix_write_medium_mode(dev, media);
+ if (ret < 0)
+ return ret;
return 0;
+}
-out:
- return ret;
+static int ax88178_link_reset(struct usbnet *dev)
+{
+ return ax88178_set_media(dev);
+}
+
+static int ax_suspend(struct usb_interface *intf,
+ pm_message_t message)
+{
+ struct usbnet *dev = usb_get_intfdata(intf);
+ struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
+
+ return data->suspend(intf, message);
+}
+
+static int ax_resume(struct usb_interface *intf)
+{
+ struct usbnet *dev = usb_get_intfdata(intf);
+ struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
+
+ return data->resume(intf);
}
+static const struct driver_info ax88178_info = {
+ .description = "ASIX AX88178 USB 2.0 Ethernet",
+ .bind = ax88178_bind,
+ .unbind = ax88178_unbind,
+ .status = ax88178_status,
+ .link_reset = ax88178_link_reset,
+ .reset = ax88178_link_reset,
+ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
+ .rx_fixup = ax88772_rx_fixup,
+ .tx_fixup = ax88772_tx_fixup,
+};
+
+static const struct driver_info belkin178_info = {
+ .description = "Belkin Gigabit USB 2.0 Network Adapter",
+ .bind = ax88178_bind,
+ .unbind = ax88178_unbind,
+ .status = ax8817x_status,
+ .link_reset = ax88178_link_reset,
+ .reset = ax88178_link_reset,
+ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
+ .rx_fixup = ax88772_rx_fixup,
+ .tx_fixup = ax88772_tx_fixup,
+};
+
static const struct driver_info ax8817x_info = {
.description = "ASIX AX8817x USB 2.0 Ethernet",
- .bind = ax88172_bind,
- .status = asix_status,
+ .bind = ax8817x_bind,
+ .status = ax8817x_status,
.link_reset = ax88172_link_reset,
.reset = ax88172_link_reset,
- .flags = FLAG_ETHER | FLAG_LINK_INTR,
- .data = 0x00130103,
+ .flags = FLAG_ETHER,
};
static const struct driver_info dlink_dub_e100_info = {
.description = "DLink DUB-E100 USB Ethernet",
- .bind = ax88172_bind,
- .status = asix_status,
+ .bind = ax8817x_bind,
+ .status = ax8817x_status,
.link_reset = ax88172_link_reset,
.reset = ax88172_link_reset,
- .flags = FLAG_ETHER | FLAG_LINK_INTR,
- .data = 0x009f9d9f,
+ .flags = FLAG_ETHER,
};
static const struct driver_info netgear_fa120_info = {
.description = "Netgear FA-120 USB Ethernet",
- .bind = ax88172_bind,
- .status = asix_status,
+ .bind = ax8817x_bind,
+ .status = ax8817x_status,
.link_reset = ax88172_link_reset,
.reset = ax88172_link_reset,
- .flags = FLAG_ETHER | FLAG_LINK_INTR,
- .data = 0x00130103,
+ .flags = FLAG_ETHER,
};
static const struct driver_info hawking_uf200_info = {
.description = "Hawking UF200 USB Ethernet",
- .bind = ax88172_bind,
- .status = asix_status,
+ .bind = ax8817x_bind,
+ .status = ax8817x_status,
.link_reset = ax88172_link_reset,
.reset = ax88172_link_reset,
- .flags = FLAG_ETHER | FLAG_LINK_INTR,
- .data = 0x001f1d1f,
+ .flags = FLAG_ETHER,
};
static const struct driver_info ax88772_info = {
.description = "ASIX AX88772 USB 2.0 Ethernet",
.bind = ax88772_bind,
- .status = asix_status,
- .link_reset = ax88772_link_reset,
- .reset = ax88772_link_reset,
- .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR,
- .rx_fixup = asix_rx_fixup,
- .tx_fixup = asix_tx_fixup,
+ .unbind = ax88772_unbind,
+ .status = ax88772_status,
+ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
+ .rx_fixup = ax88772_rx_fixup,
+ .tx_fixup = ax88772_tx_fixup,
};
-static const struct driver_info ax88178_info = {
- .description = "ASIX AX88178 USB 2.0 Ethernet",
- .bind = ax88178_bind,
- .status = asix_status,
- .link_reset = ax88178_link_reset,
- .reset = ax88178_link_reset,
- .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR,
- .rx_fixup = asix_rx_fixup,
- .tx_fixup = asix_tx_fixup,
+static const struct driver_info dlink_dub_e100b_info = {
+ .description = "D-Link DUB-E100 USB 2.0 Fast Ethernet Adapter",
+ .bind = ax88772_bind,
+ .unbind = ax88772_unbind,
+ .status = ax88772_status,
+ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
+ .rx_fixup = ax88772_rx_fixup,
+ .tx_fixup = ax88772_tx_fixup,
};
-static const struct usb_device_id products [] = {
+static const struct driver_info ax88772a_info = {
+ .description = "ASIX AX88772A USB 2.0 Ethernet",
+ .bind = ax88772a_bind,
+ .unbind = ax88772a_unbind,
+ .status = ax88772a_status,
+ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
+ .rx_fixup = ax88772_rx_fixup,
+ .tx_fixup = ax88772_tx_fixup,
+};
+
+static const struct driver_info ax88772b_info = {
+ .description = "ASIX AX88772B USB 2.0 Ethernet",
+ .bind = ax88772b_bind,
+ .unbind = ax88772b_unbind,
+ .status = ax88772b_status,
+ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
+ .rx_fixup = ax88772b_rx_fixup,
+ .tx_fixup = ax88772b_tx_fixup,
+};
+
+static const struct usb_device_id products[] = {
{
- // Linksys USB200M
- USB_DEVICE (0x077b, 0x2226),
+ /* 88178 */
+ USB_DEVICE(0x0b95, 0x1780),
+ .driver_info = (unsigned long) &ax88178_info,
+}, {
+ /* 88178 for billianton linksys */
+ USB_DEVICE(0x077b, 0x2226),
+ .driver_info = (unsigned long) &ax88178_info,
+}, {
+ /* ABOCOM for linksys */
+ USB_DEVICE(0x1737, 0x0039),
+ .driver_info = (unsigned long) &ax88178_info,
+}, {
+ /* ABOCOM for pci */
+ USB_DEVICE(0x14ea, 0xab11),
+ .driver_info = (unsigned long) &ax88178_info,
+}, {
+ /* Belkin */
+ USB_DEVICE(0x050d, 0x5055),
+ .driver_info = (unsigned long) &belkin178_info,
+}, {
+ /* Linksys USB200M */
+ USB_DEVICE(0x077b, 0x2226),
.driver_info = (unsigned long) &ax8817x_info,
}, {
- // Netgear FA120
- USB_DEVICE (0x0846, 0x1040),
+ /* Netgear FA120 */
+ USB_DEVICE(0x0846, 0x1040),
.driver_info = (unsigned long) &netgear_fa120_info,
}, {
- // DLink DUB-E100
- USB_DEVICE (0x2001, 0x1a00),
+ /* DLink DUB-E100 */
+ USB_DEVICE(0x2001, 0x1a00),
.driver_info = (unsigned long) &dlink_dub_e100_info,
}, {
- // Intellinet, ST Lab USB Ethernet
- USB_DEVICE (0x0b95, 0x1720),
+ /* DLink DUB-E100B */
+ USB_DEVICE(0x2001, 0x3c05),
+ .driver_info = (unsigned long) &dlink_dub_e100b_info,
+}, {
+ /* DLink DUB-E100B */
+ USB_DEVICE(0x07d1, 0x3c05),
+ .driver_info = (unsigned long) &dlink_dub_e100b_info,
+}, {
+ /* Intellinet, ST Lab USB Ethernet */
+ USB_DEVICE(0x0b95, 0x1720),
.driver_info = (unsigned long) &ax8817x_info,
}, {
- // Hawking UF200, TrendNet TU2-ET100
- USB_DEVICE (0x07b8, 0x420a),
+ /* Hawking UF200, TrendNet TU2-ET100 */
+ USB_DEVICE(0x07b8, 0x420a),
.driver_info = (unsigned long) &hawking_uf200_info,
}, {
- // Billionton Systems, USB2AR
- USB_DEVICE (0x08dd, 0x90ff),
+ /* Billionton Systems, USB2AR */
+ USB_DEVICE(0x08dd, 0x90ff),
.driver_info = (unsigned long) &ax8817x_info,
}, {
- // ATEN UC210T
- USB_DEVICE (0x0557, 0x2009),
+ /* ATEN UC210T */
+ USB_DEVICE(0x0557, 0x2009),
.driver_info = (unsigned long) &ax8817x_info,
}, {
- // Buffalo LUA-U2-KTX
- USB_DEVICE (0x0411, 0x003d),
+ /* Buffalo LUA-U2-KTX */
+ USB_DEVICE(0x0411, 0x003d),
.driver_info = (unsigned long) &ax8817x_info,
}, {
- // Buffalo LUA-U2-GT 10/100/1000
- USB_DEVICE (0x0411, 0x006e),
- .driver_info = (unsigned long) &ax88178_info,
-}, {
- // Sitecom LN-029 "USB 2.0 10/100 Ethernet adapter"
- USB_DEVICE (0x6189, 0x182d),
+ /* Sitecom LN-029 "USB 2.0 10/100 Ethernet adapter" */
+ USB_DEVICE(0x6189, 0x182d),
.driver_info = (unsigned long) &ax8817x_info,
}, {
- // corega FEther USB2-TX
- USB_DEVICE (0x07aa, 0x0017),
+ /* corega FEther USB2-TX */
+ USB_DEVICE(0x07aa, 0x0017),
.driver_info = (unsigned long) &ax8817x_info,
}, {
- // Surecom EP-1427X-2
- USB_DEVICE (0x1189, 0x0893),
- .driver_info = (unsigned long) &ax8817x_info,
-}, {
- // goodway corp usb gwusb2e
- USB_DEVICE (0x1631, 0x6200),
+ /* Surecom EP-1427X-2 */
+ USB_DEVICE(0x1189, 0x0893),
.driver_info = (unsigned long) &ax8817x_info,
}, {
- // JVC MP-PRX1 Port Replicator
- USB_DEVICE (0x04f1, 0x3008),
+ /* goodway corp usb gwusb2e */
+ USB_DEVICE(0x1631, 0x6200),
.driver_info = (unsigned long) &ax8817x_info,
}, {
- // ASIX AX88772B 10/100
- USB_DEVICE (0x0b95, 0x772b),
- .driver_info = (unsigned long) &ax88772_info,
-}, {
- // ASIX AX88772 10/100
- USB_DEVICE (0x0b95, 0x7720),
- .driver_info = (unsigned long) &ax88772_info,
-}, {
- // ASIX AX88178 10/100/1000
- USB_DEVICE (0x0b95, 0x1780),
- .driver_info = (unsigned long) &ax88178_info,
-}, {
- // Logitec LAN-GTJ/U2A
- USB_DEVICE (0x0789, 0x0160),
- .driver_info = (unsigned long) &ax88178_info,
-}, {
- // Linksys USB200M Rev 2
- USB_DEVICE (0x13b1, 0x0018),
- .driver_info = (unsigned long) &ax88772_info,
-}, {
- // 0Q0 cable ethernet
- USB_DEVICE (0x1557, 0x7720),
- .driver_info = (unsigned long) &ax88772_info,
-}, {
- // DLink DUB-E100 H/W Ver B1
- USB_DEVICE (0x07d1, 0x3c05),
+ /* ASIX AX88772 10/100 */
+ USB_DEVICE(0x0b95, 0x7720),
.driver_info = (unsigned long) &ax88772_info,
}, {
- // DLink DUB-E100 H/W Ver B1 Alternate
- USB_DEVICE (0x2001, 0x3c05),
+ /* ASIX AX88772 10/100 */
+ USB_DEVICE(0x125E, 0x180D),
.driver_info = (unsigned long) &ax88772_info,
}, {
- // Linksys USB1000
- USB_DEVICE (0x1737, 0x0039),
- .driver_info = (unsigned long) &ax88178_info,
-}, {
- // IO-DATA ETG-US2
- USB_DEVICE (0x04bb, 0x0930),
- .driver_info = (unsigned long) &ax88178_info,
+ /* ASIX AX88772A 10/100 */
+ USB_DEVICE(0x0b95, 0x772A),
+ .driver_info = (unsigned long) &ax88772a_info,
+}, {
+ /* ASIX AX88772A 10/100 */
+ USB_DEVICE(0x0db0, 0xA877),
+ .driver_info = (unsigned long) &ax88772a_info,
+}, {
+ /* ASIX AX88772A 10/100 */
+ USB_DEVICE(0x0421, 0x772A),
+ .driver_info = (unsigned long) &ax88772a_info,
+}, {
+ /* Linksys 200M */
+ USB_DEVICE(0x13B1, 0x0018),
+ .driver_info = (unsigned long) &ax88772a_info,
}, {
- // Belkin F5D5055
- USB_DEVICE(0x050d, 0x5055),
- .driver_info = (unsigned long) &ax88178_info,
-}, {
- // Apple USB Ethernet Adapter
USB_DEVICE(0x05ac, 0x1402),
- .driver_info = (unsigned long) &ax88772_info,
-}, {
- // Cables-to-Go USB Ethernet Adapter
- USB_DEVICE(0x0b95, 0x772a),
- .driver_info = (unsigned long) &ax88772_info,
-}, {
- // ABOCOM for pci
- USB_DEVICE(0x14ea, 0xab11),
- .driver_info = (unsigned long) &ax88178_info,
+ .driver_info = (unsigned long) &ax88772a_info,
}, {
- // ASIX 88772a
- USB_DEVICE(0x0db0, 0xa877),
- .driver_info = (unsigned long) &ax88772_info,
+ /* ASIX AX88772B 10/100 */
+ USB_DEVICE(0x0b95, 0x772B),
+ .driver_info = (unsigned long) &ax88772b_info,
+}, {
+ /* ASIX AX88772B 10/100 */
+ USB_DEVICE(0x0b95, 0x7E2B),
+ .driver_info = (unsigned long) &ax88772b_info,
},
- { }, // END
+ { }, /* END */
};
MODULE_DEVICE_TABLE(usb, products);
static struct usb_driver asix_driver = {
- .name = "asix",
+ .name = driver_name,
.id_table = products,
.probe = usbnet_probe,
- .suspend = usbnet_suspend,
- .resume = usbnet_resume,
+ .suspend = ax_suspend,
+ .resume = ax_resume,
.disconnect = usbnet_disconnect,
- .supports_autosuspend = 1,
};
static int __init asix_init(void)
{
- return usb_register(&asix_driver);
+ return usb_register(&asix_driver);
}
module_init(asix_init);
static void __exit asix_exit(void)
{
- usb_deregister(&asix_driver);
+ usb_deregister(&asix_driver);
}
module_exit(asix_exit);
--- old/drivers/net/usb/asix.h 1969-12-31 19:00:00.000000000 -0500
+++ linux-3.0.8/drivers/net/usb/asix.h 2011-11-09 12:00:58.048107035 -0500
@@ -0,0 +1,439 @@
+#ifndef __LINUX_USBNET_ASIX_H
+#define __LINUX_USBNET_ASIX_H
+
+/*
+ * Turn on this flag if the implementation of your USB host controller
+ * cannot handle non-double word aligned buffer.
+ * When turn on this flag, driver will fixup egress packet aligned on double
+ * word boundary before deliver to USB host controller. And will Disable the
+ * function "skb_reserve (skb, NET_IP_ALIGN)" to retain the buffer aligned on
+ * double word alignment for ingress packets.
+ */
+#define AX_FORCE_BUFF_ALIGN 0
+
+#define AX_MONITOR_MODE 0x01
+#define AX_MONITOR_LINK 0x02
+#define AX_MONITOR_MAGIC 0x04
+#define AX_MONITOR_HSFS 0x10
+
+/* AX88172 Medium Status Register values */
+#define AX_MEDIUM_FULL_DUPLEX 0x02
+#define AX_MEDIUM_TX_ABORT_ALLOW 0x04
+#define AX_MEDIUM_FLOW_CONTROL_EN 0x10
+#define AX_MCAST_FILTER_SIZE 8
+#define AX_MAX_MCAST 64
+
+#define AX_EEPROM_LEN 0x40
+
+#define AX_SWRESET_CLEAR 0x00
+#define AX_SWRESET_RR 0x01
+#define AX_SWRESET_RT 0x02
+#define AX_SWRESET_PRTE 0x04
+#define AX_SWRESET_PRL 0x08
+#define AX_SWRESET_BZ 0x10
+#define AX_SWRESET_IPRL 0x20
+#define AX_SWRESET_IPPD 0x40
+#define AX_SWRESET_IPOSC 0x0080
+#define AX_SWRESET_IPPSL_0 0x0100
+#define AX_SWRESET_IPPSL_1 0x0200
+#define AX_SWRESET_IPCOPS 0x0400
+#define AX_SWRESET_IPCOPSC 0x0800
+#define AX_SWRESET_AUTODETACH 0x1000
+#define AX_SWRESET_WOLLP 0x8000
+
+#define AX88772_IPG0_DEFAULT 0x15
+#define AX88772_IPG1_DEFAULT 0x0c
+#define AX88772_IPG2_DEFAULT 0x0E
+
+#define AX88772A_IPG0_DEFAULT 0x15
+#define AX88772A_IPG1_DEFAULT 0x16
+#define AX88772A_IPG2_DEFAULT 0x1A
+
+#define AX88772_MEDIUM_FULL_DUPLEX 0x0002
+#define AX88772_MEDIUM_RESERVED 0x0004
+#define AX88772_MEDIUM_RX_FC_ENABLE 0x0010
+#define AX88772_MEDIUM_TX_FC_ENABLE 0x0020
+#define AX88772_MEDIUM_PAUSE_FORMAT 0x0080
+#define AX88772_MEDIUM_RX_ENABLE 0x0100
+#define AX88772_MEDIUM_100MB 0x0200
+#define AX88772_MEDIUM_DEFAULT \
+ (AX88772_MEDIUM_FULL_DUPLEX | AX88772_MEDIUM_RX_FC_ENABLE | \
+ AX88772_MEDIUM_TX_FC_ENABLE | AX88772_MEDIUM_100MB | \
+ AX88772_MEDIUM_RESERVED | AX88772_MEDIUM_RX_ENABLE)
+
+#define AX_CMD_SET_SW_MII 0x06
+#define AX_CMD_READ_MII_REG 0x07
+#define AX_CMD_WRITE_MII_REG 0x08
+#define AX_CMD_SET_HW_MII 0x0a
+#define AX_CMD_READ_EEPROM 0x0b
+#define AX_CMD_WRITE_EEPROM 0x0c
+#define AX_CMD_WRITE_EEPROM_EN 0x0d
+#define AX_CMD_WRITE_EEPROM_DIS 0x0e
+#define AX_CMD_WRITE_RX_CTL 0x10
+#define AX_CMD_READ_IPG012 0x11
+#define AX_CMD_WRITE_IPG0 0x12
+#define AX_CMD_WRITE_IPG1 0x13
+#define AX_CMD_WRITE_IPG2 0x14
+#define AX_CMD_WRITE_MULTI_FILTER 0x16
+#define AX_CMD_READ_NODE_ID 0x17
+#define AX_CMD_READ_PHY_ID 0x19
+#define AX_CMD_READ_MEDIUM_MODE 0x1a
+#define AX_CMD_WRITE_MEDIUM_MODE 0x1b
+#define AX_CMD_READ_MONITOR_MODE 0x1c
+#define AX_CMD_WRITE_MONITOR_MODE 0x1d
+#define AX_CMD_WRITE_GPIOS 0x1f
+#define AX_CMD_SW_RESET 0x20
+#define AX_CMD_SW_PHY_STATUS 0x21
+#define AX_CMD_SW_PHY_SELECT 0x22
+ #define AX_PHYSEL_PSEL (1 << 0)
+ #define AX_PHYSEL_ASEL (1 << 1)
+ #define AX_PHYSEL_SSMII (1 << 2)
+ #define AX_PHYSEL_SSRMII (2 << 2)
+ #define AX_PHYSEL_SSRRMII (3 << 2)
+ #define AX_PHYSEL_SSEN (1 << 4)
+#define AX88772_CMD_READ_NODE_ID 0x13
+#define AX88772_CMD_WRITE_NODE_ID 0x14
+#define AX_CMD_READ_RXCOE_CTL 0x2b
+#define AX_CMD_WRITE_RXCOE_CTL 0x2c
+#define AX_CMD_READ_TXCOE_CTL 0x2d
+#define AX_CMD_WRITE_TXCOE_CTL 0x2e
+
+#define REG_LENGTH 2
+#define PHY_ID_MASK 0x1f
+
+#define AX_RXCOE_IPCE 0x0001
+#define AX_RXCOE_IPVE 0x0002
+#define AX_RXCOE_V6VE 0x0004
+#define AX_RXCOE_TCPE 0x0008
+#define AX_RXCOE_UDPE 0x0010
+#define AX_RXCOE_ICMP 0x0020
+#define AX_RXCOE_IGMP 0x0040
+#define AX_RXCOE_ICV6 0x0080
+#define AX_RXCOE_TCPV6 0x0100
+#define AX_RXCOE_UDPV6 0x0200
+#define AX_RXCOE_ICMV6 0x0400
+#define AX_RXCOE_IGMV6 0x0800
+#define AX_RXCOE_ICV6V6 0x1000
+#define AX_RXCOE_FOPC 0x8000
+#define AX_RXCOE_DEF_CSUM (AX_RXCOE_IPCE | AX_RXCOE_IPVE | \
+ AX_RXCOE_V6VE | AX_RXCOE_TCPE | \
+ AX_RXCOE_UDPE | AX_RXCOE_ICV6 | \
+ AX_RXCOE_TCPV6 | AX_RXCOE_UDPV6)
+
+#define AX_RXCOE_64TE 0x0100
+#define AX_RXCOE_PPPOE 0x0200
+#define AX_RXCOE_RPCE 0x8000
+
+#define AX_TXCOE_IP 0x0001
+#define AX_TXCOE_TCP 0x0002
+#define AX_TXCOE_UDP 0x0004
+#define AX_TXCOE_ICMP 0x0008
+#define AX_TXCOE_IGMP 0x0010
+#define AX_TXCOE_ICV6 0x0020
+
+#define AX_TXCOE_TCPV6 0x0100
+#define AX_TXCOE_UDPV6 0x0200
+#define AX_TXCOE_ICMV6 0x0400
+#define AX_TXCOE_IGMV6 0x0800
+#define AX_TXCOE_ICV6V6 0x1000
+#define AX_TXCOE_DEF_CSUM (AX_TXCOE_TCP | AX_TXCOE_UDP | \
+ AX_TXCOE_TCPV6 | AX_TXCOE_UDPV6)
+
+#define AX_TXCOE_64TE 0x0001
+#define AX_TXCOE_PPPE 0x0002
+
+#define AX88772B_MAX_BULKIN_2K 0
+#define AX88772B_MAX_BULKIN_4K 1
+#define AX88772B_MAX_BULKIN_6K 2
+#define AX88772B_MAX_BULKIN_8K 3
+#define AX88772B_MAX_BULKIN_16K 4
+#define AX88772B_MAX_BULKIN_20K 5
+#define AX88772B_MAX_BULKIN_24K 6
+#define AX88772B_MAX_BULKIN_32K 7
+
+struct {unsigned short size, byte_cnt, threshold; } AX88772B_BULKIN_SIZE[] = {
+ {2048, 0x8000, 0x8001}, /* 2k */
+ {4096, 0x8100, 0x8147}, /* 4k */
+ {6144, 0x8200, 0x81EB}, /* 6k */
+ {8192, 0x8300, 0x83D7}, /* 8k */
+ {16384, 0x8400, 0x851E}, /* 16 */
+ {20480, 0x8500, 0x8666}, /* 20k */
+ {24576, 0x8600, 0x87AE}, /* 24k */
+ {32768, 0x8700, 0x8A3D}, /* 32k */
+};
+
+
+#define AX_RX_CTL_RH1M 0x0100 /* Enable RX-Header mode 0 */
+#define AX_RX_CTL_RH2M 0x0200 /* Enable IP header in receive buffer
+ aligned on 32-bit aligment */
+#define AX_RX_CTL_RH3M 0x0400 /* checksum value in rx header 3 */
+#define AX_RX_HEADER_DEFAULT (AX_RX_CTL_RH1M | AX_RX_CTL_RH2M)
+
+#define AX_RX_CTL_MFB 0x0300 /* Maximum Frame size 16384bytes */
+#define AX_RX_CTL_START 0x0080 /* Ethernet MAC start */
+#define AX_RX_CTL_AP 0x0020 /* Accept phys addr from mcast array */
+#define AX_RX_CTL_AM 0x0010
+#define AX_RX_CTL_AB 0x0008 /* Accetp Brocadcast frames*/
+#define AX_RX_CTL_SEP 0x0004 /* Save error packets */
+#define AX_RX_CTL_AMALL 0x0002 /* Accetp all multicast frames */
+#define AX_RX_CTL_PRO 0x0001 /* Promiscuous Mode */
+#define AX_RX_CTL_STOP 0x0000 /* Stop MAC */
+
+#define AX_MONITOR_MODE 0x01
+#define AX_MONITOR_LINK 0x02
+#define AX_MONITOR_MAGIC 0x04
+#define AX_MONITOR_HSFS 0x10
+
+#define AX_MCAST_FILTER_SIZE 8
+#define AX_MAX_MCAST 64
+#define AX_INTERRUPT_BUFSIZE 8
+
+#define AX_EEPROM_LEN 0x40
+#define AX_EEPROM_MAGIC 0xdeadbeef
+#define EEPROMMASK 0x7f
+
+/* GPIO REGISTER */
+#define AXGPIOS_GPO0EN (1 << 0)
+#define AXGPIOS_GPO0 (1 << 1)
+#define AXGPIOS_GPO1EN (1 << 2)
+#define AXGPIOS_GPO1 (1 << 3)
+#define AXGPIOS_GPO2EN (1 << 4)
+#define AXGPIOS_GPO2 (1 << 5)
+#define AXGPIOS_RSE (1 << 7)
+
+/* TX-header format */
+#define AX_TX_HDR_CPHI 0x4000
+#define AX_TX_HDR_DICF 0x8000
+
+/* medium mode register */
+#define MEDIUM_GIGA_MODE 0x0001
+#define MEDIUM_FULL_DUPLEX_MODE 0x0002
+#define MEDIUM_TX_ABORT_MODE 0x0004
+#define MEDIUM_ENABLE_125MHZ 0x0008
+#define MEDIUM_ENABLE_RX_FLOWCTRL 0x0010
+#define MEDIUM_ENABLE_TX_FLOWCTRL 0x0020
+#define MEDIUM_ENABLE_JUMBO_FRAME 0x0040
+#define MEDIUM_CHECK_PAUSE_FRAME_MODE 0x0080
+#define MEDIUM_ENABLE_RECEIVE 0x0100
+#define MEDIUM_MII_100M_MODE 0x0200
+#define MEDIUM_ENABLE_JAM_PATTERN 0x0400
+#define MEDIUM_ENABLE_STOP_BACKPRESSURE 0x0800
+#define MEDIUM_ENABLE_SUPPER_MAC_SUPPORT 0x1000
+
+/* PHY mode */
+#define PHY_MODE_MARVELL 0
+#define PHY_MODE_CICADA_FAMILY 1
+#define PHY_MODE_CICADA_V1 1
+#define PHY_MODE_AGERE_FAMILY 2
+#define PHY_MODE_AGERE_V0 2
+#define PHY_MODE_CICADA_V2 5
+#define PHY_MODE_AGERE_V0_GMII 6
+#define PHY_MODE_CICADA_V2_ASIX 9
+#define PHY_MODE_VSC8601 10
+#define PHY_MODE_RTL8211CL 12
+#define PHY_MODE_RTL8211BN 13
+#define PHY_MODE_RTL8251CL 14
+#define PHY_MODE_ATTANSIC_V0 0x40
+#define PHY_MODE_ATTANSIC_FAMILY 0x40
+#define PHY_MODE_MAC_TO_MAC_GMII 0x7C
+
+/* */
+#define LED_MODE_MARVELL 0
+#define LED_MODE_CAMEO 1
+
+#define MARVELL_LED_CTRL 0x18
+#define MARVELL_MANUAL_LED 0x19
+
+#define PHY_IDENTIFIER 0x0002
+#define PHY_AGERE_IDENTIFIER 0x0282
+#define PHY_CICADA_IDENTIFIER 0x000f
+#define PHY_MARVELL_IDENTIFIER 0x0141
+
+#define PHY_MARVELL_STATUS 0x001b
+#define MARVELL_STATUS_HWCFG 0x0004 /* SGMII without clock */
+
+#define PHY_MARVELL_CTRL 0x0014
+#define MARVELL_CTRL_RXDELAY 0x0080
+#define MARVELL_CTRL_TXDELAY 0x0002
+
+#define PHY_CICADA_EXTPAGE 0x001f
+#define CICADA_EXTPAGE_EN 0x0001
+#define CICADA_EXTPAGE_DIS 0x0000
+
+
+struct {unsigned short value, offset; } CICADA_FAMILY_HWINIT[] = {
+ {0x0001, 0x001f}, {0x1c25, 0x0017}, {0x2a30, 0x001f}, {0x234c, 0x0010},
+ {0x2a30, 0x001f}, {0x0212, 0x0008}, {0x52b5, 0x001f}, {0xa7fa, 0x0000},
+ {0x0012, 0x0002}, {0x3002, 0x0001}, {0x87fa, 0x0000}, {0x52b5, 0x001f},
+ {0xafac, 0x0000}, {0x000d, 0x0002}, {0x001c, 0x0001}, {0x8fac, 0x0000},
+ {0x2a30, 0x001f}, {0x0012, 0x0008}, {0x2a30, 0x001f}, {0x0400, 0x0014},
+ {0x2a30, 0x001f}, {0x0212, 0x0008}, {0x52b5, 0x001f}, {0xa760, 0x0000},
+ {0x0000, 0x0002}, {0xfaff, 0x0001}, {0x8760, 0x0000}, {0x52b5, 0x001f},
+ {0xa760, 0x0000}, {0x0000, 0x0002}, {0xfaff, 0x0001}, {0x8760, 0x0000},
+ {0x52b5, 0x001f}, {0xafae, 0x0000}, {0x0004, 0x0002}, {0x0671, 0x0001},
+ {0x8fae, 0x0000}, {0x2a30, 0x001f}, {0x0012, 0x0008}, {0x0000, 0x001f},
+};
+
+struct {unsigned short value, offset; } CICADA_V2_HWINIT[] = {
+ {0x2a30, 0x001f}, {0x0212, 0x0008}, {0x52b5, 0x001f}, {0x000f, 0x0002},
+ {0x472a, 0x0001}, {0x8fa4, 0x0000}, {0x2a30, 0x001f}, {0x0212, 0x0008},
+ {0x0000, 0x001f},
+};
+
+struct {unsigned short value, offset; } CICADA_V2_ASIX_HWINIT[] = {
+ {0x2a30, 0x001f}, {0x0212, 0x0008}, {0x52b5, 0x001f}, {0x0012, 0x0002},
+ {0x3002, 0x0001}, {0x87fa, 0x0000}, {0x52b5, 0x001f}, {0x000f, 0x0002},
+ {0x472a, 0x0001}, {0x8fa4, 0x0000}, {0x2a30, 0x001f}, {0x0212, 0x0008},
+ {0x0000, 0x001f},
+};
+
+struct {unsigned short value, offset; } AGERE_FAMILY_HWINIT[] = {
+ {0x0800, 0x0000}, {0x0007, 0x0012}, {0x8805, 0x0010}, {0xb03e, 0x0011},
+ {0x8808, 0x0010}, {0xe110, 0x0011}, {0x8806, 0x0010}, {0xb03e, 0x0011},
+ {0x8807, 0x0010}, {0xff00, 0x0011}, {0x880e, 0x0010}, {0xb4d3, 0x0011},
+ {0x880f, 0x0010}, {0xb4d3, 0x0011}, {0x8810, 0x0010}, {0xb4d3, 0x0011},
+ {0x8817, 0x0010}, {0x1c00, 0x0011}, {0x300d, 0x0010}, {0x0001, 0x0011},
+ {0x0002, 0x0012},
+};
+
+struct ax88178_data {
+ u16 EepromData;
+ u16 MediaLink;
+ int UseGpio0;
+ int UseRgmii;
+ u8 PhyMode;
+ u8 LedMode;
+ u8 BuffaloOld;
+};
+
+enum watchdog_state {
+ AX_NOP = 0,
+ CHK_LINK, /* Routine A */
+ CHK_CABLE_EXIST, /* Called by A */
+ CHK_CABLE_EXIST_AGAIN, /* Routine B */
+ PHY_POWER_UP, /* Called by B */
+ PHY_POWER_UP_BH,
+ PHY_POWER_DOWN,
+ CHK_CABLE_STATUS, /* Routine C */
+ WAIT_AUTONEG_COMPLETE,
+ AX_SET_RX_CFG,
+};
+
+struct ax88772b_data {
+ struct usbnet *dev;
+ struct workqueue_struct *ax_work;
+ struct work_struct check_link;
+ spinlock_t checksum_lock; /* protects checksum flags */
+ unsigned long time_to_chk;
+ u16 psc;
+ u8 pw_enabled;
+ u8 Event;
+ u8 checksum;
+};
+
+struct ax88772a_data {
+ struct usbnet *dev;
+ struct workqueue_struct *ax_work;
+ struct work_struct check_link;
+ unsigned long autoneg_start;
+#define AX88772B_WATCHDOG (6 * HZ)
+ u8 Event;
+ u8 TickToExpire;
+ u8 DlyIndex;
+ u8 DlySel;
+ u16 EepromData;
+};
+
+struct ax88772_data {
+ struct usbnet *dev;
+ struct workqueue_struct *ax_work;
+ struct work_struct check_link;
+ unsigned long autoneg_start;
+ u8 Event;
+ u8 TickToExpire;
+};
+
+#define AX_RX_CHECKSUM (1 << 0)
+#define AX_TX_CHECKSUM (1 << 1)
+
+/* This structure cannot exceed sizeof(unsigned long [5]) AKA 20 bytes */
+struct ax8817x_data {
+ u8 multi_filter[AX_MCAST_FILTER_SIZE];
+ int (*resume) (struct usb_interface *intf);
+ int (*suspend) (struct usb_interface *intf, pm_message_t message);
+};
+
+struct __packed ax88172_int_data {
+ u16 res1;
+#define AX_INT_PPLS_LINK (1 << 0)
+#define AX_INT_SPLS_LINK (1 << 1)
+#define AX_INT_CABOFF_UNPLUG (1 << 7)
+ u8 link;
+ u16 res2;
+ u8 status;
+ u16 res3;
+};
+
+#define AX_RXHDR_L4_ERR (1 << 8)
+#define AX_RXHDR_L3_ERR (1 << 9)
+
+#define AX_RXHDR_L4_TYPE_UDP 1
+#define AX_RXHDR_L4_TYPE_ICMP 2
+#define AX_RXHDR_L4_TYPE_IGMP 3
+#define AX_RXHDR_L4_TYPE_TCP 4
+#define AX_RXHDR_L4_TYPE_TCMPV6 5
+#define AX_RXHDR_L4_TYPE_MASK 7
+
+#define AX_RXHDR_L3_TYPE_IP 1
+#define AX_RXHDR_L3_TYPE_IPV6 2
+
+struct __packed ax88772b_rx_header {
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+ u16 len:11,
+ res1:1,
+ crc:1,
+ mii:1,
+ runt:1,
+ mc_bc:1;
+
+ u16 len_bar:11,
+ res2:5;
+
+ u8 vlan_ind:3,
+ vlan_tag_striped:1,
+ pri:3,
+ res3:1;
+
+ u8 l4_csum_err:1,
+ l3_csum_err:1,
+ l4_type:3,
+ l3_type:2,
+ ce:1;
+#elif defined(__BIG_ENDIAN_BITFIELD)
+ u16 mc_bc:1,
+ runt:1,
+ mii:1,
+ crc:1,
+ res1:1,
+ len:11;
+
+ u16 res2:5,
+ len_bar:11;
+
+ u8 res3:1,
+ pri:3,
+ vlan_tag_striped:1,
+ vlan_ind:3;
+
+ u8 ce:1,
+ l3_type:2,
+ l4_type:3,
+ l3_csum_err:1,
+ l4_csum_err:1;
+#else
+#error "Please fix <asm/byteorder.h>"
+#endif
+};
+
+#endif /* __LINUX_USBNET_ASIX_H */
+
^ permalink raw reply
* Re: [PATCH] drivers/net/usb/asix: resync from vendor's copy
From: Ben Hutchings @ 2011-11-09 17:31 UTC (permalink / raw)
To: Mark Lord; +Cc: David Miller, netdev, linux-kernel
In-Reply-To: <4EBAB643.8020603@teksavvy.com>
On Wed, 2011-11-09 at 12:20 -0500, Mark Lord wrote:
> On 11-11-09 11:57 AM, Mark Lord wrote:
> > On 11-11-09 11:47 AM, Mark Lord wrote:
> > ..
> >> Note: I'm looking at smsc95xx.c and smsc75xx.c for examples,
> >> and they both have the same problem I'll have here:
> >>
> >> How to update the csum settings atomically.
> >> A spinlock is no good, because config register access is over USB.
> >
> > Nevermind.. a slight change in the logic and all is well again.
> ..
>
> Or even simpler (below). I don't think this method requires any
> extra locking, but I'm still open to persuasion. :)
Looks reasonable, but...
> static int ax88772b_set_features(struct net_device *netdev, u32 features)
> {
> struct usbnet *dev = netdev_priv(netdev);
> struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
> u16 tx_csum = 0, rx_csum = 0;
>
> priv->features = features & (NETIF_F_HW_CSUM | NETIF_F_RXCSUM);
...why do you need priv->features at all?
Ben.
> if (features & NETIF_F_HW_CSUM)
> tx_csum = AX_TXCOE_DEF_CSUM;
> if (features & NETIF_F_RXCSUM)
> rx_csum = AX_RXCOE_DEF_CSUM;
> ax8817x_write_cmd(dev, AX_CMD_WRITE_RXCOE_CTL, rx_csum, 0, 0, NULL);
> ax8817x_write_cmd(dev, AX_CMD_WRITE_TXCOE_CTL, tx_csum, 0, 0, NULL);
> return 0;
> }
>
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply
* Re: [PATCH] wireless: libertas: fix unaligned le64 accesses
From: Dan Williams @ 2011-11-09 17:34 UTC (permalink / raw)
To: Steven Miao
Cc: open list:NETWORKING DRIVERS, open list:NETWORKING [WIREL...,
open list
In-Reply-To: <1320827440-16904-1-git-send-email-realmz6@gmail.com>
On Wed, 2011-11-09 at 16:30 +0800, Steven Miao wrote:
> use get_unaligned_le64() to get timestamp
>
> Signed-off-by: Steven Miao <realmz6@gmail.com>
Acked-by: Dan Williams <dcbw@redhat.com>
> ---
> drivers/net/wireless/libertas/cfg.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
> index b456a53..f23c2b1 100644
> --- a/drivers/net/wireless/libertas/cfg.c
> +++ b/drivers/net/wireless/libertas/cfg.c
> @@ -630,7 +630,7 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy,
> if (channel &&
> !(channel->flags & IEEE80211_CHAN_DISABLED))
> cfg80211_inform_bss(wiphy, channel,
> - bssid, le64_to_cpu(*(__le64 *)tsfdesc),
> + bssid, get_unaligned_le64(tsfdesc),
> capa, intvl, ie, ielen,
> LBS_SCAN_RSSI_TO_MBM(rssi),
> GFP_KERNEL);
^ permalink raw reply
* Re: [PATCH] drivers/net/usb/asix: resync from vendor's copy
From: Mark Lord @ 2011-11-09 17:40 UTC (permalink / raw)
To: Ben Hutchings; +Cc: David Miller, netdev, linux-kernel
In-Reply-To: <1320859911.2781.1.camel@bwh-desktop>
On 11-11-09 12:31 PM, Ben Hutchings wrote:
> On Wed, 2011-11-09 at 12:20 -0500, Mark Lord wrote:
>> On 11-11-09 11:57 AM, Mark Lord wrote:
>>> On 11-11-09 11:47 AM, Mark Lord wrote:
>>> ..
>>>> Note: I'm looking at smsc95xx.c and smsc75xx.c for examples,
>>>> and they both have the same problem I'll have here:
>>>>
>>>> How to update the csum settings atomically.
>>>> A spinlock is no good, because config register access is over USB.
>>>
>>> Nevermind.. a slight change in the logic and all is well again.
>> ..
>>
>> Or even simpler (below). I don't think this method requires any
>> extra locking, but I'm still open to persuasion. :)
>
> Looks reasonable, but...
>
>> static int ax88772b_set_features(struct net_device *netdev, u32 features)
>> {
>> struct usbnet *dev = netdev_priv(netdev);
>> struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
>> u16 tx_csum = 0, rx_csum = 0;
>>
>> priv->features = features & (NETIF_F_HW_CSUM | NETIF_F_RXCSUM);
>
> ...why do you need priv->features at all?
There's code elsewhere that takes action under some conditions
based on the current setting of the NETIF_F_RXCSUM flag.
I don't claim to fully understand what's going on,
but it doesn't care much about races on set/clear of the flag.
Cheers
^ permalink raw reply
* Re: [PATCH v2] drivers/net/usb/asix: resync from vendor's copy
From: Mark Lord @ 2011-11-09 17:41 UTC (permalink / raw)
To: David Miller; +Cc: netdev, linux-kernel, Ben Hutchings, Michal Marek
In-Reply-To: <4EBAB8F5.1010101@teksavvy.com>
On 11-11-09 12:31 PM, Mark Lord wrote:
> Second pass (for review) at updating the in-kernel asix usb/network driver
> from the v4.1.0 vendor GPL version of the driver, obtained from here:
>
> http://www.asix.com.tw/download.php?sub=searchresult&PItemID=84&download=driver
>
> The original vendor copy used a local "axusbnet" middleware (rather than "usbnet").
> I've converted it back to using "usbnet", made a ton of cosmetic changes
> to get it to pass checkpatch.pl, and removed a small amount of code duplication.
>
> The tx/rx checksum code has been updated per Ben's comments,
> and the duplicated MII_* definitions have been removed.
> I've changed the version string to be "4.1.0-kernel",
> to reflect the vendor's code version while also distinguishing
> this port from the original vendor code.
>
> It can use more work going forward, but it is important to get it upstream
> sooner than later -- the current in-kernel driver fails with many devices,
> both old and new. This updated version works with everything I have available
> to test with, and also handles suspend / resume (unlike the in-kernel one).
>
> Signed-off-by: Mark Lord <mlord@pobox.com>
> ---
> Note that the vendor now has a v4.2.0 version available,
> but for now I'm concentrating on the original v4.1.0 code.
>
> After review/discussion of this patch, I will update for Linux-3.2-rc
> and resubmit for inclusion in the eventual linux-3.3 kernel.
>
> Patch included below, and also attached to bypass mailer mangling.
..
> +#define AX_RX_CHECKSUM (1 << 0)
> +#define AX_TX_CHECKSUM (1 << 1)
..
Please consider those two lines (from asix.h) to be "nuked" from the next version.
^ permalink raw reply
* Re: [PATCH v2] drivers/net/usb/asix: resync from vendor's copy
From: Mark Lord @ 2011-11-09 17:43 UTC (permalink / raw)
To: David Miller; +Cc: netdev, linux-kernel, Ben Hutchings, Michal Marek
In-Reply-To: <4EBAB8F5.1010101@teksavvy.com>
On 11-11-09 12:31 PM, Mark Lord wrote:
> Second pass (for review) at updating the in-kernel asix usb/network driver
> from the v4.1.0 vendor GPL version of the driver, obtained from here:
>
> http://www.asix.com.tw/download.php?sub=searchresult&PItemID=84&download=driver
>
> The original vendor copy used a local "axusbnet" middleware (rather than "usbnet").
> I've converted it back to using "usbnet", made a ton of cosmetic changes
> to get it to pass checkpatch.pl, and removed a small amount of code duplication.
>
> The tx/rx checksum code has been updated per Ben's comments,
> and the duplicated MII_* definitions have been removed.
> I've changed the version string to be "4.1.0-kernel",
> to reflect the vendor's code version while also distinguishing
> this port from the original vendor code.
>
> It can use more work going forward, but it is important to get it upstream
> sooner than later -- the current in-kernel driver fails with many devices,
> both old and new. This updated version works with everything I have available
> to test with, and also handles suspend / resume (unlike the in-kernel one).
>
> Signed-off-by: Mark Lord <mlord@pobox.com>
> ---
> Note that the vendor now has a v4.2.0 version available,
> but for now I'm concentrating on the original v4.1.0 code.
>
> After review/discussion of this patch, I will update for Linux-3.2-rc
> and resubmit for inclusion in the eventual linux-3.3 kernel.
..
And again, for ease of reviewing, the entire patched asix.c file is here:
/*
* ASIX AX8817X based USB 2.0 Ethernet Devices
* Copyright (C) 2003-2006 David Hollis <dhollis@davehollis.com>
* Copyright (C) 2005 Phil Chang <pchang23@sbcglobal.net>
* Copyright (C) 2006 James Painter <jamie.painter@iname.com>
* Copyright (c) 2002-2003 TiVo Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/module.h>
#include <linux/kmod.h>
#include <linux/sched.h>
#include <linux/init.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/ethtool.h>
#include <linux/workqueue.h>
#include <linux/mii.h>
#include <linux/usb.h>
#include <linux/crc32.h>
#include <linux/usb/usbnet.h>
#include "asix.h"
#define DRIVER_VERSION "4.1.0-kernel"
static const char driver_name[] = "asix";
static char driver_version[] =
"ASIX USB Ethernet Adapter: v" DRIVER_VERSION "\n";
/* configuration of maximum bulk in size */
static int bsize = AX88772B_MAX_BULKIN_16K;
module_param(bsize, int, 0);
MODULE_PARM_DESC(bsize, "Maximum transfer size per bulk");
static void ax88772b_link_reset(struct work_struct *work);
static void ax88772a_link_reset(struct work_struct *work);
static void ax88772_link_reset(struct work_struct *work);
static int ax88772a_phy_powerup(struct usbnet *dev);
/* ASIX AX8817X based USB 2.0 Ethernet Devices */
static int ax8817x_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
u16 size, void *data)
{
return usb_control_msg(
dev->udev,
usb_rcvctrlpipe(dev->udev, 0),
cmd,
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
value,
index,
data,
size,
USB_CTRL_GET_TIMEOUT);
}
static int ax8817x_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
u16 size, void *data)
{
return usb_control_msg(
dev->udev,
usb_sndctrlpipe(dev->udev, 0),
cmd,
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
value,
index,
data,
size,
USB_CTRL_SET_TIMEOUT);
}
static void ax8817x_async_cmd_callback(struct urb *urb)
{
struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context;
if (urb->status < 0)
printk(KERN_DEBUG "ax8817x_async_cmd_callback() failed with %d",
urb->status);
kfree(req);
usb_free_urb(urb);
}
static int ax8817x_set_mac_addr(struct net_device *net, void *p)
{
struct usbnet *dev = netdev_priv(net);
struct sockaddr *addr = p;
memcpy(net->dev_addr, addr->sa_data, ETH_ALEN);
/* Set the MAC address */
return ax8817x_write_cmd(dev, AX88772_CMD_WRITE_NODE_ID,
0, 0, ETH_ALEN, net->dev_addr);
}
static void ax8817x_status(struct usbnet *dev, struct urb *urb)
{
struct ax88172_int_data *event;
int link;
if (urb->actual_length < 8)
return;
event = urb->transfer_buffer;
link = event->link & 0x01;
if (netif_carrier_ok(dev->net) != link) {
if (link) {
netif_carrier_on(dev->net);
usbnet_defer_kevent(dev, EVENT_LINK_RESET);
} else
netif_carrier_off(dev->net);
netdev_warn(dev->net, "%s: link status is: %d\n",
__func__, link);
}
}
static void ax88178_status(struct usbnet *dev, struct urb *urb)
{
struct ax88178_data *priv = (struct ax88178_data *)dev->driver_priv;
if (priv->EepromData == PHY_MODE_MAC_TO_MAC_GMII)
return;
ax8817x_status(dev, urb);
}
static void ax88772_status(struct usbnet *dev, struct urb *urb)
{
struct ax88172_int_data *event;
struct ax88772_data *priv = (struct ax88772_data *)dev->driver_priv;
int link;
if (urb->actual_length < 8)
return;
event = urb->transfer_buffer;
link = event->link & 0x01;
if (netif_carrier_ok(dev->net) != link) {
if (link) {
netif_carrier_on(dev->net);
priv->Event = AX_SET_RX_CFG;
} else {
netif_carrier_off(dev->net);
if (priv->Event == AX_NOP) {
priv->Event = PHY_POWER_DOWN;
priv->TickToExpire = 25;
}
}
netdev_warn(dev->net, "%s: link status is: %d\n",
__func__, link);
}
if (priv->Event)
queue_work(priv->ax_work, &priv->check_link);
}
static void ax88772a_status(struct usbnet *dev, struct urb *urb)
{
struct ax88172_int_data *event;
struct ax88772a_data *priv = (struct ax88772a_data *)dev->driver_priv;
int link;
int PowSave = (priv->EepromData >> 14);
if (urb->actual_length < 8)
return;
event = urb->transfer_buffer;
link = event->link & 0x01;
if (netif_carrier_ok(dev->net) != link) {
if (link) {
netif_carrier_on(dev->net);
priv->Event = AX_SET_RX_CFG;
} else if ((PowSave == 0x3) || (PowSave == 0x1)) {
netif_carrier_off(dev->net);
if (priv->Event == AX_NOP) {
priv->Event = CHK_CABLE_EXIST;
priv->TickToExpire = 14;
}
} else {
netif_carrier_off(dev->net);
priv->Event = AX_NOP;
}
netdev_warn(dev->net, "%s: link status is: %d\n",
__func__, link);
}
if (priv->Event)
queue_work(priv->ax_work, &priv->check_link);
}
static void ax88772b_status(struct usbnet *dev, struct urb *urb)
{
struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
struct ax88172_int_data *event;
int link;
if (urb->actual_length < 8)
return;
event = urb->transfer_buffer;
link = event->link & AX_INT_PPLS_LINK;
if (netif_carrier_ok(dev->net) != link) {
if (link) {
netif_carrier_on(dev->net);
priv->Event = AX_SET_RX_CFG;
} else {
netif_carrier_off(dev->net);
priv->time_to_chk = jiffies;
}
netdev_warn(dev->net, "%s: link status is: %d\n",
__func__, link);
}
if (!link) {
int no_cable = (event->link & AX_INT_CABOFF_UNPLUG) ? 1 : 0;
if (no_cable) {
if ((priv->psc &
(AX_SWRESET_IPPSL_0 | AX_SWRESET_IPPSL_1)) &&
!priv->pw_enabled) {
/*
* AX88772B already entered power saving state
*/
priv->pw_enabled = 1;
}
} else {
/* AX88772B resumed from power saving state */
if (priv->pw_enabled ||
(jiffies >
(priv->time_to_chk + AX88772B_WATCHDOG))) {
if (priv->pw_enabled)
priv->pw_enabled = 0;
priv->Event = PHY_POWER_UP;
priv->time_to_chk = jiffies;
}
}
}
if (priv->Event)
queue_work(priv->ax_work, &priv->check_link);
}
static void
ax8817x_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 index,
u16 size, void *data)
{
struct usb_ctrlrequest *req;
int status;
struct urb *urb;
urb = usb_alloc_urb(0, GFP_ATOMIC);
if (urb == NULL) {
netdev_err(dev->net, "%s: usb_alloc_urb() failed\n", __func__);
return;
}
req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC);
if (req == NULL) {
netdev_err(dev->net, "%s: kmalloc() failed\n", __func__);
usb_free_urb(urb);
return;
}
req->bRequestType = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE;
req->bRequest = cmd;
req->wValue = cpu_to_le16(value);
req->wIndex = cpu_to_le16(index);
req->wLength = cpu_to_le16(size);
usb_fill_control_urb(urb, dev->udev,
usb_sndctrlpipe(dev->udev, 0),
(void *)req, data, size,
ax8817x_async_cmd_callback, req);
status = usb_submit_urb(urb, GFP_ATOMIC);
if (status < 0) {
netdev_err(dev->net, "%s: usb_submit_urb() failed, err=%d\n",
__func__, status);
kfree(req);
usb_free_urb(urb);
}
}
static void ax8817x_set_multicast(struct net_device *net)
{
struct usbnet *dev = netdev_priv(net);
struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
u8 rx_ctl = AX_RX_CTL_START | AX_RX_CTL_AB;
int mc_count;
mc_count = netdev_mc_count(net);
if (net->flags & IFF_PROMISC) {
rx_ctl |= AX_RX_CTL_PRO;
} else if (net->flags & IFF_ALLMULTI
|| mc_count > AX_MAX_MCAST) {
rx_ctl |= AX_RX_CTL_AMALL;
} else if (mc_count == 0) {
/* just broadcast and directed */
} else {
/* We use the 20 byte dev->data
* for our 8 byte filter buffer
* to avoid allocating memory that
* is tricky to free later */
u32 crc_bits;
struct netdev_hw_addr *ha;
memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE);
netdev_for_each_mc_addr(ha, net) {
crc_bits = ether_crc(ETH_ALEN, ha->addr) >> 26;
data->multi_filter[crc_bits >> 3] |=
1 << (crc_bits & 7);
}
ax8817x_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,
AX_MCAST_FILTER_SIZE, data->multi_filter);
rx_ctl |= AX_RX_CTL_AM;
}
ax8817x_write_cmd_async(dev, AX_CMD_WRITE_RX_CTL, rx_ctl, 0, 0, NULL);
}
static void ax88772b_set_multicast(struct net_device *net)
{
struct usbnet *dev = netdev_priv(net);
struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
u16 rx_ctl = (AX_RX_CTL_START | AX_RX_CTL_AB | AX_RX_HEADER_DEFAULT);
int mc_count;
mc_count = netdev_mc_count(net);
if (net->flags & IFF_PROMISC) {
rx_ctl |= AX_RX_CTL_PRO;
} else if (net->flags & IFF_ALLMULTI
|| mc_count > AX_MAX_MCAST) {
rx_ctl |= AX_RX_CTL_AMALL;
} else if (mc_count == 0) {
/* just broadcast and directed */
} else {
/* We use the 20 byte dev->data
* for our 8 byte filter buffer
* to avoid allocating memory that
* is tricky to free later */
u32 crc_bits;
struct netdev_hw_addr *ha;
memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE);
netdev_for_each_mc_addr(ha, net) {
crc_bits = ether_crc(ETH_ALEN, ha->addr) >> 26;
data->multi_filter[crc_bits >> 3] |=
1 << (crc_bits & 7);
}
ax8817x_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,
AX_MCAST_FILTER_SIZE, data->multi_filter);
rx_ctl |= AX_RX_CTL_AM;
}
ax8817x_write_cmd_async(dev, AX_CMD_WRITE_RX_CTL, rx_ctl, 0, 0, NULL);
}
static int ax8817x_mdio_read(struct net_device *netdev, int phy_id, int loc)
{
struct usbnet *dev = netdev_priv(netdev);
u16 *res;
u16 ret;
res = kmalloc(2, GFP_ATOMIC);
if (!res)
return 0;
ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0, 0, 0, NULL);
ax8817x_read_cmd(dev, AX_CMD_READ_MII_REG, phy_id, (__u16)loc, 2, res);
ax8817x_write_cmd(dev, AX_CMD_SET_HW_MII, 0, 0, 0, NULL);
ret = *res & 0xffff;
kfree(res);
return ret;
}
static int
ax8817x_swmii_mdio_read(struct net_device *netdev, int phy_id, int loc)
{
struct usbnet *dev = netdev_priv(netdev);
u16 *res;
u16 ret;
res = kmalloc(2, GFP_ATOMIC);
if (!res)
return 0;
ax8817x_read_cmd(dev, AX_CMD_READ_MII_REG, phy_id,
(__u16)loc, 2, res);
ret = *res & 0xffff;
kfree(res);
return ret;
}
/* same as above, but converts resulting value to cpu byte order */
static int ax8817x_mdio_read_le(struct net_device *netdev, int phy_id, int loc)
{
return le16_to_cpu(ax8817x_mdio_read(netdev, phy_id, loc));
}
static int
ax8817x_swmii_mdio_read_le(struct net_device *netdev, int phy_id, int loc)
{
return le16_to_cpu(ax8817x_swmii_mdio_read(netdev, phy_id, loc));
}
static void
ax8817x_mdio_write(struct net_device *netdev, int phy_id, int loc, int val)
{
struct usbnet *dev = netdev_priv(netdev);
u16 *res;
res = kmalloc(2, GFP_ATOMIC);
if (!res)
return;
*res = val;
ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0, 0, 0, NULL);
ax8817x_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id,
(__u16)loc, 2, res);
ax8817x_write_cmd(dev, AX_CMD_SET_HW_MII, 0, 0, 0, NULL);
kfree(res);
}
static void ax8817x_swmii_mdio_write(struct net_device *netdev,
int phy_id, int loc, int val)
{
struct usbnet *dev = netdev_priv(netdev);
u16 *res;
res = kmalloc(2, GFP_ATOMIC);
if (!res)
return;
*res = val;
ax8817x_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id,
(__u16)loc, 2, res);
kfree(res);
}
static void
ax88772b_mdio_write(struct net_device *netdev, int phy_id, int loc, int val)
{
struct usbnet *dev = netdev_priv(netdev);
u16 *res;
res = kmalloc(2, GFP_ATOMIC);
if (!res)
return;
*res = val;
ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0, 0, 0, NULL);
ax8817x_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id,
(__u16)loc, 2, res);
if (loc == MII_ADVERTISE) {
*res = cpu_to_le16(BMCR_ANENABLE | BMCR_ANRESTART);
ax8817x_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id,
(__u16)MII_BMCR, 2, res);
}
ax8817x_write_cmd(dev, AX_CMD_SET_HW_MII, 0, 0, 0, NULL);
kfree(res);
}
/* same as above, but converts new value to le16 byte order before writing */
static void
ax8817x_mdio_write_le(struct net_device *netdev, int phy_id, int loc, int val)
{
ax8817x_mdio_write(netdev, phy_id, loc, cpu_to_le16(val));
}
static void ax8817x_swmii_mdio_write_le(struct net_device *netdev,
int phy_id, int loc, int val)
{
ax8817x_swmii_mdio_write(netdev, phy_id, loc, cpu_to_le16(val));
}
static void
ax88772b_mdio_write_le(struct net_device *netdev, int phy_id, int loc, int val)
{
ax88772b_mdio_write(netdev, phy_id, loc, cpu_to_le16(val));
}
static int asix_write_medium_mode(struct usbnet *dev, u16 value)
{
int ret;
ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_MEDIUM_MODE,
value, 0, 0, NULL);
if (ret < 0)
netdev_err(dev->net, "%s (0x%04x) failed, err=%d\n",
__func__, value, ret);
return ret;
}
static int ax88772_suspend(struct usb_interface *intf,
pm_message_t message)
{
struct usbnet *dev = usb_get_intfdata(intf);
u16 *medium;
medium = kmalloc(2, GFP_ATOMIC);
if (!medium)
return usbnet_suspend(intf, message);
ax8817x_read_cmd(dev, AX_CMD_READ_MEDIUM_MODE, 0, 0, 2, medium);
asix_write_medium_mode(dev, *medium & ~AX88772_MEDIUM_RX_ENABLE);
kfree(medium);
return usbnet_suspend(intf, message);
}
static int ax88772b_suspend(struct usb_interface *intf,
pm_message_t message)
{
struct usbnet *dev = usb_get_intfdata(intf);
struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
u16 *tmp16;
u8 *opt;
tmp16 = kmalloc(2, GFP_ATOMIC);
if (!tmp16)
return usbnet_suspend(intf, message);
opt = (u8 *)tmp16;
ax8817x_read_cmd(dev, AX_CMD_READ_MEDIUM_MODE, 0, 0, 2, tmp16);
asix_write_medium_mode(dev, *tmp16 & ~AX88772_MEDIUM_RX_ENABLE);
ax8817x_read_cmd(dev, AX_CMD_READ_MONITOR_MODE, 0, 0, 1, opt);
if (!(*opt & AX_MONITOR_LINK) && !(*opt & AX_MONITOR_MAGIC)) {
ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_IPRL | AX_SWRESET_IPPD, 0, 0, NULL);
} else {
if (priv->psc & AX_SWRESET_WOLLP) {
*tmp16 = ax8817x_mdio_read_le(dev->net,
dev->mii.phy_id, MII_BMCR);
ax8817x_mdio_write_le(dev->net, dev->mii.phy_id,
MII_BMCR, *tmp16 | BMCR_ANENABLE);
ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_IPRL | priv->psc, 0, 0, NULL);
}
if (priv->psc &
(AX_SWRESET_IPPSL_0 | AX_SWRESET_IPPSL_1)) {
*opt |= AX_MONITOR_LINK;
ax8817x_write_cmd(dev, AX_CMD_WRITE_MONITOR_MODE,
*opt, 0, 0, NULL);
}
}
kfree(tmp16);
return usbnet_suspend(intf, message);
}
static int ax88772_resume(struct usb_interface *intf)
{
struct usbnet *dev = usb_get_intfdata(intf);
netif_carrier_off(dev->net);
return usbnet_resume(intf);
}
static int ax88772b_resume(struct usb_interface *intf)
{
struct usbnet *dev = usb_get_intfdata(intf);
struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
if (priv->psc & AX_SWRESET_WOLLP) {
ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_IPRL | (priv->psc & 0x7FFF),
0, 0, NULL);
}
if (priv->psc & (AX_SWRESET_IPPSL_0 | AX_SWRESET_IPPSL_1))
ax88772a_phy_powerup(dev);
netif_carrier_off(dev->net);
return usbnet_resume(intf);
}
static int ax88172_link_reset(struct usbnet *dev)
{
u16 lpa;
u16 adv;
u16 res;
u8 mode;
mode = AX_MEDIUM_TX_ABORT_ALLOW | AX_MEDIUM_FLOW_CONTROL_EN;
lpa = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, MII_LPA);
adv = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, MII_ADVERTISE);
res = mii_nway_result(lpa|adv);
if (res & LPA_DUPLEX)
mode |= AX_MEDIUM_FULL_DUPLEX;
asix_write_medium_mode(dev, mode);
return 0;
}
static void
ax8817x_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
{
struct usbnet *dev = netdev_priv(net);
u8 *opt;
wolinfo->supported = 0;
wolinfo->wolopts = 0;
opt = kmalloc(1, GFP_KERNEL);
if (!opt)
return;
if (ax8817x_read_cmd(dev, AX_CMD_READ_MONITOR_MODE, 0, 0, 1, opt) < 0)
return;
wolinfo->supported = WAKE_PHY | WAKE_MAGIC;
if (*opt & AX_MONITOR_LINK)
wolinfo->wolopts |= WAKE_PHY;
if (*opt & AX_MONITOR_MAGIC)
wolinfo->wolopts |= WAKE_MAGIC;
kfree(opt);
}
static int
ax8817x_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
{
struct usbnet *dev = netdev_priv(net);
u8 *opt;
opt = kmalloc(1, GFP_KERNEL);
if (!opt)
return -ENOMEM;
*opt = 0;
if (wolinfo->wolopts & WAKE_PHY)
*opt |= AX_MONITOR_LINK;
if (wolinfo->wolopts & WAKE_MAGIC)
*opt |= AX_MONITOR_MAGIC;
ax8817x_write_cmd(dev, AX_CMD_WRITE_MONITOR_MODE, *opt, 0, 0, NULL);
kfree(opt);
return 0;
}
static int ax8817x_get_eeprom_len(struct net_device *net)
{
return AX_EEPROM_LEN;
}
static int ax8817x_get_eeprom(struct net_device *net,
struct ethtool_eeprom *eeprom, u8 *data)
{
struct usbnet *dev = netdev_priv(net);
u16 *ebuf = (u16 *)data;
int i;
/* Crude hack to ensure that we don't overwrite memory
* if an odd length is supplied
*/
if (eeprom->len % 2)
return -EINVAL;
eeprom->magic = AX_EEPROM_MAGIC;
/* ax8817x returns 2 bytes from eeprom on read */
for (i = 0; i < eeprom->len / 2; i++) {
if (ax8817x_read_cmd(dev, AX_CMD_READ_EEPROM,
eeprom->offset + i, 0, 2, &ebuf[i]) < 0)
return -EINVAL;
}
return 0;
}
static void ax8817x_get_drvinfo(struct net_device *net,
struct ethtool_drvinfo *info)
{
/* Inherit standard device info */
usbnet_get_drvinfo(net, info);
info->eedump_len = 0x3e;
}
static int ax8817x_get_settings(struct net_device *net, struct ethtool_cmd *cmd)
{
struct usbnet *dev = netdev_priv(net);
return mii_ethtool_gset(&dev->mii, cmd);
}
static int ax8817x_set_settings(struct net_device *net, struct ethtool_cmd *cmd)
{
struct usbnet *dev = netdev_priv(net);
return mii_ethtool_sset(&dev->mii, cmd);
}
/*
* We need to override some ethtool_ops so we require our
* own structure so we don't interfere with other usbnet
* devices that may be connected at the same time.
*/
static struct ethtool_ops ax8817x_ethtool_ops = {
.get_drvinfo = ax8817x_get_drvinfo,
.get_link = ethtool_op_get_link,
.get_msglevel = usbnet_get_msglevel,
.set_msglevel = usbnet_set_msglevel,
.get_wol = ax8817x_get_wol,
.set_wol = ax8817x_set_wol,
.get_eeprom_len = ax8817x_get_eeprom_len,
.get_eeprom = ax8817x_get_eeprom,
.get_settings = ax8817x_get_settings,
.set_settings = ax8817x_set_settings,
};
static int ax8817x_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
{
struct usbnet *dev = netdev_priv(net);
return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
}
static const struct net_device_ops ax88x72_netdev_ops = {
.ndo_open = usbnet_open,
.ndo_stop = usbnet_stop,
.ndo_start_xmit = usbnet_start_xmit,
.ndo_tx_timeout = usbnet_tx_timeout,
.ndo_change_mtu = usbnet_change_mtu,
.ndo_do_ioctl = ax8817x_ioctl,
.ndo_set_mac_address = ax8817x_set_mac_addr,
.ndo_validate_addr = eth_validate_addr,
.ndo_set_multicast_list = ax8817x_set_multicast,
};
static int asix_read_mac(struct usbnet *dev, u8 op)
{
u8 *buf;
int ret, len = ETH_ALEN;
buf = kzalloc(len, GFP_KERNEL);
if (!buf) {
netdev_err(dev->net, "%s kzalloc failed\n", __func__);
return -ENOMEM;
}
ret = ax8817x_read_cmd(dev, op, 0, 0, len, buf);
if (ret < 0) {
netdev_err(dev->net, "%s failed, err=%d\n", __func__, ret);
} else {
memcpy(dev->net->dev_addr, buf, len);
ret = 0;
}
kfree(buf);
return ret;
}
static int asix_read_phyid(struct usbnet *dev, u8 op)
{
u8 *buf;
int ret, len = 2;
buf = kzalloc(len, GFP_KERNEL);
if (!buf) {
netdev_err(dev->net, "%s kzalloc failed\n", __func__);
return -ENOMEM;
}
ret = ax8817x_read_cmd(dev, op, 0, 0, len, buf);
if (ret < 0) {
netdev_err(dev->net, "%s failed, err=%d\n", __func__, ret);
} else if (ret < len) {
netdev_err(dev->net, "%s read only %d/%d bytes\n",
__func__, ret, len);
ret = -EIO;
} else {
dev->mii.phy_id = buf[1];
ret = 0;
}
kfree(buf);
return ret;
}
static int asix_read_eeprom_le16(struct usbnet *dev, u8 offset, u16 *data)
{
u16 *buf;
int ret, len = 2;
buf = kzalloc(len, GFP_KERNEL);
if (!buf) {
netdev_err(dev->net, "%s kzalloc failed\n", __func__);
return -ENOMEM;
}
ret = ax8817x_read_cmd(dev, AX_CMD_READ_EEPROM, offset, 0, len, buf);
if (ret != 2) {
netdev_err(dev->net, "%s failed offset 0x%02x, err=%d\n",
__func__, offset, ret);
} else {
le16_to_cpus(buf);
*data = *buf;
ret = 0;
}
kfree(buf);
return ret;
}
static int asix_read_mac_from_eeprom(struct usbnet *dev)
{
u16 buf[ETH_ALEN / 2];
int i, ret;
memset(buf, 0, sizeof(buf));
for (i = 0; i < ETH_ALEN; i += 2) {
ret = asix_read_eeprom_le16(dev, i + 4, buf + i);
if (ret < 0) {
netdev_err(dev->net, "%s failed\n", __func__);
return ret;
}
}
memcpy(dev->net->dev_addr, buf, ETH_ALEN);
return 0;
}
static int asix_phy_select(struct usbnet *dev, u16 physel)
{
int ret;
ret = ax8817x_write_cmd(dev, AX_CMD_SW_PHY_SELECT, physel, 0, 0, NULL);
if (ret < 0)
netdev_err(dev->net, "%s (0x%04x) failed, err=%d\n",
__func__, physel, ret);
return ret;
}
static int asix_write_gpio(struct usbnet *dev, unsigned int wait, u16 value)
{
int ret;
ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_GPIOS, value, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s (0x%x) failed\n", __func__, value);
return ret;
}
if (!wait)
wait = 5;
if (wait < 20)
usleep_range(wait * 1000, wait * (1000 * 2));
else
msleep(wait);
return 0;
}
static int ax8817x_bind(struct usbnet *dev, struct usb_interface *intf)
{
int ret = 0;
int i;
unsigned long gpio_bits = dev->driver_info->data;
struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
usbnet_get_endpoints(dev, intf);
/* Toggle the GPIOs in a manufacturer/model specific way */
for (i = 2; i >= 0; i--) {
ret = asix_write_gpio(dev, 0, (gpio_bits >> (i * 8)) & 0xff);
if (ret)
goto err_out;
}
ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL, 0x80, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: WRITE_RX_CTL failed, err=%d\n",
__func__, ret);
goto err_out;
}
/* Get the MAC address */
ret = asix_read_mac(dev, AX_CMD_READ_NODE_ID);
if (ret < 0)
goto err_out;
/* Get the PHY id */
ret = asix_read_phyid(dev, AX_CMD_READ_PHY_ID);
if (ret < 0)
goto err_out;
/* Initialize MII structure */
dev->mii.dev = dev->net;
dev->mii.mdio_read = ax8817x_mdio_read_le;
dev->mii.mdio_write = ax8817x_mdio_write_le;
dev->mii.phy_id_mask = 0x3f;
dev->mii.reg_num_mask = 0x1f;
dev->net->netdev_ops = &ax88x72_netdev_ops;
dev->net->ethtool_ops = &ax8817x_ethtool_ops;
/* Register suspend and resume functions */
data->suspend = usbnet_suspend;
data->resume = usbnet_resume;
ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
mii_nway_restart(&dev->mii);
printk(KERN_INFO "%s\n", driver_version);
return 0;
err_out:
return ret;
}
static struct ethtool_ops ax88772_ethtool_ops = {
.get_drvinfo = ax8817x_get_drvinfo,
.get_link = ethtool_op_get_link,
.get_msglevel = usbnet_get_msglevel,
.set_msglevel = usbnet_set_msglevel,
.get_wol = ax8817x_get_wol,
.set_wol = ax8817x_set_wol,
.get_eeprom_len = ax8817x_get_eeprom_len,
.get_eeprom = ax8817x_get_eeprom,
.get_settings = ax8817x_get_settings,
.set_settings = ax8817x_set_settings,
};
static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
{
int ret;
struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
struct ax88772_data *priv;
usbnet_get_endpoints(dev, intf);
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv) {
netdev_err(dev->net, "%s: kzalloc(priv) failed\n", __func__);
return -ENOMEM;
}
dev->driver_priv = priv;
priv->ax_work = create_singlethread_workqueue("ax88772");
if (!priv->ax_work) {
netdev_err(dev->net, "%s: create workqueue failed\n", __func__);
kfree(priv);
return -ENOMEM;
}
priv->dev = dev;
INIT_WORK(&priv->check_link, ax88772_link_reset);
/* reload eeprom data */
ret = asix_write_gpio(dev, 0, AXGPIOS_RSE|AXGPIOS_GPO2|AXGPIOS_GPO2EN);
if (ret)
goto err_out;
/* Initialize MII structure */
dev->mii.dev = dev->net;
dev->mii.mdio_read = ax8817x_mdio_read_le;
dev->mii.mdio_write = ax8817x_mdio_write_le;
dev->mii.phy_id_mask = 0xff;
dev->mii.reg_num_mask = 0xff;
/* Get the PHY id */
ret = asix_read_phyid(dev, AX_CMD_READ_PHY_ID);
if (ret < 0)
goto err_out;
if (dev->mii.phy_id == 0x10) {
ret = asix_phy_select(dev, 0x0001);
if (ret < 0)
goto err_out;
ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_IPPD, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: Failed to power down PHY"
", err=%d\n", __func__, ret);
goto err_out;
}
msleep(150);
ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_CLEAR, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: SW_RESET failed, err=%d\n",
__func__, ret);
goto err_out;
}
msleep(150);
ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_IPRL | AX_SWRESET_PRL, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: Failed to set PHY reset "
"control, err=%d\n", __func__, ret);
goto err_out;
}
} else {
ret = asix_phy_select(dev, 0x0000);
if (ret < 0)
goto err_out;
ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_IPPD | AX_SWRESET_PRL, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: Failed to power down "
"internal PHY, err=%d\n", __func__, ret);
goto err_out;
}
}
msleep(150);
ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL, 0x0000, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: Failed to reset RX_CTL, err=%d\n",
__func__, ret);
goto err_out;
}
/* Get the MAC address */
ret = asix_read_mac(dev, AX88772_CMD_READ_NODE_ID);
if (ret < 0)
goto err_out;
ret = ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: Failed to enable software MII"
", err=%d\n", __func__, ret);
goto err_out;
}
if (dev->mii.phy_id == 0x10) {
ret = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, 2);
if (ret != 0x003b) {
netdev_err(dev->net, "%s: PHY reg 2 not 0x3b00: 0x%x\n",
__func__, ret);
goto err_out;
}
ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_PRL, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: Failed to set "
"external PHY reset pin level, err=%d\n",
__func__, ret);
goto err_out;
}
msleep(150);
ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_IPRL | AX_SWRESET_PRL, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: Failed to set "
"internal/external PHY reset control, err=%d\n",
__func__, ret);
goto err_out;
}
msleep(150);
}
dev->net->netdev_ops = &ax88x72_netdev_ops;
dev->net->ethtool_ops = &ax88772_ethtool_ops;
/* Register suspend and resume functions */
data->suspend = ax88772_suspend;
data->resume = ax88772_resume;
ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
ADVERTISE_ALL | ADVERTISE_CSMA);
mii_nway_restart(&dev->mii);
priv->autoneg_start = jiffies;
priv->Event = WAIT_AUTONEG_COMPLETE;
ret = asix_write_medium_mode(dev, AX88772_MEDIUM_DEFAULT);
if (ret < 0)
goto err_out;
ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_IPG0,
AX88772_IPG0_DEFAULT | AX88772_IPG1_DEFAULT << 8,
AX88772_IPG2_DEFAULT, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: WRITE_IPG0/1/2 failed, err=%d\n",
__func__, ret);
goto err_out;
}
ret = ax8817x_write_cmd(dev, AX_CMD_SET_HW_MII, 0, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: SET_HW_MII failed, err=%d\n",
__func__, ret);
goto err_out;
}
/* Set RX_CTL to default values with 2k buffer, and enable cactus */
ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL, 0x0088, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: WRITE_RX_CTL failed, err=%d\n",
__func__, ret);
goto err_out;
}
/* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
if (dev->driver_info->flags & FLAG_FRAMING_AX) {
/*
* hard_mtu is still the default;
* the device does not support jumbo eth frames
*/
dev->rx_urb_size = 2048;
}
printk(KERN_INFO "%s\n", driver_version);
return 0;
err_out:
destroy_workqueue(priv->ax_work);
kfree(priv);
return ret;
}
static void ax88772_unbind(struct usbnet *dev, struct usb_interface *intf)
{
struct ax88772_data *priv = (struct ax88772_data *)dev->driver_priv;
if (priv) {
flush_workqueue(priv->ax_work);
destroy_workqueue(priv->ax_work);
/* stop MAC operation */
ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
AX_RX_CTL_STOP, 0, 0, NULL);
/* Power down PHY */
ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_IPPD, 0, 0, NULL);
kfree(priv);
}
}
static int ax88772a_phy_powerup(struct usbnet *dev)
{
int ret;
/* set the embedded Ethernet PHY in power-down state */
ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_IPPD | AX_SWRESET_IPRL, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: power down PHY failed, err=%d\n",
__func__, ret);
return ret;
}
msleep(20); /* was 10ms */
/* set the embedded Ethernet PHY in power-up state */
ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET, AX_SWRESET_IPRL,
0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: reset PHY failed, err=%d\n",
__func__, ret);
return ret;
}
msleep(600);
/* set the embedded Ethernet PHY in reset state */
ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET, AX_SWRESET_CLEAR,
0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: power up PHY failed, err=%d\n",
__func__, ret);
return ret;
}
/* set the embedded Ethernet PHY in power-up state */
ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET, AX_SWRESET_IPRL,
0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: second reset PHY failed, err=%d\n",
__func__, ret);
return ret;
}
return 0;
}
static int ax88772a_bind(struct usbnet *dev, struct usb_interface *intf)
{
int ret = -EIO;
struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
struct ax88772a_data *priv;
usbnet_get_endpoints(dev, intf);
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv) {
netdev_err(dev->net, "%s: kzalloc(priv) failed\n", __func__);
return -ENOMEM;
}
dev->driver_priv = priv;
priv->ax_work = create_singlethread_workqueue("ax88772a");
if (!priv->ax_work) {
netdev_err(dev->net, "%s: create workqueue failed\n", __func__);
kfree(priv);
return -ENOMEM;
}
priv->dev = dev;
INIT_WORK(&priv->check_link, ax88772a_link_reset);
/* Get the EEPROM data*/
ret = asix_read_eeprom_le16(dev, 0x17, &priv->EepromData);
if (ret < 0)
goto err_out;
/* reload eeprom data */
ret = asix_write_gpio(dev, 0, AXGPIOS_RSE);
if (ret)
goto err_out;
/* Initialize MII structure */
dev->mii.dev = dev->net;
dev->mii.mdio_read = ax8817x_mdio_read_le;
dev->mii.mdio_write = ax8817x_mdio_write_le;
dev->mii.phy_id_mask = 0xff;
dev->mii.reg_num_mask = 0xff;
/* Get the PHY id */
ret = asix_read_phyid(dev, AX_CMD_READ_PHY_ID);
if (ret < 0)
goto err_out;
if (dev->mii.phy_id != 0x10) {
netdev_err(dev->net, "%s: Got wrong PHY_ID: 0x%02x\n",
__func__, dev->mii.phy_id);
ret = -EIO;
goto err_out;
}
/* select the embedded 10/100 Ethernet PHY */
ret = asix_phy_select(dev,
AX_PHYSEL_SSEN | AX_PHYSEL_PSEL | AX_PHYSEL_SSMII);
if (ret < 0)
goto err_out;
ret = ax88772a_phy_powerup(dev);
if (ret < 0)
goto err_out;
/* stop MAC operation */
ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
AX_RX_CTL_STOP, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: reset RX_CTL failed, err=%d\n",
__func__, ret);
goto err_out;
}
/* Get the MAC address */
ret = asix_read_mac(dev, AX88772_CMD_READ_NODE_ID);
if (ret < 0)
goto err_out;
/* make sure the driver can enable sw mii operation */
ret = ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: enable software MII failed, err=%d\n",
__func__, ret);
goto err_out;
}
dev->net->netdev_ops = &ax88x72_netdev_ops;
dev->net->ethtool_ops = &ax88772_ethtool_ops;
/* Register suspend and resume functions */
data->suspend = ax88772_suspend;
data->resume = ax88772_resume;
ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
mii_nway_restart(&dev->mii);
priv->autoneg_start = jiffies;
priv->Event = WAIT_AUTONEG_COMPLETE;
ret = asix_write_medium_mode(dev, AX88772_MEDIUM_DEFAULT);
if (ret < 0)
goto err_out;
ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_IPG0,
AX88772A_IPG0_DEFAULT | AX88772A_IPG1_DEFAULT << 8,
AX88772A_IPG2_DEFAULT, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: write IPG,IPG1,IPG2 failed, err=%d\n",
__func__, ret);
goto err_out;
}
/* Set RX_CTL to default values with 2k buffer, and enable cactus */
ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
AX_RX_CTL_START | AX_RX_CTL_AB, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: Reset RX_CTL failed, err=%d\n",
__func__, ret);
goto err_out;
}
/* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
if (dev->driver_info->flags & FLAG_FRAMING_AX) {
/*
* hard_mtu is still the default;
* the device does not support jumbo eth frames
*/
dev->rx_urb_size = 2048;
}
printk(KERN_INFO "%s\n", driver_version);
return ret;
err_out:
destroy_workqueue(priv->ax_work);
kfree(priv);
return ret;
}
static void ax88772a_unbind(struct usbnet *dev, struct usb_interface *intf)
{
struct ax88772a_data *priv = (struct ax88772a_data *)dev->driver_priv;
if (priv) {
flush_workqueue(priv->ax_work);
destroy_workqueue(priv->ax_work);
/* stop MAC operation */
ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
AX_RX_CTL_STOP, 0, 0, NULL);
/* Power down PHY */
ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_IPPD, 0, 0, NULL);
kfree(priv);
}
}
static int ax88772b_set_csums(struct usbnet *dev)
{
struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
u16 checksum;
if (priv->checksum & AX_RX_CHECKSUM)
checksum = AX_RXCOE_DEF_CSUM;
else
checksum = 0;
if (priv->checksum & AX_TX_CHECKSUM)
checksum = AX_TXCOE_DEF_CSUM;
else
checksum = 0;
ax8817x_write_cmd(dev, AX_CMD_WRITE_RXCOE_CTL,
checksum, 0, 0, NULL);
ax8817x_write_cmd(dev, AX_CMD_WRITE_TXCOE_CTL,
checksum, 0, 0, NULL);
return 0;
}
static int ax88772b_set_features(struct net_device *netdev, u32 features)
{
struct usbnet *dev = netdev_priv(netdev);
struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
unsigned long flags;
u16 tx_csum = 0, rx_csum = 0;
spin_lock_irqsave(&priv->checksum_lock, flags);
if (features & NETIF_F_HW_CSUM) {
priv->checksum |= AX_TX_CHECKSUM;
tx_csum = AX_TXCOE_DEF_CSUM;
} else
priv->checksum &= ~AX_TX_CHECKSUM;
if (features & NETIF_F_RXCSUM) {
priv->checksum |= AX_RX_CHECKSUM;
rx_csum = AX_RXCOE_DEF_CSUM;
} else
priv->checksum &= ~AX_RX_CHECKSUM;
spin_unlock_irqrestore(&priv->checksum_lock, flags);
ax8817x_write_cmd(dev, AX_CMD_WRITE_RXCOE_CTL,
rx_csum, 0, 0, NULL);
ax8817x_write_cmd(dev, AX_CMD_WRITE_TXCOE_CTL,
tx_csum, 0, 0, NULL);
return 0;
}
static struct ethtool_ops ax88772b_ethtool_ops = {
.get_drvinfo = ax8817x_get_drvinfo,
.get_link = ethtool_op_get_link,
.get_msglevel = usbnet_get_msglevel,
.set_msglevel = usbnet_set_msglevel,
.get_wol = ax8817x_get_wol,
.set_wol = ax8817x_set_wol,
.get_eeprom_len = ax8817x_get_eeprom_len,
.get_eeprom = ax8817x_get_eeprom,
.get_settings = ax8817x_get_settings,
.set_settings = ax8817x_set_settings,
};
static const struct net_device_ops ax88772b_netdev_ops = {
.ndo_open = usbnet_open,
.ndo_stop = usbnet_stop,
.ndo_start_xmit = usbnet_start_xmit,
.ndo_tx_timeout = usbnet_tx_timeout,
.ndo_change_mtu = usbnet_change_mtu,
.ndo_do_ioctl = ax8817x_ioctl,
.ndo_set_mac_address = ax8817x_set_mac_addr,
.ndo_validate_addr = eth_validate_addr,
.ndo_set_multicast_list = ax88772b_set_multicast,
.ndo_set_features = ax88772b_set_features,
};
static int ax88772b_bind(struct usbnet *dev, struct usb_interface *intf)
{
int ret;
struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
struct ax88772b_data *priv;
int rx_size;
u16 tmp16;
usbnet_get_endpoints(dev, intf);
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv) {
netdev_err(dev->net, "%s: kzalloc(priv) failed\n", __func__);
return -ENOMEM;
}
spin_lock_init(&priv->checksum_lock);
dev->driver_priv = priv;
priv->ax_work = create_singlethread_workqueue("ax88772b");
if (!priv->ax_work) {
netdev_err(dev->net, "%s: create workqueue failed\n", __func__);
kfree(priv);
return -ENOMEM;
}
priv->dev = dev;
INIT_WORK(&priv->check_link, ax88772b_link_reset);
/* reload eeprom data */
ret = asix_write_gpio(dev, 0, AXGPIOS_RSE);
if (ret)
goto err_out;
/* Get the EEPROM data*/
ret = asix_read_eeprom_le16(dev, 0x18, &priv->psc);
if (ret < 0)
goto err_out;
priv->psc &= 0xFF00;
/* Get the MAC address from the eeprom */
ret = asix_read_mac_from_eeprom(dev);
if (ret < 0)
goto err_out;
/* Set the MAC address */
ret = ax8817x_write_cmd(dev, AX88772_CMD_WRITE_NODE_ID,
0, 0, ETH_ALEN, dev->net->dev_addr);
if (ret < 0) {
netdev_err(dev->net, "%s: set mac addr failed, err=%d\n",
__func__, ret);
goto err_out;
}
/* Initialize MII structure */
dev->mii.dev = dev->net;
dev->mii.mdio_read = ax8817x_mdio_read_le;
dev->mii.mdio_write = ax88772b_mdio_write_le;
dev->mii.phy_id_mask = 0xff;
dev->mii.reg_num_mask = 0xff;
/* Get the PHY id */
ret = asix_read_phyid(dev, AX_CMD_READ_PHY_ID);
if (ret < 0)
goto err_out;
if (dev->mii.phy_id != 0x10) {
netdev_err(dev->net, "%s: Got wrong PHY_ID: 0x%02x\n",
__func__, dev->mii.phy_id);
ret = -EIO;
goto err_out;
}
/* select the embedded 10/100 Ethernet PHY */
ret = asix_phy_select(dev,
AX_PHYSEL_SSEN | AX_PHYSEL_PSEL | AX_PHYSEL_SSMII);
if (ret < 0)
goto err_out;
ret = ax88772a_phy_powerup(dev);
if (ret < 0)
goto err_out;
/* stop MAC operation */
ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
AX_RX_CTL_STOP, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: reset RX_CTL failed, err=%d\n",
__func__, ret);
goto err_out;
}
/* make sure the driver can enable sw mii operation */
ret = ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: enable software MII failed, err=%d\n",
__func__, ret);
goto err_out;
}
dev->net->netdev_ops = &ax88772b_netdev_ops;
dev->net->ethtool_ops = &ax88772b_ethtool_ops;
/* Register suspend and resume functions */
data->suspend = ax88772b_suspend;
data->resume = ax88772b_resume;
tmp16 = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, 0x12);
ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, 0x12,
((tmp16 & 0xFF9F) | 0x0040));
ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
mii_nway_restart(&dev->mii);
ret = asix_write_medium_mode(dev, AX88772_MEDIUM_DEFAULT);
if (ret < 0)
goto err_out;
ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_IPG0,
AX88772A_IPG0_DEFAULT | AX88772A_IPG1_DEFAULT << 8,
AX88772A_IPG2_DEFAULT, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: write interfram gap failed, err=%d\n",
__func__, ret);
goto err_out;
}
dev->net->features |= NETIF_F_IP_CSUM;
dev->net->features |= NETIF_F_IPV6_CSUM;
priv->checksum = AX_RX_CHECKSUM | AX_TX_CHECKSUM;
ret = ax88772b_set_csums(dev);
if (ret < 0) {
netdev_err(dev->net, "%s: write RX_COE/TX_COE failed, err=%d\n",
__func__, ret);
goto err_out;
}
rx_size = bsize & 0x07;
if (dev->udev->speed == USB_SPEED_HIGH) {
ret = ax8817x_write_cmd(dev, 0x2A,
AX88772B_BULKIN_SIZE[rx_size].byte_cnt,
AX88772B_BULKIN_SIZE[rx_size].threshold,
0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: set rx_size failed, err=%d\n",
__func__, ret);
goto err_out;
}
dev->rx_urb_size = AX88772B_BULKIN_SIZE[rx_size].size;
} else {
ret = ax8817x_write_cmd(dev, 0x2A, 0x8000, 0x8001, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: set rx_size failed, err=%d\n",
__func__, ret);
goto err_out;
}
dev->rx_urb_size = 2048;
}
/* Configure RX header type */
ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
(AX_RX_CTL_START | AX_RX_CTL_AB | AX_RX_HEADER_DEFAULT),
0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: reset RX_CTL failed, err=%d\n",
__func__, ret);
goto err_out;
}
/* Overwrite power saving configuration from eeprom */
ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_IPRL | (priv->psc & 0x7FFF), 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: set phy power saving failed, err=%d\n",
__func__, ret);
goto err_out;
}
printk(KERN_INFO "%s\n", driver_version);
return ret;
err_out:
destroy_workqueue(priv->ax_work);
kfree(priv);
return ret;
}
static void ax88772b_unbind(struct usbnet *dev, struct usb_interface *intf)
{
struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
if (priv) {
flush_workqueue(priv->ax_work);
destroy_workqueue(priv->ax_work);
/* stop MAC operation */
ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
AX_RX_CTL_STOP, 0, 0, NULL);
/* Power down PHY */
ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_IPPD, 0, 0, NULL);
kfree(priv);
}
}
static int
ax88178_media_check(struct usbnet *dev, struct ax88178_data *priv)
{
int fullduplex;
u16 tempshort = 0;
u16 media;
u16 advertise, lpa, result, stat1000;
advertise = ax8817x_mdio_read_le(dev->net,
dev->mii.phy_id, MII_ADVERTISE);
lpa = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, MII_LPA);
result = advertise & lpa;
stat1000 = ax8817x_mdio_read_le(dev->net,
dev->mii.phy_id, MII_STAT1000);
if ((priv->PhyMode == PHY_MODE_MARVELL) &&
(priv->LedMode == 1)) {
tempshort = ax8817x_mdio_read_le(dev->net,
dev->mii.phy_id, MARVELL_MANUAL_LED) & 0xfc0f;
}
fullduplex = 1;
if (stat1000 & LPA_1000FULL) {
media = MEDIUM_GIGA_MODE | MEDIUM_FULL_DUPLEX_MODE |
MEDIUM_ENABLE_125MHZ | MEDIUM_ENABLE_RECEIVE;
if ((priv->PhyMode == PHY_MODE_MARVELL) &&
(priv->LedMode == 1))
tempshort |= 0x3e0;
} else if (result & LPA_100FULL) {
media = MEDIUM_FULL_DUPLEX_MODE | MEDIUM_ENABLE_RECEIVE |
MEDIUM_MII_100M_MODE;
if ((priv->PhyMode == PHY_MODE_MARVELL) &&
(priv->LedMode == 1))
tempshort |= 0x3b0;
} else if (result & LPA_100HALF) {
fullduplex = 0;
media = MEDIUM_ENABLE_RECEIVE | MEDIUM_MII_100M_MODE;
if ((priv->PhyMode == PHY_MODE_MARVELL) &&
(priv->LedMode == 1))
tempshort |= 0x3b0;
} else if (result & LPA_10FULL) {
media = MEDIUM_FULL_DUPLEX_MODE | MEDIUM_ENABLE_RECEIVE;
if ((priv->PhyMode == PHY_MODE_MARVELL) &&
(priv->LedMode == 1))
tempshort |= 0x2f0;
} else {
media = MEDIUM_ENABLE_RECEIVE;
fullduplex = 0;
if ((priv->PhyMode == PHY_MODE_MARVELL) &&
(priv->LedMode == 1))
tempshort |= 0x02f0;
}
if ((priv->PhyMode == PHY_MODE_MARVELL) &&
(priv->LedMode == 1)) {
ax8817x_mdio_write_le(dev->net,
dev->mii.phy_id, MARVELL_MANUAL_LED, tempshort);
}
media |= 0x0004;
if (priv->UseRgmii)
media |= 0x0008;
if (fullduplex) {
media |= 0x0020; /* enable tx flow control as default */
media |= 0x0010; /* enable rx flow control as default */
}
return media;
}
static void Vitess_8601_Init(struct usbnet *dev, int State)
{
u16 reg;
switch (State) {
case 0: /* tx, rx clock skew */
ax8817x_swmii_mdio_write_le(dev->net, dev->mii.phy_id, 31, 1);
ax8817x_swmii_mdio_write_le(dev->net, dev->mii.phy_id, 28, 0);
ax8817x_swmii_mdio_write_le(dev->net, dev->mii.phy_id, 31, 0);
break;
case 1:
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 31, 0x52B5);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 18, 0x009E);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 17, 0xDD39);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 16, 0x87AA);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 16, 0xA7B4);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 18,
ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 18));
reg = (ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 17) & ~0x003f) | 0x003c;
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 17, reg);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 16, 0x87B4);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 16, 0xa794);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 18,
ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 18));
reg = (ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 17) & ~0x003f) | 0x003e;
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 17, reg);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 16, 0x8794);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 18, 0x00f7);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 17, 0xbe36);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 16, 0x879e);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 16, 0xa7a0);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 18,
ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 18));
reg = (ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 17) & ~0x003f) | 0x0034;
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 17, reg);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 16, 0x87a0);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 18, 0x003c);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 17, 0xf3cf);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 16, 0x87a2);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 18, 0x003c);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 17, 0xf3cf);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 16, 0x87a4);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 18, 0x003c);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 17, 0xd287);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 16, 0x87a6);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 16, 0xa7a8);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 18,
ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 18));
reg = (ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 17) & ~0x0fff) | 0x0125;
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 17, reg);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 16, 0x87a8);
/* Enable Smart Pre-emphasis */
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 16, 0xa7fa);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 18,
ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 18));
reg = (ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 17) & ~0x0008) | 0x0008;
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 17, reg);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 16, 0x87fa);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 31, 0);
break;
}
}
static int
ax88178_phy_init(struct usbnet *dev, struct ax88178_data *priv)
{
int i;
u16 PhyAnar, PhyAuxCtrl, PhyCtrl, TempShort, PhyID1;
u16 PhyReg = 0;
/* Disable MII operation of AX88178 Hardware */
ax8817x_write_cmd(dev, AX_CMD_SET_SW_MII, 0x0000, 0, 0, NULL);
/* Read SROM - MiiPhy Address (ID) */
ax8817x_read_cmd(dev, AX_CMD_READ_PHY_ID, 0, 0, 2, &dev->mii.phy_id);
le16_to_cpus(&dev->mii.phy_id);
/* Initialize MII structure */
dev->mii.phy_id >>= 8;
dev->mii.phy_id &= PHY_ID_MASK;
dev->mii.dev = dev->net;
dev->mii.mdio_read = ax8817x_mdio_read_le;
dev->mii.mdio_write = ax8817x_mdio_write_le;
dev->mii.phy_id_mask = 0x3f;
dev->mii.reg_num_mask = 0x1f;
dev->mii.supports_gmii = 1;
if (priv->PhyMode == PHY_MODE_MAC_TO_MAC_GMII) {
priv->UseRgmii = 0;
priv->MediaLink = MEDIUM_GIGA_MODE |
MEDIUM_FULL_DUPLEX_MODE |
MEDIUM_ENABLE_125MHZ |
MEDIUM_ENABLE_RECEIVE |
MEDIUM_ENABLE_RX_FLOWCTRL |
MEDIUM_ENABLE_TX_FLOWCTRL;
goto SkipPhySetting;
}
/* test read phy register 2 */
if (!priv->UseGpio0) {
i = 1000;
while (i--) {
PhyID1 = ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, MII_PHYSID1);
if ((PhyID1 == 0x000f) || (PhyID1 == 0x0141) ||
(PhyID1 == 0x0282) || (PhyID1 == 0x004d) ||
(PhyID1 == 0x0243) || (PhyID1 == 0x001C) ||
(PhyID1 == 0x0007))
break;
usleep_range(5, 20);
}
if (i < 0)
return -EIO;
}
priv->UseRgmii = 0;
if (priv->PhyMode == PHY_MODE_MARVELL) {
PhyReg = ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 27);
if (!(PhyReg & 4)) {
priv->UseRgmii = 1;
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 20, 0x82);
priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
}
} else if ((priv->PhyMode == PHY_MODE_AGERE_V0) ||
(priv->PhyMode == PHY_MODE_AGERE_V0_GMII)) {
if (priv->PhyMode == PHY_MODE_AGERE_V0) {
priv->UseRgmii = 1;
priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
}
} else if (priv->PhyMode == PHY_MODE_CICADA_V1) {
/* not Cameo */
if (!priv->UseGpio0 || priv->LedMode) {
priv->UseRgmii = 1;
priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
}
for (i = 0; i < (sizeof(CICADA_FAMILY_HWINIT) /
sizeof(CICADA_FAMILY_HWINIT[0])); i++) {
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id,
CICADA_FAMILY_HWINIT[i].offset,
CICADA_FAMILY_HWINIT[i].value);
}
} else if (priv->PhyMode == PHY_MODE_CICADA_V2) {
/* not Cameo */
if (!priv->UseGpio0 || priv->LedMode) {
priv->UseRgmii = 1;
priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
}
for (i = 0; i < (sizeof(CICADA_V2_HWINIT) /
sizeof(CICADA_V2_HWINIT[0])); i++) {
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, CICADA_V2_HWINIT[i].offset,
CICADA_V2_HWINIT[i].value);
}
} else if (priv->PhyMode == PHY_MODE_CICADA_V2_ASIX) {
/* not Cameo */
if (!priv->UseGpio0 || priv->LedMode) {
priv->UseRgmii = 1;
priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
}
for (i = 0; i < (sizeof(CICADA_V2_HWINIT) /
sizeof(CICADA_V2_HWINIT[0])); i++) {
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, CICADA_V2_HWINIT[i].offset,
CICADA_V2_HWINIT[i].value);
}
} else if (priv->PhyMode == PHY_MODE_RTL8211CL) {
priv->UseRgmii = 1;
priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
} else if (priv->PhyMode == PHY_MODE_RTL8211BN) {
priv->UseRgmii = 1;
priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
} else if (priv->PhyMode == PHY_MODE_RTL8251CL) {
priv->UseRgmii = 1;
priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
} else if (priv->PhyMode == PHY_MODE_VSC8601) {
priv->UseRgmii = 1;
priv->MediaLink |= MEDIUM_ENABLE_125MHZ;
/* Vitess_8601_Init(dev, 0); */
}
if (priv->PhyMode != PHY_MODE_ATTANSIC_V0) {
/* software reset */
ax8817x_swmii_mdio_write_le(
dev->net, dev->mii.phy_id, MII_BMCR,
ax8817x_swmii_mdio_read_le(
dev->net, dev->mii.phy_id, MII_BMCR)
| BMCR_RESET);
usleep_range(1000, 2000);
}
if ((priv->PhyMode == PHY_MODE_AGERE_V0) ||
(priv->PhyMode == PHY_MODE_AGERE_V0_GMII)) {
if (priv->PhyMode == PHY_MODE_AGERE_V0) {
i = 1000;
while (i--) {
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 21, 0x1001);
PhyReg = ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 21);
if ((PhyReg & 0xf00f) == 0x1001)
break;
}
if (i < 0)
return -EIO;
}
if (priv->LedMode == 4) {
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 28, 0x7417);
} else if (priv->LedMode == 9) {
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 28, 0x7a10);
} else if (priv->LedMode == 10) {
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 28, 0x7a13);
}
for (i = 0; i < (sizeof(AGERE_FAMILY_HWINIT) /
sizeof(AGERE_FAMILY_HWINIT[0])); i++) {
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, AGERE_FAMILY_HWINIT[i].offset,
AGERE_FAMILY_HWINIT[i].value);
}
} else if (priv->PhyMode == PHY_MODE_RTL8211CL) {
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 0x1f, 0x0005);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 0x0c, 0);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 0x01,
(ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 0x01) | 0x0080));
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 0x1f, 0);
if (priv->LedMode == 12) {
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 0x1f, 0x0002);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 0x1a, 0x00cb);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 0x1f, 0);
}
} else if (priv->PhyMode == PHY_MODE_VSC8601) {
Vitess_8601_Init(dev, 1);
}
/* read phy register 0 */
PhyCtrl = ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, MII_BMCR);
TempShort = PhyCtrl;
PhyCtrl &= ~(BMCR_PDOWN | BMCR_ISOLATE);
if (PhyCtrl != TempShort) {
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, MII_BMCR, PhyCtrl);
}
/* led */
if (priv->PhyMode == PHY_MODE_MARVELL) {
if (priv->LedMode == 1) {
PhyReg = (ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 24) & 0xf8ff) | (1 + 0x100);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 24, PhyReg);
PhyReg = ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 25) & 0xfc0f;
} else if (priv->LedMode == 2) {
PhyReg = (ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 24) & 0xf886) |
(1 + 0x10 + 0x300);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 24, PhyReg);
} else if (priv->LedMode == 5) {
PhyReg = (ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 24) & 0xf8be) |
(1 + 0x40 + 0x300);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 24, PhyReg);
} else if (priv->LedMode == 7) {
PhyReg = (ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 24) & 0xf8ff) |
(1 + 0x100);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 24, PhyReg);
} else if (priv->LedMode == 8) {
PhyReg = (ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 24) & 0xf8be) |
(1 + 0x40 + 0x100);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 24, PhyReg);
} else if (priv->LedMode == 11) {
PhyReg = ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 24) & 0x4106;
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 24, PhyReg);
}
} else if ((priv->PhyMode == PHY_MODE_CICADA_V1) ||
(priv->PhyMode == PHY_MODE_CICADA_V2) ||
(priv->PhyMode == PHY_MODE_CICADA_V2_ASIX)) {
if (priv->LedMode == 3) {
PhyReg = (ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 27) & 0xFCFF) | 0x0100;
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 27, PhyReg);
}
}
if (priv->PhyMode == PHY_MODE_MARVELL) {
if (priv->LedMode == 1)
PhyReg |= 0x3f0;
}
PhyAnar = ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP |
ADVERTISE_100FULL | ADVERTISE_100HALF |
ADVERTISE_10FULL | ADVERTISE_10HALF |
ADVERTISE_PAUSE_ASYM;
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, MII_ADVERTISE, PhyAnar);
PhyAuxCtrl = ADVERTISE_1000FULL;
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, MII_CTRL1000, PhyAuxCtrl);
if (priv->PhyMode == PHY_MODE_VSC8601) {
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 31, 0x52B5);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 16, 0xA7F8);
TempShort = ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 17) & (~0x0018);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 17, TempShort);
TempShort = ax8817x_swmii_mdio_read_le(dev->net,
dev->mii.phy_id, 18);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 18, TempShort);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 16, 0x87F8);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 31, 0);
}
if (priv->PhyMode == PHY_MODE_ATTANSIC_V0) {
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, MII_BMCR, 0x9000);
} else {
PhyCtrl &= ~BMCR_LOOPBACK;
PhyCtrl |= (BMCR_ANENABLE | BMCR_ANRESTART);
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, MII_BMCR, PhyCtrl);
}
if (priv->PhyMode == PHY_MODE_MARVELL) {
if (priv->LedMode == 1)
ax8817x_swmii_mdio_write_le(dev->net,
dev->mii.phy_id, 25, PhyReg);
}
SkipPhySetting:
asix_write_medium_mode(dev, priv->MediaLink);
ax8817x_write_cmd(dev, AX_CMD_WRITE_IPG0,
AX88772_IPG0_DEFAULT | (AX88772_IPG1_DEFAULT << 8),
AX88772_IPG2_DEFAULT, 0, NULL);
usleep_range(1000, 2000);
ax8817x_write_cmd(dev, AX_CMD_SET_HW_MII, 0, 0, 0, NULL);
return 0;
}
static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
{
int ret;
struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
struct ax88178_data *priv;
usbnet_get_endpoints(dev, intf);
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv) {
netdev_err(dev->net, "%s: kzalloc(priv) failed\n", __func__);
return -ENOMEM;
}
dev->driver_priv = priv;
/* Get the EEPROM data*/
ret = asix_read_eeprom_le16(dev, 0x17, &priv->EepromData);
if (ret < 0)
goto err_out;
if (priv->EepromData == 0xffff) {
priv->PhyMode = PHY_MODE_MARVELL;
priv->LedMode = 0;
priv->UseGpio0 = 1;
} else {
priv->PhyMode = (u8)(priv->EepromData & EEPROMMASK);
priv->LedMode = (u8)(priv->EepromData >> 8);
if (priv->LedMode == 6) /* for buffalo new (use gpio2) */
priv->LedMode = 1;
else if (priv->LedMode == 1)
priv->BuffaloOld = 1;
if (priv->EepromData & 0x80)
priv->UseGpio0 = 0; /* MARVEL se and other */
else
priv->UseGpio0 = 1; /* cameo */
}
if (priv->UseGpio0) {
if (priv->PhyMode == PHY_MODE_MARVELL) {
ret = asix_write_gpio(dev, 25,
AXGPIOS_GPO0EN | AXGPIOS_RSE);
if (ret)
goto err_out;
ret = asix_write_gpio(dev, 15,
AXGPIOS_GPO2 | AXGPIOS_GPO2EN |
AXGPIOS_GPO0EN);
if (ret)
goto err_out;
ret = asix_write_gpio(dev, 245,
AXGPIOS_GPO2EN | AXGPIOS_GPO0EN);
if (ret)
goto err_out;
ret = asix_write_gpio(dev, 0,
AXGPIOS_GPO2 | AXGPIOS_GPO2EN |
AXGPIOS_GPO0EN);
if (ret)
goto err_out;
} else { /* vitesse */
ret = asix_write_gpio(dev, 25,
AXGPIOS_RSE | AXGPIOS_GPO0EN |
AXGPIOS_GPO0);
if (ret)
goto err_out;
ret = asix_write_gpio(dev, 25,
AXGPIOS_GPO0EN | AXGPIOS_GPO0 |
AXGPIOS_GPO2EN | AXGPIOS_GPO2);
if (ret)
goto err_out;
ret = asix_write_gpio(dev, 245,
AXGPIOS_GPO0EN | AXGPIOS_GPO0 |
AXGPIOS_GPO2EN);
if (ret)
goto err_out;
ret = asix_write_gpio(dev, 0,
AXGPIOS_GPO0EN | AXGPIOS_GPO0 |
AXGPIOS_GPO2EN | AXGPIOS_GPO2);
if (ret)
goto err_out;
}
} else { /* use gpio1 */
if (priv->BuffaloOld) {
ret = asix_write_gpio(dev, 350,
AXGPIOS_GPO1 | AXGPIOS_GPO1EN |
AXGPIOS_RSE);
if (ret)
goto err_out;
ret = asix_write_gpio(dev, 350,
AXGPIOS_GPO1EN);
if (ret)
goto err_out;
ret = asix_write_gpio(dev, 0,
AXGPIOS_GPO1EN | AXGPIOS_GPO1);
if (ret)
goto err_out;
} else {
ret = asix_write_gpio(dev, 25,
AXGPIOS_GPO1 | AXGPIOS_GPO1EN |
AXGPIOS_RSE);
if (ret)
goto err_out;
ret = asix_write_gpio(dev, 25,
AXGPIOS_GPO1EN | AXGPIOS_GPO1 |
AXGPIOS_GPO2EN | AXGPIOS_GPO2);
if (ret)
goto err_out;
ret = asix_write_gpio(dev, 245,
AXGPIOS_GPO1EN | AXGPIOS_GPO1 |
AXGPIOS_GPO2EN);
if (ret)
goto err_out;
ret = asix_write_gpio(dev, 0,
AXGPIOS_GPO1EN | AXGPIOS_GPO1 |
AXGPIOS_GPO2EN | AXGPIOS_GPO2);
if (ret)
goto err_out;
}
}
ret = asix_phy_select(dev, 0);
if (ret < 0)
goto err_out;
ret = ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_IPPD | AX_SWRESET_PRL, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: SW_RESET failed\n", __func__);
goto err_out;
}
ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL, 0, 0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: RX_CTL failed\n", __func__);
goto err_out;
}
/* Get the MAC address */
ret = asix_read_mac(dev, AX88772_CMD_READ_NODE_ID);
if (ret < 0)
goto err_out;
ret = ax88178_phy_init(dev, priv);
if (ret < 0)
goto err_out;
dev->net->netdev_ops = &ax88x72_netdev_ops;
dev->net->ethtool_ops = &ax8817x_ethtool_ops;
/* Register suspend and resume functions */
data->suspend = ax88772_suspend;
data->resume = ax88772_resume;
if (dev->driver_info->flags & FLAG_FRAMING_AX)
dev->rx_urb_size = 16384;
ret = ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
(AX_RX_CTL_MFB | AX_RX_CTL_START | AX_RX_CTL_AB),
0, 0, NULL);
if (ret < 0) {
netdev_err(dev->net, "%s: RX_CTL failed\n", __func__);
goto err_out;
}
printk(KERN_INFO "%s\n", driver_version);
return ret;
err_out:
kfree(priv);
return ret;
}
static void ax88178_unbind(struct usbnet *dev, struct usb_interface *intf)
{
struct ax88178_data *priv = (struct ax88178_data *)dev->driver_priv;
if (priv) {
/* stop MAC operation */
ax8817x_write_cmd(dev, AX_CMD_WRITE_RX_CTL,
AX_RX_CTL_STOP, 0, 0, NULL);
kfree(priv);
}
}
static int ax88772_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
{
u8 *head;
u32 header;
char *packet;
struct sk_buff *ax_skb;
u16 size;
head = (u8 *) skb->data;
memcpy(&header, head, sizeof(header));
le32_to_cpus(&header);
packet = head + sizeof(header);
skb_pull(skb, 4);
while (skb->len > 0) {
if ((short)(header & 0x0000ffff) !=
~((short)((header & 0xffff0000) >> 16))) {
netdev_err(dev->net,
"%s: header length data is error 0x%08x, %d\n",
__func__, header, skb->len);
}
/* get the packet length */
size = (u16) (header & 0x0000ffff);
if ((skb->len) - ((size + 1) & 0xfffe) == 0) {
/* Make sure ip header is aligned on 32-bit boundary */
if (!((unsigned long)skb->data & 0x02)) {
memmove(skb->data - 2, skb->data, size);
skb->data -= 2;
skb_set_tail_pointer(skb, size);
}
skb->truesize = size + sizeof(struct sk_buff);
return 2;
}
if (size > ETH_FRAME_LEN) {
netdev_err(dev->net, "%s: invalid rx length %d\n",
__func__, size);
return 0;
}
ax_skb = skb_clone(skb, GFP_ATOMIC);
if (ax_skb) {
/* Make sure ip header is aligned on 32-bit boundary */
if (!((unsigned long)packet & 0x02)) {
memmove(packet - 2, packet, size);
packet -= 2;
}
ax_skb->data = packet;
skb_set_tail_pointer(ax_skb, size);
ax_skb->truesize = size + sizeof(struct sk_buff);
usbnet_skb_return(dev, ax_skb);
} else {
return 0;
}
skb_pull(skb, (size + 1) & 0xfffe);
if (skb->len == 0)
break;
head = (u8 *) skb->data;
memcpy(&header, head, sizeof(header));
le32_to_cpus(&header);
packet = head + sizeof(header);
skb_pull(skb, 4);
}
if (skb->len < 0) {
netdev_err(dev->net, "%s: invalid rx length %d\n",
__func__, skb->len);
return 0;
}
return 1;
}
static struct sk_buff *ax88772_tx_fixup(struct usbnet *dev,
struct sk_buff *skb, gfp_t flags)
{
int padlen = ((skb->len + 4) % 512) ? 0 : 4;
u32 packet_len;
u32 padbytes = 0xffff0000;
int headroom = skb_headroom(skb);
int tailroom = skb_tailroom(skb);
if ((!skb_cloned(skb))
&& ((headroom + tailroom) >= (4 + padlen))) {
if ((headroom < 4) || (tailroom < padlen)) {
skb->data = memmove(skb->head + 4, skb->data, skb->len);
skb_set_tail_pointer(skb, skb->len);
}
} else {
struct sk_buff *skb2;
skb2 = skb_copy_expand(skb, 4, padlen, flags);
dev_kfree_skb_any(skb);
skb = skb2;
if (!skb)
return NULL;
}
skb_push(skb, 4);
packet_len = (((skb->len - 4) ^ 0x0000ffff) << 16) + (skb->len - 4);
cpu_to_le32s(&packet_len);
skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len));
if ((skb->len % 512) == 0) {
cpu_to_le32s(&padbytes);
memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes));
skb_put(skb, sizeof(padbytes));
}
return skb;
}
static void
ax88772b_rx_checksum(struct sk_buff *skb, struct ax88772b_rx_header *rx_hdr)
{
skb->ip_summed = CHECKSUM_NONE;
/* checksum error bit is set */
if (rx_hdr->l3_csum_err || rx_hdr->l4_csum_err)
return;
/* It must be a TCP or UDP packet with a valid checksum */
if ((rx_hdr->l4_type == AX_RXHDR_L4_TYPE_TCP) ||
(rx_hdr->l4_type == AX_RXHDR_L4_TYPE_UDP)) {
skb->ip_summed = CHECKSUM_UNNECESSARY;
}
}
static int ax88772b_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
{
struct ax88772b_rx_header rx_hdr;
struct sk_buff *ax_skb;
struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
while (skb->len > 0) {
memcpy(&rx_hdr, skb->data, sizeof(struct ax88772b_rx_header));
if ((short)rx_hdr.len != (~((short)rx_hdr.len_bar) & 0x7FF))
return 0;
if (rx_hdr.len > (ETH_FRAME_LEN + 4)) {
netdev_err(dev->net, "%s: invalid rx length %d\n",
__func__, rx_hdr.len);
return 0;
}
if (skb->len - ((rx_hdr.len +
sizeof(struct ax88772b_rx_header) + 3) &
0xfffc) == 0) {
skb_pull(skb, sizeof(struct ax88772b_rx_header));
skb->len = rx_hdr.len;
skb_set_tail_pointer(skb, rx_hdr.len);
skb->truesize = rx_hdr.len + sizeof(struct sk_buff);
if (priv->checksum & AX_RX_CHECKSUM)
ax88772b_rx_checksum(skb, &rx_hdr);
return 2;
}
ax_skb = skb_clone(skb, GFP_ATOMIC);
if (ax_skb) {
ax_skb->len = rx_hdr.len;
ax_skb->data = skb->data +
sizeof(struct ax88772b_rx_header);
skb_set_tail_pointer(ax_skb, rx_hdr.len);
ax_skb->truesize = rx_hdr.len + sizeof(struct sk_buff);
if (priv->checksum & AX_RX_CHECKSUM)
ax88772b_rx_checksum(ax_skb, &rx_hdr);
usbnet_skb_return(dev, ax_skb);
} else {
return 0;
}
skb_pull(skb, ((rx_hdr.len +
sizeof(struct ax88772b_rx_header) + 3)
& 0xfffc));
}
if (skb->len < 0) {
netdev_err(dev->net, "%s: invalid rx length %d\n",
__func__, skb->len);
return 0;
}
return 1;
}
static struct sk_buff *
ax88772b_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
{
int padlen = ((skb->len + 4) % 512) ? 0 : 4;
u32 packet_len;
u32 padbytes = 0xffff0000;
int headroom = skb_headroom(skb);
int tailroom = skb_tailroom(skb);
if ((!skb_cloned(skb))
&& ((headroom + tailroom) >= (4 + padlen))) {
if ((headroom < 4) || (tailroom < padlen)) {
skb->data = memmove(skb->head + 4, skb->data, skb->len);
skb_set_tail_pointer(skb, skb->len);
}
} else {
struct sk_buff *skb2;
skb2 = skb_copy_expand(skb, 4, padlen, flags);
dev_kfree_skb_any(skb);
skb = skb2;
if (!skb)
return NULL;
}
skb_push(skb, 4);
packet_len = (((skb->len - 4) ^ 0x0000ffff) << 16) + (skb->len - 4);
cpu_to_le32s(&packet_len);
skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len));
if ((skb->len % 512) == 0) {
cpu_to_le32s(&padbytes);
memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes));
skb_put(skb, sizeof(padbytes));
}
return skb;
}
static const u8 ChkCntSel[6][3] = {
{12, 23, 31},
{12, 31, 23},
{23, 31, 12},
{23, 12, 31},
{31, 12, 23},
{31, 23, 12}
};
static void ax88772_link_reset(struct work_struct *work)
{
struct ax88772_data *priv = container_of(work,
struct ax88772_data, check_link);
struct usbnet *dev = priv->dev;
if (priv->Event == AX_SET_RX_CFG) {
u16 bmcr;
u16 mode;
priv->Event = AX_NOP;
mode = AX88772_MEDIUM_DEFAULT;
bmcr = ax8817x_mdio_read_le(dev->net,
dev->mii.phy_id, MII_BMCR);
if (!(bmcr & BMCR_FULLDPLX))
mode &= ~AX88772_MEDIUM_FULL_DUPLEX;
if (!(bmcr & BMCR_SPEED100))
mode &= ~AX88772_MEDIUM_100MB;
asix_write_medium_mode(dev, mode);
return;
}
switch (priv->Event) {
case WAIT_AUTONEG_COMPLETE:
if (jiffies > (priv->autoneg_start + 5 * HZ)) {
priv->Event = PHY_POWER_DOWN;
priv->TickToExpire = 23;
}
break;
case PHY_POWER_DOWN:
if (priv->TickToExpire == 23) {
/* Set Phy Power Down */
ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_IPPD,
0, 0, NULL);
--priv->TickToExpire;
} else if (--priv->TickToExpire == 0) {
/* Set Phy Power Up */
ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_IPRL, 0, 0, NULL);
ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_IPPD | AX_SWRESET_IPRL, 0, 0, NULL);
usleep_range(10000, 20000);
ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_IPRL, 0, 0, NULL);
msleep(60);
ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_CLEAR, 0, 0, NULL);
ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_IPRL, 0, 0, NULL);
ax8817x_mdio_write_le(dev->net, dev->mii.phy_id,
MII_ADVERTISE,
ADVERTISE_ALL | ADVERTISE_CSMA |
ADVERTISE_PAUSE_CAP);
mii_nway_restart(&dev->mii);
priv->Event = PHY_POWER_UP;
priv->TickToExpire = 47;
}
break;
case PHY_POWER_UP:
if (--priv->TickToExpire == 0) {
priv->Event = PHY_POWER_DOWN;
priv->TickToExpire = 23;
}
break;
default:
break;
}
return;
}
static void ax88772a_link_reset(struct work_struct *work)
{
struct ax88772a_data *priv = container_of(work,
struct ax88772a_data, check_link);
struct usbnet *dev = priv->dev;
int PowSave = (priv->EepromData >> 14);
u16 phy_reg;
if (priv->Event == AX_SET_RX_CFG) {
u16 bmcr;
u16 mode;
priv->Event = AX_NOP;
mode = AX88772_MEDIUM_DEFAULT;
bmcr = ax8817x_mdio_read_le(dev->net,
dev->mii.phy_id, MII_BMCR);
if (!(bmcr & BMCR_FULLDPLX))
mode &= ~AX88772_MEDIUM_FULL_DUPLEX;
if (!(bmcr & BMCR_SPEED100))
mode &= ~AX88772_MEDIUM_100MB;
asix_write_medium_mode(dev, mode);
return;
}
switch (priv->Event) {
case WAIT_AUTONEG_COMPLETE:
if (jiffies > (priv->autoneg_start + 5 * HZ)) {
priv->Event = CHK_CABLE_EXIST;
priv->TickToExpire = 14;
}
break;
case CHK_CABLE_EXIST:
phy_reg = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, 0x12);
if ((phy_reg != 0x8012) && (phy_reg != 0x8013)) {
ax8817x_mdio_write_le(dev->net,
dev->mii.phy_id, 0x16, 0x4040);
mii_nway_restart(&dev->mii);
priv->Event = CHK_CABLE_STATUS;
priv->TickToExpire = 31;
} else if (--priv->TickToExpire == 0) {
mii_nway_restart(&dev->mii);
priv->Event = CHK_CABLE_EXIST_AGAIN;
if (PowSave == 0x03) {
priv->TickToExpire = 47;
} else if (PowSave == 0x01) {
priv->DlyIndex = (u8)(jiffies % 6);
priv->DlySel = 0;
priv->TickToExpire =
ChkCntSel[priv->DlyIndex][priv->DlySel];
}
}
break;
case CHK_CABLE_EXIST_AGAIN:
/* if cable disconnected */
phy_reg = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, 0x12);
if ((phy_reg != 0x8012) && (phy_reg != 0x8013)) {
mii_nway_restart(&dev->mii);
priv->Event = CHK_CABLE_STATUS;
priv->TickToExpire = 31;
} else if (--priv->TickToExpire == 0) {
/* Power down PHY */
ax8817x_write_cmd(dev, AX_CMD_SW_RESET,
AX_SWRESET_IPPD,
0, 0, NULL);
priv->Event = PHY_POWER_DOWN;
if (PowSave == 0x03)
priv->TickToExpire = 23;
else if (PowSave == 0x01)
priv->TickToExpire = 31;
}
break;
case PHY_POWER_DOWN:
if (--priv->TickToExpire == 0)
priv->Event = PHY_POWER_UP;
break;
case CHK_CABLE_STATUS:
if (--priv->TickToExpire == 0) {
ax8817x_mdio_write_le(dev->net,
dev->mii.phy_id, 0x16, 0x4040);
mii_nway_restart(&dev->mii);
priv->Event = CHK_CABLE_EXIST_AGAIN;
if (PowSave == 0x03) {
priv->TickToExpire = 47;
} else if (PowSave == 0x01) {
priv->DlyIndex = (u8)(jiffies % 6);
priv->DlySel = 0;
priv->TickToExpire =
ChkCntSel[priv->DlyIndex][priv->DlySel];
}
}
break;
case PHY_POWER_UP:
ax88772a_phy_powerup(dev);
ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
mii_nway_restart(&dev->mii);
priv->Event = CHK_CABLE_EXIST_AGAIN;
if (PowSave == 0x03) {
priv->TickToExpire = 47;
} else if (PowSave == 0x01) {
if (++priv->DlySel >= 3) {
priv->DlyIndex = (u8)(jiffies % 6);
priv->DlySel = 0;
}
priv->TickToExpire =
ChkCntSel[priv->DlyIndex][priv->DlySel];
}
break;
default:
break;
}
return;
}
static void ax88772b_link_reset(struct work_struct *work)
{
struct ax88772b_data *priv = container_of(work,
struct ax88772b_data, check_link);
struct usbnet *dev = priv->dev;
switch (priv->Event) {
case AX_SET_RX_CFG:
{
u16 bmcr = ax8817x_mdio_read_le(dev->net,
dev->mii.phy_id, MII_BMCR);
u16 mode = AX88772_MEDIUM_DEFAULT;
if (!(bmcr & BMCR_FULLDPLX))
mode &= ~AX88772_MEDIUM_FULL_DUPLEX;
if (!(bmcr & BMCR_SPEED100))
mode &= ~AX88772_MEDIUM_100MB;
asix_write_medium_mode(dev, mode);
break;
}
case PHY_POWER_UP:
{
u16 tmp16;
ax88772a_phy_powerup(dev);
tmp16 = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, 0x12);
ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, 0x12,
((tmp16 & 0xFF9F) | 0x0040));
ax8817x_mdio_write_le(dev->net, dev->mii.phy_id, MII_ADVERTISE,
ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
break;
}
default:
break;
}
priv->Event = AX_NOP;
return;
}
static int ax88178_set_media(struct usbnet *dev)
{
int ret;
struct ax88178_data *priv = (struct ax88178_data *)dev->driver_priv;
int media;
media = ax88178_media_check(dev, priv);
if (media < 0)
return media;
ret = asix_write_medium_mode(dev, media);
if (ret < 0)
return ret;
return 0;
}
static int ax88178_link_reset(struct usbnet *dev)
{
return ax88178_set_media(dev);
}
static int ax_suspend(struct usb_interface *intf,
pm_message_t message)
{
struct usbnet *dev = usb_get_intfdata(intf);
struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
return data->suspend(intf, message);
}
static int ax_resume(struct usb_interface *intf)
{
struct usbnet *dev = usb_get_intfdata(intf);
struct ax8817x_data *data = (struct ax8817x_data *)&dev->data;
return data->resume(intf);
}
static const struct driver_info ax88178_info = {
.description = "ASIX AX88178 USB 2.0 Ethernet",
.bind = ax88178_bind,
.unbind = ax88178_unbind,
.status = ax88178_status,
.link_reset = ax88178_link_reset,
.reset = ax88178_link_reset,
.flags = FLAG_ETHER | FLAG_FRAMING_AX,
.rx_fixup = ax88772_rx_fixup,
.tx_fixup = ax88772_tx_fixup,
};
static const struct driver_info belkin178_info = {
.description = "Belkin Gigabit USB 2.0 Network Adapter",
.bind = ax88178_bind,
.unbind = ax88178_unbind,
.status = ax8817x_status,
.link_reset = ax88178_link_reset,
.reset = ax88178_link_reset,
.flags = FLAG_ETHER | FLAG_FRAMING_AX,
.rx_fixup = ax88772_rx_fixup,
.tx_fixup = ax88772_tx_fixup,
};
static const struct driver_info ax8817x_info = {
.description = "ASIX AX8817x USB 2.0 Ethernet",
.bind = ax8817x_bind,
.status = ax8817x_status,
.link_reset = ax88172_link_reset,
.reset = ax88172_link_reset,
.flags = FLAG_ETHER,
};
static const struct driver_info dlink_dub_e100_info = {
.description = "DLink DUB-E100 USB Ethernet",
.bind = ax8817x_bind,
.status = ax8817x_status,
.link_reset = ax88172_link_reset,
.reset = ax88172_link_reset,
.flags = FLAG_ETHER,
};
static const struct driver_info netgear_fa120_info = {
.description = "Netgear FA-120 USB Ethernet",
.bind = ax8817x_bind,
.status = ax8817x_status,
.link_reset = ax88172_link_reset,
.reset = ax88172_link_reset,
.flags = FLAG_ETHER,
};
static const struct driver_info hawking_uf200_info = {
.description = "Hawking UF200 USB Ethernet",
.bind = ax8817x_bind,
.status = ax8817x_status,
.link_reset = ax88172_link_reset,
.reset = ax88172_link_reset,
.flags = FLAG_ETHER,
};
static const struct driver_info ax88772_info = {
.description = "ASIX AX88772 USB 2.0 Ethernet",
.bind = ax88772_bind,
.unbind = ax88772_unbind,
.status = ax88772_status,
.flags = FLAG_ETHER | FLAG_FRAMING_AX,
.rx_fixup = ax88772_rx_fixup,
.tx_fixup = ax88772_tx_fixup,
};
static const struct driver_info dlink_dub_e100b_info = {
.description = "D-Link DUB-E100 USB 2.0 Fast Ethernet Adapter",
.bind = ax88772_bind,
.unbind = ax88772_unbind,
.status = ax88772_status,
.flags = FLAG_ETHER | FLAG_FRAMING_AX,
.rx_fixup = ax88772_rx_fixup,
.tx_fixup = ax88772_tx_fixup,
};
static const struct driver_info ax88772a_info = {
.description = "ASIX AX88772A USB 2.0 Ethernet",
.bind = ax88772a_bind,
.unbind = ax88772a_unbind,
.status = ax88772a_status,
.flags = FLAG_ETHER | FLAG_FRAMING_AX,
.rx_fixup = ax88772_rx_fixup,
.tx_fixup = ax88772_tx_fixup,
};
static const struct driver_info ax88772b_info = {
.description = "ASIX AX88772B USB 2.0 Ethernet",
.bind = ax88772b_bind,
.unbind = ax88772b_unbind,
.status = ax88772b_status,
.flags = FLAG_ETHER | FLAG_FRAMING_AX,
.rx_fixup = ax88772b_rx_fixup,
.tx_fixup = ax88772b_tx_fixup,
};
static const struct usb_device_id products[] = {
{
/* 88178 */
USB_DEVICE(0x0b95, 0x1780),
.driver_info = (unsigned long) &ax88178_info,
}, {
/* 88178 for billianton linksys */
USB_DEVICE(0x077b, 0x2226),
.driver_info = (unsigned long) &ax88178_info,
}, {
/* ABOCOM for linksys */
USB_DEVICE(0x1737, 0x0039),
.driver_info = (unsigned long) &ax88178_info,
}, {
/* ABOCOM for pci */
USB_DEVICE(0x14ea, 0xab11),
.driver_info = (unsigned long) &ax88178_info,
}, {
/* Belkin */
USB_DEVICE(0x050d, 0x5055),
.driver_info = (unsigned long) &belkin178_info,
}, {
/* Linksys USB200M */
USB_DEVICE(0x077b, 0x2226),
.driver_info = (unsigned long) &ax8817x_info,
}, {
/* Netgear FA120 */
USB_DEVICE(0x0846, 0x1040),
.driver_info = (unsigned long) &netgear_fa120_info,
}, {
/* DLink DUB-E100 */
USB_DEVICE(0x2001, 0x1a00),
.driver_info = (unsigned long) &dlink_dub_e100_info,
}, {
/* DLink DUB-E100B */
USB_DEVICE(0x2001, 0x3c05),
.driver_info = (unsigned long) &dlink_dub_e100b_info,
}, {
/* DLink DUB-E100B */
USB_DEVICE(0x07d1, 0x3c05),
.driver_info = (unsigned long) &dlink_dub_e100b_info,
}, {
/* Intellinet, ST Lab USB Ethernet */
USB_DEVICE(0x0b95, 0x1720),
.driver_info = (unsigned long) &ax8817x_info,
}, {
/* Hawking UF200, TrendNet TU2-ET100 */
USB_DEVICE(0x07b8, 0x420a),
.driver_info = (unsigned long) &hawking_uf200_info,
}, {
/* Billionton Systems, USB2AR */
USB_DEVICE(0x08dd, 0x90ff),
.driver_info = (unsigned long) &ax8817x_info,
}, {
/* ATEN UC210T */
USB_DEVICE(0x0557, 0x2009),
.driver_info = (unsigned long) &ax8817x_info,
}, {
/* Buffalo LUA-U2-KTX */
USB_DEVICE(0x0411, 0x003d),
.driver_info = (unsigned long) &ax8817x_info,
}, {
/* Sitecom LN-029 "USB 2.0 10/100 Ethernet adapter" */
USB_DEVICE(0x6189, 0x182d),
.driver_info = (unsigned long) &ax8817x_info,
}, {
/* corega FEther USB2-TX */
USB_DEVICE(0x07aa, 0x0017),
.driver_info = (unsigned long) &ax8817x_info,
}, {
/* Surecom EP-1427X-2 */
USB_DEVICE(0x1189, 0x0893),
.driver_info = (unsigned long) &ax8817x_info,
}, {
/* goodway corp usb gwusb2e */
USB_DEVICE(0x1631, 0x6200),
.driver_info = (unsigned long) &ax8817x_info,
}, {
/* ASIX AX88772 10/100 */
USB_DEVICE(0x0b95, 0x7720),
.driver_info = (unsigned long) &ax88772_info,
}, {
/* ASIX AX88772 10/100 */
USB_DEVICE(0x125E, 0x180D),
.driver_info = (unsigned long) &ax88772_info,
}, {
/* ASIX AX88772A 10/100 */
USB_DEVICE(0x0b95, 0x772A),
.driver_info = (unsigned long) &ax88772a_info,
}, {
/* ASIX AX88772A 10/100 */
USB_DEVICE(0x0db0, 0xA877),
.driver_info = (unsigned long) &ax88772a_info,
}, {
/* ASIX AX88772A 10/100 */
USB_DEVICE(0x0421, 0x772A),
.driver_info = (unsigned long) &ax88772a_info,
}, {
/* Linksys 200M */
USB_DEVICE(0x13B1, 0x0018),
.driver_info = (unsigned long) &ax88772a_info,
}, {
USB_DEVICE(0x05ac, 0x1402),
.driver_info = (unsigned long) &ax88772a_info,
}, {
/* ASIX AX88772B 10/100 */
USB_DEVICE(0x0b95, 0x772B),
.driver_info = (unsigned long) &ax88772b_info,
}, {
/* ASIX AX88772B 10/100 */
USB_DEVICE(0x0b95, 0x7E2B),
.driver_info = (unsigned long) &ax88772b_info,
},
{ }, /* END */
};
MODULE_DEVICE_TABLE(usb, products);
static struct usb_driver asix_driver = {
.name = driver_name,
.id_table = products,
.probe = usbnet_probe,
.suspend = ax_suspend,
.resume = ax_resume,
.disconnect = usbnet_disconnect,
};
static int __init asix_init(void)
{
return usb_register(&asix_driver);
}
module_init(asix_init);
static void __exit asix_exit(void)
{
usb_deregister(&asix_driver);
}
module_exit(asix_exit);
MODULE_AUTHOR("David Hollis");
MODULE_DESCRIPTION("ASIX AX8817X based USB 2.0 Ethernet Devices");
MODULE_LICENSE("GPL");
^ permalink raw reply
* Re: [PATCH v2] drivers/net/usb/asix: resync from vendor's copy
From: Ben Hutchings @ 2011-11-09 17:47 UTC (permalink / raw)
To: Mark Lord; +Cc: David Miller, netdev, linux-kernel, Michal Marek
In-Reply-To: <4EBAB8F5.1010101@teksavvy.com>
On Wed, 2011-11-09 at 12:31 -0500, Mark Lord wrote:
[...]
> +static int ax88172_link_reset(struct usbnet *dev)
> +{
> + u16 lpa;
> + u16 adv;
> + u16 res;
> + u8 mode;
> +
> + mode = AX_MEDIUM_TX_ABORT_ALLOW | AX_MEDIUM_FLOW_CONTROL_EN;
> + lpa = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, MII_LPA);
> + adv = ax8817x_mdio_read_le(dev->net, dev->mii.phy_id, MII_ADVERTISE);
> + res = mii_nway_result(lpa|adv);
[...]
The argument to mii_nway_result() must be lpa & adv (the intersection of
supported modes, not the union!).
Ben
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply
* Re: [PATCH] drivers/net/usb/asix: resync from vendor's copy
From: Ben Hutchings @ 2011-11-09 17:48 UTC (permalink / raw)
To: Mark Lord; +Cc: David Miller, netdev, linux-kernel
In-Reply-To: <4EBABAFD.6050604@teksavvy.com>
On Wed, 2011-11-09 at 12:40 -0500, Mark Lord wrote:
> On 11-11-09 12:31 PM, Ben Hutchings wrote:
> > On Wed, 2011-11-09 at 12:20 -0500, Mark Lord wrote:
> >> On 11-11-09 11:57 AM, Mark Lord wrote:
> >>> On 11-11-09 11:47 AM, Mark Lord wrote:
> >>> ..
> >>>> Note: I'm looking at smsc95xx.c and smsc75xx.c for examples,
> >>>> and they both have the same problem I'll have here:
> >>>>
> >>>> How to update the csum settings atomically.
> >>>> A spinlock is no good, because config register access is over USB.
> >>>
> >>> Nevermind.. a slight change in the logic and all is well again.
> >> ..
> >>
> >> Or even simpler (below). I don't think this method requires any
> >> extra locking, but I'm still open to persuasion. :)
> >
> > Looks reasonable, but...
> >
> >> static int ax88772b_set_features(struct net_device *netdev, u32 features)
> >> {
> >> struct usbnet *dev = netdev_priv(netdev);
> >> struct ax88772b_data *priv = (struct ax88772b_data *)dev->driver_priv;
> >> u16 tx_csum = 0, rx_csum = 0;
> >>
> >> priv->features = features & (NETIF_F_HW_CSUM | NETIF_F_RXCSUM);
> >
> > ...why do you need priv->features at all?
>
>
> There's code elsewhere that takes action under some conditions
> based on the current setting of the NETIF_F_RXCSUM flag.
>
> I don't claim to fully understand what's going on,
> but it doesn't care much about races on set/clear of the flag.
And it can use dev->features.
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox