Skip to content

Commit 7bba261

Browse files
committed
cxl/port: Scan single-target ports for decoders
Do not assume that a single-target port falls back to a passthrough decoder configuration. Scan for decoders and only fallback after probing that the HDM decoder capability is not present. One user visible affect of this bug is the inability to enumerate present CXL regions as the decoder settings for the present decoders are skipped. Fixes: d17d054 ("cxl/core/hdm: Add CXL standard decoder enumeration to the core") Reported-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Link: http://lore.kernel.org/r/20230227153128.8164-1-Jonathan.Cameron@huawei.com Cc: <stable@vger.kernel.org> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Dave Jiang <dave.jiang@intel.com> Reviewed-by: Alison Schofield <alison.schofield@intel.com> Link: https://lore.kernel.org/r/168149845130.792294.3210421233937427962.stgit@dwillia2-xfh.jf.intel.com Signed-off-by: Dan Williams <dan.j.williams@intel.com>
1 parent 104087a commit 7bba261

2 files changed

Lines changed: 16 additions & 7 deletions

File tree

drivers/cxl/core/hdm.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,9 @@ static int map_hdm_decoder_regs(struct cxl_port *port, void __iomem *crb,
9292

9393
cxl_probe_component_regs(&port->dev, crb, &map.component_map);
9494
if (!map.component_map.hdm_decoder.valid) {
95-
dev_err(&port->dev, "HDM decoder registers invalid\n");
96-
return -ENXIO;
95+
dev_dbg(&port->dev, "HDM decoder registers not implemented\n");
96+
/* unique error code to indicate no HDM decoder capability */
97+
return -ENODEV;
9798
}
9899

99100
return cxl_map_component_regs(&port->dev, regs, &map,

drivers/cxl/port.c

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,22 @@ static int cxl_switch_port_probe(struct cxl_port *port)
6666
if (rc < 0)
6767
return rc;
6868

69-
if (rc == 1)
70-
return devm_cxl_add_passthrough_decoder(port);
71-
7269
cxlhdm = devm_cxl_setup_hdm(port, NULL);
73-
if (IS_ERR(cxlhdm))
70+
if (!IS_ERR(cxlhdm))
71+
return devm_cxl_enumerate_decoders(cxlhdm, NULL);
72+
73+
if (PTR_ERR(cxlhdm) != -ENODEV) {
74+
dev_err(&port->dev, "Failed to map HDM decoder capability\n");
7475
return PTR_ERR(cxlhdm);
76+
}
77+
78+
if (rc == 1) {
79+
dev_dbg(&port->dev, "Fallback to passthrough decoder\n");
80+
return devm_cxl_add_passthrough_decoder(port);
81+
}
7582

76-
return devm_cxl_enumerate_decoders(cxlhdm, NULL);
83+
dev_err(&port->dev, "HDM decoder capability not found\n");
84+
return -ENXIO;
7785
}
7886

7987
static int cxl_endpoint_port_probe(struct cxl_port *port)

0 commit comments

Comments
 (0)