CVS commit: src/sys/dev/pci/cxgb
Module Name:src Committed By: andvar Date: Sun Aug 8 20:57:09 UTC 2021 Modified Files: src/sys/dev/pci/cxgb: cxgb_offload.c Log Message: s/propely/properly/ To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/cxgb/cxgb_offload.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/cxgb/cxgb_offload.c diff -u src/sys/dev/pci/cxgb/cxgb_offload.c:1.6 src/sys/dev/pci/cxgb/cxgb_offload.c:1.7 --- src/sys/dev/pci/cxgb/cxgb_offload.c:1.6 Fri Dec 27 09:22:20 2019 +++ src/sys/dev/pci/cxgb/cxgb_offload.c Sun Aug 8 20:57:09 2021 @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. #include -__KERNEL_RCSID(0, "$NetBSD: cxgb_offload.c,v 1.6 2019/12/27 09:22:20 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cxgb_offload.c,v 1.7 2021/08/08 20:57:09 andvar Exp $"); #include #include @@ -516,7 +516,7 @@ cxgb_insert_tid(struct toedev *tdev, str } /* - * Populate a TID_RELEASE WR. The mbuf must be already propely sized. + * Populate a TID_RELEASE WR. The mbuf must be already properly sized. */ static inline void mk_tid_release(struct mbuf *m, unsigned int tid)
CVS commit: src/sys/dev/pci/cxgb
Module Name:src
Committed By: jdolecek
Date: Sun Dec 9 11:49:07 UTC 2018
Modified Files:
src/sys/dev/pci/cxgb: cxgb_main.c
Log Message:
use pci_intr_establish_xname()
XXX due to 2008-01-17 '10 gigabit Chelsio cards now compile and work, although
XXX not very well yet' commit this looks like having worked in past, but since
XXX ~2010 received only mechanical updates, and currently it's unreferenced
XXX and uncompilable - does it make sense to keep the driver around?
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/cxgb/cxgb_main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/cxgb/cxgb_main.c
diff -u src/sys/dev/pci/cxgb/cxgb_main.c:1.6 src/sys/dev/pci/cxgb/cxgb_main.c:1.7
--- src/sys/dev/pci/cxgb/cxgb_main.c:1.6 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pci/cxgb/cxgb_main.c Sun Dec 9 11:49:06 2018
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
***/
#include
-__KERNEL_RCSID(0, "$NetBSD: cxgb_main.c,v 1.6 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxgb_main.c,v 1.7 2018/12/09 11:49:06 jdolecek Exp $");
#include
#include
@@ -640,8 +640,8 @@ cxgb_setup_msix(adapter_t *sc, int msix_
printf("cxgb_setup_msix(%d): pci_intr_map() failed\n", __LINE__);
return (EINVAL);
}
-sc->intr_cookie = pci_intr_establish(sc->pa.pa_pc, sc->intr_handle,
-IPL_NET, cxgb_async_intr, sc);
+sc->intr_cookie = pci_intr_establish_xname(sc->pa.pa_pc, sc->intr_handle,
+IPL_NET, cxgb_async_intr, sc, device_xname(sc->dev));
if (sc->intr_cookie == NULL)
{
printf("cxgb_setup_msix(%d): pci_intr_establish() failed\n", __LINE__);
@@ -1124,9 +1124,9 @@ cxgb_up(struct adapter *sc)
goto out;
}
device_printf(sc->dev, "allocated intr_handle=%d\n", sc->intr_handle);
-sc->intr_cookie = pci_intr_establish(sc->pa.pa_pc,
+sc->intr_cookie = pci_intr_establish_xname(sc->pa.pa_pc,
sc->intr_handle, IPL_NET,
-sc->cxgb_intr, sc);
+sc->cxgb_intr, sc, device_xname(sc->dev));
if (sc->intr_cookie == NULL)
{
device_printf(sc->dev, "Cannot establish interrupt\n");
CVS commit: src/sys/dev/pci/cxgb
Module Name:src
Committed By: maxv
Date: Tue Oct 11 12:53:56 UTC 2016
Modified Files:
src/sys/dev/pci/cxgb: cxgb_l2t.c
Log Message:
There are two memory leaks here, found by mootja; just add some XXXs.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/cxgb/cxgb_l2t.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/cxgb/cxgb_l2t.c
diff -u src/sys/dev/pci/cxgb/cxgb_l2t.c:1.3 src/sys/dev/pci/cxgb/cxgb_l2t.c:1.4
--- src/sys/dev/pci/cxgb/cxgb_l2t.c:1.3 Tue Mar 25 16:19:14 2014
+++ src/sys/dev/pci/cxgb/cxgb_l2t.c Tue Oct 11 12:53:56 2016
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
***/
#include
-__KERNEL_RCSID(0, "$NetBSD: cxgb_l2t.c,v 1.3 2014/03/25 16:19:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxgb_l2t.c,v 1.4 2016/10/11 12:53:56 maxv Exp $");
#include
#include
@@ -127,7 +127,7 @@ setup_l2e_send_pending(struct toedev *de
memcpy(req->dst_mac, e->dmac, sizeof(req->dst_mac));
m_set_priority(m, CPL_PRIORITY_CONTROL);
while (e->arpq_head) {
-m = e->arpq_head;
+m = e->arpq_head; /* XXX XXX XXX: Memory leak? */
e->arpq_head = m->m_next;
m->m_next = NULL;
}
@@ -182,6 +182,7 @@ again:
arpq_enqueue(e, m);
mtx_unlock(&e->lock);
+ /* XXX XXX XXX: Memory leak? */
if ((m0 = m_gethdr(M_NOWAIT, MT_DATA)) == NULL)
return (ENOMEM);
/*
CVS commit: src/sys/dev/pci/cxgb
Module Name:src
Committed By: ozaki-r
Date: Wed May 25 10:15:01 UTC 2016
Modified Files:
src/sys/dev/pci/cxgb: cxgb_osdep.h
Log Message:
Use M_GETCTX and M_SETCTX
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/cxgb/cxgb_osdep.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/cxgb/cxgb_osdep.h
diff -u src/sys/dev/pci/cxgb/cxgb_osdep.h:1.4 src/sys/dev/pci/cxgb/cxgb_osdep.h:1.5
--- src/sys/dev/pci/cxgb/cxgb_osdep.h:1.4 Thu Mar 20 06:48:54 2014
+++ src/sys/dev/pci/cxgb/cxgb_osdep.h Wed May 25 10:15:01 2016
@@ -183,8 +183,8 @@ struct t3_mbuf_hdr {
} while (0)
-#define m_get_priority(m) ((uintptr_t)(m)->m_pkthdr.rcvif)
-#define m_set_priority(m, pri) ((m)->m_pkthdr.rcvif = (struct ifnet *)((uintptr_t)pri))
+#define m_get_priority(m) M_GETCTX((m), uintptr_t)
+#define m_set_priority(m, pri) M_SETCTX((m), (uintptr_t)(pri))
#define if_name(ifp) (ifp)->if_xname
#define M_SANITY(m, n)
CVS commit: src/sys/dev/pci/cxgb
Module Name:src
Committed By: christos
Date: Sun Sep 21 17:05:02 UTC 2014
Modified Files:
src/sys/dev/pci/cxgb: cxgb_offload.c
Log Message:
comment out code that was never used, but probably intended to be used.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/cxgb/cxgb_offload.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/cxgb/cxgb_offload.c
diff -u src/sys/dev/pci/cxgb/cxgb_offload.c:1.3 src/sys/dev/pci/cxgb/cxgb_offload.c:1.4
--- src/sys/dev/pci/cxgb/cxgb_offload.c:1.3 Tue Mar 25 12:19:14 2014
+++ src/sys/dev/pci/cxgb/cxgb_offload.c Sun Sep 21 13:05:02 2014
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include
-__KERNEL_RCSID(0, "$NetBSD: cxgb_offload.c,v 1.3 2014/03/25 16:19:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxgb_offload.c,v 1.4 2014/09/21 17:05:02 christos Exp $");
#include
#include
@@ -711,7 +711,7 @@ do_hwtid_rpl(struct toedev *dev, struct
printf("do_hwtid_rpl m=%p\n", m);
return (0);
-
+#ifdef notyet
hwtid = G_TID(ntohl(p->opcode_tid));
@@ -725,6 +725,7 @@ do_hwtid_rpl(struct toedev *dev, struct
dev->name, p->opcode);
return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG;
}
+#endif
}
static int
CVS commit: src/sys/dev/pci/cxgb
Module Name:src
Committed By: joerg
Date: Wed Jan 23 23:31:27 UTC 2013
Modified Files:
src/sys/dev/pci/cxgb: cxgb_common.h cxgb_l2t.c cxgb_main.c cxgb_osdep.h
Log Message:
Make cxgb at least compilable. Fix _rt_key usage.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/cxgb/cxgb_common.h \
src/sys/dev/pci/cxgb/cxgb_l2t.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/cxgb/cxgb_main.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/cxgb/cxgb_osdep.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/cxgb/cxgb_common.h
diff -u src/sys/dev/pci/cxgb/cxgb_common.h:1.1 src/sys/dev/pci/cxgb/cxgb_common.h:1.2
--- src/sys/dev/pci/cxgb/cxgb_common.h:1.1 Sun Mar 21 21:11:13 2010
+++ src/sys/dev/pci/cxgb/cxgb_common.h Wed Jan 23 23:31:26 2013
@@ -668,7 +668,7 @@ int t3_read_flash(adapter_t *adapter, un
int t3_get_tp_version(adapter_t *adapter, u32 *vers);
int t3_check_tpsram_version(adapter_t *adapter);
int t3_check_tpsram(adapter_t *adapter, const u8 *tp_ram, unsigned int size);
-int t3_load_fw(adapter_t *adapter, const const u8 *fw_data, unsigned int size);
+int t3_load_fw(adapter_t *adapter, const u8 *fw_data, unsigned int size);
int t3_get_fw_version(adapter_t *adapter, u32 *vers);
int t3_check_fw_version(adapter_t *adapter);
int t3_init_hw(adapter_t *adapter, u32 fw_params);
Index: src/sys/dev/pci/cxgb/cxgb_l2t.c
diff -u src/sys/dev/pci/cxgb/cxgb_l2t.c:1.1 src/sys/dev/pci/cxgb/cxgb_l2t.c:1.2
--- src/sys/dev/pci/cxgb/cxgb_l2t.c:1.1 Sun Mar 21 21:11:13 2010
+++ src/sys/dev/pci/cxgb/cxgb_l2t.c Wed Jan 23 23:31:26 2013
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
***/
#include
-__KERNEL_RCSID(0, "$NetBSD: cxgb_l2t.c,v 1.1 2010/03/21 21:11:13 jklos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxgb_l2t.c,v 1.2 2013/01/23 23:31:26 joerg Exp $");
#include
#include
@@ -346,7 +346,7 @@ t3_l2t_get(struct toedev *dev, struct rt
{
struct l2t_entry *e;
struct l2t_data *d = L2DATA(dev);
-u32 addr = *(u32 *)neigh->_rt_key;
+u32 addr = ((struct sockaddr_in *)rt_getkey(neigh))->sin_addr.s_addr;
int ifidx = neigh->rt_ifp->if_index;
int hash = arp_hash(addr, ifidx, d);
@@ -427,7 +427,7 @@ t3_l2t_update(struct toedev *dev, struct
struct l2t_entry *e;
struct mbuf *arpq = NULL;
struct l2t_data *d = L2DATA(dev);
-u32 addr = *(u32 *)neigh->_rt_key;
+u32 addr = ((struct sockaddr_in *)rt_getkey(neigh))->sin_addr.s_addr;
int ifidx = neigh->rt_ifp->if_index;
int hash = arp_hash(addr, ifidx, d);
struct llinfo_arp *la;
Index: src/sys/dev/pci/cxgb/cxgb_main.c
diff -u src/sys/dev/pci/cxgb/cxgb_main.c:1.3 src/sys/dev/pci/cxgb/cxgb_main.c:1.4
--- src/sys/dev/pci/cxgb/cxgb_main.c:1.3 Sat Oct 27 17:18:36 2012
+++ src/sys/dev/pci/cxgb/cxgb_main.c Wed Jan 23 23:31:26 2013
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
***/
#include
-__KERNEL_RCSID(0, "$NetBSD: cxgb_main.c,v 1.3 2012/10/27 17:18:36 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxgb_main.c,v 1.4 2013/01/23 23:31:26 joerg Exp $");
#include
#include
@@ -1123,7 +1123,7 @@ cxgb_up(struct adapter *sc)
err = EINVAL;
goto out;
}
-device_printf(sc->dev, "allocated intr_handle=%p\n", sc->intr_handle);
+device_printf(sc->dev, "allocated intr_handle=%d\n", sc->intr_handle);
sc->intr_cookie = pci_intr_establish(sc->pa.pa_pc,
sc->intr_handle, IPL_NET,
sc->cxgb_intr, sc);
Index: src/sys/dev/pci/cxgb/cxgb_osdep.h
diff -u src/sys/dev/pci/cxgb/cxgb_osdep.h:1.2 src/sys/dev/pci/cxgb/cxgb_osdep.h:1.3
--- src/sys/dev/pci/cxgb/cxgb_osdep.h:1.2 Wed May 18 01:01:59 2011
+++ src/sys/dev/pci/cxgb/cxgb_osdep.h Wed Jan 23 23:31:27 2013
@@ -116,10 +116,6 @@ static inline void critical_exit(void)
{
}
-static inline void device_printf(device_t d, ...)
-{
-}
-
int atomic_fetchadd_int(volatile int *p, int v);
#if 0
int atomic_add_int(volatile int *p, int v);
@@ -174,26 +170,6 @@ struct cxgb_attach_args
#define INT3 __asm("int $3")
-static inline struct mbuf *
-m_defrag(struct mbuf *m0, int flags)
-{
-struct mbuf *m;
-MGETHDR(m, flags, MT_DATA);
-if (m == NULL)
-return NULL;
-
-M_COPY_PKTHDR(m, m0);
-MCLGET(m, flags);
-if ((m->m_flags & M_EXT) == 0) {
-m_free(m);
-return NULL;
-}
-m_copydata(m0, 0, m0->m_pkthdr.len, mtod(m, void *));
-m->m_len = m->m_pkthdr.len;
-return m;
-}
-
-
typedef struct adapter adapter_t;
struct sge_rspq;
@@ -215,8 +191,6 @@ struct t3_mbuf_hdr {
#define if_name(ifp) (ifp)->if_xname
#define M_SANITY(m, n)
-#define __read_mostly __section(".data.read_mostly")
-
/*
* Workaroun
CVS commit: src/sys/dev/pci/cxgb
Module Name:src Committed By: dyoung Date: Wed May 18 01:02:00 UTC 2011 Modified Files: src/sys/dev/pci/cxgb: cxgb_adapter.h cxgb_lro.c cxgb_main.c cxgb_offload.c cxgb_osdep.c cxgb_osdep.h cxgb_sge.c Log Message: MI code must #include , not . To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/cxgb/cxgb_adapter.h \ src/sys/dev/pci/cxgb/cxgb_lro.c src/sys/dev/pci/cxgb/cxgb_main.c \ src/sys/dev/pci/cxgb/cxgb_offload.c src/sys/dev/pci/cxgb/cxgb_osdep.c \ src/sys/dev/pci/cxgb/cxgb_osdep.h src/sys/dev/pci/cxgb/cxgb_sge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/cxgb/cxgb_adapter.h diff -u src/sys/dev/pci/cxgb/cxgb_adapter.h:1.1 src/sys/dev/pci/cxgb/cxgb_adapter.h:1.2 --- src/sys/dev/pci/cxgb/cxgb_adapter.h:1.1 Sun Mar 21 21:11:13 2010 +++ src/sys/dev/pci/cxgb/cxgb_adapter.h Wed May 18 01:01:59 2011 @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include Index: src/sys/dev/pci/cxgb/cxgb_lro.c diff -u src/sys/dev/pci/cxgb/cxgb_lro.c:1.1 src/sys/dev/pci/cxgb/cxgb_lro.c:1.2 --- src/sys/dev/pci/cxgb/cxgb_lro.c:1.1 Sun Mar 21 21:11:13 2010 +++ src/sys/dev/pci/cxgb/cxgb_lro.c Wed May 18 01:01:59 2011 @@ -28,14 +28,14 @@ ***/ #include -__KERNEL_RCSID(0, "$NetBSD: cxgb_lro.c,v 1.1 2010/03/21 21:11:13 jklos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cxgb_lro.c,v 1.2 2011/05/18 01:01:59 dyoung Exp $"); #include #include #include #include -#include +#include #include #include Index: src/sys/dev/pci/cxgb/cxgb_main.c diff -u src/sys/dev/pci/cxgb/cxgb_main.c:1.1 src/sys/dev/pci/cxgb/cxgb_main.c:1.2 --- src/sys/dev/pci/cxgb/cxgb_main.c:1.1 Sun Mar 21 21:11:13 2010 +++ src/sys/dev/pci/cxgb/cxgb_main.c Wed May 18 01:01:59 2011 @@ -28,13 +28,13 @@ ***/ #include -__KERNEL_RCSID(0, "$NetBSD: cxgb_main.c,v 1.1 2010/03/21 21:11:13 jklos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cxgb_main.c,v 1.2 2011/05/18 01:01:59 dyoung Exp $"); #include #include #include #include -#include +#include #include #include #include Index: src/sys/dev/pci/cxgb/cxgb_offload.c diff -u src/sys/dev/pci/cxgb/cxgb_offload.c:1.1 src/sys/dev/pci/cxgb/cxgb_offload.c:1.2 --- src/sys/dev/pci/cxgb/cxgb_offload.c:1.1 Sun Mar 21 21:11:13 2010 +++ src/sys/dev/pci/cxgb/cxgb_offload.c Wed May 18 01:01:59 2011 @@ -31,13 +31,13 @@ #include -__KERNEL_RCSID(0, "$NetBSD: cxgb_offload.c,v 1.1 2010/03/21 21:11:13 jklos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cxgb_offload.c,v 1.2 2011/05/18 01:01:59 dyoung Exp $"); #include #include #include #include -#include +#include #include #include #include Index: src/sys/dev/pci/cxgb/cxgb_osdep.c diff -u src/sys/dev/pci/cxgb/cxgb_osdep.c:1.1 src/sys/dev/pci/cxgb/cxgb_osdep.c:1.2 --- src/sys/dev/pci/cxgb/cxgb_osdep.c:1.1 Sun Mar 21 21:11:13 2010 +++ src/sys/dev/pci/cxgb/cxgb_osdep.c Wed May 18 01:01:59 2011 @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include Index: src/sys/dev/pci/cxgb/cxgb_osdep.h diff -u src/sys/dev/pci/cxgb/cxgb_osdep.h:1.1 src/sys/dev/pci/cxgb/cxgb_osdep.h:1.2 --- src/sys/dev/pci/cxgb/cxgb_osdep.h:1.1 Sun Mar 21 21:11:13 2010 +++ src/sys/dev/pci/cxgb/cxgb_osdep.h Wed May 18 01:01:59 2011 @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include Index: src/sys/dev/pci/cxgb/cxgb_sge.c diff -u src/sys/dev/pci/cxgb/cxgb_sge.c:1.1 src/sys/dev/pci/cxgb/cxgb_sge.c:1.2 --- src/sys/dev/pci/cxgb/cxgb_sge.c:1.1 Sun Mar 21 21:11:13 2010 +++ src/sys/dev/pci/cxgb/cxgb_sge.c Wed May 18 01:01:59 2011 @@ -28,13 +28,13 @@ ***/ #include -__KERNEL_RCSID(0, "$NetBSD: cxgb_sge.c,v 1.1 2010/03/21 21:11:13 jklos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cxgb_sge.c,v 1.2 2011/05/18 01:01:59 dyoung Exp $"); #include #include #include #include -#include +#include #include #include
