lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

be2net: Fix port name in message during driver load

Browse Source 
Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Padmanabh Ratnakar
2012-07-12 03:57:35 +00:00
committed by David S. Miller
parent 19d59aa762
commit b4e32a7169
3 changed files with 57 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/net/ethernet/emulex/benet/be_cmds.c
View File

@ -2716,6 +2716,44 @@ err:
return status; return status;
} }
int be_cmd_query_port_name(struct be_adapter *adapter, u8 *port_name)
{
struct be_mcc_wrb *wrb;
struct be_cmd_req_get_port_name *req;
int status;
if (!lancer_chip(adapter)) {
*port_name = adapter->hba_port_num + '0';
return 0;
}
spin_lock_bh(&adapter->mcc_lock);
wrb = wrb_from_mccq(adapter);
if (!wrb) {
status = -EBUSY;
goto err;
}
req = embedded_payload(wrb);
be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
OPCODE_COMMON_GET_PORT_NAME, sizeof(*req), wrb,
NULL);
req->hdr.version = 1;
status = be_mcc_notify_wait(adapter);
if (!status) {
struct be_cmd_resp_get_port_name *resp = embedded_payload(wrb);
*port_name = resp->port_name[adapter->hba_port_num];
} else {
*port_name = adapter->hba_port_num + '0';
}
err:
spin_unlock_bh(&adapter->mcc_lock);
return status;
}
int be_roce_mcc_cmd(void *netdev_handle, void *wrb_payload, int be_roce_mcc_cmd(void *netdev_handle, void *wrb_payload,
int wrb_payload_size, u16 *cmd_status, u16 *ext_status) int wrb_payload_size, u16 *cmd_status, u16 *ext_status)
{ {

13
drivers/net/ethernet/emulex/benet/be_cmds.h
View File

@ -186,6 +186,7 @@ struct be_mcc_mailbox {
#define OPCODE_COMMON_ENABLE_DISABLE_BEACON 69 #define OPCODE_COMMON_ENABLE_DISABLE_BEACON 69
#define OPCODE_COMMON_GET_BEACON_STATE 70 #define OPCODE_COMMON_GET_BEACON_STATE 70
#define OPCODE_COMMON_READ_TRANSRECV_DATA 73 #define OPCODE_COMMON_READ_TRANSRECV_DATA 73
#define OPCODE_COMMON_GET_PORT_NAME 77
#define OPCODE_COMMON_GET_PHY_DETAILS 102 #define OPCODE_COMMON_GET_PHY_DETAILS 102
#define OPCODE_COMMON_SET_DRIVER_FUNCTION_CAP 103 #define OPCODE_COMMON_SET_DRIVER_FUNCTION_CAP 103
#define OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES 121 #define OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES 121
@ -1506,6 +1507,17 @@ struct be_cmd_resp_get_hsw_config {
u32 rsvd; u32 rsvd;
}; };
/******************* get port names ***************/
struct be_cmd_req_get_port_name {
struct be_cmd_req_hdr hdr;
u32 rsvd0;
};
struct be_cmd_resp_get_port_name {
struct be_cmd_req_hdr hdr;
u8 port_name[4];
};
/*************** HW Stats Get v1 **********************************/ /*************** HW Stats Get v1 **********************************/
#define BE_TXP_SW_SZ 48 #define BE_TXP_SW_SZ 48
struct be_port_rxf_stats_v1 { struct be_port_rxf_stats_v1 {
@ -1772,4 +1784,5 @@ extern int be_cmd_set_ext_fat_capabilites(struct be_adapter *adapter,
struct be_fat_conf_params *cfgs); struct be_fat_conf_params *cfgs);
extern int lancer_wait_ready(struct be_adapter *adapter); extern int lancer_wait_ready(struct be_adapter *adapter);
extern int lancer_test_and_set_rdy_state(struct be_adapter *adapter); extern int lancer_test_and_set_rdy_state(struct be_adapter *adapter);
extern int be_cmd_query_port_name(struct be_adapter *adapter, u8 *port_name);

8
drivers/net/ethernet/emulex/benet/be_main.c
View File

@ -3797,6 +3797,7 @@ static int __devinit be_probe(struct pci_dev *pdev,
int status = 0; int status = 0;
struct be_adapter *adapter; struct be_adapter *adapter;
struct net_device *netdev; struct net_device *netdev;
char port_name;
status = pci_enable_device(pdev); status = pci_enable_device(pdev);
if (status) if (status)
@ -3887,8 +3888,11 @@ static int __devinit be_probe(struct pci_dev *pdev,
schedule_delayed_work(&adapter->func_recovery_work, schedule_delayed_work(&adapter->func_recovery_work,
msecs_to_jiffies(1000)); msecs_to_jiffies(1000));
dev_info(&pdev->dev, "%s: %s port %d\n", netdev->name, nic_name(pdev),
adapter->port_num); be_cmd_query_port_name(adapter, &port_name);
dev_info(&pdev->dev, "%s: %s port %c\n", netdev->name, nic_name(pdev),
port_name);
return 0; return 0;