git: 79b36ec91dec - main - ixgbe: Use C99 bool types
Kevin Bowling
kbowling at FreeBSD.org
Tue Sep 7 04:46:11 UTC 2021
The branch main has been updated by kbowling (ports committer):
URL: https://cgit.FreeBSD.org/src/commit/?id=79b36ec91decc18d062fc428e2fd34d41aba0630
commit 79b36ec91decc18d062fc428e2fd34d41aba0630
Author: Kevin Bowling <kbowling at FreeBSD.org>
AuthorDate: 2021-09-07 02:54:22 +0000
Commit: Kevin Bowling <kbowling at FreeBSD.org>
CommitDate: 2021-09-07 02:54:22 +0000
ixgbe: Use C99 bool types
Approved by: imp
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D31621
---
sys/dev/ixgbe/if_ix.c | 86 +++++++++++++-------------
sys/dev/ixgbe/if_ixv.c | 30 +++++-----
sys/dev/ixgbe/if_sriov.c | 24 ++++----
sys/dev/ixgbe/ix_txrx.c | 12 ++--
sys/dev/ixgbe/ixgbe.h | 4 +-
sys/dev/ixgbe/ixgbe_82598.c | 48 +++++++--------
sys/dev/ixgbe/ixgbe_82599.c | 104 ++++++++++++++++----------------
sys/dev/ixgbe/ixgbe_api.c | 14 ++---
sys/dev/ixgbe/ixgbe_common.c | 130 ++++++++++++++++++++--------------------
sys/dev/ixgbe/ixgbe_dcb.c | 2 +-
sys/dev/ixgbe/ixgbe_dcb_82599.c | 10 ++--
sys/dev/ixgbe/ixgbe_mbx.c | 2 +-
sys/dev/ixgbe/ixgbe_mbx.h | 2 +-
sys/dev/ixgbe/ixgbe_osdep.h | 4 --
sys/dev/ixgbe/ixgbe_phy.c | 84 +++++++++++++-------------
sys/dev/ixgbe/ixgbe_vf.c | 18 +++---
sys/dev/ixgbe/ixgbe_x540.c | 8 +--
sys/dev/ixgbe/ixgbe_x550.c | 98 +++++++++++++++---------------
18 files changed, 338 insertions(+), 342 deletions(-)
diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c
index 91bf7e4dd218..42523f82cc01 100644
--- a/sys/dev/ixgbe/if_ix.c
+++ b/sys/dev/ixgbe/if_ix.c
@@ -332,7 +332,7 @@ SYSCTL_INT(_hw_ix, OID_AUTO, enable_msix, CTLFLAG_RDTUN, &ixgbe_enable_msix, 0,
* of unsupported SFP+ modules, note that
* doing so you are on your own :)
*/
-static int allow_unsupported_sfp = FALSE;
+static int allow_unsupported_sfp = false;
SYSCTL_INT(_hw_ix, OID_AUTO, unsupported_sfp, CTLFLAG_RDTUN,
&allow_unsupported_sfp, 0,
"Allow unsupported SFP modules...use at your own risk");
@@ -356,7 +356,7 @@ SYSCTL_INT(_hw_ix, OID_AUTO, enable_rss, CTLFLAG_RDTUN, &ixgbe_enable_rss, 0,
* is varied over time based on the
* traffic for that interrupt vector
*/
-static int ixgbe_enable_aim = FALSE;
+static int ixgbe_enable_aim = false;
SYSCTL_INT(_hw_ix, OID_AUTO, enable_aim, CTLFLAG_RWTUN, &ixgbe_enable_aim, 0,
"Enable adaptive interrupt moderation");
@@ -943,7 +943,7 @@ ixgbe_if_attach_pre(if_ctx_t ctx)
/* Verify adapter fan is still functional (if applicable) */
if (adapter->feat_en & IXGBE_FEATURE_FAN_FAIL) {
u32 esdp = IXGBE_READ_REG(hw, IXGBE_ESDP);
- ixgbe_check_fan_failure(adapter, esdp, FALSE);
+ ixgbe_check_fan_failure(adapter, esdp, false);
}
/* Ensure SW/FW semaphore is free */
@@ -952,16 +952,16 @@ ixgbe_if_attach_pre(if_ctx_t ctx)
/* Set an initial default flow control value */
hw->fc.requested_mode = ixgbe_flow_control;
- hw->phy.reset_if_overtemp = TRUE;
+ hw->phy.reset_if_overtemp = true;
error = ixgbe_reset_hw(hw);
- hw->phy.reset_if_overtemp = FALSE;
+ hw->phy.reset_if_overtemp = false;
if (error == IXGBE_ERR_SFP_NOT_PRESENT) {
/*
* No optics in this port, set up
* so the timer routine will probe
* for later insertion.
*/
- adapter->sfp_probe = TRUE;
+ adapter->sfp_probe = true;
error = 0;
} else if (error == IXGBE_ERR_SFP_NOT_SUPPORTED) {
device_printf(dev, "Unsupported SFP+ module detected!\n");
@@ -1097,7 +1097,7 @@ ixgbe_if_attach_post(if_ctx_t ctx)
ixgbe_enable_tx_laser(hw);
/* Enable power to the phy. */
- ixgbe_set_phy_power(hw, TRUE);
+ ixgbe_set_phy_power(hw, true);
ixgbe_initialize_iov(adapter);
@@ -1366,23 +1366,23 @@ ixgbe_is_sfp(struct ixgbe_hw *hw)
switch (hw->mac.type) {
case ixgbe_mac_82598EB:
if (hw->phy.type == ixgbe_phy_nl)
- return (TRUE);
- return (FALSE);
+ return (true);
+ return (false);
case ixgbe_mac_82599EB:
switch (hw->mac.ops.get_media_type(hw)) {
case ixgbe_media_type_fiber:
case ixgbe_media_type_fiber_qsfp:
- return (TRUE);
+ return (true);
default:
- return (FALSE);
+ return (false);
}
case ixgbe_mac_X550EM_x:
case ixgbe_mac_X550EM_a:
if (hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber)
- return (TRUE);
- return (FALSE);
+ return (true);
+ return (false);
default:
- return (FALSE);
+ return (false);
}
} /* ixgbe_is_sfp */
@@ -1405,7 +1405,7 @@ ixgbe_config_link(if_ctx_t ctx)
} else {
if (hw->mac.ops.check_link)
err = ixgbe_check_link(hw, &adapter->link_speed,
- &adapter->link_up, FALSE);
+ &adapter->link_up, false);
if (err)
return;
autoneg = hw->phy.autoneg_advertised;
@@ -1911,7 +1911,7 @@ ixgbe_setup_vlan_hw_support(if_ctx_t ctx)
ctrl |= IXGBE_RXDCTL_VME;
IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(rxr->me), ctrl);
}
- rxr->vtag_strip = TRUE;
+ rxr->vtag_strip = true;
}
}
@@ -1948,7 +1948,7 @@ ixgbe_get_slot_info(struct adapter *adapter)
{
device_t dev = iflib_get_dev(adapter->ctx);
struct ixgbe_hw *hw = &adapter->hw;
- int bus_info_valid = TRUE;
+ int bus_info_valid = true;
u32 offset;
u16 link;
@@ -1997,7 +1997,7 @@ get_parent_info:
* Hmm...can't get PCI-Express capabilities.
* Falling back to default method.
*/
- bus_info_valid = FALSE;
+ bus_info_valid = false;
ixgbe_get_bus_info(hw);
goto display;
}
@@ -2423,8 +2423,8 @@ ixgbe_if_media_change(if_ctx_t ctx)
goto invalid;
}
- hw->mac.autotry_restart = TRUE;
- hw->mac.ops.setup_link(hw, speed, TRUE);
+ hw->mac.autotry_restart = true;
+ hw->mac.ops.setup_link(hw, speed, true);
adapter->advertise =
((speed & IXGBE_LINK_SPEED_10GB_FULL) ? 4 : 0) |
((speed & IXGBE_LINK_SPEED_1GB_FULL) ? 2 : 0) |
@@ -2578,7 +2578,7 @@ ixgbe_msix_link(void *arg)
/* Check for fan failure */
if (adapter->feat_en & IXGBE_FEATURE_FAN_FAIL) {
- ixgbe_check_fan_failure(adapter, eicr, TRUE);
+ ixgbe_check_fan_failure(adapter, eicr, true);
IXGBE_WRITE_REG(hw, IXGBE_EICR, IXGBE_EICR_GPI_SDP1_BY_MAC(hw));
}
@@ -2795,7 +2795,7 @@ ixgbe_setup_low_power_mode(if_ctx_t ctx)
s32 error = 0;
if (!hw->wol_enabled)
- ixgbe_set_phy_power(hw, FALSE);
+ ixgbe_set_phy_power(hw, false);
/* Limit power management flow to X550EM baseT */
if (hw->device_id == IXGBE_DEV_ID_X550EM_X_10G_T &&
@@ -2821,12 +2821,12 @@ ixgbe_setup_low_power_mode(if_ctx_t ctx)
IXGBE_WUC_WKEN | IXGBE_WUC_PME_EN);
/* X550EM baseT adapters need a special LPLU flow */
- hw->phy.reset_disable = TRUE;
+ hw->phy.reset_disable = true;
ixgbe_if_stop(ctx);
error = hw->phy.ops.enter_lplu(hw);
if (error)
device_printf(dev, "Error entering LPLU: %d\n", error);
- hw->phy.reset_disable = FALSE;
+ hw->phy.reset_disable = false;
} else {
/* Just stop for other adapters */
ixgbe_if_stop(ctx);
@@ -3127,7 +3127,7 @@ ixgbe_if_init(if_ctx_t ctx)
IXGBE_WRITE_REG(hw, IXGBE_EITR(adapter->vector), IXGBE_LINK_ITR);
/* Enable power to the phy. */
- ixgbe_set_phy_power(hw, TRUE);
+ ixgbe_set_phy_power(hw, true);
/* Config/Enable Link */
ixgbe_config_link(ctx);
@@ -3336,7 +3336,7 @@ ixgbe_config_delay_values(struct adapter *adapter)
hw->fc.low_water[0] = IXGBE_BT2KB(tmp);
hw->fc.pause_time = IXGBE_FC_PAUSE;
- hw->fc.send_xon = TRUE;
+ hw->fc.send_xon = true;
} /* ixgbe_config_delay_values */
/************************************************************************
@@ -3392,7 +3392,7 @@ ixgbe_if_multi_set(if_ctx_t ctx)
if (mcnt < MAX_NUM_MULTICAST_ADDRESSES) {
update_ptr = (u8 *)mta;
ixgbe_update_mc_addr_list(&adapter->hw, update_ptr, mcnt,
- ixgbe_mc_array_itr, TRUE);
+ ixgbe_mc_array_itr, true);
}
} /* ixgbe_if_multi_set */
@@ -3455,7 +3455,7 @@ ixgbe_sfp_probe(if_ctx_t ctx)
struct adapter *adapter = iflib_get_softc(ctx);
struct ixgbe_hw *hw = &adapter->hw;
device_t dev = iflib_get_dev(ctx);
- bool result = FALSE;
+ bool result = false;
if ((hw->phy.type == ixgbe_phy_nl) &&
(hw->phy.sfp_type == ixgbe_sfp_type_not_present)) {
@@ -3463,7 +3463,7 @@ ixgbe_sfp_probe(if_ctx_t ctx)
if (ret)
goto out;
ret = hw->phy.ops.reset(hw);
- adapter->sfp_probe = FALSE;
+ adapter->sfp_probe = false;
if (ret == IXGBE_ERR_SFP_NOT_SUPPORTED) {
device_printf(dev, "Unsupported SFP+ module detected!");
device_printf(dev,
@@ -3472,7 +3472,7 @@ ixgbe_sfp_probe(if_ctx_t ctx)
} else
device_printf(dev, "SFP+ module detected!\n");
/* We now have supported optics */
- result = TRUE;
+ result = true;
}
out:
@@ -3554,7 +3554,7 @@ ixgbe_handle_msf(void *context)
if ((!autoneg) && (hw->mac.ops.get_link_capabilities))
hw->mac.ops.get_link_capabilities(hw, &autoneg, &negotiate);
if (hw->mac.ops.setup_link)
- hw->mac.ops.setup_link(hw, autoneg, TRUE);
+ hw->mac.ops.setup_link(hw, autoneg, true);
/* Adjust media types shown in ifconfig */
ifmedia_removeall(adapter->media);
@@ -3596,7 +3596,7 @@ ixgbe_if_stop(if_ctx_t ctx)
INIT_DEBUGOUT("ixgbe_if_stop: begin\n");
ixgbe_reset_hw(hw);
- hw->adapter_stopped = FALSE;
+ hw->adapter_stopped = false;
ixgbe_stop_adapter(hw);
if (hw->mac.type == ixgbe_mac_82599EB)
ixgbe_stop_mac_link_on_d3_82599(hw);
@@ -3604,7 +3604,7 @@ ixgbe_if_stop(if_ctx_t ctx)
ixgbe_disable_tx_laser(hw);
/* Update the stack */
- adapter->link_up = FALSE;
+ adapter->link_up = false;
ixgbe_if_update_admin_status(ctx);
/* reprogram the RAR[0] in case user changed it. */
@@ -3627,12 +3627,12 @@ ixgbe_if_update_admin_status(if_ctx_t ctx)
device_t dev = iflib_get_dev(ctx);
if (adapter->link_up) {
- if (adapter->link_active == FALSE) {
+ if (adapter->link_active == false) {
if (bootverbose)
device_printf(dev, "Link is up %d Gbps %s \n",
((adapter->link_speed == 128) ? 10 : 1),
"Full Duplex");
- adapter->link_active = TRUE;
+ adapter->link_active = true;
/* Update any Flow Control changes */
ixgbe_fc_enable(&adapter->hw);
/* Update DMA coalescing config */
@@ -3644,11 +3644,11 @@ ixgbe_if_update_admin_status(if_ctx_t ctx)
ixgbe_ping_all_vfs(adapter);
}
} else { /* Link down */
- if (adapter->link_active == TRUE) {
+ if (adapter->link_active == true) {
if (bootverbose)
device_printf(dev, "Link is Down\n");
iflib_link_state_change(ctx, LINK_STATE_DOWN, 0);
- adapter->link_active = FALSE;
+ adapter->link_active = false;
if (adapter->feat_en & IXGBE_FEATURE_SRIOV)
ixgbe_ping_all_vfs(adapter);
}
@@ -3685,7 +3685,7 @@ ixgbe_config_dmac(struct adapter *adapter)
if (dcfg->watchdog_timer ^ adapter->dmac ||
dcfg->link_speed ^ adapter->link_speed) {
dcfg->watchdog_timer = adapter->dmac;
- dcfg->fcoe_en = FALSE;
+ dcfg->fcoe_en = false;
dcfg->link_speed = adapter->link_speed;
dcfg->num_tcs = 1;
@@ -4016,7 +4016,7 @@ ixgbe_set_flowcntl(struct adapter *adapter, int fc)
}
/* Don't autoneg if forcing a value */
- adapter->hw.fc.disable_fc_autoneg = TRUE;
+ adapter->hw.fc.disable_fc_autoneg = true;
ixgbe_fc_enable(&adapter->hw);
return (0);
@@ -4115,7 +4115,7 @@ ixgbe_set_advertise(struct adapter *adapter, int advertise)
ixgbe_link_speed speed = 0;
ixgbe_link_speed link_caps = 0;
s32 err = IXGBE_NOT_IMPLEMENTED;
- bool negotiate = FALSE;
+ bool negotiate = false;
/* Checks to validate new value */
if (adapter->advertise == advertise) /* no change */
@@ -4177,8 +4177,8 @@ ixgbe_set_advertise(struct adapter *adapter, int advertise)
speed |= IXGBE_LINK_SPEED_10_FULL;
}
- hw->mac.autotry_restart = TRUE;
- hw->mac.ops.setup_link(hw, speed, TRUE);
+ hw->mac.autotry_restart = true;
+ hw->mac.ops.setup_link(hw, speed, true);
adapter->advertise = advertise;
return (0);
@@ -4201,7 +4201,7 @@ ixgbe_get_advertise(struct adapter *adapter)
int speed;
ixgbe_link_speed link_caps = 0;
s32 err;
- bool negotiate = FALSE;
+ bool negotiate = false;
/*
* Advertised speed means nothing unless it's copper or
diff --git a/sys/dev/ixgbe/if_ixv.c b/sys/dev/ixgbe/if_ixv.c
index 301d3c0368ae..acebf0a65e12 100644
--- a/sys/dev/ixgbe/if_ixv.c
+++ b/sys/dev/ixgbe/if_ixv.c
@@ -195,7 +195,7 @@ TUNABLE_INT("hw.ixv.flow_control", &ixv_flow_control);
* it can be a performance win in some workloads, but
* in others it actually hurts, its off by default.
*/
-static int ixv_header_split = FALSE;
+static int ixv_header_split = false;
TUNABLE_INT("hw.ixv.hdr_split", &ixv_header_split);
/*
@@ -602,7 +602,7 @@ ixv_if_init(if_ctx_t ctx)
int error = 0;
INIT_DEBUGOUT("ixv_if_init: begin");
- hw->adapter_stopped = FALSE;
+ hw->adapter_stopped = false;
hw->mac.ops.stop_adapter(hw);
/* reprogram the RAR[0] in case user changed it. */
@@ -649,7 +649,7 @@ ixv_if_init(if_ctx_t ctx)
/* Config/Enable Link */
hw->mac.ops.check_link(hw, &adapter->link_speed, &adapter->link_up,
- FALSE);
+ false);
/* And now turn on interrupts */
ixv_if_enable_intr(ctx);
@@ -849,7 +849,7 @@ ixv_if_multi_set(if_ctx_t ctx)
update_ptr = mta;
adapter->hw.mac.ops.update_mc_addr_list(&adapter->hw, update_ptr, mcnt,
- ixv_mc_array_itr, TRUE);
+ ixv_mc_array_itr, true);
} /* ixv_if_multi_set */
/************************************************************************
@@ -903,33 +903,33 @@ ixv_if_update_admin_status(if_ctx_t ctx)
device_t dev = iflib_get_dev(ctx);
s32 status;
- adapter->hw.mac.get_link_status = TRUE;
+ adapter->hw.mac.get_link_status = true;
status = ixgbe_check_link(&adapter->hw, &adapter->link_speed,
- &adapter->link_up, FALSE);
+ &adapter->link_up, false);
- if (status != IXGBE_SUCCESS && adapter->hw.adapter_stopped == FALSE) {
+ if (status != IXGBE_SUCCESS && adapter->hw.adapter_stopped == false) {
/* Mailbox's Clear To Send status is lost or timeout occurred.
* We need reinitialization. */
iflib_get_ifp(ctx)->if_init(ctx);
}
if (adapter->link_up) {
- if (adapter->link_active == FALSE) {
+ if (adapter->link_active == false) {
if (bootverbose)
device_printf(dev, "Link is up %d Gbps %s \n",
((adapter->link_speed == 128) ? 10 : 1),
"Full Duplex");
- adapter->link_active = TRUE;
+ adapter->link_active = true;
iflib_link_state_change(ctx, LINK_STATE_UP,
IF_Gbps(10));
}
} else { /* Link down */
- if (adapter->link_active == TRUE) {
+ if (adapter->link_active == true) {
if (bootverbose)
device_printf(dev, "Link is Down\n");
iflib_link_state_change(ctx, LINK_STATE_DOWN, 0);
- adapter->link_active = FALSE;
+ adapter->link_active = false;
}
}
@@ -955,11 +955,11 @@ ixv_if_stop(if_ctx_t ctx)
ixv_if_disable_intr(ctx);
hw->mac.ops.reset_hw(hw);
- adapter->hw.adapter_stopped = FALSE;
+ adapter->hw.adapter_stopped = false;
hw->mac.ops.stop_adapter(hw);
/* Update the stack */
- adapter->link_up = FALSE;
+ adapter->link_up = false;
ixv_if_update_admin_status(ctx);
/* reprogram the RAR[0] in case user changed it. */
@@ -1510,7 +1510,7 @@ ixv_setup_vlan_support(if_ctx_t ctx)
* Let Rx path know that it needs to store VLAN tag
* as part of extra mbuf info.
*/
- adapter->rx_queues[i].rxr.vtag_strip = TRUE;
+ adapter->rx_queues[i].rxr.vtag_strip = true;
}
}
@@ -1540,7 +1540,7 @@ ixv_setup_vlan_support(if_ctx_t ctx)
continue;
vid = (i * 32) + j;
/* Call the shared code mailbox routine */
- while (hw->mac.ops.set_vfta(hw, vid, 0, TRUE, FALSE)) {
+ while (hw->mac.ops.set_vfta(hw, vid, 0, true, false)) {
if (++retry > 5)
break;
}
diff --git a/sys/dev/ixgbe/if_sriov.c b/sys/dev/ixgbe/if_sriov.c
index 9a7d73a69d2d..3cc4d788ecd4 100644
--- a/sys/dev/ixgbe/if_sriov.c
+++ b/sys/dev/ixgbe/if_sriov.c
@@ -62,11 +62,11 @@ ixgbe_define_iov_schemas(device_t dev, int *error)
vf_schema = pci_iov_schema_alloc_node();
pci_iov_schema_add_unicast_mac(vf_schema, "mac-addr", 0, NULL);
pci_iov_schema_add_bool(vf_schema, "mac-anti-spoof",
- IOV_SCHEMA_HASDEFAULT, TRUE);
+ IOV_SCHEMA_HASDEFAULT, true);
pci_iov_schema_add_bool(vf_schema, "allow-set-mac",
- IOV_SCHEMA_HASDEFAULT, FALSE);
+ IOV_SCHEMA_HASDEFAULT, false);
pci_iov_schema_add_bool(vf_schema, "allow-promisc",
- IOV_SCHEMA_HASDEFAULT, FALSE);
+ IOV_SCHEMA_HASDEFAULT, false);
*error = pci_iov_attach(dev, pf_schema, vf_schema);
if (*error != 0) {
device_printf(dev,
@@ -266,7 +266,7 @@ ixgbe_vf_frame_size_compatible(struct adapter *adapter, struct ixgbe_vf *vf)
* frames on PFs and VFs.
*/
if (adapter->hw.mac.type != ixgbe_mac_82599EB)
- return (TRUE);
+ return (true);
switch (vf->api_ver) {
case IXGBE_API_VER_1_0:
@@ -277,9 +277,9 @@ ixgbe_vf_frame_size_compatible(struct adapter *adapter, struct ixgbe_vf *vf)
*/
if (adapter->max_frame_size > ETHER_MAX_LEN ||
vf->maximum_frame_size > ETHER_MAX_LEN)
- return (FALSE);
+ return (false);
- return (TRUE);
+ return (true);
break;
case IXGBE_API_VER_1_1:
@@ -289,16 +289,16 @@ ixgbe_vf_frame_size_compatible(struct adapter *adapter, struct ixgbe_vf *vf)
* jumbo frames.
*/
if (vf->maximum_frame_size <= ETHER_MAX_LEN)
- return (TRUE);
+ return (true);
/*
* Jumbo frames only work with VFs if the PF is also using jumbo
* frames.
*/
if (adapter->max_frame_size <= ETHER_MAX_LEN)
- return (TRUE);
+ return (true);
- return (FALSE);
+ return (false);
}
} /* ixgbe_vf_frame_size_compatible */
@@ -362,7 +362,7 @@ ixgbe_vf_reset_msg(struct adapter *adapter, struct ixgbe_vf *vf, uint32_t *msg)
if (ixgbe_validate_mac_addr(vf->ether_addr) == 0) {
ixgbe_set_rar(&adapter->hw, vf->rar_index, vf->ether_addr,
- vf->pool, TRUE);
+ vf->pool, true);
ack = IXGBE_VT_MSGTYPE_ACK;
} else
ack = IXGBE_VT_MSGTYPE_NACK;
@@ -400,7 +400,7 @@ ixgbe_vf_set_mac(struct adapter *adapter, struct ixgbe_vf *vf, uint32_t *msg)
bcopy(mac, vf->ether_addr, ETHER_ADDR_LEN);
ixgbe_set_rar(&adapter->hw, vf->rar_index, vf->ether_addr, vf->pool,
- TRUE);
+ true);
ixgbe_send_vf_ack(adapter, vf, msg[0]);
} /* ixgbe_vf_set_mac */
@@ -764,7 +764,7 @@ ixgbe_init_vf(struct adapter *adapter, struct ixgbe_vf *vf)
if (ixgbe_validate_mac_addr(vf->ether_addr) == 0) {
ixgbe_set_rar(&adapter->hw, vf->rar_index,
- vf->ether_addr, vf->pool, TRUE);
+ vf->ether_addr, vf->pool, true);
}
ixgbe_vf_enable_transmit(adapter, vf);
diff --git a/sys/dev/ixgbe/ix_txrx.c b/sys/dev/ixgbe/ix_txrx.c
index fe38919fc594..2cecf79b3422 100644
--- a/sys/dev/ixgbe/ix_txrx.c
+++ b/sys/dev/ixgbe/ix_txrx.c
@@ -88,7 +88,7 @@ ixgbe_tx_ctx_setup(struct ixgbe_adv_tx_context_desc *TXD, if_pkt_info_t pi)
uint32_t olinfo_status, mss_l4len_idx, pktlen, offload;
u8 ehdrlen;
- offload = TRUE;
+ offload = true;
olinfo_status = mss_l4len_idx = vlan_macip_lens = type_tucmd_mlhl = 0;
/* VLAN MACLEN IPLEN */
vlan_macip_lens |= (htole16(pi->ipi_vtag) << IXGBE_ADVTXD_VLAN_SHIFT);
@@ -126,7 +126,7 @@ ixgbe_tx_ctx_setup(struct ixgbe_adv_tx_context_desc *TXD, if_pkt_info_t pi)
} else if (pi->ipi_flags & IPI_TX_IPV6)
type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_IPV6;
else
- offload = FALSE;
+ offload = false;
vlan_macip_lens |= pi->ipi_ip_hlen;
@@ -135,22 +135,22 @@ ixgbe_tx_ctx_setup(struct ixgbe_adv_tx_context_desc *TXD, if_pkt_info_t pi)
if (pi->ipi_csum_flags & (CSUM_IP_TCP | CSUM_IP6_TCP | CSUM_TSO))
type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_L4T_TCP;
else
- offload = FALSE;
+ offload = false;
break;
case IPPROTO_UDP:
if (pi->ipi_csum_flags & (CSUM_IP_UDP | CSUM_IP6_UDP))
type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_L4T_UDP;
else
- offload = FALSE;
+ offload = false;
break;
case IPPROTO_SCTP:
if (pi->ipi_csum_flags & (CSUM_IP_SCTP | CSUM_IP6_SCTP))
type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_L4T_SCTP;
else
- offload = FALSE;
+ offload = false;
break;
default:
- offload = FALSE;
+ offload = false;
break;
}
/* Insert L4 checksum into data descriptors */
diff --git a/sys/dev/ixgbe/ixgbe.h b/sys/dev/ixgbe/ixgbe.h
index 31d5cc41c066..93bfff427a27 100644
--- a/sys/dev/ixgbe/ixgbe.h
+++ b/sys/dev/ixgbe/ixgbe.h
@@ -569,11 +569,11 @@ drbr_needs_enqueue(struct ifnet *ifp, struct buf_ring *br)
static inline bool
ixv_check_ether_addr(u8 *addr)
{
- bool status = TRUE;
+ bool status = true;
if ((addr[0] == 0 && addr[1]== 0 && addr[2] == 0 &&
addr[3] == 0 && addr[4]== 0 && addr[5] == 0))
- status = FALSE;
+ status = false;
return (status);
}
diff --git a/sys/dev/ixgbe/ixgbe_82598.c b/sys/dev/ixgbe/ixgbe_82598.c
index 7c821aea2d03..885dfbf869bc 100644
--- a/sys/dev/ixgbe/ixgbe_82598.c
+++ b/sys/dev/ixgbe/ixgbe_82598.c
@@ -316,17 +316,17 @@ static s32 ixgbe_get_link_capabilities_82598(struct ixgbe_hw *hw,
switch (autoc & IXGBE_AUTOC_LMS_MASK) {
case IXGBE_AUTOC_LMS_1G_LINK_NO_AN:
*speed = IXGBE_LINK_SPEED_1GB_FULL;
- *autoneg = FALSE;
+ *autoneg = false;
break;
case IXGBE_AUTOC_LMS_10G_LINK_NO_AN:
*speed = IXGBE_LINK_SPEED_10GB_FULL;
- *autoneg = FALSE;
+ *autoneg = false;
break;
case IXGBE_AUTOC_LMS_1G_AN:
*speed = IXGBE_LINK_SPEED_1GB_FULL;
- *autoneg = TRUE;
+ *autoneg = true;
break;
case IXGBE_AUTOC_LMS_KX4_AN:
@@ -336,7 +336,7 @@ static s32 ixgbe_get_link_capabilities_82598(struct ixgbe_hw *hw,
*speed |= IXGBE_LINK_SPEED_10GB_FULL;
if (autoc & IXGBE_AUTOC_KX_SUPP)
*speed |= IXGBE_LINK_SPEED_1GB_FULL;
- *autoneg = TRUE;
+ *autoneg = true;
break;
default:
@@ -443,7 +443,7 @@ s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw)
* so if it's on turn it off once we know link_speed. For
* more details see 82598 Specification update.
*/
- hw->mac.ops.check_link(hw, &link_speed, &link_up, FALSE);
+ hw->mac.ops.check_link(hw, &link_speed, &link_up, false);
if (link_up && link_speed == IXGBE_LINK_SPEED_1GB_FULL) {
switch (hw->fc.requested_mode) {
case ixgbe_fc_full:
@@ -550,7 +550,7 @@ out:
/**
* ixgbe_start_mac_link_82598 - Configures MAC link settings
* @hw: pointer to hardware structure
- * @autoneg_wait_to_complete: TRUE when waiting for completion is needed
+ * @autoneg_wait_to_complete: true when waiting for completion is needed
*
* Configures link settings based on values in the ixgbe_hw struct.
* Restarts the link. Performs autonegotiation if needed.
@@ -635,7 +635,7 @@ static s32 ixgbe_validate_link_ready(struct ixgbe_hw *hw)
* ixgbe_check_mac_link_82598 - Get link/speed status
* @hw: pointer to hardware structure
* @speed: pointer to link speed
- * @link_up: TRUE is link is up, FALSE otherwise
+ * @link_up: true is link is up, false otherwise
* @link_up_wait_to_complete: bool used to wait for link up or not
*
* Reads the links register to determine if link is up and the current speed
@@ -665,10 +665,10 @@ static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw,
for (i = 0; i < hw->mac.max_link_up_time; i++) {
if ((link_reg & 1) &&
((adapt_comp_reg & 1) == 0)) {
- *link_up = TRUE;
+ *link_up = true;
break;
} else {
- *link_up = FALSE;
+ *link_up = false;
}
msec_delay(100);
hw->phy.ops.read_reg(hw, 0xC79F,
@@ -680,12 +680,12 @@ static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw,
}
} else {
if ((link_reg & 1) && ((adapt_comp_reg & 1) == 0))
- *link_up = TRUE;
+ *link_up = true;
else
- *link_up = FALSE;
+ *link_up = false;
}
- if (*link_up == FALSE)
+ if (*link_up == false)
goto out;
}
@@ -693,19 +693,19 @@ static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw,
if (link_up_wait_to_complete) {
for (i = 0; i < hw->mac.max_link_up_time; i++) {
if (links_reg & IXGBE_LINKS_UP) {
- *link_up = TRUE;
+ *link_up = true;
break;
} else {
- *link_up = FALSE;
+ *link_up = false;
}
msec_delay(100);
links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS);
}
} else {
if (links_reg & IXGBE_LINKS_UP)
- *link_up = TRUE;
+ *link_up = true;
else
- *link_up = FALSE;
+ *link_up = false;
}
if (links_reg & IXGBE_LINKS_SPEED)
@@ -713,9 +713,9 @@ static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw,
else
*speed = IXGBE_LINK_SPEED_1GB_FULL;
- if ((hw->device_id == IXGBE_DEV_ID_82598AT2) && (*link_up == TRUE) &&
+ if ((hw->device_id == IXGBE_DEV_ID_82598AT2) && (*link_up == true) &&
(ixgbe_validate_link_ready(hw) != IXGBE_SUCCESS))
- *link_up = FALSE;
+ *link_up = false;
out:
return IXGBE_SUCCESS;
@@ -725,7 +725,7 @@ out:
* ixgbe_setup_mac_link_82598 - Set MAC link speed
* @hw: pointer to hardware structure
* @speed: new link speed
- * @autoneg_wait_to_complete: TRUE when waiting for completion is needed
+ * @autoneg_wait_to_complete: true when waiting for completion is needed
*
* Set the link speed in the AUTOC register and restarts link.
**/
@@ -733,7 +733,7 @@ static s32 ixgbe_setup_mac_link_82598(struct ixgbe_hw *hw,
ixgbe_link_speed speed,
bool autoneg_wait_to_complete)
{
- bool autoneg = FALSE;
+ bool autoneg = false;
s32 status = IXGBE_SUCCESS;
ixgbe_link_speed link_capabilities = IXGBE_LINK_SPEED_UNKNOWN;
u32 curr_autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
@@ -779,7 +779,7 @@ static s32 ixgbe_setup_mac_link_82598(struct ixgbe_hw *hw,
* ixgbe_setup_copper_link_82598 - Set the PHY autoneg advertised field
* @hw: pointer to hardware structure
* @speed: new link speed
- * @autoneg_wait_to_complete: TRUE if waiting is needed to complete
+ * @autoneg_wait_to_complete: true if waiting is needed to complete
*
* Sets the link speed in the AUTOC register in the MAC and restarts link.
**/
@@ -859,7 +859,7 @@ static s32 ixgbe_reset_hw_82598(struct ixgbe_hw *hw)
}
/* Reset PHY */
- if (hw->phy.reset_disable == FALSE) {
+ if (hw->phy.reset_disable == false) {
/* PHY ops must be identified and initialized prior to reset */
/* Init PHY and function pointers, perform SFP setup */
@@ -915,9 +915,9 @@ mac_reset_top:
* AUTOC value since the reset operation sets back to deaults.
*/
autoc = IXGBE_READ_REG(hw, IXGBE_AUTOC);
- if (hw->mac.orig_link_settings_stored == FALSE) {
+ if (hw->mac.orig_link_settings_stored == false) {
hw->mac.orig_autoc = autoc;
- hw->mac.orig_link_settings_stored = TRUE;
+ hw->mac.orig_link_settings_stored = true;
} else if (autoc != hw->mac.orig_autoc) {
IXGBE_WRITE_REG(hw, IXGBE_AUTOC, hw->mac.orig_autoc);
}
diff --git a/sys/dev/ixgbe/ixgbe_82599.c b/sys/dev/ixgbe/ixgbe_82599.c
index 1f81f6109f1b..d682dfbc9ab8 100644
--- a/sys/dev/ixgbe/ixgbe_82599.c
+++ b/sys/dev/ixgbe/ixgbe_82599.c
@@ -124,7 +124,7 @@ s32 ixgbe_init_phy_ops_82599(struct ixgbe_hw *hw)
if (hw->device_id == IXGBE_DEV_ID_82599_QSFP_SF_QP) {
/* Store flag indicating I2C bus access control unit. */
- hw->phy.qsfp_shared_i2c_bus = TRUE;
+ hw->phy.qsfp_shared_i2c_bus = true;
/* Initialize access to QSFP+ I2C bus */
esdp = IXGBE_READ_REG(hw, IXGBE_ESDP);
@@ -215,7 +215,7 @@ s32 ixgbe_setup_sfp_modules_82599(struct ixgbe_hw *hw)
/* Restart DSP and set SFI mode */
ret_val = hw->mac.ops.prot_autoc_write(hw,
hw->mac.orig_autoc | IXGBE_AUTOC_LMS_10G_SERIAL,
- FALSE);
+ false);
if (ret_val) {
DEBUGOUT("sfp module setup not complete\n");
@@ -252,7 +252,7 @@ s32 prot_autoc_read_82599(struct ixgbe_hw *hw, bool *locked, u32 *reg_val)
{
s32 ret_val;
- *locked = FALSE;
+ *locked = false;
/* If LESM is on then we need to hold the SW/FW semaphore. */
if (ixgbe_verify_lesm_fw_enabled_82599(hw)) {
ret_val = hw->mac.ops.acquire_swfw_sync(hw,
@@ -260,7 +260,7 @@ s32 prot_autoc_read_82599(struct ixgbe_hw *hw, bool *locked, u32 *reg_val)
if (ret_val != IXGBE_SUCCESS)
return IXGBE_ERR_SWFW_SYNC;
- *locked = TRUE;
+ *locked = true;
}
*reg_val = IXGBE_READ_REG(hw, IXGBE_AUTOC);
@@ -295,7 +295,7 @@ s32 prot_autoc_write_82599(struct ixgbe_hw *hw, u32 autoc, bool locked)
if (ret_val != IXGBE_SUCCESS)
return IXGBE_ERR_SWFW_SYNC;
- locked = TRUE;
+ locked = true;
}
IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc);
@@ -409,7 +409,7 @@ s32 ixgbe_init_ops_82599(struct ixgbe_hw *hw)
* ixgbe_get_link_capabilities_82599 - Determines link capabilities
* @hw: pointer to hardware structure
* @speed: pointer to link speed
- * @autoneg: TRUE when autoneg or autotry is enabled
+ * @autoneg: true when autoneg or autotry is enabled
*
* Determines the link capabilities by reading the AUTOC register.
**/
@@ -431,7 +431,7 @@ s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw,
hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 ||
hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1) {
*speed = IXGBE_LINK_SPEED_1GB_FULL;
- *autoneg = TRUE;
+ *autoneg = true;
goto out;
}
@@ -448,22 +448,22 @@ s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw,
switch (autoc & IXGBE_AUTOC_LMS_MASK) {
case IXGBE_AUTOC_LMS_1G_LINK_NO_AN:
*speed = IXGBE_LINK_SPEED_1GB_FULL;
- *autoneg = FALSE;
+ *autoneg = false;
break;
case IXGBE_AUTOC_LMS_10G_LINK_NO_AN:
*speed = IXGBE_LINK_SPEED_10GB_FULL;
- *autoneg = FALSE;
+ *autoneg = false;
break;
case IXGBE_AUTOC_LMS_1G_AN:
*speed = IXGBE_LINK_SPEED_1GB_FULL;
- *autoneg = TRUE;
+ *autoneg = true;
break;
case IXGBE_AUTOC_LMS_10G_SERIAL:
*speed = IXGBE_LINK_SPEED_10GB_FULL;
- *autoneg = FALSE;
+ *autoneg = false;
break;
case IXGBE_AUTOC_LMS_KX4_KX_KR:
@@ -475,7 +475,7 @@ s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw,
*speed |= IXGBE_LINK_SPEED_10GB_FULL;
if (autoc & IXGBE_AUTOC_KX_SUPP)
*speed |= IXGBE_LINK_SPEED_1GB_FULL;
- *autoneg = TRUE;
+ *autoneg = true;
break;
case IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII:
@@ -486,12 +486,12 @@ s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw,
*speed |= IXGBE_LINK_SPEED_10GB_FULL;
if (autoc & IXGBE_AUTOC_KX_SUPP)
*speed |= IXGBE_LINK_SPEED_1GB_FULL;
- *autoneg = TRUE;
+ *autoneg = true;
break;
case IXGBE_AUTOC_LMS_SGMII_1G_100M:
*speed = IXGBE_LINK_SPEED_1GB_FULL | IXGBE_LINK_SPEED_100_FULL;
- *autoneg = FALSE;
+ *autoneg = false;
break;
default:
@@ -508,9 +508,9 @@ s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw,
* Limited autoneg is enabled at 1G
*/
if (hw->phy.media_type == ixgbe_media_type_fiber_qsfp)
- *autoneg = FALSE;
+ *autoneg = false;
else
- *autoneg = TRUE;
+ *autoneg = true;
}
out:
@@ -568,7 +568,7 @@ enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw)
break;
case IXGBE_DEV_ID_82599_BYPASS:
media_type = ixgbe_media_type_fiber_fixed;
- hw->phy.multispeed_fiber = TRUE;
+ hw->phy.multispeed_fiber = true;
break;
default:
media_type = ixgbe_media_type_unknown;
@@ -604,7 +604,7 @@ void ixgbe_stop_mac_link_on_d3_82599(struct ixgbe_hw *hw)
/**
* ixgbe_start_mac_link_82599 - Setup MAC link settings
* @hw: pointer to hardware structure
- * @autoneg_wait_to_complete: TRUE when waiting for completion is needed
+ * @autoneg_wait_to_complete: true when waiting for completion is needed
*
* Configures link settings based on values in the ixgbe_hw struct.
* Restarts the link. Performs autonegotiation if needed.
@@ -616,7 +616,7 @@ s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw,
u32 links_reg;
u32 i;
s32 status = IXGBE_SUCCESS;
- bool got_lock = FALSE;
+ bool got_lock = false;
DEBUGFUNC("ixgbe_start_mac_link_82599");
@@ -630,7 +630,7 @@ s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw,
if (status != IXGBE_SUCCESS)
goto out;
- got_lock = TRUE;
+ got_lock = true;
}
/* Restart link */
@@ -716,11 +716,11 @@ void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
* @hw: pointer to hardware structure
*
* When the driver changes the link speeds that it can support,
- * it sets autotry_restart to TRUE to indicate that we need to
+ * it sets autotry_restart to true to indicate that we need to
* initiate a new autotry session with the link partner. To do
* so, we set the speed then disable and re-enable the Tx laser, to
* alert the link partner that it also needs to restart autotry on its
- * end. This is consistent with TRUE clause 37 autoneg, which also
+ * end. This is consistent with true clause 37 autoneg, which also
* involves a loss of signal.
**/
void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
@@ -734,7 +734,7 @@ void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
if (hw->mac.autotry_restart) {
*** 1758 LINES SKIPPED ***
More information about the dev-commits-src-all
mailing list