On Thu, 23 Jun 2022 19:46:36 -0700
Dan Williams <dan.j.williams@xxxxxxxxx> wrote:
> From: Ben Widawsky <bwidawsk@xxxxxxxxxx>
>
> In preparation for region provisioning all device decoders need to be
> enumerated since DPA allocations are calculated by summing the
> capacities of all decoders in a set. I.e. the programming for decoder[N]
> depends on the state of decoder[N-1], so skipping over decoders that
> fail to initialize prevents accurate DPA accounting.
>
> Signed-off-by: Ben Widawsky <bwidawsk@xxxxxxxxxx>
> [djbw: reword changelog]
> Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
Good to see this tidied up the handling always felt a bit odd..
> ---
> drivers/cxl/core/hdm.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c
> index 2223d151b61b..c940a4911fee 100644
> --- a/drivers/cxl/core/hdm.c
> +++ b/drivers/cxl/core/hdm.c
> @@ -199,7 +199,7 @@ int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm)
> {
> void __iomem *hdm = cxlhdm->regs.hdm_decoder;
> struct cxl_port *port = cxlhdm->port;
> - int i, committed, failed;
> + int i, committed;
> u32 ctrl;
>
> /*
> @@ -219,7 +219,7 @@ int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm)
> if (committed != cxlhdm->decoder_count)
> msleep(20);
>
> - for (i = 0, failed = 0; i < cxlhdm->decoder_count; i++) {
> + for (i = 0; i < cxlhdm->decoder_count; i++) {
> int target_map[CXL_DECODER_MAX_INTERLEAVE] = { 0 };
> int rc, target_count = cxlhdm->target_count;
> struct cxl_decoder *cxld;
> @@ -250,8 +250,7 @@ int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm)
> rc = init_hdm_decoder(port, cxld, target_map, hdm, i);
> if (rc) {
> put_device(&cxld->dev);
> - failed++;
> - continue;
> + return rc;
> }
> rc = add_hdm_decoder(port, cxld, target_map);
> if (rc) {
> @@ -261,11 +260,6 @@ int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm)
> }
> }
>
> - if (failed == cxlhdm->decoder_count) {
> - dev_err(&port->dev, "No valid decoders found\n");
> - return -ENXIO;
> - }
> -
> return 0;
> }
> EXPORT_SYMBOL_NS_GPL(devm_cxl_enumerate_decoders, CXL);
>
