Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci/ixgbe KNF. No functional change.
details: https://anonhg.NetBSD.org/src/rev/469c80e77ecb
branches: trunk
changeset: 935052:469c80e77ecb
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Tue Jun 23 05:50:01 2020 +0000
description:
KNF. No functional change.
diffstat:
sys/dev/pci/ixgbe/ixgbe.h | 90 ++++++++++++++++++++++++----------------------
1 files changed, 47 insertions(+), 43 deletions(-)
diffs (175 lines):
diff -r 84133148aa8f -r 469c80e77ecb sys/dev/pci/ixgbe/ixgbe.h
--- a/sys/dev/pci/ixgbe/ixgbe.h Tue Jun 23 05:19:12 2020 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.h Tue Jun 23 05:50:01 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.h,v 1.65 2020/02/06 06:28:49 thorpej Exp $ */
+/* $NetBSD: ixgbe.h,v 1.66 2020/06/23 05:50:01 msaitoh Exp $ */
/******************************************************************************
SPDX-License-Identifier: BSD-3-Clause
@@ -268,10 +268,10 @@
/* This is used to get SFP+ module data */
struct ixgbe_i2c_req {
- u8 dev_addr;
- u8 offset;
- u8 len;
- u8 data[8];
+ u8 dev_addr;
+ u8 offset;
+ u8 len;
+ u8 data[8];
};
struct ixgbe_bp_data {
@@ -334,13 +334,15 @@
char namebuf[32];
char evnamebuf[32];
- kmutex_t dc_mtx; /* lock for disabled_count and this queue's EIMS/EIMC bit */
- int disabled_count;/*
- * means
- * 0 : this queue is enabled
- * > 0 : this queue is disabled
- * the value is ixgbe_disable_queue() called count
- */
+ /* Lock for disabled_count and this queue's EIMS/EIMC bit */
+ kmutex_t dc_mtx;
+ /*
+ * disabled_count means:
+ * 0 : this queue is enabled
+ * > 0 : this queue is disabled
+ * the value is ixgbe_disable_queue() called count
+ */
+ int disabled_count;
bool txrx_use_workqueue;
};
@@ -373,10 +375,10 @@
u16 atr_sample;
u16 atr_count;
- u64 bytes; /* used for AIM */
+ u64 bytes; /* Used for AIM */
u64 packets;
/* Soft Stats */
- struct evcnt tso_tx;
+ struct evcnt tso_tx;
struct evcnt no_desc_avail;
struct evcnt total_packets;
struct evcnt pcq_drops;
@@ -409,7 +411,7 @@
bool hw_rsc;
bool vtag_strip;
u16 next_to_refresh;
- u16 next_to_check;
+ u16 next_to_check;
u16 num_desc;
u16 mbuf_sz;
#if 0
@@ -417,8 +419,8 @@
#endif
struct ixgbe_rx_buf *rx_buffers;
ixgbe_dma_tag_t *ptag;
- u16 last_rx_mbuf_sz;
- u32 last_num_rx_desc;
+ u16 last_rx_mbuf_sz;
+ u32 last_num_rx_desc;
ixgbe_extmem_head_t jcl_head;
u64 bytes; /* Used for AIM calc */
@@ -427,10 +429,10 @@
/* Soft stats */
struct evcnt rx_copies;
struct evcnt rx_packets;
- struct evcnt rx_bytes;
- struct evcnt rx_discarded;
- struct evcnt no_jmbuf;
- u64 rsc_num;
+ struct evcnt rx_bytes;
+ struct evcnt rx_discarded;
+ struct evcnt no_jmbuf;
+ u64 rsc_num;
/* Flow Director */
u64 flm;
@@ -496,7 +498,7 @@
u16 num_segs;
u32 link_speed;
bool link_up;
- u32 vector;
+ u32 vector;
u16 dmac;
u32 phy_layer;
@@ -525,15 +527,17 @@
void *phy_si; /* PHY intr tasklet */
bool txrx_use_workqueue;
- struct workqueue *que_wq; /* workqueue for ixgbe_handle_que_work() */
- /*
- * que_wq's "enqueued flag" is not required,
- * because twice workqueue_enqueue() for
- * ixgbe_handle_que_work() is avoided by masking
- * the queue's interrupt by EIMC.
- * See also ixgbe_msix_que().
- */
- struct workqueue *txr_wq; /* workqueue for ixgbe_deferred_mq_start_work() */
+
+ /*
+ * Workqueue for ixgbe_handle_que_work().
+ *
+ * que_wq's "enqueued flag" is not required, because twice
+ * workqueue_enqueue() for ixgbe_handle_que_work() is avoided by
+ * masking the queue's interrupt by EIMC. See also ixgbe_msix_que().
+ */
+ struct workqueue *que_wq;
+ /* Workqueue for ixgbe_deferred_mq_start_work() */
+ struct workqueue *txr_wq;
percpu_t *txr_wq_enqueued;
/*
@@ -574,23 +578,23 @@
struct ixgbe_bp_data bypass;
/* Netmap */
- void (*init_locked)(struct adapter *);
- void (*stop_locked)(void *);
+ void (*init_locked)(struct adapter *);
+ void (*stop_locked)(void *);
/* Firmware error check */
u_int recovery_mode;
struct callout recovery_mode_timer;
/* Misc stats maintained by the driver */
- struct evcnt efbig_tx_dma_setup;
- struct evcnt mbuf_defrag_failed;
- struct evcnt efbig2_tx_dma_setup;
- struct evcnt einval_tx_dma_setup;
- struct evcnt other_tx_dma_setup;
- struct evcnt eagain_tx_dma_setup;
- struct evcnt enomem_tx_dma_setup;
- struct evcnt tso_err;
- struct evcnt watchdog_events;
+ struct evcnt efbig_tx_dma_setup;
+ struct evcnt mbuf_defrag_failed;
+ struct evcnt efbig2_tx_dma_setup;
+ struct evcnt einval_tx_dma_setup;
+ struct evcnt other_tx_dma_setup;
+ struct evcnt eagain_tx_dma_setup;
+ struct evcnt enomem_tx_dma_setup;
+ struct evcnt tso_err;
+ struct evcnt watchdog_events;
struct evcnt link_irq;
struct evcnt link_sicount;
struct evcnt mod_sicount;
@@ -633,7 +637,7 @@
#define IXGBE_CORE_LOCK_INIT(_sc, _name) \
- mutex_init(&(_sc)->core_mtx, MUTEX_DEFAULT, IPL_SOFTNET)
+ mutex_init(&(_sc)->core_mtx, MUTEX_DEFAULT, IPL_SOFTNET)
#define IXGBE_CORE_LOCK_DESTROY(_sc) mutex_destroy(&(_sc)->core_mtx)
#define IXGBE_TX_LOCK_DESTROY(_sc) mutex_destroy(&(_sc)->tx_mtx)
#define IXGBE_RX_LOCK_DESTROY(_sc) mutex_destroy(&(_sc)->rx_mtx)
Home |
Main Index |
Thread Index |
Old Index