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
net/ice/base: reduce calls to get profile associations
[dpdk.git]
/
drivers
/
net
/
cxgbe
/
cxgbe_main.c
diff --git
a/drivers/net/cxgbe/cxgbe_main.c
b/drivers/net/cxgbe/cxgbe_main.c
index
a135df9
..
620f60b
100644
(file)
--- a/
drivers/net/cxgbe/cxgbe_main.c
+++ b/
drivers/net/cxgbe/cxgbe_main.c
@@
-33,9
+33,9
@@
#include <rte_dev.h>
#include <rte_kvargs.h>
#include <rte_dev.h>
#include <rte_kvargs.h>
-#include "common.h"
-#include "t4_regs.h"
-#include "t4_msg.h"
+#include "
base/
common.h"
+#include "
base/
t4_regs.h"
+#include "
base/
t4_msg.h"
#include "cxgbe.h"
#include "clip_tbl.h"
#include "l2t.h"
#include "cxgbe.h"
#include "clip_tbl.h"
#include "l2t.h"
@@
-116,12
+116,13
@@
out:
/**
* Setup sge control queues to pass control information.
*/
/**
* Setup sge control queues to pass control information.
*/
-int setup_sge_ctrl_txq(struct adapter *adapter)
+int
cxgbe_
setup_sge_ctrl_txq(struct adapter *adapter)
{
struct sge *s = &adapter->sge;
int err = 0, i = 0;
for_each_port(adapter, i) {
{
struct sge *s = &adapter->sge;
int err = 0, i = 0;
for_each_port(adapter, i) {
+ struct port_info *pi = adap2pinfo(adapter, i);
char name[RTE_ETH_NAME_MAX_LEN];
struct sge_ctrl_txq *q = &s->ctrlq[i];
char name[RTE_ETH_NAME_MAX_LEN];
struct sge_ctrl_txq *q = &s->ctrlq[i];
@@
-135,16
+136,19
@@
int setup_sge_ctrl_txq(struct adapter *adapter)
err);
goto out;
}
err);
goto out;
}
- snprintf(name, sizeof(name), "cxgbe_ctrl_pool_%d", i);
+ snprintf(name, sizeof(name), "%s_ctrl_pool_%d",
+ pi->eth_dev->device->driver->name,
+ pi->eth_dev->data->port_id);
q->mb_pool = rte_pktmbuf_pool_create(name, s->ctrlq[i].q.size,
RTE_CACHE_LINE_SIZE,
RTE_MBUF_PRIV_ALIGN,
RTE_MBUF_DEFAULT_BUF_SIZE,
SOCKET_ID_ANY);
if (!q->mb_pool) {
q->mb_pool = rte_pktmbuf_pool_create(name, s->ctrlq[i].q.size,
RTE_CACHE_LINE_SIZE,
RTE_MBUF_PRIV_ALIGN,
RTE_MBUF_DEFAULT_BUF_SIZE,
SOCKET_ID_ANY);
if (!q->mb_pool) {
- dev_err(adapter, "Can't create ctrl pool for port: %d",
- i);
- err = -ENOMEM;
+ err = -rte_errno;
+ dev_err(adapter,
+ "Can't create ctrl pool for port %d. Err: %d\n",
+ pi->eth_dev->data->port_id, err);
goto out;
}
}
goto out;
}
}
@@
-157,18
+161,18
@@
out:
/**
* cxgbe_poll_for_completion: Poll rxq for completion
* @q: rxq to poll
/**
* cxgbe_poll_for_completion: Poll rxq for completion
* @q: rxq to poll
- * @
us: micro
seconds to delay
+ * @
ms: milli
seconds to delay
* @cnt: number of times to poll
* @c: completion to check for 'done' status
*
* Polls the rxq for reples until completion is done or the count
* expires.
*/
* @cnt: number of times to poll
* @c: completion to check for 'done' status
*
* Polls the rxq for reples until completion is done or the count
* expires.
*/
-int cxgbe_poll_for_completion(struct sge_rspq *q, unsigned int
u
s,
+int cxgbe_poll_for_completion(struct sge_rspq *q, unsigned int
m
s,
unsigned int cnt, struct t4_completion *c)
{
unsigned int i;
unsigned int cnt, struct t4_completion *c)
{
unsigned int i;
- unsigned int work_done, budget =
4
;
+ unsigned int work_done, budget =
32
;
if (!c)
return -EINVAL;
if (!c)
return -EINVAL;
@@
-181,12
+185,12
@@
int cxgbe_poll_for_completion(struct sge_rspq *q, unsigned int us,
return 0;
}
t4_os_unlock(&c->lock);
return 0;
}
t4_os_unlock(&c->lock);
-
udelay(u
s);
+
rte_delay_ms(m
s);
}
return -ETIMEDOUT;
}
}
return -ETIMEDOUT;
}
-int setup_sge_fwevtq(struct adapter *adapter)
+int
cxgbe_
setup_sge_fwevtq(struct adapter *adapter)
{
struct sge *s = &adapter->sge;
int err = 0;
{
struct sge *s = &adapter->sge;
int err = 0;
@@
-411,7
+415,7
@@
static int tid_init(struct tid_info *t)
return -ENOMEM;
t->atid_tab = (union aopen_entry *)&t->tid_tab[t->ntids];
return -ENOMEM;
t->atid_tab = (union aopen_entry *)&t->tid_tab[t->ntids];
- t->ftid_tab = (struct filter_entry *)&t->tid_tab[t->natids];
+ t->ftid_tab = (struct filter_entry *)&t->
a
tid_tab[t->natids];
t->ftid_bmap_array = t4_os_alloc(ftid_bmap_size);
if (!t->ftid_bmap_array) {
tid_free(t);
t->ftid_bmap_array = t4_os_alloc(ftid_bmap_size);
if (!t->ftid_bmap_array) {
tid_free(t);
@@
-461,7
+465,7
@@
static inline bool is_x_10g_port(const struct link_config *lc)
return high_speeds != 0;
}
return high_speeds != 0;
}
-inline void init_rspq(struct adapter *adap, struct sge_rspq *q,
+
static
inline void init_rspq(struct adapter *adap, struct sge_rspq *q,
unsigned int us, unsigned int cnt,
unsigned int size, unsigned int iqe_size)
{
unsigned int us, unsigned int cnt,
unsigned int size, unsigned int iqe_size)
{
@@
-471,9
+475,9
@@
inline void init_rspq(struct adapter *adap, struct sge_rspq *q,
q->size = size;
}
q->size = size;
}
-int cfg_queue_count(struct rte_eth_dev *eth_dev)
+int c
xgbe_c
fg_queue_count(struct rte_eth_dev *eth_dev)
{
{
- struct port_info *pi =
(struct port_info *)(eth_dev->data->dev_private)
;
+ struct port_info *pi =
eth_dev->data->dev_private
;
struct adapter *adap = pi->adapter;
struct sge *s = &adap->sge;
unsigned int max_queues = s->max_ethqsets / adap->params.nports;
struct adapter *adap = pi->adapter;
struct sge *s = &adap->sge;
unsigned int max_queues = s->max_ethqsets / adap->params.nports;
@@
-498,10
+502,9
@@
int cfg_queue_count(struct rte_eth_dev *eth_dev)
return 0;
}
return 0;
}
-void cfg_queues(struct rte_eth_dev *eth_dev)
+void c
xgbe_c
fg_queues(struct rte_eth_dev *eth_dev)
{
{
- struct rte_config *config = rte_eal_get_configuration();
- struct port_info *pi = (struct port_info *)(eth_dev->data->dev_private);
+ struct port_info *pi = eth_dev->data->dev_private;
struct adapter *adap = pi->adapter;
struct sge *s = &adap->sge;
unsigned int i, nb_ports = 0, qidx = 0;
struct adapter *adap = pi->adapter;
struct sge *s = &adap->sge;
unsigned int i, nb_ports = 0, qidx = 0;
@@
-523,8
+526,8
@@
void cfg_queues(struct rte_eth_dev *eth_dev)
(adap->params.nports - nb_ports)) /
nb_ports;
(adap->params.nports - nb_ports)) /
nb_ports;
- if (q_per_port >
config->lcore_count
)
- q_per_port =
config->lcore_count
;
+ if (q_per_port >
rte_lcore_count()
)
+ q_per_port =
rte_lcore_count()
;
for_each_port(adap, i) {
struct port_info *pi = adap2pinfo(adap, i);
for_each_port(adap, i) {
struct port_info *pi = adap2pinfo(adap, i);
@@
-592,7
+595,7
@@
static void setup_memwin(struct adapter *adap)
MEMWIN_NIC));
}
MEMWIN_NIC));
}
-int init_rss(struct adapter *adap)
+int
cxgbe_
init_rss(struct adapter *adap)
{
unsigned int i;
{
unsigned int i;
@@
-619,7
+622,7
@@
int init_rss(struct adapter *adap)
/**
* Dump basic information about the adapter.
*/
/**
* Dump basic information about the adapter.
*/
-void print_adapter_info(struct adapter *adap)
+void
cxgbe_
print_adapter_info(struct adapter *adap)
{
/**
* Hardware/Firmware/etc. Version/Revision IDs.
{
/**
* Hardware/Firmware/etc. Version/Revision IDs.
@@
-627,7
+630,7
@@
void print_adapter_info(struct adapter *adap)
t4_dump_version_info(adap);
}
t4_dump_version_info(adap);
}
-void print_port_info(struct adapter *adap)
+void
cxgbe_
print_port_info(struct adapter *adap)
{
int i;
char buf[80];
{
int i;
char buf[80];
@@
-775,7
+778,7
@@
static void configure_pcie_ext_tag(struct adapter *adapter)
}
/* Figure out how many Queue Sets we can support */
}
/* Figure out how many Queue Sets we can support */
-void configure_max_ethqsets(struct adapter *adapter)
+void c
xgbe_c
onfigure_max_ethqsets(struct adapter *adapter)
{
unsigned int ethqsets;
{
unsigned int ethqsets;
@@
-1264,7
+1267,7
@@
static int adap_init0(struct adapter *adap)
t4_init_tp_params(adap);
configure_pcie_ext_tag(adap);
configure_vlan_types(adap);
t4_init_tp_params(adap);
configure_pcie_ext_tag(adap);
configure_vlan_types(adap);
- configure_max_ethqsets(adap);
+ c
xgbe_c
onfigure_max_ethqsets(adap);
adap->params.drv_memwin = MEMWIN_NIC;
adap->flags |= FW_OK;
adap->params.drv_memwin = MEMWIN_NIC;
adap->flags |= FW_OK;
@@
-1318,7
+1321,7
@@
void t4_os_portmod_changed(const struct adapter *adap, int port_id)
pi->port_id, pi->mod_type);
}
pi->port_id, pi->mod_type);
}
-
inline bool
force_linkup(struct adapter *adap)
+
bool cxgbe_
force_linkup(struct adapter *adap)
{
struct rte_pci_device *pdev = adap->pdev;
{
struct rte_pci_device *pdev = adap->pdev;
@@
-1336,21
+1339,25
@@
inline bool force_linkup(struct adapter *adap)
*
* Performs the MAC and PHY actions needed to enable a port.
*/
*
* Performs the MAC and PHY actions needed to enable a port.
*/
-int link_start(struct port_info *pi)
+int
cxgbe_
link_start(struct port_info *pi)
{
struct adapter *adapter = pi->adapter;
{
struct adapter *adapter = pi->adapter;
-
int ret
;
+
u64 conf_offloads
;
unsigned int mtu;
unsigned int mtu;
+ int ret;
mtu = pi->eth_dev->data->dev_conf.rxmode.max_rx_pkt_len -
mtu = pi->eth_dev->data->dev_conf.rxmode.max_rx_pkt_len -
- (ETHER_HDR_LEN + ETHER_CRC_LEN);
+ (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN);
+
+ conf_offloads = pi->eth_dev->data->dev_conf.rxmode.offloads;
/*
* We do not set address filters and promiscuity here, the stack does
* that step explicitly.
*/
/*
* We do not set address filters and promiscuity here, the stack does
* that step explicitly.
*/
- ret = t4_set_rxmode(adapter, adapter->mbox, pi->viid, mtu, -1, -1,
- -1, 1, true);
+ ret = t4_set_rxmode(adapter, adapter->mbox, pi->viid, mtu, -1, -1, -1,
+ !!(conf_offloads & DEV_RX_OFFLOAD_VLAN_STRIP),
+ true);
if (ret == 0) {
ret = cxgbe_mpstcam_modify(pi, (int)pi->xact_addr_filt,
(u8 *)&pi->eth_dev->data->mac_addrs[0]);
if (ret == 0) {
ret = cxgbe_mpstcam_modify(pi, (int)pi->xact_addr_filt,
(u8 *)&pi->eth_dev->data->mac_addrs[0]);
@@
-1374,7
+1381,7
@@
int link_start(struct port_info *pi)
true, true, false);
}
true, true, false);
}
- if (ret == 0 && force_linkup(adapter))
+ if (ret == 0 &&
cxgbe_
force_linkup(adapter))
pi->eth_dev->data->dev_link.link_status = ETH_LINK_UP;
return ret;
}
pi->eth_dev->data->dev_link.link_status = ETH_LINK_UP;
return ret;
}
@@
-1482,7
+1489,7
@@
int cxgbe_write_rss(const struct port_info *pi, const u16 *queues)
* We always configure the RSS mapping for all ports since the mapping
* table has plenty of entries.
*/
* We always configure the RSS mapping for all ports since the mapping
* table has plenty of entries.
*/
-int setup_rss(struct port_info *pi)
+int
cxgbe_
setup_rss(struct port_info *pi)
{
int j, err;
struct adapter *adapter = pi->adapter;
{
int j, err;
struct adapter *adapter = pi->adapter;
@@
-1710,12
+1717,7
@@
void cxgbe_close(struct adapter *adapter)
if (pi->viid != 0)
t4_free_vi(adapter, adapter->mbox,
adapter->pf, 0, pi->viid);
if (pi->viid != 0)
t4_free_vi(adapter, adapter->mbox,
adapter->pf, 0, pi->viid);
- rte_free(pi->eth_dev->data->mac_addrs);
- /* Skip first port since it'll be freed by DPDK stack */
- if (i) {
- rte_free(pi->eth_dev->data->dev_private);
- rte_eth_dev_release_port(pi->eth_dev);
- }
+ rte_eth_dev_release_port(pi->eth_dev);
}
adapter->flags &= ~FULL_INIT_DONE;
}
}
adapter->flags &= ~FULL_INIT_DONE;
}
@@
-1822,7
+1824,7
@@
int cxgbe_probe(struct adapter *adapter)
goto out_free;
allocate_mac:
goto out_free;
allocate_mac:
- pi =
(struct port_info *)
eth_dev->data->dev_private;
+ pi = eth_dev->data->dev_private;
adapter->port[i] = pi;
pi->eth_dev = eth_dev;
pi->adapter = adapter;
adapter->port[i] = pi;
pi->eth_dev = eth_dev;
pi->adapter = adapter;
@@
-1838,7
+1840,7
@@
allocate_mac:
rte_eth_copy_pci_info(pi->eth_dev, adapter->pdev);
pi->eth_dev->data->mac_addrs = rte_zmalloc(name,
rte_eth_copy_pci_info(pi->eth_dev, adapter->pdev);
pi->eth_dev->data->mac_addrs = rte_zmalloc(name,
-
ETHER_ADDR_LEN, 0);
+
RTE_
ETHER_ADDR_LEN, 0);
if (!pi->eth_dev->data->mac_addrs) {
dev_err(adapter, "%s: Mem allocation failed for storing mac addr, aborting\n",
__func__);
if (!pi->eth_dev->data->mac_addrs) {
dev_err(adapter, "%s: Mem allocation failed for storing mac addr, aborting\n",
__func__);
@@
-1861,10
+1863,10
@@
allocate_mac:
}
}
}
}
- cfg_queues(adapter->eth_dev);
+ c
xgbe_c
fg_queues(adapter->eth_dev);
- print_adapter_info(adapter);
- print_port_info(adapter);
+
cxgbe_
print_adapter_info(adapter);
+
cxgbe_
print_port_info(adapter);
adapter->clipt = t4_init_clip_tbl(adapter->clipt_start,
adapter->clipt_end);
adapter->clipt = t4_init_clip_tbl(adapter->clipt_start,
adapter->clipt_end);
@@
-1906,7
+1908,7
@@
allocate_mac:
"Maskless filter support disabled. Continuing\n");
}
"Maskless filter support disabled. Continuing\n");
}
- err = init_rss(adapter);
+ err =
cxgbe_
init_rss(adapter);
if (err)
goto out_free;
if (err)
goto out_free;
@@
-1918,14
+1920,7
@@
out_free:
if (pi->viid != 0)
t4_free_vi(adapter, adapter->mbox, adapter->pf,
0, pi->viid);
if (pi->viid != 0)
t4_free_vi(adapter, adapter->mbox, adapter->pf,
0, pi->viid);
- /* Skip first port since it'll be de-allocated by DPDK */
- if (i == 0)
- continue;
- if (pi->eth_dev) {
- if (pi->eth_dev->data->dev_private)
- rte_free(pi->eth_dev->data->dev_private);
- rte_eth_dev_release_port(pi->eth_dev);
- }
+ rte_eth_dev_release_port(pi->eth_dev);
}
if (adapter->flags & FW_OK)
}
if (adapter->flags & FW_OK)