Commit 8bf7187d authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Leon Romanovsky

RDMA/hfi1: Use FIELD_GET() to extract Link Width

Use FIELD_GET() to extract PCIe Negotiated Link Width field instead of
custom masking and shifting, and remove extract_width() which only
wraps that FIELD_GET().
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20230919125648.1920-2-ilpo.jarvinen@linux.intel.comReviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarDean Luick <dean.luick@cornelisnetworks.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent c5930a1a
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* Copyright(c) 2015 - 2019 Intel Corporation. * Copyright(c) 2015 - 2019 Intel Corporation.
*/ */
#include <linux/bitfield.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/delay.h> #include <linux/delay.h>
...@@ -210,12 +211,6 @@ static u32 extract_speed(u16 linkstat) ...@@ -210,12 +211,6 @@ static u32 extract_speed(u16 linkstat)
return speed; return speed;
} }
/* return the PCIe link speed from the given link status */
static u32 extract_width(u16 linkstat)
{
return (linkstat & PCI_EXP_LNKSTA_NLW) >> PCI_EXP_LNKSTA_NLW_SHIFT;
}
/* read the link status and set dd->{lbus_width,lbus_speed,lbus_info} */ /* read the link status and set dd->{lbus_width,lbus_speed,lbus_info} */
static void update_lbus_info(struct hfi1_devdata *dd) static void update_lbus_info(struct hfi1_devdata *dd)
{ {
...@@ -228,7 +223,7 @@ static void update_lbus_info(struct hfi1_devdata *dd) ...@@ -228,7 +223,7 @@ static void update_lbus_info(struct hfi1_devdata *dd)
return; return;
} }
dd->lbus_width = extract_width(linkstat); dd->lbus_width = FIELD_GET(PCI_EXP_LNKSTA_NLW, linkstat);
dd->lbus_speed = extract_speed(linkstat); dd->lbus_speed = extract_speed(linkstat);
snprintf(dd->lbus_info, sizeof(dd->lbus_info), snprintf(dd->lbus_info, sizeof(dd->lbus_info),
"PCIe,%uMHz,x%u", dd->lbus_speed, dd->lbus_width); "PCIe,%uMHz,x%u", dd->lbus_speed, dd->lbus_width);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment