be2net:Changes to update ethtool get_settings function to return appropriate values.
Subsystems (2)
PATCH 1/1 be2net:Changes to update ethtool get_settings function to return appropriate values.
Update ethtool get_settings function to:
- get current link speed settings from controller
- get port transceiver type from controller
- fill appropriate values for supported, phy_address
Signed-off-by Sarveshwar Bandi <[email protected]>
--- drivers/net/benet/be_cmds.c | 37 +++++++++++++++++++++++++++++++-- drivers/net/benet/be_cmds.h | 45 ++++++++++++++++++++++++++++++++++++++-- drivers/net/benet/be_ethtool.c | 36 +++++++++++++++++++++++++++++++- drivers/net/benet/be_main.c | 5 ++++ 4 files changed, 117 insertions(+), 6 deletions(-)
drivers/net/benet/be_cmds.c +35 -2
@@ -823,7 +823,7 @@ int be_cmd_get_stats(struct be_adapter */* Uses synchronous mcc */ int be_cmd_link_status_query (struct be_adapter *adapter, -bool *link_up) +bool *link_up,u8 *mac_speed,u16 *link_speed) {struct be_mcc_wrb *wrb;struct be_cmd_req_link_status *req;
@@ -844,8 +844,11 @@ int be_cmd_link_status_query(struct be_a status =be_mcc_notify_wait (adapter);if (!status) {struct be_cmd_resp_link_status *resp =embedded_payload (wrb); -if (resp->mac_speed !=PHY_LINK_SPEED_ZERO ) +if (resp->mac_speed !=PHY_LINK_SPEED_ZERO ) { *link_up = true; + *link_speed =le16_to_cpu (resp->link_speed); + *mac_speed = resp->mac_speed; + } }spin_unlock_bh (&adapter->mcc_lock);
@@ -1177,6 +1180,36 @@ int be_cmd_get_beacon_state(struct be_adreturn status; } +/* Uses sync mcc */ +int be_cmd_read_port_type (struct be_adapter *adapter,u32 port, +u8 *connector) +{ +struct be_mcc_wrb *wrb; +struct be_cmd_req_port_type *req; +int status; + +spin_lock_bh (&adapter->mcc_lock); + + wrb =wrb_from_mccq (adapter); + req =embedded_payload (wrb); + +be_wrb_hdr_prepare (wrb,sizeof (struct be_cmd_resp_port_type ), true,0 ); + +be_cmd_hdr_prepare (&req->hdr,CMD_SUBSYSTEM_COMMON , +OPCODE_COMMON_READ_TRANSRECV_DATA ,sizeof (*req)); + + req->port =cpu_to_le32 (port); + req->page_num =cpu_to_le32 (TR_PAGE_A0 ); + status =be_mcc_notify_wait (adapter); +if (!status) { +struct be_cmd_resp_port_type *resp =embedded_payload (wrb); + *connector = resp->data.connector; + } + +spin_unlock_bh (&adapter->mcc_lock); +return status; +} +int be_cmd_write_flashrom (struct be_adapter *adapter,struct be_dma_mem *cmd,u32 flash_type,u32 flash_opcode,u32 buf_size) {
drivers/net/benet/be_cmds.h +43 -2
71 lines not on this page · raw message
drivers/net/benet/be_ethtool.c +35 -1
@@ -293,9 +293,43 @@ static int be_get_sset_count(struct net_static int be_get_settings (struct net_device *netdev,struct ethtool_cmd *ecmd) { - ecmd->speed =SPEED_10000 ; +struct be_adapter *adapter =netdev_priv (netdev); +u8 mac_speed =0 , connector =0 ; +u16 link_speed =0 ; +bool link_up = false; + +be_cmd_link_status_query (adapter, &link_up, &mac_speed, &link_speed); + +/* link_speed is in units of 10 Mbps */ +if (link_speed) { + ecmd->speed = link_speed*10 ; + }else { +switch (mac_speed) { +case PHY_LINK_SPEED_1GBPS : + ecmd->speed =SPEED_1000 ; +break ; +case PHY_LINK_SPEED_10GBPS : + ecmd->speed =SPEED_10000 ; +break ; + } + } ecmd->duplex =DUPLEX_FULL ; ecmd->autoneg =AUTONEG_DISABLE ; + ecmd->supported = (SUPPORTED_10000baseT_Full |SUPPORTED_TP ); + +be_cmd_read_port_type (adapter, adapter->port_num, &connector); +switch (connector) { +case 7 : + ecmd->port =PORT_FIBRE ; +break ; +default : + ecmd->port =PORT_TP ; +break ; + } + + ecmd->phy_address = adapter->port_num; + ecmd->transceiver =XCVR_INTERNAL ; +return 0 ; }
drivers/net/benet/be_main.c +4 -1
@@ -1586,6 +1586,8 @@ static int be_open(struct net_device *nestruct be_eq_obj *tx_eq = &adapter->tx_eq;bool link_up;int status; +u8 mac_speed; +u16 link_speed;/* First time posting */ be_post_rx_frags (adapter);
@@ -1604,7 +1606,8 @@ static int be_open(struct net_device *ne/* Rx compl queue may be in unarmed state; rearm it */ be_cq_notify (adapter, adapter->rx_obj.cq.id, true,0 ); - status =be_cmd_link_status_query (adapter, &link_up); + status =be_cmd_link_status_query (adapter, &link_up, &mac_speed, + &link_speed);if (status)return status;be_link_status_update (adapter, link_up);
Signature · 1 line
1.4.0
From: Sarveshwar Bandi <[email protected]>
Date: Thu, 22 Oct 2009 19:00:00 +0530
Quoted 6 lines
Update ethtool
get_settingsfunction to:
- get current link speed settings from controller
- get port transceiver type from controller
- fill appropriate values for supported,phy_addressSigned-off-by Sarveshwar Bandi <[email protected]>
Applied, thanks.