mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-10-18 02:19:39 +00:00
Code Issues Releases Activity

igc: Rename 'struct adapter' to 'struct igc_softc'

Browse Source 
Rename the 'struct adapter' to 'struct igc_softc' to avoid type
ambiguity in things like kgdb and make sharing code with e1000 and
ixgbe easier.

MFC after:	1 week
Sponsored by:	BBOX.io
This commit is contained in:
Kevin Bowling 2024-10-14 06:29:55 -07:00
parent 1bae9dc584
commit 542f5d5631
3 changed files with 509 additions and 509 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

954
sys/dev/igc/if_igc.c
View File

File diff suppressed because it is too large Load Diff

28
sys/dev/igc/if_igc.h
View File

@ -206,10 +206,10 @@
CSUM_IP_SCTP | CSUM_IP6_UDP | CSUM_IP6_TCP | \
CSUM_IP6_SCTP) /* Offload bits in mbuf flag */
struct igc_adapter;
struct igc_softc;
struct igc_int_delay_info {
struct igc_adapter *adapter; /* Back-pointer to the adapter struct */
struct igc_softc *sc; /* Back-pointer to the softc struct */
int offset; /* Register offset to read/write */
int value; /* Current value in usecs */
};
@ -218,9 +218,9 @@ struct igc_int_delay_info {
* The transmit ring, one per tx queue
*/
struct tx_ring {
struct igc_adapter *adapter;
struct igc_softc *sc;
struct igc_tx_desc *tx_base;
uint64_t tx_paddr;
uint64_t tx_paddr;
qidx_t *tx_rsq;
uint8_t me;
qidx_t tx_rs_cidx;
@ -253,7 +253,7 @@ struct tx_ring {
* The Receive ring, one per rx queue
*/
struct rx_ring {
struct igc_adapter *adapter;
struct igc_softc *sc;
struct igc_rx_queue *que;
u32 me;
u32 payload;
@ -275,15 +275,15 @@ struct rx_ring {
};
struct igc_tx_queue {
struct igc_adapter *adapter;
u32 msix;
u32 eims; /* This queue's EIMS bit */
u32 me;
struct tx_ring txr;
struct igc_softc *sc;
u32 msix;
u32 eims; /* This queue's EIMS bit */
u32 me;
struct tx_ring txr;
};
struct igc_rx_queue {
struct igc_adapter *adapter;
struct igc_softc *sc;
u32 me;
u32 msix;
u32 eims;
@ -293,8 +293,8 @@ struct igc_rx_queue {
struct if_irq que_irq;
};
/* Our adapter structure */
struct igc_adapter {
/* Our softc structure */
struct igc_softc {
if_t ifp;
struct igc_hw hw;
@ -373,7 +373,7 @@ struct igc_adapter {
u16 vf_ifp;
};
void igc_dump_rs(struct igc_adapter *);
void igc_dump_rs(struct igc_softc *);
#define IGC_RSSRK_SIZE 4
#define IGC_RSSRK_VAL(key, i) (key[(i) * IGC_RSSRK_SIZE] | \

36
sys/dev/igc/igc_txrx.c
View File

@ -80,9 +80,9 @@ struct if_txrx igc_txrx = {
};
void
igc_dump_rs(struct igc_adapter *adapter)
igc_dump_rs(struct igc_softc *sc)
{
if_softc_ctx_t scctx = adapter->shared;
if_softc_ctx_t scctx = sc->shared;
struct igc_tx_queue *que;
struct tx_ring *txr;
qidx_t i, ntxd, qid, cur;
@ -91,8 +91,8 @@ igc_dump_rs(struct igc_adapter *adapter)
printf("\n");
ntxd = scctx->isc_ntxd[0];
for (qid = 0; qid < adapter->tx_num_queues; qid++) {
que = &adapter->tx_queues[qid];
for (qid = 0; qid < sc->tx_num_queues; qid++) {
que = &sc->tx_queues[qid];
txr = &que->txr;
rs_cidx = txr->tx_rs_cidx;
if (rs_cidx != txr->tx_rs_pidx) {
@ -263,7 +263,7 @@ igc_tx_ctx_setup(struct tx_ring *txr, if_pkt_info_t pi, uint32_t *cmd_type_len,
static int
igc_isc_txd_encap(void *arg, if_pkt_info_t pi)
{
struct igc_adapter *sc = arg;
struct igc_softc *sc = arg;
if_softc_ctx_t scctx = sc->shared;
struct igc_tx_queue *que = &sc->tx_queues[pi->ipi_qsidx];
struct tx_ring *txr = &que->txr;
@ -326,19 +326,19 @@ igc_isc_txd_encap(void *arg, if_pkt_info_t pi)
static void
igc_isc_txd_flush(void *arg, uint16_t txqid, qidx_t pidx)
{
struct igc_adapter *adapter = arg;
struct igc_tx_queue *que = &adapter->tx_queues[txqid];
struct igc_softc *sc = arg;
struct igc_tx_queue *que = &sc->tx_queues[txqid];
struct tx_ring *txr = &que->txr;
IGC_WRITE_REG(&adapter->hw, IGC_TDT(txr->me), pidx);
IGC_WRITE_REG(&sc->hw, IGC_TDT(txr->me), pidx);
}
static int
igc_isc_txd_credits_update(void *arg, uint16_t txqid, bool clear)
{
struct igc_adapter *adapter = arg;
if_softc_ctx_t scctx = adapter->shared;
struct igc_tx_queue *que = &adapter->tx_queues[txqid];
struct igc_softc *sc = arg;
if_softc_ctx_t scctx = sc->shared;
struct igc_tx_queue *que = &sc->tx_queues[txqid];
struct tx_ring *txr = &que->txr;
qidx_t processed = 0;
@ -388,7 +388,7 @@ igc_isc_txd_credits_update(void *arg, uint16_t txqid, bool clear)
static void
igc_isc_rxd_refill(void *arg, if_rxd_update_t iru)
{
struct igc_adapter *sc = arg;
struct igc_softc *sc = arg;
if_softc_ctx_t scctx = sc->shared;
uint16_t rxqid = iru->iru_qsidx;
struct igc_rx_queue *que = &sc->rx_queues[rxqid];
@ -415,7 +415,7 @@ igc_isc_rxd_refill(void *arg, if_rxd_update_t iru)
static void
igc_isc_rxd_flush(void *arg, uint16_t rxqid, uint8_t flid __unused, qidx_t pidx)
{
struct igc_adapter *sc = arg;
struct igc_softc *sc = arg;
struct igc_rx_queue *que = &sc->rx_queues[rxqid];
struct rx_ring *rxr = &que->rxr;
@ -425,7 +425,7 @@ igc_isc_rxd_flush(void *arg, uint16_t rxqid, uint8_t flid __unused, qidx_t pidx)
static int
igc_isc_rxd_available(void *arg, uint16_t rxqid, qidx_t idx, qidx_t budget)
{
struct igc_adapter *sc = arg;
struct igc_softc *sc = arg;
if_softc_ctx_t scctx = sc->shared;
struct igc_rx_queue *que = &sc->rx_queues[rxqid];
struct rx_ring *rxr = &que->rxr;
@ -457,9 +457,9 @@ igc_isc_rxd_available(void *arg, uint16_t rxqid, qidx_t idx, qidx_t budget)
static int
igc_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri)
{
struct igc_adapter *adapter = arg;
if_softc_ctx_t scctx = adapter->shared;
struct igc_rx_queue *que = &adapter->rx_queues[ri->iri_qsidx];
struct igc_softc *sc = arg;
if_softc_ctx_t scctx = sc->shared;
struct igc_rx_queue *que = &sc->rx_queues[ri->iri_qsidx];
struct rx_ring *rxr = &que->rxr;
union igc_adv_rx_desc *rxd;
@ -489,7 +489,7 @@ igc_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri)
/* Make sure bad packets are discarded */
if (eop && ((staterr & IGC_RXDEXT_STATERR_RXE) != 0)) {
adapter->dropped_pkts++;
sc->dropped_pkts++;
++rxr->rx_discarded;
return (EBADMSG);
}