| Message ID | 1519683669-17075-1-git-send-email-ukrishn@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On 27/02/18 09:21, Uma Krishnan wrote: > The OCXL specification supports distributing acTags amongst different > AFUs and functions on the link. As cxlflash devices are expected to only > support a single AFU and function, the entire range that was assigned to > the function is also assigned to the AFU. > > Signed-off-by: Uma Krishnan <ukrishn@linux.vnet.ibm.com> > Acked-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com> Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > diff --git a/drivers/scsi/cxlflash/ocxl_hw.h b/drivers/scsi/cxlflash/ocxl_hw.h > index f6af247..9c675fa 100644 > --- a/drivers/scsi/cxlflash/ocxl_hw.h > +++ b/drivers/scsi/cxlflash/ocxl_hw.h > @@ -22,4 +22,6 @@ struct ocxl_hw_afu { > > int fn_actag_base; /* Function acTag base */ > int fn_actag_enabled; /* Function acTag number enabled */ > + int afu_actag_base; /* AFU acTag base */ > + int afu_actag_enabled; /* AFU acTag number enabled */ > }; > Is it ever foreseen that you will need to support more than one AFU on a function? I guess it's good to keep the fn and afu values separate anyway just in case...
Le 26/02/2018 à 23:21, Uma Krishnan a écrit : > The OCXL specification supports distributing acTags amongst different > AFUs and functions on the link. As cxlflash devices are expected to only > support a single AFU and function, the entire range that was assigned to > the function is also assigned to the AFU. > > Signed-off-by: Uma Krishnan <ukrishn@linux.vnet.ibm.com> > Acked-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com> > --- Reviewed-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com> > drivers/scsi/cxlflash/ocxl_hw.c | 13 +++++++++++++ > drivers/scsi/cxlflash/ocxl_hw.h | 2 ++ > 2 files changed, 15 insertions(+) > > diff --git a/drivers/scsi/cxlflash/ocxl_hw.c b/drivers/scsi/cxlflash/ocxl_hw.c > index 2325030..d01847d9 100644 > --- a/drivers/scsi/cxlflash/ocxl_hw.c > +++ b/drivers/scsi/cxlflash/ocxl_hw.c > @@ -89,6 +89,9 @@ static int ocxlflash_config_afu(struct pci_dev *pdev, struct ocxl_hw_afu *afu) > struct ocxl_afu_config *acfg = &afu->acfg; > struct ocxl_fn_config *fcfg = &afu->fcfg; > struct device *dev = &pdev->dev; > + int count; > + int base; > + int pos; > int rc = 0; > > /* Read AFU config at index 0 */ > @@ -98,6 +101,16 @@ static int ocxlflash_config_afu(struct pci_dev *pdev, struct ocxl_hw_afu *afu) > __func__, rc); > goto out; > } > + > + /* Only one AFU per function is supported, so actag_base is same */ > + base = afu->fn_actag_base; > + count = min_t(int, acfg->actag_supported, afu->fn_actag_enabled); > + pos = acfg->dvsec_afu_control_pos; > + > + ocxl_config_set_afu_actag(pdev, pos, base, count); > + dev_dbg(dev, "%s: acTag base=%d enabled=%d\n", __func__, base, count); > + afu->afu_actag_base = base; > + afu->afu_actag_enabled = count; > out: > return rc; > } > diff --git a/drivers/scsi/cxlflash/ocxl_hw.h b/drivers/scsi/cxlflash/ocxl_hw.h > index f6af247..9c675fa 100644 > --- a/drivers/scsi/cxlflash/ocxl_hw.h > +++ b/drivers/scsi/cxlflash/ocxl_hw.h > @@ -22,4 +22,6 @@ struct ocxl_hw_afu { > > int fn_actag_base; /* Function acTag base */ > int fn_actag_enabled; /* Function acTag number enabled */ > + int afu_actag_base; /* AFU acTag base */ > + int afu_actag_enabled; /* AFU acTag number enabled */ > }; >
diff --git a/drivers/scsi/cxlflash/ocxl_hw.c b/drivers/scsi/cxlflash/ocxl_hw.c index 2325030..d01847d9 100644 --- a/drivers/scsi/cxlflash/ocxl_hw.c +++ b/drivers/scsi/cxlflash/ocxl_hw.c @@ -89,6 +89,9 @@ static int ocxlflash_config_afu(struct pci_dev *pdev, struct ocxl_hw_afu *afu) struct ocxl_afu_config *acfg = &afu->acfg; struct ocxl_fn_config *fcfg = &afu->fcfg; struct device *dev = &pdev->dev; + int count; + int base; + int pos; int rc = 0; /* Read AFU config at index 0 */ @@ -98,6 +101,16 @@ static int ocxlflash_config_afu(struct pci_dev *pdev, struct ocxl_hw_afu *afu) __func__, rc); goto out; } + + /* Only one AFU per function is supported, so actag_base is same */ + base = afu->fn_actag_base; + count = min_t(int, acfg->actag_supported, afu->fn_actag_enabled); + pos = acfg->dvsec_afu_control_pos; + + ocxl_config_set_afu_actag(pdev, pos, base, count); + dev_dbg(dev, "%s: acTag base=%d enabled=%d\n", __func__, base, count); + afu->afu_actag_base = base; + afu->afu_actag_enabled = count; out: return rc; } diff --git a/drivers/scsi/cxlflash/ocxl_hw.h b/drivers/scsi/cxlflash/ocxl_hw.h index f6af247..9c675fa 100644 --- a/drivers/scsi/cxlflash/ocxl_hw.h +++ b/drivers/scsi/cxlflash/ocxl_hw.h @@ -22,4 +22,6 @@ struct ocxl_hw_afu { int fn_actag_base; /* Function acTag base */ int fn_actag_enabled; /* Function acTag number enabled */ + int afu_actag_base; /* AFU acTag base */ + int afu_actag_enabled; /* AFU acTag number enabled */ };