| Message ID | 169645694613.622744.16961380551670781524.stgit@djiang5-mobl3 |
|---|---|
| State | Superseded |
| Headers | show |
| Series | cxl: Add cxl_decoders_committed() helper | expand |
On 10/4/23 15:02, Dave Jiang wrote: > Add a helper to retrieve the number of decoders committed for the port. > Replace all the open coding of the calculation with the helper. > > Link: https://lore.kernel.org/linux-cxl/651c98472dfed_ae7e729495@dwillia2-xfh.jf.intel.com.notmuch/ > Suggested-by: Dan Williams <dan.j.williams@intel.com> > Signed-off-by: Dave Jiang <dave.jiang@intel.com> Ignore pls > --- > drivers/cxl/core/hdm.c | 7 ++++--- > drivers/cxl/core/memdev.c | 8 ++++---- > drivers/cxl/core/port.c | 6 ++++++ > drivers/cxl/cxl.h | 1 + > 4 files changed, 15 insertions(+), 7 deletions(-) > > diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c > index 4449b34a80cc..1b1ba46decfd 100644 > --- a/drivers/cxl/core/hdm.c > +++ b/drivers/cxl/core/hdm.c > @@ -643,10 +643,11 @@ static int cxl_decoder_commit(struct cxl_decoder *cxld) > if (cxld->flags & CXL_DECODER_F_ENABLE) > return 0; > > - if (port->commit_end + 1 != id) { > + if (cxl_decoders_committed(port) != id) { > dev_dbg(&port->dev, > "%s: out of order commit, expected decoder%d.%d\n", > - dev_name(&cxld->dev), port->id, port->commit_end + 1); > + dev_name(&cxld->dev), port->id, > + cxl_decoders_committed(port)); > return -EBUSY; > } > > @@ -844,7 +845,7 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, > cxld->target_type = CXL_DECODER_HOSTONLYMEM; > else > cxld->target_type = CXL_DECODER_DEVMEM; > - if (cxld->id != port->commit_end + 1) { > + if (cxld->id != cxl_decoders_committed(port)) { > dev_warn(&port->dev, > "decoder%d.%d: Committed out of order\n", > port->id, cxld->id); > diff --git a/drivers/cxl/core/memdev.c b/drivers/cxl/core/memdev.c > index 14b547c07f54..cb88a2dd723a 100644 > --- a/drivers/cxl/core/memdev.c > +++ b/drivers/cxl/core/memdev.c > @@ -164,7 +164,7 @@ static ssize_t security_sanitize_store(struct device *dev, > return -EINVAL; > > /* ensure no regions are mapped to this memdev */ > - if (port->commit_end != -1) > + if (cxl_decoders_committed(port)) > return -EBUSY; > > rc = cxl_mem_sanitize(mds, CXL_MBOX_OP_SANITIZE); > @@ -191,7 +191,7 @@ static ssize_t security_erase_store(struct device *dev, > return -EINVAL; > > /* ensure no regions are mapped to this memdev */ > - if (port->commit_end != -1) > + if (cxl_decoders_committed(port)) > return -EBUSY; > > rc = cxl_mem_sanitize(mds, CXL_MBOX_OP_SECURE_ERASE); > @@ -242,7 +242,7 @@ int cxl_trigger_poison_list(struct cxl_memdev *cxlmd) > if (rc) > return rc; > > - if (port->commit_end == -1) { > + if (!cxl_decoders_committed(port)) { > /* No regions mapped to this memdev */ > rc = cxl_get_poison_by_memdev(cxlmd); > } else { > @@ -293,7 +293,7 @@ static struct cxl_region *cxl_dpa_to_region(struct cxl_memdev *cxlmd, u64 dpa) > .dpa = dpa, > }; > port = cxlmd->endpoint; > - if (port && is_cxl_endpoint(port) && port->commit_end != -1) > + if (port && is_cxl_endpoint(port) && cxl_decoders_committed(port)) > device_for_each_child(&port->dev, &ctx, __cxl_dpa_to_region); > > return ctx.cxlr; > diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c > index 7ca01a834e18..16efb68eacfa 100644 > --- a/drivers/cxl/core/port.c > +++ b/drivers/cxl/core/port.c > @@ -31,6 +31,12 @@ > static DEFINE_IDA(cxl_port_ida); > static DEFINE_XARRAY(cxl_root_buses); > > +int cxl_decoders_committed(struct cxl_port *port) > +{ > + return port->commit_end + 1; > +} > +EXPORT_SYMBOL_NS_GPL(cxl_decoders_committed, CXL); > + > static ssize_t devtype_show(struct device *dev, struct device_attribute *attr, > char *buf) > { > diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h > index 76d92561af29..2728700d8b33 100644 > --- a/drivers/cxl/cxl.h > +++ b/drivers/cxl/cxl.h > @@ -679,6 +679,7 @@ static inline bool is_cxl_root(struct cxl_port *port) > return port->uport_dev == port->dev.parent; > } > > +int cxl_decoders_committed(struct cxl_port *port); > bool is_cxl_port(const struct device *dev); > struct cxl_port *to_cxl_port(const struct device *dev); > struct pci_bus; > >
diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index 4449b34a80cc..1b1ba46decfd 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -643,10 +643,11 @@ static int cxl_decoder_commit(struct cxl_decoder *cxld) if (cxld->flags & CXL_DECODER_F_ENABLE) return 0; - if (port->commit_end + 1 != id) { + if (cxl_decoders_committed(port) != id) { dev_dbg(&port->dev, "%s: out of order commit, expected decoder%d.%d\n", - dev_name(&cxld->dev), port->id, port->commit_end + 1); + dev_name(&cxld->dev), port->id, + cxl_decoders_committed(port)); return -EBUSY; } @@ -844,7 +845,7 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, cxld->target_type = CXL_DECODER_HOSTONLYMEM; else cxld->target_type = CXL_DECODER_DEVMEM; - if (cxld->id != port->commit_end + 1) { + if (cxld->id != cxl_decoders_committed(port)) { dev_warn(&port->dev, "decoder%d.%d: Committed out of order\n", port->id, cxld->id); diff --git a/drivers/cxl/core/memdev.c b/drivers/cxl/core/memdev.c index 14b547c07f54..cb88a2dd723a 100644 --- a/drivers/cxl/core/memdev.c +++ b/drivers/cxl/core/memdev.c @@ -164,7 +164,7 @@ static ssize_t security_sanitize_store(struct device *dev, return -EINVAL; /* ensure no regions are mapped to this memdev */ - if (port->commit_end != -1) + if (cxl_decoders_committed(port)) return -EBUSY; rc = cxl_mem_sanitize(mds, CXL_MBOX_OP_SANITIZE); @@ -191,7 +191,7 @@ static ssize_t security_erase_store(struct device *dev, return -EINVAL; /* ensure no regions are mapped to this memdev */ - if (port->commit_end != -1) + if (cxl_decoders_committed(port)) return -EBUSY; rc = cxl_mem_sanitize(mds, CXL_MBOX_OP_SECURE_ERASE); @@ -242,7 +242,7 @@ int cxl_trigger_poison_list(struct cxl_memdev *cxlmd) if (rc) return rc; - if (port->commit_end == -1) { + if (!cxl_decoders_committed(port)) { /* No regions mapped to this memdev */ rc = cxl_get_poison_by_memdev(cxlmd); } else { @@ -293,7 +293,7 @@ static struct cxl_region *cxl_dpa_to_region(struct cxl_memdev *cxlmd, u64 dpa) .dpa = dpa, }; port = cxlmd->endpoint; - if (port && is_cxl_endpoint(port) && port->commit_end != -1) + if (port && is_cxl_endpoint(port) && cxl_decoders_committed(port)) device_for_each_child(&port->dev, &ctx, __cxl_dpa_to_region); return ctx.cxlr; diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 7ca01a834e18..16efb68eacfa 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -31,6 +31,12 @@ static DEFINE_IDA(cxl_port_ida); static DEFINE_XARRAY(cxl_root_buses); +int cxl_decoders_committed(struct cxl_port *port) +{ + return port->commit_end + 1; +} +EXPORT_SYMBOL_NS_GPL(cxl_decoders_committed, CXL); + static ssize_t devtype_show(struct device *dev, struct device_attribute *attr, char *buf) { diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 76d92561af29..2728700d8b33 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -679,6 +679,7 @@ static inline bool is_cxl_root(struct cxl_port *port) return port->uport_dev == port->dev.parent; } +int cxl_decoders_committed(struct cxl_port *port); bool is_cxl_port(const struct device *dev); struct cxl_port *to_cxl_port(const struct device *dev); struct pci_bus;
Add a helper to retrieve the number of decoders committed for the port. Replace all the open coding of the calculation with the helper. Link: https://lore.kernel.org/linux-cxl/651c98472dfed_ae7e729495@dwillia2-xfh.jf.intel.com.notmuch/ Suggested-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Dave Jiang <dave.jiang@intel.com> --- drivers/cxl/core/hdm.c | 7 ++++--- drivers/cxl/core/memdev.c | 8 ++++---- drivers/cxl/core/port.c | 6 ++++++ drivers/cxl/cxl.h | 1 + 4 files changed, 15 insertions(+), 7 deletions(-)