There are 3 steps in handling region programming once it has been
configured by userspace.
1. Sanitize the parameters against the system.
2. Collect decoder resources from the topology
3. Program decoder resources
The infrastructure added here addresses #2. Two new APIs are introduced
to allow collecting and returning decoder resources. Additionally the
infrastructure includes two lists managed by the region driver, a staged
list, and a commit list. The staged list contains those collected in
step #2, and the commit list are all the decoders programmed in step #3.
Signed-off-by: Ben Widawsky <ben.widawsky@xxxxxxxxx>
---
drivers/cxl/core/port.c | 75 ++++++++++++++++++++++++++++--
drivers/cxl/core/region.c | 2 +
drivers/cxl/cxl.h | 8 ++++
drivers/cxl/cxlmem.h | 7 +++
drivers/cxl/port.c | 42 ++++++++++++++++-
drivers/cxl/region.c | 97 +++++++++++++++++++++++++++++++++------
drivers/cxl/region.h | 5 ++
7 files changed, 218 insertions(+), 18 deletions(-)
diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c
index 99589f23f1ff..c9fd5bab1498 100644
--- a/drivers/cxl/core/port.c
+++ b/drivers/cxl/core/port.c
@@ -32,8 +32,6 @@ static DEFINE_XARRAY(cxl_root_buses);
static void cxl_decoder_release(struct device *dev);
-static bool is_cxl_decoder(struct device *dev);
-
static int decoder_match(struct device *dev, void *data)
{
struct resource *theirs = (struct resource *)data;
@@ -291,10 +289,11 @@ bool is_root_decoder(struct device *dev)
}
EXPORT_SYMBOL_NS_GPL(is_root_decoder, CXL);
-static bool is_cxl_decoder(struct device *dev)
+bool is_cxl_decoder(struct device *dev)
{
return dev->type->release == cxl_decoder_release;
}
+EXPORT_SYMBOL_NS_GPL(is_cxl_decoder, CXL);
struct cxl_decoder *to_cxl_decoder(struct device *dev)
{
@@ -1040,6 +1039,8 @@ static struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port,
cxld->target_type = CXL_DECODER_EXPANDER;
cxld->platform_res = (struct resource)DEFINE_RES_MEM(0, 0);
+ INIT_LIST_HEAD(&cxld->region_link);
+
ida_init(&cxld->region_ida);
return cxld;
@@ -1200,6 +1201,74 @@ int cxl_decoder_add(struct cxl_decoder *cxld, int *target_map)
}
EXPORT_SYMBOL_NS_GPL(cxl_decoder_add, CXL);
+/**
+ * cxl_get_decoder() - Get an unused decoder from the port.
+ * @port: The port to obtain a decoder from.
+ *
+ * Region programming requires obtaining decoder resources from all ports that
+ * participate in the interleave set. This function shall be used to pull the
+ * decoder resource out of the list of available.
+ *
+ * Context: Process context. Takes and releases the device lock of the port.
+ *
+ * Return: A cxl_decoder that can be used for programming if successful, else a
+ * negative error code.
+ */
+struct cxl_decoder *cxl_get_decoder(struct cxl_port *port)
+{
+ struct cxl_port_state *cxlps;
+ int dec;
+
+ cxlps = dev_get_drvdata(&port->dev);
+ if (dev_WARN_ONCE(&port->dev, !cxlps, "No port drvdata\n"))
+ return ERR_PTR(-ENXIO);
+
+ device_lock(&port->dev);
+ dec = find_first_bit(cxlps->decoders.free_mask, cxlps->decoders.count);
+ if (dec == cxlps->decoders.count) {
+ device_unlock(&port->dev);
+ return ERR_PTR(-ENODEV);
+ }
+
+ clear_bit(dec, cxlps->decoders.free_mask);
+ device_unlock(&port->dev);
+
+ return cxlps->decoders.cxld[dec];
+}
+EXPORT_SYMBOL_NS_GPL(cxl_get_decoder, CXL);
+
+/**
+ * cxl_put_decoder() - Return an inactive decoder to the port.
+ * @cxld: The decoder being returned.
+ */
+void cxl_put_decoder(struct cxl_decoder *cxld)
+{
+ struct cxl_port *port = to_cxl_port(cxld->dev.parent);
+ struct cxl_port_state *cxlps;
+ int i;
+
+ cxlps = dev_get_drvdata(&port->dev);
+ if (dev_WARN_ONCE(&port->dev, !cxlps, "No port drvdata\n"))
+ return;
+
+ device_lock(&port->dev);
+
+ for (i = 0; i < CXL_DECODER_MAX_INSTANCES; i++) {
+ struct cxl_decoder *d = cxlps->decoders.cxld[i];
+
+ if (!d)
+ break;
+
+ if (d == cxld) {
+ set_bit(i, cxlps->decoders.free_mask);
+ break;
+ }
+ }
+
+ device_unlock(&port->dev);
+}
+EXPORT_SYMBOL_NS_GPL(cxl_put_decoder, CXL);
+
static void cxld_unregister(void *dev)
{
struct cxl_decoder *plat_decoder, *cxld = to_cxl_decoder(dev);
diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c
index de0514a85cf1..b15202732d55 100644
--- a/drivers/cxl/core/region.c
+++ b/drivers/cxl/core/region.c
@@ -435,6 +435,8 @@ struct cxl_region *cxl_alloc_region(struct cxl_decoder *cxld, int id)
if (!region)
return ERR_PTR(-ENOMEM);
+ INIT_LIST_HEAD(®ion->staged_list);
+ INIT_LIST_HEAD(®ion->commit_list);
region->id = id;
return region;
diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h
index 762da3621ca4..79bca9a8246c 100644
--- a/drivers/cxl/cxl.h
+++ b/drivers/cxl/cxl.h
@@ -35,6 +35,8 @@
#define CXL_CM_CAP_CAP_ID_HDM 0x5
#define CXL_CM_CAP_CAP_HDM_VERSION 1
+#define CXL_DECODER_MAX_INSTANCES 10
+
/* HDM decoders CXL 2.0 8.2.5.12 CXL HDM Decoder Capability Structure */
#define CXL_HDM_DECODER_CAP_OFFSET 0x0
#define CXL_HDM_DECODER_COUNT_MASK GENMASK(3, 0)
@@ -208,6 +210,7 @@ enum cxl_decoder_type {
* @flags: memory type capabilities and locking
* @region_ida: allocator for region ids.
* @address_space: Used/free address space for regions.
+ * @region_link: This decoder's place on either the staged, or commit list.
* @nr_targets: number of elements in @target
* @target: active ordered target list in current decoder configuration
*/
@@ -224,6 +227,7 @@ struct cxl_decoder {
unsigned long flags;
struct ida region_ida;
struct gen_pool *address_space;
+ struct list_head region_link;
const int nr_targets;
struct cxl_dport *target[];
};
@@ -277,6 +281,7 @@ struct cxl_walk_context {
* @id: id for port device-name
* @dports: cxl_dport instances referenced by decoders
* @endpoints: cxl_ep instances, endpoints that are a descendant of this port
+ * @region_link: this port's node on the region's list of ports
* @decoder_ida: allocator for decoder ids
* @component_reg_phys: component register capability base address (optional)
* @dead: last ep has been removed, force port re-creation
@@ -347,6 +352,8 @@ struct cxl_port *devm_cxl_add_port(struct device *host, struct device *uport,
struct cxl_port *parent_port);
int devm_cxl_enumerate_ports(struct cxl_memdev *cxlmd);
struct cxl_port *cxl_mem_find_port(struct cxl_memdev *cxlmd);
+struct cxl_decoder *cxl_get_decoder(struct cxl_port *port);
+void cxl_put_decoder(struct cxl_decoder *cxld);
bool schedule_cxl_rescan(void);
struct cxl_dport *cxl_add_dport(struct cxl_port *port, struct device *dport,
@@ -359,6 +366,7 @@ struct cxl_dport *cxl_find_dport_by_dev(struct cxl_port *port,
struct cxl_port *ep_find_cxl_port(struct cxl_memdev *cxlmd, unsigned int depth);
struct cxl_decoder *to_cxl_decoder(struct device *dev);
+bool is_cxl_decoder(struct device *dev);
bool is_root_decoder(struct device *dev);
struct cxl_decoder *cxl_root_decoder_alloc(struct cxl_port *port,
unsigned int nr_targets);
diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h
index 38d6129499c8..e4793e5f25bc 100644
--- a/drivers/cxl/cxlmem.h
+++ b/drivers/cxl/cxlmem.h
@@ -301,6 +301,13 @@ struct cxl_port_state {
unsigned int interleave11_8;
unsigned int interleave14_12;
} caps;
+
+ struct port_decoders {
+ unsigned long *free_mask;
+ int count;
+
+ struct cxl_decoder *cxld[CXL_DECODER_MAX_INSTANCES];
+ } decoders;
};
int devm_cxl_setup_hdm(struct cxl_port *port);
diff --git a/drivers/cxl/port.c b/drivers/cxl/port.c
index c10b462373db..ddf6e78189ee 100644
--- a/drivers/cxl/port.c
+++ b/drivers/cxl/port.c
@@ -41,10 +41,39 @@ static bool is_cxl_endpoint(struct cxl_port *port)
return is_cxl_memdev(port->uport);
}
+static int count_decoders(struct device *dev, void *data)
+{
+ if (is_cxl_decoder(dev))
+ (*(int *)data)++;
+
+ return 0;
+}
+
+static int set_decoders(struct device *dev, void *data)
+{
+ struct cxl_port_state *cxlps;
+ int dec;
+
+ if (!is_cxl_decoder(dev))
+ return 0;
+
+ cxlps = data;
+ dec = find_first_zero_bit(cxlps->decoders.free_mask, cxlps->decoders.count);
+ if (dev_WARN_ONCE(dev, dec == cxlps->decoders.count,
+ "Impossible decoder bitmap state\n"))
+ return 1;
+
+ set_bit(dec, cxlps->decoders.free_mask);
+ cxlps->decoders.cxld[dec] = to_cxl_decoder(dev);
+
+ return 0;
+}
+
static int cxl_port_probe(struct device *dev)
{
struct cxl_port *port = to_cxl_port(dev);
- int rc;
+ struct cxl_port_state *cxlps;
+ int rc, decoder_count = 0;
if (!is_cxl_endpoint(port)) {
rc = cxl_port_enumerate_dports(port);
@@ -59,6 +88,8 @@ static int cxl_port_probe(struct device *dev)
if (rc)
return rc;
+ cxlps = dev_get_drvdata(dev);
+
if (is_cxl_endpoint(port))
rc = devm_cxl_enumerate_endpoint_decoders(port);
else
@@ -68,6 +99,15 @@ static int cxl_port_probe(struct device *dev)
return rc;
}
+ device_for_each_child(&port->dev, &decoder_count, count_decoders);
+
+ cxlps->decoders.free_mask =
+ devm_bitmap_zalloc(&port->dev, decoder_count, GFP_KERNEL);
+ cxlps->decoders.count = decoder_count;
+
+ if (device_for_each_child(&port->dev, cxlps, set_decoders))
+ return -ENXIO;
+
schedule_cxl_rescan();
return 0;
diff --git a/drivers/cxl/region.c b/drivers/cxl/region.c
index 87fdcf0049d8..eafd95419895 100644
--- a/drivers/cxl/region.c
+++ b/drivers/cxl/region.c
@@ -343,17 +343,20 @@ static bool has_switch(const struct cxl_region *region)
* region_hb_rp_config_valid() - determine root port ordering is correct
* @rootd: root decoder for this @region
* @region: Region to validate
+ * @state_update: Whether or not to update port state
*
* The algorithm is outlined in 2.13.15 "Verify HB root port configuration
* sequence" of the CXL Memory Device SW Guide (Rev1p0).
*
* Returns true if the configuration is valid.
*/
-static bool region_hb_rp_config_valid(const struct cxl_region *region,
- const struct cxl_decoder *rootd)
+static bool region_hb_rp_config_valid(struct cxl_region *region,
+ const struct cxl_decoder *rootd,
+ bool state_update)
{
const int num_root_ports = get_num_root_ports(region);
struct cxl_port *hbs[CXL_DECODER_MAX_INTERLEAVE];
+ struct cxl_decoder *cxld, *c;
int hb_count, i;
hb_count = get_unique_hostbridges(region, hbs);
@@ -362,8 +365,24 @@ static bool region_hb_rp_config_valid(const struct cxl_region *region,
* Are all devices in this region on the same CXL Host Bridge
* Root Port?
*/
- if (num_root_ports == 1 && !has_switch(region))
+ if (num_root_ports == 1 && !has_switch(region)) {
+ struct cxl_decoder *cxld;
+
+ if (!state_update)
+ return true;
+
+ cxld = cxl_get_decoder(hbs[0]);
+ if (!cxld) {
+ trace_hb_rp_valid(region, "Couldn't get decoder for region");
+ return false;
+ }
+
+ cxld->interleave_ways = 1;
+ cxld->interleave_granularity = region_ig(region);
+ cxld->target[0] = get_rp(region->config.targets[0]);
+ list_add_tail(&cxld->region_link, (struct list_head *)®ion->staged_list);
return true;
+ }
for (i = 0; i < hb_count; i++) {
int idx, position_mask;
@@ -373,6 +392,14 @@ static bool region_hb_rp_config_valid(const struct cxl_region *region,
/* Get next CXL Host Bridge this region spans */
hb = hbs[i];
+ if (state_update) {
+ cxld = cxl_get_decoder(hbs[i]);
+ if (IS_ERR(cxld))
+ goto err;
+ cxld->interleave_ways = 0;
+ } else
+ cxld = NULL;
+
/*
* Calculate the position mask: NumRootPorts = 2^PositionMask
* for this region.
@@ -411,9 +438,18 @@ static bool region_hb_rp_config_valid(const struct cxl_region *region,
}
}
}
+ if (state_update)
+ list_add_tail(&cxld->region_link, ®ion->staged_list);
}
return true;
+
+err:
+ trace_hb_rp_valid(region, "Couldn't get decoder for region");
+ list_for_each_entry_safe(cxld, c, ®ion->staged_list, region_link)
+ cxl_put_decoder(cxld);
+
+ return false;
}
/**
@@ -429,7 +465,8 @@ static bool rootd_contains(const struct cxl_region *region,
}
static bool rootd_valid(const struct cxl_region *region,
- const struct cxl_decoder *rootd)
+ const struct cxl_decoder *rootd,
+ bool state_update)
{
const struct cxl_memdev *endpoint = region->config.targets[0];
@@ -442,7 +479,7 @@ static bool rootd_valid(const struct cxl_region *region,
if (!region_xhb_config_valid(region, rootd))
return false;
- if (!region_hb_rp_config_valid(region, rootd))
+ if (!region_hb_rp_config_valid((struct cxl_region *)region, rootd, state_update))
return false;
if (!rootd_contains(region, rootd))
@@ -465,7 +502,7 @@ static int rootd_match(struct device *dev, void *data)
if (!is_root_decoder(dev))
return 0;
- return !!rootd_valid(region, to_cxl_decoder(dev));
+ return !!rootd_valid(region, to_cxl_decoder(dev), false);
}
/*
@@ -488,12 +525,40 @@ static struct cxl_decoder *find_rootd(const struct cxl_region *region,
return NULL;
}
-static int collect_ep_decoders(const struct cxl_region *region)
+static int collect_ep_decoders(struct cxl_region *region)
{
- /* TODO: */
+ struct cxl_memdev *ep;
+ int i;
+
+ for_each_cxl_endpoint(ep, region, i) {
+ struct cxl_decoder *cxld;
+
+ cxld = cxl_get_decoder(ep->port);
+ if (IS_ERR(cxld))
+ return PTR_ERR(cxld);
+
+ cxld->decoder_range = (struct range) {
+ .start = region->res->start,
+ .end = region->res->end
+ };
+ cxld->interleave_granularity = region_ig(region);
+ cxld->interleave_ways = region_ways(region);
+ list_add_tail(&cxld->region_link, ®ion->staged_list);
+ }
+
return 0;
}
+static void cleanup_staged_decoders(struct cxl_region *region)
+{
+ struct cxl_decoder *cxld, *d;
+
+ list_for_each_entry_safe(cxld, d, ®ion->staged_list, region_link) {
+ cxl_put_decoder(cxld);
+ list_del_init(&cxld->region_link);
+ }
+}
+
static int bind_region(const struct cxl_region *region)
{
/* TODO: */
@@ -534,7 +599,7 @@ static int cxl_region_probe(struct device *dev)
return -ENXIO;
}
- if (!rootd_valid(region, rootd)) {
+ if (!rootd_valid(region, rootd, true)) {
dev_err(dev, "Picked invalid rootd\n");
return -ENXIO;
}
@@ -549,14 +614,18 @@ static int cxl_region_probe(struct device *dev)
ret = collect_ep_decoders(region);
if (ret)
- return ret;
+ goto err;
ret = bind_region(region);
- if (!ret) {
- region->active = true;
- trace_region_activated(region, "");
- }
+ if (ret)
+ goto err;
+ region->active = true;
+ trace_region_activated(region, "");
+ return 0;
+
+err:
+ cleanup_staged_decoders(region);
return ret;
}
diff --git a/drivers/cxl/region.h b/drivers/cxl/region.h
index 97bb3f12f2fc..e865b8d6af2e 100644
--- a/drivers/cxl/region.h
+++ b/drivers/cxl/region.h
@@ -14,6 +14,9 @@
* @list: Node in decoder's region list.
* @res: Resource this region carves out of the platform decode range.
* @active: If the region has been activated.
+ * @staged_list: All decoders staged for programming.
+ * @commit_list: All decoders programmed for this region's parameters.
+ *
* @config: HDM decoder program config
* @config.size: Size of the region determined from LSA or userspace.
* @config.uuid: The UUID for this region.
@@ -27,6 +30,8 @@ struct cxl_region {
struct list_head list;
struct resource *res;
bool active;
+ struct list_head staged_list;
+ struct list_head commit_list;
struct {
u64 size;
--
2.34.1
