On Tue, Jun 03, 2025 at 07:03:39PM +0200, Jerome Brunet wrote:
> The config file related to the memory windows start the numbering of
> the MW from 1. The other NTB function does the same, yet the enumeration
> defining the BARs of the vNTB function starts numbering the MW from 0.
>
> Both numbering are fine I suppose but mixing the two is a bit confusing.
> The configfs file being the interface with userspace, lets keep that stable
> and consistently start the numbering of the MW from 1.
>
> Signed-off-by: Jerome Brunet <jbrunet@xxxxxxxxxxxx>
Reviewed-by: Frank Li <Frank.Li@xxxxxxx>
> ---
> drivers/pci/endpoint/functions/pci-epf-vntb.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c
> index 35fa0a21fc91100a5539bff775e7ebc25e1fb9c1..2198282a80a40774047502a37f0288ca396bdb0e 100644
> --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c
> +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c
> @@ -70,9 +70,9 @@ static struct workqueue_struct *kpcintb_workqueue;
> enum epf_ntb_bar {
> BAR_CONFIG,
> BAR_DB,
> - BAR_MW0,
> BAR_MW1,
> BAR_MW2,
> + BAR_MW3,
> };
>
> /*
> @@ -576,7 +576,7 @@ static int epf_ntb_mw_bar_init(struct epf_ntb *ntb)
>
> for (i = 0; i < ntb->num_mws; i++) {
> size = ntb->mws_size[i];
> - barno = ntb->epf_ntb_bar[BAR_MW0 + i];
> + barno = ntb->epf_ntb_bar[BAR_MW1 + i];
>
> ntb->epf->bar[barno].barno = barno;
> ntb->epf->bar[barno].size = size;
> @@ -629,7 +629,7 @@ static void epf_ntb_mw_bar_clear(struct epf_ntb *ntb, int num_mws)
> int i;
>
> for (i = 0; i < num_mws; i++) {
> - barno = ntb->epf_ntb_bar[BAR_MW0 + i];
> + barno = ntb->epf_ntb_bar[BAR_MW1 + i];
> pci_epc_clear_bar(ntb->epf->epc,
> ntb->epf->func_no,
> ntb->epf->vfunc_no,
> @@ -676,7 +676,7 @@ static int epf_ntb_init_epc_bar(struct epf_ntb *ntb)
> epc_features = pci_epc_get_features(ntb->epf->epc, ntb->epf->func_no, ntb->epf->vfunc_no);
>
> /* These are required BARs which are mandatory for NTB functionality */
> - for (bar = BAR_CONFIG; bar <= BAR_MW0; bar++, barno++) {
> + for (bar = BAR_CONFIG; bar <= BAR_MW1; bar++, barno++) {
> barno = pci_epc_get_next_free_bar(epc_features, barno);
> if (barno < 0) {
> dev_err(dev, "Fail to get NTB function BAR\n");
> @@ -1048,7 +1048,7 @@ static int vntb_epf_mw_set_trans(struct ntb_dev *ndev, int pidx, int idx,
> struct device *dev;
>
> dev = &ntb->ntb.dev;
> - barno = ntb->epf_ntb_bar[BAR_MW0 + idx];
> + barno = ntb->epf_ntb_bar[BAR_MW1 + idx];
> epf_bar = &ntb->epf->bar[barno];
> epf_bar->phys_addr = addr;
> epf_bar->barno = barno;
>
> --
> 2.47.2
>
