Skip to content

Commit cb06b6b

Browse files
xuhaoyue1rleon
authored andcommitted
RDMA/core: Get IB width and speed from netdev
Previously, there was no way to query the number of lanes for a network card, so the same netdev_speed would result in a fixed pair of width and speed. As network card specifications become more diverse, such fixed mode is no longer suitable, so a method is needed to obtain the correct width and speed based on the number of lanes. This patch retrieves netdev lanes and speed from net_device and translates them to IB width and speed. Signed-off-by: Haoyue Xu <xuhaoyue1@hisilicon.com> Signed-off-by: Luoyouming <luoyouming@huawei.com> Signed-off-by: Junxian Huang <huangjunxian6@hisilicon.com> Link: https://lore.kernel.org/r/20230721092052.2090449-1-huangjunxian6@hisilicon.com Signed-off-by: Leon Romanovsky <leon@kernel.org>
1 parent 8b6573f commit cb06b6b

File tree

1 file changed

+79
-21
lines changed

1 file changed

+79
-21
lines changed

drivers/infiniband/core/verbs.c

+79-21
Original file line numberDiff line numberDiff line change
@@ -1880,6 +1880,80 @@ int ib_modify_qp_with_udata(struct ib_qp *ib_qp, struct ib_qp_attr *attr,
18801880
}
18811881
EXPORT_SYMBOL(ib_modify_qp_with_udata);
18821882

1883+
static void ib_get_width_and_speed(u32 netdev_speed, u32 lanes,
1884+
u16 *speed, u8 *width)
1885+
{
1886+
if (!lanes) {
1887+
if (netdev_speed <= SPEED_1000) {
1888+
*width = IB_WIDTH_1X;
1889+
*speed = IB_SPEED_SDR;
1890+
} else if (netdev_speed <= SPEED_10000) {
1891+
*width = IB_WIDTH_1X;
1892+
*speed = IB_SPEED_FDR10;
1893+
} else if (netdev_speed <= SPEED_20000) {
1894+
*width = IB_WIDTH_4X;
1895+
*speed = IB_SPEED_DDR;
1896+
} else if (netdev_speed <= SPEED_25000) {
1897+
*width = IB_WIDTH_1X;
1898+
*speed = IB_SPEED_EDR;
1899+
} else if (netdev_speed <= SPEED_40000) {
1900+
*width = IB_WIDTH_4X;
1901+
*speed = IB_SPEED_FDR10;
1902+
} else {
1903+
*width = IB_WIDTH_4X;
1904+
*speed = IB_SPEED_EDR;
1905+
}
1906+
1907+
return;
1908+
}
1909+
1910+
switch (lanes) {
1911+
case 1:
1912+
*width = IB_WIDTH_1X;
1913+
break;
1914+
case 2:
1915+
*width = IB_WIDTH_2X;
1916+
break;
1917+
case 4:
1918+
*width = IB_WIDTH_4X;
1919+
break;
1920+
case 8:
1921+
*width = IB_WIDTH_8X;
1922+
break;
1923+
case 12:
1924+
*width = IB_WIDTH_12X;
1925+
break;
1926+
default:
1927+
*width = IB_WIDTH_1X;
1928+
}
1929+
1930+
switch (netdev_speed / lanes) {
1931+
case SPEED_2500:
1932+
*speed = IB_SPEED_SDR;
1933+
break;
1934+
case SPEED_5000:
1935+
*speed = IB_SPEED_DDR;
1936+
break;
1937+
case SPEED_10000:
1938+
*speed = IB_SPEED_FDR10;
1939+
break;
1940+
case SPEED_14000:
1941+
*speed = IB_SPEED_FDR;
1942+
break;
1943+
case SPEED_25000:
1944+
*speed = IB_SPEED_EDR;
1945+
break;
1946+
case SPEED_50000:
1947+
*speed = IB_SPEED_HDR;
1948+
break;
1949+
case SPEED_100000:
1950+
*speed = IB_SPEED_NDR;
1951+
break;
1952+
default:
1953+
*speed = IB_SPEED_SDR;
1954+
}
1955+
}
1956+
18831957
int ib_get_eth_speed(struct ib_device *dev, u32 port_num, u16 *speed, u8 *width)
18841958
{
18851959
int rc;
@@ -1904,29 +1978,13 @@ int ib_get_eth_speed(struct ib_device *dev, u32 port_num, u16 *speed, u8 *width)
19041978
netdev_speed = lksettings.base.speed;
19051979
} else {
19061980
netdev_speed = SPEED_1000;
1907-
pr_warn("%s speed is unknown, defaulting to %u\n", netdev->name,
1908-
netdev_speed);
1981+
if (rc)
1982+
pr_warn("%s speed is unknown, defaulting to %u\n",
1983+
netdev->name, netdev_speed);
19091984
}
19101985

1911-
if (netdev_speed <= SPEED_1000) {
1912-
*width = IB_WIDTH_1X;
1913-
*speed = IB_SPEED_SDR;
1914-
} else if (netdev_speed <= SPEED_10000) {
1915-
*width = IB_WIDTH_1X;
1916-
*speed = IB_SPEED_FDR10;
1917-
} else if (netdev_speed <= SPEED_20000) {
1918-
*width = IB_WIDTH_4X;
1919-
*speed = IB_SPEED_DDR;
1920-
} else if (netdev_speed <= SPEED_25000) {
1921-
*width = IB_WIDTH_1X;
1922-
*speed = IB_SPEED_EDR;
1923-
} else if (netdev_speed <= SPEED_40000) {
1924-
*width = IB_WIDTH_4X;
1925-
*speed = IB_SPEED_FDR10;
1926-
} else {
1927-
*width = IB_WIDTH_4X;
1928-
*speed = IB_SPEED_EDR;
1929-
}
1986+
ib_get_width_and_speed(netdev_speed, lksettings.lanes,
1987+
speed, width);
19301988

19311989
return 0;
19321990
}

0 commit comments

Comments
 (0)