be2net: Patch to determine if function is VF while running in guest OS.

When driver is loaded in guest OS, the pci variables is_virtfn and is_physfn are
both set to 0. This change uses registers in controller to determine the same.

Signed-off-by: Sarveshwar Bandi <sarveshwarb@serverengines.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sarveshwar Bandi 2010-07-09 01:43:55 +00:00 committed by David S. Miller
parent 1ebed71ae2
commit 344dbf1073
2 changed files with 12 additions and 1 deletions

View File

@ -291,9 +291,10 @@ struct be_adapter {
u32 vf_if_handle[BE_MAX_VF]; u32 vf_if_handle[BE_MAX_VF];
u32 vf_pmac_id[BE_MAX_VF]; u32 vf_pmac_id[BE_MAX_VF];
u8 base_eq_id; u8 base_eq_id;
u8 is_virtfn;
}; };
#define be_physfn(adapter) (!adapter->pdev->is_virtfn) #define be_physfn(adapter) (!adapter->is_virtfn)
/* BladeEngine Generation numbers */ /* BladeEngine Generation numbers */
#define BE_GEN2 2 #define BE_GEN2 2
@ -393,6 +394,15 @@ static inline u8 is_udp_pkt(struct sk_buff *skb)
return val; return val;
} }
static inline void be_check_sriov_fn_type(struct be_adapter *adapter)
{
u8 data;
pci_write_config_byte(adapter->pdev, 0xFE, 0xAA);
pci_read_config_byte(adapter->pdev, 0xFE, &data);
adapter->is_virtfn = (data != 0xAA);
}
extern void be_cq_notify(struct be_adapter *adapter, u16 qid, bool arm, extern void be_cq_notify(struct be_adapter *adapter, u16 qid, bool arm,
u16 num_popped); u16 num_popped);
extern void be_link_status_update(struct be_adapter *adapter, bool link_up); extern void be_link_status_update(struct be_adapter *adapter, bool link_up);

View File

@ -1631,6 +1631,7 @@ static void be_sriov_enable(struct be_adapter *adapter)
{ {
#ifdef CONFIG_PCI_IOV #ifdef CONFIG_PCI_IOV
int status; int status;
be_check_sriov_fn_type(adapter);
if (be_physfn(adapter) && num_vfs) { if (be_physfn(adapter) && num_vfs) {
status = pci_enable_sriov(adapter->pdev, num_vfs); status = pci_enable_sriov(adapter->pdev, num_vfs);
adapter->sriov_enabled = status ? false : true; adapter->sriov_enabled = status ? false : true;