Message ID | 20180425110834.16048-2-felix@linux.ibm.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | [v3,1/2] cxl: Set the PBCQ Tunnel BAR register when enabling capi mode | expand |
Le 25/04/2018 à 13:08, Philippe Bergheaud a écrit : > Failure to synchronize the tunneled operations does not prevent > the initialization of the cxl card. This patch reports the tunneled > operations status via /sys. > > Signed-off-by: Philippe Bergheaud <felix@linux.ibm.com> > --- Good idea, but you'll have to also edit Documentation/ABI/testing/sysfs-class-cxl to describe the new sysfs entry. Fred > v3: Added this patch to report the tunneled operations status. > --- > drivers/misc/cxl/cxl.h | 1 + > drivers/misc/cxl/pci.c | 7 ++++++- > drivers/misc/cxl/sysfs.c | 10 ++++++++++ > 3 files changed, 17 insertions(+), 1 deletion(-) > > diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h > index a4c9c8297a6d..918d4fb742d1 100644 > --- a/drivers/misc/cxl/cxl.h > +++ b/drivers/misc/cxl/cxl.h > @@ -717,6 +717,7 @@ struct cxl { > bool perst_select_user; > bool perst_same_image; > bool psl_timebase_synced; > + bool tunneled_ops_supported; > > /* > * number of contexts mapped on to this card. Possible values are: > diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c > index 355c789406f7..008f50a0c465 100644 > --- a/drivers/misc/cxl/pci.c > +++ b/drivers/misc/cxl/pci.c > @@ -1742,9 +1742,14 @@ static int cxl_configure_adapter(struct cxl *adapter, struct pci_dev *dev) > /* Required for devices using CAPP DMA mode, harmless for others */ > pci_set_master(dev); > > - if (cxl_is_power9()) > + adapter->tunneled_ops_supported = false; > + > + if (cxl_is_power9()) { > if (pnv_pci_set_tunnel_bar(dev, 0x00020000E0000000ull, 1)) > dev_info(&dev->dev, "Tunneled operations unsupported\n"); > + else > + adapter->tunneled_ops_supported = true; > + } > > if ((rc = pnv_phb_to_cxl_mode(dev, adapter->native->sl_ops->capi_mode))) > goto err; > diff --git a/drivers/misc/cxl/sysfs.c b/drivers/misc/cxl/sysfs.c > index 95285b7f636f..4b5a4c5d3c01 100644 > --- a/drivers/misc/cxl/sysfs.c > +++ b/drivers/misc/cxl/sysfs.c > @@ -78,6 +78,15 @@ static ssize_t psl_timebase_synced_show(struct device *device, > return scnprintf(buf, PAGE_SIZE, "%i\n", adapter->psl_timebase_synced); > } > > +static ssize_t tunneled_ops_supported_show(struct device *device, > + struct device_attribute *attr, > + char *buf) > +{ > + struct cxl *adapter = to_cxl_adapter(device); > + > + return scnprintf(buf, PAGE_SIZE, "%i\n", adapter->tunneled_ops_supported); > +} > + > static ssize_t reset_adapter_store(struct device *device, > struct device_attribute *attr, > const char *buf, size_t count) > @@ -183,6 +192,7 @@ static struct device_attribute adapter_attrs[] = { > __ATTR_RO(base_image), > __ATTR_RO(image_loaded), > __ATTR_RO(psl_timebase_synced), > + __ATTR_RO(tunneled_ops_supported), > __ATTR_RW(load_image_on_perst), > __ATTR_RW(perst_reloads_same_image), > __ATTR(reset, S_IWUSR, NULL, reset_adapter_store), >
diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h index a4c9c8297a6d..918d4fb742d1 100644 --- a/drivers/misc/cxl/cxl.h +++ b/drivers/misc/cxl/cxl.h @@ -717,6 +717,7 @@ struct cxl { bool perst_select_user; bool perst_same_image; bool psl_timebase_synced; + bool tunneled_ops_supported; /* * number of contexts mapped on to this card. Possible values are: diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c index 355c789406f7..008f50a0c465 100644 --- a/drivers/misc/cxl/pci.c +++ b/drivers/misc/cxl/pci.c @@ -1742,9 +1742,14 @@ static int cxl_configure_adapter(struct cxl *adapter, struct pci_dev *dev) /* Required for devices using CAPP DMA mode, harmless for others */ pci_set_master(dev); - if (cxl_is_power9()) + adapter->tunneled_ops_supported = false; + + if (cxl_is_power9()) { if (pnv_pci_set_tunnel_bar(dev, 0x00020000E0000000ull, 1)) dev_info(&dev->dev, "Tunneled operations unsupported\n"); + else + adapter->tunneled_ops_supported = true; + } if ((rc = pnv_phb_to_cxl_mode(dev, adapter->native->sl_ops->capi_mode))) goto err; diff --git a/drivers/misc/cxl/sysfs.c b/drivers/misc/cxl/sysfs.c index 95285b7f636f..4b5a4c5d3c01 100644 --- a/drivers/misc/cxl/sysfs.c +++ b/drivers/misc/cxl/sysfs.c @@ -78,6 +78,15 @@ static ssize_t psl_timebase_synced_show(struct device *device, return scnprintf(buf, PAGE_SIZE, "%i\n", adapter->psl_timebase_synced); } +static ssize_t tunneled_ops_supported_show(struct device *device, + struct device_attribute *attr, + char *buf) +{ + struct cxl *adapter = to_cxl_adapter(device); + + return scnprintf(buf, PAGE_SIZE, "%i\n", adapter->tunneled_ops_supported); +} + static ssize_t reset_adapter_store(struct device *device, struct device_attribute *attr, const char *buf, size_t count) @@ -183,6 +192,7 @@ static struct device_attribute adapter_attrs[] = { __ATTR_RO(base_image), __ATTR_RO(image_loaded), __ATTR_RO(psl_timebase_synced), + __ATTR_RO(tunneled_ops_supported), __ATTR_RW(load_image_on_perst), __ATTR_RW(perst_reloads_same_image), __ATTR(reset, S_IWUSR, NULL, reset_adapter_store),
Failure to synchronize the tunneled operations does not prevent the initialization of the cxl card. This patch reports the tunneled operations status via /sys. Signed-off-by: Philippe Bergheaud <felix@linux.ibm.com> --- v3: Added this patch to report the tunneled operations status. --- drivers/misc/cxl/cxl.h | 1 + drivers/misc/cxl/pci.c | 7 ++++++- drivers/misc/cxl/sysfs.c | 10 ++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-)