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

Commit b3f028fc authored by Sudheer Mogilappagari's avatar Sudheer Mogilappagari Committed by Jeff Kirsher
Browse files

i40e: Add bus number info to i40e_bus_info struct 



Currently i40e_bus_info has PCI device and function info only and log
messages print device number as bus number. Added field to provide bus
number info and modified log statements to print bus, device and
function information.

Change-ID: I811617cee2714cc0d6bade8d369f57040990756f
Signed-off-by: default avatarSudheer Mogilappagari <sudheer.mogilappagari@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 3bb83baf

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

+9 −7
Original line number Original line Diff line number Diff line
@@ -510,9 +510,10 @@ void i40e_client_subtask(struct i40e_pf *pf) 
			continue;

			continue;





		if (!existing) {

		if (!existing) {

			dev_info(&pf->pdev->dev, "Added instance of Client %s to PF%d bus=0x%02x func=0x%02x\n",

			dev_info(&pf->pdev->dev, "Added instance of Client %s to PF%d bus=0x%02x dev=0x%02x func=0x%02x\n",

				 client->name, pf->hw.pf_id,

				 client->name, pf->hw.pf_id,

				 pf->hw.bus.device, pf->hw.bus.func);

				 pf->hw.bus.bus_id, pf->hw.bus.device,

				 pf->hw.bus.func);

		}

		}





		mutex_lock(&i40e_client_instance_mutex);

		mutex_lock(&i40e_client_instance_mutex);
@@ -561,8 +562,9 @@ int i40e_lan_add_device(struct i40e_pf *pf) 
	ldev->pf = pf;

	ldev->pf = pf;

	INIT_LIST_HEAD(&ldev->list);

	INIT_LIST_HEAD(&ldev->list);

	list_add(&ldev->list, &i40e_devices);

	list_add(&ldev->list, &i40e_devices);

	dev_info(&pf->pdev->dev, "Added LAN device PF%d bus=0x%02x func=0x%02x\n",

	dev_info(&pf->pdev->dev, "Added LAN device PF%d bus=0x%02x dev=0x%02x func=0x%02x\n",

		 pf->hw.pf_id, pf->hw.bus.device, pf->hw.bus.func);

		 pf->hw.pf_id, pf->hw.bus.bus_id,

		 pf->hw.bus.device, pf->hw.bus.func);





	/* Since in some cases register may have happened before a device gets

	/* Since in some cases register may have happened before a device gets

	 * added, we can schedule a subtask to go initiate the clients if

	 * added, we can schedule a subtask to go initiate the clients if
@@ -590,9 +592,9 @@ int i40e_lan_del_device(struct i40e_pf *pf) 
	mutex_lock(&i40e_device_mutex);

	mutex_lock(&i40e_device_mutex);

	list_for_each_entry_safe(ldev, tmp, &i40e_devices, list) {

	list_for_each_entry_safe(ldev, tmp, &i40e_devices, list) {

		if (ldev->pf == pf) {

		if (ldev->pf == pf) {

			dev_info(&pf->pdev->dev, "Deleted LAN device PF%d bus=0x%02x func=0x%02x\n",

			dev_info(&pf->pdev->dev, "Deleted LAN device PF%d bus=0x%02x dev=0x%02x func=0x%02x\n",

				 pf->hw.pf_id, pf->hw.bus.device,

				 pf->hw.pf_id, pf->hw.bus.bus_id,

				 pf->hw.bus.func);

				 pf->hw.bus.device, pf->hw.bus.func);

			list_del(&ldev->list);

			list_del(&ldev->list);

			kfree(ldev);

			kfree(ldev);

			ret = 0;

			ret = 0;

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -10990,6 +10990,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	hw->subsystem_device_id = pdev->subsystem_device;

	hw->subsystem_device_id = pdev->subsystem_device;

	hw->bus.device = PCI_SLOT(pdev->devfn);

	hw->bus.device = PCI_SLOT(pdev->devfn);

	hw->bus.func = PCI_FUNC(pdev->devfn);

	hw->bus.func = PCI_FUNC(pdev->devfn);

	hw->bus.bus_id = pdev->bus->number;

	pf->instance = pfs_found;

	pf->instance = pfs_found;





	/* set up the locks for the AQ, do this only once in probe

	/* set up the locks for the AQ, do this only once in probe

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

+6 −6
Original line number Original line Diff line number Diff line
@@ -72,9 +72,9 @@ struct i40e_virt_mem { 
#define i40e_debug(h, m, s, ...)				\

#define i40e_debug(h, m, s, ...)				\

do {								\

do {								\

	if (((m) & (h)->debug_mask))				\

	if (((m) & (h)->debug_mask))				\

		pr_info("i40e %02x.%x " s,                      \

		pr_info("i40e %02x:%02x.%x " s,			\

			(h)->bus.device, (h)->bus.func,         \

			(h)->bus.bus_id, (h)->bus.device,	\

			##__VA_ARGS__);                         \

			(h)->bus.func, ##__VA_ARGS__);		\

} while (0)

} while (0)





typedef enum i40e_status_code i40e_status;

typedef enum i40e_status_code i40e_status;

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -469,6 +469,7 @@ struct i40e_bus_info { 
	u16 func;

	u16 func;

	u16 device;

	u16 device;

	u16 lan_id;

	u16 lan_id;

	u16 bus_id;

};

};





/* Flow control (FC) parameters */

/* Flow control (FC) parameters */

drivers/net/ethernet/intel/i40evf/i40e_type.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -442,6 +442,7 @@ struct i40e_bus_info { 
	u16 func;

	u16 func;

	u16 device;

	u16 device;

	u16 lan_id;

	u16 lan_id;

	u16 bus_id;

};

};





/* Flow control (FC) parameters */

/* Flow control (FC) parameters */