hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Sudheer Mogilappagari 2017-02-09 23:58:22 -08:00 committed by Jeff Kirsher
parent 3bb83baf9a
commit b3f028fc8a
6 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/ethernet/intel/i40e/i40e_client.c
View File

@ -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;

1
drivers/net/ethernet/intel/i40e/i40e_main.c
View File

@ -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

12
drivers/net/ethernet/intel/i40e/i40e_osdep.h
View File

@ -69,12 +69,12 @@ struct i40e_virt_mem {
#define i40e_allocate_virt_mem(h, m, s) i40e_allocate_virt_mem_d(h, m, s) #define i40e_allocate_virt_mem(h, m, s) i40e_allocate_virt_mem_d(h, m, s)
#define i40e_free_virt_mem(h, m) i40e_free_virt_mem_d(h, m) #define i40e_free_virt_mem(h, m) i40e_free_virt_mem_d(h, m)
#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;

1
drivers/net/ethernet/intel/i40e/i40e_type.h
View File

@ -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 */

1
drivers/net/ethernet/intel/i40evf/i40e_type.h
View File

@ -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 */

1
drivers/net/ethernet/intel/i40evf/i40evf_main.c
View File

@ -2726,6 +2726,7 @@ static int i40evf_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;
/* 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
* and destroy them only once in remove * and destroy them only once in remove