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

Commit e7fef9b4 authored by Edward Cree's avatar Edward Cree Committed by David S. Miller
Browse files

sfc: add sysfs entry to control MCDI tracing 



MCDI tracing is enabled per-function with a sysfs file
    /sys/class/net/<NET_DEV>/device/mcdi_logging

Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 75aba2a5

drivers/net/ethernet/sfc/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -43,4 +43,5 @@ config SFC_MCDI_LOGGING 
	---help---

	  This enables support for tracing of MCDI (Management-Controller-to-

	  Driver-Interface) commands and responses, allowing debugging of

	  driver/firmware interaction.
 
	  driver/firmware interaction.  The tracing is actually enabled by

	  a sysfs file 'mcdi_logging' under the PCI device.

drivers/net/ethernet/sfc/efx.c

+42 −7
Original line number Diff line number Diff line
@@ -2326,6 +2326,28 @@ show_phy_type(struct device *dev, struct device_attribute *attr, char *buf) 
}

static DEVICE_ATTR(phy_type, 0444, show_phy_type, NULL);



#ifdef CONFIG_SFC_MCDI_LOGGING

static ssize_t show_mcdi_log(struct device *dev, struct device_attribute *attr,

			     char *buf)

{

	struct efx_nic *efx = pci_get_drvdata(to_pci_dev(dev));

	struct efx_mcdi_iface *mcdi = efx_mcdi(efx);



	return scnprintf(buf, PAGE_SIZE, "%d\n", mcdi->logging_enabled);

}

static ssize_t set_mcdi_log(struct device *dev, struct device_attribute *attr,

			    const char *buf, size_t count)

{

	struct efx_nic *efx = pci_get_drvdata(to_pci_dev(dev));

	struct efx_mcdi_iface *mcdi = efx_mcdi(efx);

	bool enable = count > 0 && *buf != '0';



	mcdi->logging_enabled = enable;

	return count;

}

static DEVICE_ATTR(mcdi_logging, 0644, show_mcdi_log, set_mcdi_log);

#endif



static int efx_register_netdev(struct efx_nic *efx)

{

	struct net_device *net_dev = efx->net_dev;
@@ -2383,9 +2405,21 @@ static int efx_register_netdev(struct efx_nic *efx) 
			  "failed to init net dev attributes\n");

		goto fail_registered;

	}

#ifdef CONFIG_SFC_MCDI_LOGGING

	rc = device_create_file(&efx->pci_dev->dev, &dev_attr_mcdi_logging);

	if (rc) {

		netif_err(efx, drv, efx->net_dev,

			  "failed to init net dev attributes\n");

		goto fail_attr_mcdi_logging;

	}

#endif



	return 0;



#ifdef CONFIG_SFC_MCDI_LOGGING

fail_attr_mcdi_logging:

	device_remove_file(&efx->pci_dev->dev, &dev_attr_phy_type);

#endif

fail_registered:

	rtnl_lock();

	efx_dissociate(efx);
@@ -2404,13 +2438,14 @@ static void efx_unregister_netdev(struct efx_nic *efx) 


	BUG_ON(netdev_priv(efx->net_dev) != efx);



	if (efx_dev_registered(efx)) {

		strlcpy(efx->name, pci_name(efx->pci_dev), sizeof(efx->name));

#ifdef CONFIG_SFC_MCDI_LOGGING

		device_remove_file(&efx->pci_dev->dev, &dev_attr_mcdi_logging);

#endif

		device_remove_file(&efx->pci_dev->dev, &dev_attr_phy_type);



	rtnl_lock();

	unregister_netdevice(efx->net_dev);

	efx->state = STATE_UNINIT;

	rtnl_unlock();

		unregister_netdev(efx->net_dev);

	}

}



/**************************************************************************

drivers/net/ethernet/sfc/mcdi.c

+2 −2
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static void efx_mcdi_send_request(struct efx_nic *efx, unsigned cmd, 
	}



#ifdef CONFIG_SFC_MCDI_LOGGING

	if (!WARN_ON_ONCE(!buf)) {

	if (mcdi->logging_enabled && !WARN_ON_ONCE(!buf)) {

		int bytes = 0;

		int i;

		/* Lengths should always be a whole number of dwords, so scream
@@ -274,7 +274,7 @@ static void efx_mcdi_read_response_header(struct efx_nic *efx) 
	}



#ifdef CONFIG_SFC_MCDI_LOGGING

	if (!WARN_ON_ONCE(!buf)) {

	if (mcdi->logging_enabled && !WARN_ON_ONCE(!buf)) {

		size_t hdr_len, data_len;

		int bytes = 0;

		int i;

drivers/net/ethernet/sfc/mcdi.h

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ enum efx_mcdi_mode { 
 * @async_list: Queue of asynchronous requests

 * @async_timer: Timer for asynchronous request timeout

 * @logging_buffer: buffer that may be used to build MCDI tracing messages

 * @logging_enabled: whether to trace MCDI

 */

struct efx_mcdi_iface {

	struct efx_nic *efx;
@@ -77,6 +78,7 @@ struct efx_mcdi_iface { 
	struct timer_list async_timer;

#ifdef CONFIG_SFC_MCDI_LOGGING

	char *logging_buffer;

	bool logging_enabled;

#endif

};