RDMA/nes: fix CX4 link problem in back-to-back configuration
PATCH 1/1 RDMA/nes: fix CX4 link problem in back-to-back configuration
commit 09124e1913cf2140941f60ab4fdf8576e1e8fd8d took out too much code and broke CX4 link detection in back-to-back configuration. This will put back the code that does the link check.
Signed-off-by Chien Tung <[email protected]>
--- drivers/infiniband/hw/nes/nes_nic.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-)
drivers/infiniband/hw/nes/nes_nic.c +28 -2
@@ -1582,7 +1582,6 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,struct nes_vnic *nesvnic;struct net_device *netdev;struct nic_qp_map *curr_qp_map; -u32 u32temp;u8 phy_type = nesdev->nesadapter->phy_type[nesdev->mac_index]; netdev =alloc_etherdev (sizeof (struct nes_vnic ));
@@ -1694,6 +1693,10 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev, ((phy_type == NES_PHY_TYPE_PUMA_1G) && (((PCI_FUNC(nesdev->pcidev->devfn) == 1) && (nesdev->mac_index == 2)) || ((PCI_FUNC(nesdev->pcidev->devfn) == 2) && (nesdev->mac_index == 1)))))) { +u32 u32temp; +u32 link_mask; +u32 link_val; + u32temp =nes_read_indexed (nesdev,NES_IDX_PHY_PCS_CONTROL_STATUS0 + (0x200 * (nesdev->mac_index &1 )));if (phy_type !=NES_PHY_TYPE_PUMA_1G ) {
@@ -1702,13 +1705,36 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev, (0x200 * (nesdev->mac_index & 1)), u32temp); } +/* Check and set linkup here. This is for back to back */ +/* configuration where second port won't get link interrupt */ +switch (phy_type) { +case NES_PHY_TYPE_PUMA_1G : +if (nesdev->mac_index <2 ) { + link_mask =0x01010000 ; + link_val =0x01010000 ; + }else { + link_mask =0x02020000 ; + link_val =0x02020000 ; + } +break ; +default : + link_mask =0x0f1f0000 ; + link_val =0x0f0f0000 ; +break ; + } + + u32temp =nes_read_indexed (nesdev, +NES_IDX_PHY_PCS_CONTROL_STATUS0 + + (0x200 * (nesdev->mac_index &1 ))); +if ((u32temp & link_mask) == link_val) + nesvnic->linkup =1 ; +/* clear the MAC interrupt status, assumes direct logical to physical mapping */ u32temp =nes_read_indexed (nesdev,NES_IDX_MAC_INT_STATUS + (0x200 * nesdev->mac_index));nes_debug (NES_DBG_INIT ,"Phy interrupt status = 0x%X.\n" , u32temp);nes_write_indexed (nesdev,NES_IDX_MAC_INT_STATUS + (0x200 * nesdev->mac_index), u32temp);nes_init_phy (nesdev); - }return netdev;
Signature · 6 lines
1.6.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Roland Dreier
Appliedthanks, applied.
Signature · 7 lines
Roland Dreier <[email protected]> For corporate legal information go to: http://www.cisco.com/web/about/doing_business/legal/cri/index.html -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html