git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix spelling in comments and strings
[dpdk.git]
/
drivers
/
net
/
axgbe
/
axgbe_mdio.c
diff --git
a/drivers/net/axgbe/axgbe_mdio.c
b/drivers/net/axgbe/axgbe_mdio.c
index
0f226c3
..
32d8c66
100644
(file)
--- a/
drivers/net/axgbe/axgbe_mdio.c
+++ b/
drivers/net/axgbe/axgbe_mdio.c
@@
-597,7
+597,7
@@
again:
pdata->an_int = 0;
axgbe_an73_clear_interrupts(pdata);
pdata->eth_dev->data->dev_link.link_status =
pdata->an_int = 0;
axgbe_an73_clear_interrupts(pdata);
pdata->eth_dev->data->dev_link.link_status =
- ETH_LINK_DOWN;
+
RTE_
ETH_LINK_DOWN;
} else if (pdata->an_state == AXGBE_AN_ERROR) {
PMD_DRV_LOG(ERR, "error during auto-negotiation, state=%u\n",
cur_state);
} else if (pdata->an_state == AXGBE_AN_ERROR) {
PMD_DRV_LOG(ERR, "error during auto-negotiation, state=%u\n",
cur_state);
@@
-916,7
+916,7
@@
static int __axgbe_phy_config_aneg(struct axgbe_port *pdata)
{
int ret;
{
int ret;
-
axgbe_set_bit
(AXGBE_LINK_INIT, &pdata->dev_state);
+
rte_bit_relaxed_set32
(AXGBE_LINK_INIT, &pdata->dev_state);
pdata->link_check = rte_get_timer_cycles();
ret = pdata->phy_if.phy_impl.an_config(pdata);
pdata->link_check = rte_get_timer_cycles();
ret = pdata->phy_if.phy_impl.an_config(pdata);
@@
-933,7
+933,7
@@
static int __axgbe_phy_config_aneg(struct axgbe_port *pdata)
}
/* Disable auto-negotiation interrupt */
}
/* Disable auto-negotiation interrupt */
- rte_intr_disable(
&
pdata->pci_dev->intr_handle);
+ rte_intr_disable(pdata->pci_dev->intr_handle);
/* Start auto-negotiation in a supported mode */
if (axgbe_use_mode(pdata, AXGBE_MODE_KR)) {
/* Start auto-negotiation in a supported mode */
if (axgbe_use_mode(pdata, AXGBE_MODE_KR)) {
@@
-951,7
+951,7
@@
static int __axgbe_phy_config_aneg(struct axgbe_port *pdata)
} else if (axgbe_use_mode(pdata, AXGBE_MODE_SGMII_100)) {
axgbe_set_mode(pdata, AXGBE_MODE_SGMII_100);
} else {
} else if (axgbe_use_mode(pdata, AXGBE_MODE_SGMII_100)) {
axgbe_set_mode(pdata, AXGBE_MODE_SGMII_100);
} else {
- rte_intr_enable(
&
pdata->pci_dev->intr_handle);
+ rte_intr_enable(pdata->pci_dev->intr_handle);
return -EINVAL;
}
return -EINVAL;
}
@@
-964,7
+964,7
@@
static int __axgbe_phy_config_aneg(struct axgbe_port *pdata)
pdata->kx_state = AXGBE_RX_BPA;
/* Re-enable auto-negotiation interrupt */
pdata->kx_state = AXGBE_RX_BPA;
/* Re-enable auto-negotiation interrupt */
- rte_intr_enable(
&
pdata->pci_dev->intr_handle);
+ rte_intr_enable(pdata->pci_dev->intr_handle);
axgbe_an37_enable_interrupts(pdata);
axgbe_an_init(pdata);
axgbe_an37_enable_interrupts(pdata);
axgbe_an_init(pdata);
@@
-981,9
+981,9
@@
static int axgbe_phy_config_aneg(struct axgbe_port *pdata)
ret = __axgbe_phy_config_aneg(pdata);
if (ret)
ret = __axgbe_phy_config_aneg(pdata);
if (ret)
-
axgbe_set_bit
(AXGBE_LINK_ERR, &pdata->dev_state);
+
rte_bit_relaxed_set32
(AXGBE_LINK_ERR, &pdata->dev_state);
else
else
-
axgbe_clear_bit
(AXGBE_LINK_ERR, &pdata->dev_state);
+
rte_bit_relaxed_clear32
(AXGBE_LINK_ERR, &pdata->dev_state);
pthread_mutex_unlock(&pdata->an_mutex);
pthread_mutex_unlock(&pdata->an_mutex);
@@
-1072,7
+1072,7
@@
static void axgbe_phy_status(struct axgbe_port *pdata)
unsigned int reg = 0;
unsigned long autoneg_start_time;
unsigned int reg = 0;
unsigned long autoneg_start_time;
- if (
axgbe_test_bit
(AXGBE_LINK_ERR, &pdata->dev_state)) {
+ if (
rte_bit_relaxed_get32
(AXGBE_LINK_ERR, &pdata->dev_state)) {
pdata->phy.link = 0;
goto adjust_link;
}
pdata->phy.link = 0;
goto adjust_link;
}
@@
-1116,10
+1116,11
@@
static void axgbe_phy_status(struct axgbe_port *pdata)
}
}
axgbe_phy_status_result(pdata);
}
}
axgbe_phy_status_result(pdata);
- if (axgbe_test_bit(AXGBE_LINK_INIT, &pdata->dev_state))
- axgbe_clear_bit(AXGBE_LINK_INIT, &pdata->dev_state);
+ if (rte_bit_relaxed_get32(AXGBE_LINK_INIT, &pdata->dev_state))
+ rte_bit_relaxed_clear32(AXGBE_LINK_INIT,
+ &pdata->dev_state);
} else {
} else {
- if (
axgbe_test_bit
(AXGBE_LINK_INIT, &pdata->dev_state)) {
+ if (
rte_bit_relaxed_get32
(AXGBE_LINK_INIT, &pdata->dev_state)) {
axgbe_check_link_timeout(pdata);
if (link_aneg)
axgbe_check_link_timeout(pdata);
if (link_aneg)