Re: [PATCH v2 01/10] IB/hfi1: Use FIELD_GET() to extract Link Width

[Jonathan Cameron <Jonathan.Cameron@Huawei.com>]

On Wed, 13 Sep 2023 15:27:39 +0300
Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> wrote:

> 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: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

> ---
>  drivers/infiniband/hw/hfi1/pcie.c | 9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/infiniband/hw/hfi1/pcie.c b/drivers/infiniband/hw/hfi1/pcie.c
> index 08732e1ac966..c132a9c073bf 100644
> --- a/drivers/infiniband/hw/hfi1/pcie.c
> +++ b/drivers/infiniband/hw/hfi1/pcie.c
> @@ -3,6 +3,7 @@
>   * Copyright(c) 2015 - 2019 Intel Corporation.
>   */
>  
> +#include <linux/bitfield.h>
>  #include <linux/pci.h>
>  #include <linux/io.h>
>  #include <linux/delay.h>
> @@ -210,12 +211,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)
>  {
> @@ -228,7 +223,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);