When a region is not assigned a host physical address, one is picked by the driver. As the address will determine which CFMWS contains the region, it's usually a better idea to let the driver make this determination. Signed-off-by: Ben Widawsky <ben.widawsky@xxxxxxxxx> --- drivers/cxl/region.c | 38 ++++++++++++++++++++++++++++++++++++-- drivers/cxl/trace.h | 3 +++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/drivers/cxl/region.c b/drivers/cxl/region.c index b458d7b97120..c8e3c48dfbb9 100644 --- a/drivers/cxl/region.c +++ b/drivers/cxl/region.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* Copyright(c) 2021 Intel Corporation. All rights reserved. */ #include <linux/platform_device.h> +#include <linux/genalloc.h> #include <linux/device.h> #include <linux/module.h> #include <linux/pci.h> @@ -62,6 +63,20 @@ static struct cxl_port *get_root_decoder(const struct cxl_memdev *endpoint) return NULL; } +static void release_cxl_region(void *r) +{ + struct cxl_region *region = (struct cxl_region *)r; + struct cxl_decoder *rootd = rootd_from_region(region); + struct resource *res = &rootd->platform_res; + resource_size_t start, size; + + start = region->res->start; + size = resource_size(region->res); + + __release_region(res, start, size); + gen_pool_free(rootd->address_space, start, size); +} + /** * sanitize_region() - Check is region is reasonably configured * @region: The region to check @@ -111,8 +126,27 @@ static int sanitize_region(const struct cxl_region *region) */ static int allocate_address_space(struct cxl_region *region) { - /* TODO */ - return 0; + struct cxl_decoder *rootd = rootd_from_region(region); + unsigned long start; + + start = gen_pool_alloc(rootd->address_space, region->config.size); + if (!start) { + trace_allocation_failed(region, + "Couldn't allocate address space"); + return -ENOMEM; + } + + region->res = __request_region(&rootd->platform_res, start, + region->config.size, + dev_name(®ion->dev), IORESOURCE_MEM); + if (!region->res) { + trace_allocation_failed(region, "Couldn't obtain region"); + gen_pool_free(rootd->address_space, start, region->config.size); + return -ENOMEM; + } + + return devm_add_action_or_reset(®ion->dev, release_cxl_region, + region); } /** diff --git a/drivers/cxl/trace.h b/drivers/cxl/trace.h index 8f7f471e15b8..a53f00ba5d0e 100644 --- a/drivers/cxl/trace.h +++ b/drivers/cxl/trace.h @@ -35,6 +35,9 @@ DEFINE_EVENT(cxl_region_template, region_activated, DEFINE_EVENT(cxl_region_template, sanitize_failed, TP_PROTO(const struct cxl_region *region, char *status), TP_ARGS(region, status)); +DEFINE_EVENT(cxl_region_template, allocation_failed, + TP_PROTO(const struct cxl_region *region, char *status), + TP_ARGS(region, status)); #endif /* if !defined (__CXL_TRACE_H__) || defined(TRACE_HEADER_MULTI_READ) */ -- 2.34.1