Module Name: src
Committed By: martin
Date: Thu Sep 5 09:11:03 UTC 2019
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-9]: ix_txrx.c ixgbe.c ixgbe_netbsd.c
ixv.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #180):
sys/dev/pci/ixgbe/ixv.c: revision 1.130
sys/dev/pci/ixgbe/ixgbe.c: revision 1.207
sys/dev/pci/ixgbe/ixgbe.c: revision 1.208
sys/dev/pci/ixgbe/ix_txrx.c: revision 1.55
sys/dev/pci/ixgbe/ixv.c: revision 1.129
sys/dev/pci/ixgbe/ixgbe_netbsd.c: revision 1.10
printf -> device_printf
Set IFM_1000_BX10 correctly.
Use aprint_*() in the attach function.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.54.2.1 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.199.2.3 -r1.199.2.4 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.9 -r1.9.4.1 src/sys/dev/pci/ixgbe/ixgbe_netbsd.c
cvs rdiff -u -r1.125.2.2 -r1.125.2.3 src/sys/dev/pci/ixgbe/ixv.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/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.54 src/sys/dev/pci/ixgbe/ix_txrx.c:1.54.2.1
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.54 Thu Jul 4 08:56:35 2019
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Thu Sep 5 09:11:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.54 2019/07/04 08:56:35 msaitoh Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.54.2.1 2019/09/05 09:11:03 martin Exp $ */
/******************************************************************************
@@ -1363,7 +1363,9 @@ ixgbe_refresh_mbufs(struct rx_ring *rxr,
error = bus_dmamap_load_mbuf(rxr->ptag->dt_dmat,
rxbuf->pmap, mp, BUS_DMA_NOWAIT);
if (error != 0) {
- printf("Refresh mbufs: payload dmamap load failure - %d\n", error);
+ device_printf(adapter->dev, "Refresh mbufs: "
+ "payload dmamap load failure - %d\n",
+ error);
m_free(mp);
rxbuf->buf = NULL;
goto update;
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.199.2.3 src/sys/dev/pci/ixgbe/ixgbe.c:1.199.2.4
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.199.2.3 Sun Sep 1 13:08:12 2019
+++ src/sys/dev/pci/ixgbe/ixgbe.c Thu Sep 5 09:11:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.199.2.3 2019/09/01 13:08:12 martin Exp $ */
+/* $NetBSD: ixgbe.c,v 1.199.2.4 2019/09/05 09:11:03 martin Exp $ */
/******************************************************************************
@@ -1403,7 +1403,6 @@ static void
ixgbe_add_media_types(struct adapter *adapter)
{
struct ixgbe_hw *hw = &adapter->hw;
- device_t dev = adapter->dev;
u64 layer;
layer = adapter->phy_layer;
@@ -1469,7 +1468,7 @@ ixgbe_add_media_types(struct adapter *ad
ADD(IFM_5000_T | IFM_FDX, 0);
}
if (layer & IXGBE_PHYSICAL_LAYER_1000BASE_BX)
- device_printf(dev, "Media supported: 1000baseBX\n");
+ ADD(IFM_1000_BX10 | IFM_FDX, 0);
/* XXX no ifmedia_set? */
ADD(IFM_AUTO, 0);
@@ -3306,7 +3305,8 @@ ixgbe_sysctl_instance(struct adapter *ad
return rnode;
err:
- printf("%s: sysctl_createv failed, rc = %d\n", __func__, rc);
+ device_printf(adapter->dev,
+ "%s: sysctl_createv failed, rc = %d\n", __func__, rc);
return NULL;
}
Index: src/sys/dev/pci/ixgbe/ixgbe_netbsd.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_netbsd.c:1.9 src/sys/dev/pci/ixgbe/ixgbe_netbsd.c:1.9.4.1
--- src/sys/dev/pci/ixgbe/ixgbe_netbsd.c:1.9 Thu Dec 6 13:25:02 2018
+++ src/sys/dev/pci/ixgbe/ixgbe_netbsd.c Thu Sep 5 09:11:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_netbsd.c,v 1.9 2018/12/06 13:25:02 msaitoh Exp $ */
+/* $NetBSD: ixgbe_netbsd.c,v 1.9.4.1 2019/09/05 09:11:03 martin Exp $ */
/*
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -197,7 +197,8 @@ ixgbe_jcl_reinit(struct adapter *adapter
for (i = 0; i < nbuf; i++) {
if ((em = ixgbe_newext(eh, dmat, size)) == NULL) {
- printf("%s: only %d of %d jumbo buffers allocated\n",
+ device_printf(adapter->dev,
+ "%s: only %d of %d jumbo buffers allocated\n",
__func__, i, nbuf);
break;
}
Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.125.2.2 src/sys/dev/pci/ixgbe/ixv.c:1.125.2.3
--- src/sys/dev/pci/ixgbe/ixv.c:1.125.2.2 Sun Sep 1 11:12:45 2019
+++ src/sys/dev/pci/ixgbe/ixv.c Thu Sep 5 09:11:03 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.125.2.2 2019/09/01 11:12:45 martin Exp $*/
+/*$NetBSD: ixv.c,v 1.125.2.3 2019/09/05 09:11:03 martin Exp $*/
/******************************************************************************
@@ -516,7 +516,7 @@ ixv_attach(device_t parent, device_t dev
error = ixv_allocate_msix(adapter, pa);
if (error) {
- device_printf(dev, "ixv_allocate_msix() failed!\n");
+ aprint_error_dev(dev, "ixv_allocate_msix() failed!\n");
goto err_late;
}
@@ -2406,7 +2406,8 @@ ixv_sysctl_instance(struct adapter *adap
return rnode;
err:
- printf("%s: sysctl_createv failed, rc = %d\n", __func__, rc);
+ device_printf(adapter->dev,
+ "%s: sysctl_createv failed, rc = %d\n", __func__, rc);
return NULL;
}
