Commit 9e479d64 authored by Ivan Vecera's avatar Ivan Vecera Committed by David S. Miller
Browse files

i40e: Add initial devlink support 



Add an initial support for devlink interface to i40e driver.

Similarly to ice driver the implementation doe not enable devlink
to manage device-wide configuration and devlink instance is created
for each physical function of PCIe device.

Signed-off-by: default avatarIvan Vecera <ivecera@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b22f21f7

drivers/net/ethernet/intel/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ config I40E 
	depends on PTP_1588_CLOCK_OPTIONAL

	depends on PCI

	select AUXILIARY_BUS

	select NET_DEVLINK

	help

	  This driver supports Intel(R) Ethernet Controller XL710 Family of

	  devices.  For more information on how to identify your adapter, go

drivers/net/ethernet/intel/i40e/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ i40e-objs := i40e_main.o \ 
	i40e_ddp.o \

	i40e_client.o   \

	i40e_virtchnl_pf.o \

	i40e_xsk.o

	i40e_xsk.o	\

	i40e_devlink.o



i40e-$(CONFIG_I40E_DCB) += i40e_dcb.o i40e_dcb_nl.o

drivers/net/ethernet/intel/i40e/i40e.h

+3 −0
Original line number Diff line number Diff line
@@ -9,10 +9,12 @@ 
#include <linux/types.h>

#include <linux/avf/virtchnl.h>

#include <linux/net/intel/i40e_client.h>

#include <net/devlink.h>

#include <net/pkt_cls.h>

#include <net/udp_tunnel.h>

#include "i40e_dcb.h"

#include "i40e_debug.h"

#include "i40e_devlink.h"

#include "i40e_io.h"

#include "i40e_prototype.h"

#include "i40e_register.h"
@@ -411,6 +413,7 @@ static inline const u8 *i40e_channel_mac(struct i40e_channel *ch) 
/* struct that defines the Ethernet device */

struct i40e_pf {

	struct pci_dev *pdev;

	struct devlink_port devlink_port;

	struct i40e_hw hw;

	DECLARE_BITMAP(state, __I40E_STATE_SIZE__);

	struct msix_entry *msix_entries;

drivers/net/ethernet/intel/i40e/i40e_devlink.c

0 → 100644
+118 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 2023 Intel Corporation. */



#include <net/devlink.h>

#include "i40e.h"

#include "i40e_devlink.h"



static const struct devlink_ops i40e_devlink_ops = {

};



/**

 * i40e_alloc_pf - Allocate devlink and return i40e_pf structure pointer

 * @dev: the device to allocate for

 *

 * Allocate a devlink instance for this device and return the private

 * area as the i40e_pf structure.

 **/

struct i40e_pf *i40e_alloc_pf(struct device *dev)

{

	struct devlink *devlink;



	devlink = devlink_alloc(&i40e_devlink_ops, sizeof(struct i40e_pf), dev);

	if (!devlink)

		return NULL;



	return devlink_priv(devlink);

}



/**

 * i40e_free_pf - Free i40e_pf structure and associated devlink

 * @pf: the PF structure

 *

 * Free i40e_pf structure and devlink allocated by devlink_alloc.

 **/

void i40e_free_pf(struct i40e_pf *pf)

{

	struct devlink *devlink = priv_to_devlink(pf);



	devlink_free(devlink);

}



/**

 * i40e_devlink_register - Register devlink interface for this PF

 * @pf: the PF to register the devlink for.

 *

 * Register the devlink instance associated with this physical function.

 **/

void i40e_devlink_register(struct i40e_pf *pf)

{

	devlink_register(priv_to_devlink(pf));

}



/**

 * i40e_devlink_unregister - Unregister devlink resources for this PF.

 * @pf: the PF structure to cleanup

 *

 * Releases resources used by devlink and cleans up associated memory.

 **/

void i40e_devlink_unregister(struct i40e_pf *pf)

{

	devlink_unregister(priv_to_devlink(pf));

}



/**

 * i40e_devlink_set_switch_id - Set unique switch id based on pci dsn

 * @pf: the PF to create a devlink port for

 * @ppid: struct with switch id information

 */

static void i40e_devlink_set_switch_id(struct i40e_pf *pf,

				       struct netdev_phys_item_id *ppid)

{

	u64 id = pci_get_dsn(pf->pdev);



	ppid->id_len = sizeof(id);

	put_unaligned_be64(id, &ppid->id);

}



/**

 * i40e_devlink_create_port - Create a devlink port for this PF

 * @pf: the PF to create a port for

 *

 * Create and register a devlink_port for this PF. Note that although each

 * physical function is connected to a separate devlink instance, the port

 * will still be numbered according to the physical function id.

 *

 * Return: zero on success or an error code on failure.

 **/

int i40e_devlink_create_port(struct i40e_pf *pf)

{

	struct devlink *devlink = priv_to_devlink(pf);

	struct devlink_port_attrs attrs = {};

	struct device *dev = &pf->pdev->dev;

	int err;



	attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;

	attrs.phys.port_number = pf->hw.pf_id;

	i40e_devlink_set_switch_id(pf, &attrs.switch_id);

	devlink_port_attrs_set(&pf->devlink_port, &attrs);

	err = devlink_port_register(devlink, &pf->devlink_port, pf->hw.pf_id);

	if (err) {

		dev_err(dev, "devlink_port_register failed: %d\n", err);

		return err;

	}



	return 0;

}



/**

 * i40e_devlink_destroy_port - Destroy the devlink_port for this PF

 * @pf: the PF to cleanup

 *

 * Unregisters the devlink_port structure associated with this PF.

 **/

void i40e_devlink_destroy_port(struct i40e_pf *pf)

{

	devlink_port_type_clear(&pf->devlink_port);

	devlink_port_unregister(&pf->devlink_port);

}

drivers/net/ethernet/intel/i40e/i40e_devlink.h

0 → 100644
+18 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Copyright (c) 2023, Intel Corporation. */



#ifndef _I40E_DEVLINK_H_

#define _I40E_DEVLINK_H_



#include <linux/device.h>



struct i40e_pf;



struct i40e_pf *i40e_alloc_pf(struct device *dev);

void i40e_free_pf(struct i40e_pf *pf);

void i40e_devlink_register(struct i40e_pf *pf);

void i40e_devlink_unregister(struct i40e_pf *pf);

int i40e_devlink_create_port(struct i40e_pf *pf);

void i40e_devlink_destroy_port(struct i40e_pf *pf);



#endif /* _I40E_DEVLINK_H_ */