[src/netbsd-9]: src/sys/dev/pci/ixgbe Pull up following revision(s) (requeste...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5e12ccc99cc8
branches:  netbsd-9
changeset: 962944:5e12ccc99cc8
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Sep 05 09:11:03 2019 +0000

description:
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.

diffstat:

 sys/dev/pci/ixgbe/ix_txrx.c      |  6 ++++--
 sys/dev/pci/ixgbe/ixgbe.c        |  8 ++++----
 sys/dev/pci/ixgbe/ixgbe_netbsd.c |  5 +++--
 sys/dev/pci/ixgbe/ixv.c          |  7 ++++---
 4 files changed, 15 insertions(+), 11 deletions(-)

diffs (103 lines):

diff -r 4c46a869d497 -r 5e12ccc99cc8 sys/dev/pci/ixgbe/ix_txrx.c
--- a/sys/dev/pci/ixgbe/ix_txrx.c       Thu Sep 05 09:02:48 2019 +0000
+++ b/sys/dev/pci/ixgbe/ix_txrx.c       Thu Sep 05 09:11:03 2019 +0000
@@ -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 @@
                        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;
diff -r 4c46a869d497 -r 5e12ccc99cc8 sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Thu Sep 05 09:02:48 2019 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Thu Sep 05 09:11:03 2019 +0000
@@ -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 @@
 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 @@
                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 @@
 
        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;
 }
 
diff -r 4c46a869d497 -r 5e12ccc99cc8 sys/dev/pci/ixgbe/ixgbe_netbsd.c
--- a/sys/dev/pci/ixgbe/ixgbe_netbsd.c  Thu Sep 05 09:02:48 2019 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_netbsd.c  Thu Sep 05 09:11:03 2019 +0000
@@ -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 @@
 
        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;
                }
diff -r 4c46a869d497 -r 5e12ccc99cc8 sys/dev/pci/ixgbe/ixv.c
--- a/sys/dev/pci/ixgbe/ixv.c   Thu Sep 05 09:02:48 2019 +0000
+++ b/sys/dev/pci/ixgbe/ixv.c   Thu Sep 05 09:11:03 2019 +0000
@@ -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 @@
 
        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 @@
 
        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;
 }