Re: [PATCH] PCI: endpoint: pci-epf-{,v}ntb: fix a check for no epc alignment constraint

From: Bjorn Helgaas
Date: Mon Sep 19 2022 - 14:55:54 EST


On Fri, Sep 16, 2022 at 04:56:51PM +0900, Shunsuke Mie wrote:
> Some pci endpoint controllers has not alignment constraint, and the

s/pci/PCI/
s/has not/have no/
s/constraint/constraints/

> epc_features->align becomes 0. In this case, IS_ALIGNED() in
> epf_ntb_config_spad_bar_alloc() doesn't work well. So this patch adds the 0
> checking before the IS_ALIGNED().

s/So this patch adds .../Check for this before IS_ALIGNED()/

> Signed-off-by: Shunsuke Mie <mie@xxxxxxxxxx>
> ---
> drivers/pci/endpoint/functions/pci-epf-ntb.c | 2 +-
> drivers/pci/endpoint/functions/pci-epf-vntb.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/endpoint/functions/pci-epf-ntb.c b/drivers/pci/endpoint/functions/pci-epf-ntb.c
> index 9a00448c7e61..f74155ee8d72 100644
> --- a/drivers/pci/endpoint/functions/pci-epf-ntb.c
> +++ b/drivers/pci/endpoint/functions/pci-epf-ntb.c
> @@ -1021,7 +1021,7 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb,
> peer_size = peer_epc_features->bar_fixed_size[peer_barno];
>
> /* Check if epc_features is populated incorrectly */
> - if ((!IS_ALIGNED(size, align)))
> + if (align && (!IS_ALIGNED(size, align)))
> return -EINVAL;
>
> spad_count = ntb->spad_count;
> diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c
> index 0ea85e1d292e..5e346c0a0f05 100644
> --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c
> +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c
> @@ -418,7 +418,7 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb)
> size = epc_features->bar_fixed_size[barno];
> align = epc_features->align;
>
> - if ((!IS_ALIGNED(size, align)))
> + if (align && !IS_ALIGNED(size, align))
> return -EINVAL;
>
> spad_count = ntb->spad_count;
> --
> 2.17.1
>