Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e18d266f authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Greg Kroah-Hartman
Browse files

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



[ Upstream commit 8bf7187d978610b9e327a3d92728c8864a575ebd ]

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.com


Reviewed-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>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c9c13346

drivers/infiniband/hw/hfi1/pcie.c

+2 −7
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
 *

 */



#include <linux/bitfield.h>

#include <linux/pci.h>

#include <linux/io.h>

#include <linux/delay.h>
@@ -261,12 +262,6 @@ static u32 extract_speed(u16 linkstat) 
	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} */

static void update_lbus_info(struct hfi1_devdata *dd)

{
@@ -279,7 +274,7 @@ static void update_lbus_info(struct hfi1_devdata *dd) 
		return;

	}



	dd->lbus_width = extract_width(linkstat);

	dd->lbus_width = FIELD_GET(PCI_EXP_LNKSTA_NLW, linkstat);

	dd->lbus_speed = extract_speed(linkstat);

	snprintf(dd->lbus_info, sizeof(dd->lbus_info),

		 "PCIe,%uMHz,x%u", dd->lbus_speed, dd->lbus_width);