FPGA/corundum
1
0
Fork 0
mirror of https://github.com/corundum/corundum.git synced 2025-01-16 08:12:53 +08:00
Code Issues Projects Releases Wiki Activity

modules/mqnic: Store port references in netdev priv

Browse Source 
Signed-off-by: Alex Forencich <alex@alexforencich.com>
This commit is contained in:
Alex Forencich 2023-09-06 21:48:38 -07:00
parent 2e387d3630
commit ebd7cb7ad9
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/mqnic/mqnic.h
View File

@ -448,6 +448,9 @@ struct mqnic_priv {
u32 sched_block_count; u32 sched_block_count;
struct mqnic_sched_block *sched_block[MQNIC_MAX_PORTS]; struct mqnic_sched_block *sched_block[MQNIC_MAX_PORTS];
u32 port_count;
struct mqnic_port *port[MQNIC_MAX_PORTS];
u32 max_desc_block_size; u32 max_desc_block_size;
u32 rx_queue_map_indir_table_size; u32 rx_queue_map_indir_table_size;

15
modules/mqnic/mqnic_netdev.c
View File

@ -489,21 +489,20 @@ static const struct net_device_ops mqnic_netdev_ops = {
static void mqnic_link_status_timeout(struct timer_list *timer) static void mqnic_link_status_timeout(struct timer_list *timer)
{ {
struct mqnic_priv *priv = from_timer(priv, timer, link_status_timer); struct mqnic_priv *priv = from_timer(priv, timer, link_status_timer);
struct mqnic_if *interface = priv->interface;
int k; int k;
unsigned int up; unsigned int up;
// "combine" all TX/RX status signals of all ports of this interface // "combine" all TX/RX status signals of all ports of this netdev
for (k = 0, up = 0; k < interface->port_count; k++) { for (k = 0, up = 0; k < priv->port_count; k++) {
if (!(mqnic_port_get_tx_status(interface->port[k]) & 0x1)) if (!(mqnic_port_get_tx_status(priv->port[k]) & 0x1))
continue; continue;
if (!(mqnic_port_get_rx_status(interface->port[k]) & 0x1)) if (!(mqnic_port_get_rx_status(priv->port[k]) & 0x1))
continue; continue;
up++; up++;
} }
if (up < interface->port_count) { if (up < priv->port_count) {
// report carrier off, as soon as a one port's TX/RX status is deasserted // report carrier off, as soon as a one port's TX/RX status is deasserted
if (priv->link_status) { if (priv->link_status) {
netif_carrier_off(priv->ndev); netif_carrier_off(priv->ndev);
@ -574,6 +573,10 @@ struct net_device *mqnic_create_netdev(struct mqnic_if *interface, int index, in
for (k = 0; k < interface->sched_block_count; k++) for (k = 0; k < interface->sched_block_count; k++)
priv->sched_block[k] = interface->sched_block[k]; priv->sched_block[k] = interface->sched_block[k];
priv->port_count = interface->port_count;
for (k = 0; k < interface->port_count; k++)
priv->port[k] = interface->port[k];
netif_set_real_num_tx_queues(ndev, priv->txq_count); netif_set_real_num_tx_queues(ndev, priv->txq_count);
netif_set_real_num_rx_queues(ndev, priv->rxq_count); netif_set_real_num_rx_queues(ndev, priv->rxq_count);