Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a58e196 authored by Shannon Nelson's avatar Shannon Nelson Committed by David S. Miller
Browse files

ionic: Add basic lif support 



The LIF is the Logical Interface, which represents the external
connections.  The NIC can multiplex many LIFs to a single port,
but in most setups, LIF0 is the primary control for the port.

Signed-off-by: default avatarShannon Nelson <snelson@pensando.io>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 04436595

drivers/net/ethernet/pensando/ionic/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,4 +4,4 @@ 
obj-$(CONFIG_IONIC) := ionic.o



ionic-y := ionic_main.o ionic_bus_pci.o ionic_devlink.o ionic_dev.o \

	   ionic_debugfs.o
 
	   ionic_debugfs.o ionic_lif.o

drivers/net/ethernet/pensando/ionic/ionic.h

+7 −0
Original line number Diff line number Diff line
@@ -32,6 +32,13 @@ struct ionic { 
	struct ionic_dev_bar bars[IONIC_BARS_MAX];

	unsigned int num_bars;

	struct ionic_identity ident;

	struct list_head lifs;

	unsigned int nnqs_per_lif;

	unsigned int neqs_per_lif;

	unsigned int ntxqs_per_lif;

	unsigned int nrxqs_per_lif;

	DECLARE_BITMAP(lifbits, IONIC_LIFS_MAX);

	unsigned int nintrs;

};



int ionic_dev_cmd_wait(struct ionic *ionic, unsigned long max_wait);

drivers/net/ethernet/pensando/ionic/ionic_bus.h

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
#define _IONIC_BUS_H_



const char *ionic_bus_info(struct ionic *ionic);

int ionic_bus_alloc_irq_vectors(struct ionic *ionic, unsigned int nintrs);

void ionic_bus_free_irq_vectors(struct ionic *ionic);

int ionic_bus_register_driver(void);

void ionic_bus_unregister_driver(void);

drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c

+47 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include "ionic.h"

#include "ionic_bus.h"

#include "ionic_lif.h"

#include "ionic_debugfs.h"



/* Supported devices */
@@ -23,6 +24,17 @@ const char *ionic_bus_info(struct ionic *ionic) 
	return pci_name(ionic->pdev);

}



int ionic_bus_alloc_irq_vectors(struct ionic *ionic, unsigned int nintrs)

{

	return pci_alloc_irq_vectors(ionic->pdev, nintrs, nintrs,

				     PCI_IRQ_MSIX);

}



void ionic_bus_free_irq_vectors(struct ionic *ionic)

{

	pci_free_irq_vectors(ionic->pdev);

}



static int ionic_map_bars(struct ionic *ionic)

{

	struct pci_dev *pdev = ionic->pdev;
@@ -151,12 +163,44 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_out_reset;

	}



	/* Configure LIFs */

	err = ionic_lif_identify(ionic, IONIC_LIF_TYPE_CLASSIC,

				 &ionic->ident.lif);

	if (err) {

		dev_err(dev, "Cannot identify LIFs: %d, aborting\n", err);

		goto err_out_port_reset;

	}



	err = ionic_lifs_size(ionic);

	if (err) {

		dev_err(dev, "Cannot size LIFs: %d, aborting\n", err);

		goto err_out_port_reset;

	}



	err = ionic_lifs_alloc(ionic);

	if (err) {

		dev_err(dev, "Cannot allocate LIFs: %d, aborting\n", err);

		goto err_out_free_irqs;

	}



	err = ionic_lifs_init(ionic);

	if (err) {

		dev_err(dev, "Cannot init LIFs: %d, aborting\n", err);

		goto err_out_free_lifs;

	}



	err = ionic_devlink_register(ionic);

	if (err)

		dev_err(dev, "Cannot register devlink: %d\n", err);



	return 0;



err_out_free_lifs:

	ionic_lifs_free(ionic);

err_out_free_irqs:

	ionic_bus_free_irq_vectors(ionic);

err_out_port_reset:

	ionic_port_reset(ionic);

err_out_reset:

	ionic_reset(ionic);

err_out_teardown:
@@ -185,6 +229,9 @@ static void ionic_remove(struct pci_dev *pdev) 
		return;



	ionic_devlink_unregister(ionic);

	ionic_lifs_deinit(ionic);

	ionic_lifs_free(ionic);

	ionic_bus_free_irq_vectors(ionic);

	ionic_port_reset(ionic);

	ionic_reset(ionic);

	ionic_dev_teardown(ionic);

drivers/net/ethernet/pensando/ionic/ionic_debugfs.c

+36 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 2017 - 2019 Pensando Systems, Inc */



#include <linux/pci.h>

#include <linux/netdevice.h>



#include "ionic.h"

#include "ionic_bus.h"

#include "ionic_lif.h"

#include "ionic_debugfs.h"



#ifdef CONFIG_DEBUG_FS
@@ -58,4 +60,38 @@ void ionic_debugfs_add_ident(struct ionic *ionic) 
			    ionic, &identity_fops) ? 0 : -EOPNOTSUPP;

}



void ionic_debugfs_add_sizes(struct ionic *ionic)

{

	debugfs_create_u32("nlifs", 0400, ionic->dentry,

			   (u32 *)&ionic->ident.dev.nlifs);

	debugfs_create_u32("nintrs", 0400, ionic->dentry, &ionic->nintrs);



	debugfs_create_u32("ntxqs_per_lif", 0400, ionic->dentry,

			   (u32 *)&ionic->ident.lif.eth.config.queue_count[IONIC_QTYPE_TXQ]);

	debugfs_create_u32("nrxqs_per_lif", 0400, ionic->dentry,

			   (u32 *)&ionic->ident.lif.eth.config.queue_count[IONIC_QTYPE_RXQ]);

}



static int netdev_show(struct seq_file *seq, void *v)

{

	struct net_device *netdev = seq->private;



	seq_printf(seq, "%s\n", netdev->name);



	return 0;

}

DEFINE_SHOW_ATTRIBUTE(netdev);



void ionic_debugfs_add_lif(struct ionic_lif *lif)

{

	lif->dentry = debugfs_create_dir(lif->name, lif->ionic->dentry);

	debugfs_create_file("netdev", 0400, lif->dentry,

			    lif->netdev, &netdev_fops);

}



void ionic_debugfs_del_lif(struct ionic_lif *lif)

{

	debugfs_remove_recursive(lif->dentry);

	lif->dentry = NULL;

}

#endif