Skip to content

Commit 8d42854

Browse files
committed
cxl/region: Fix port setup uninitialized variable warnings
0day robot reports: drivers/cxl/core/region.c:1068 cxl_port_setup_targets() error: uninitialized symbol 'eiw'. drivers/cxl/core/region.c:1068 cxl_port_setup_targets() error: uninitialized symbol 'peig'. drivers/cxl/core/region.c:1068 cxl_port_setup_targets() error: uninitialized symbol 'peiw'. ...which are all valid reports. Add debug statement to consume the, albeit unexpected, errors. Fixes: 27b3f8d ("cxl/region: Program target lists") Reported-by: kernel test robot <[email protected]> Reviewed-by: Jonathan Cameron <[email protected]> Link: https://lore.kernel.org/r/165951147487.967013.929590444907251028.stgit@dwillia2-xfh.jf.intel.com Signed-off-by: Dan Williams <[email protected]>
1 parent 817b279 commit 8d42854

File tree

1 file changed

+22
-3
lines changed

1 file changed

+22
-3
lines changed

drivers/cxl/core/region.c

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -987,11 +987,30 @@ static int cxl_port_setup_targets(struct cxl_port *port,
987987
parent_iw = parent_cxld->interleave_ways;
988988
}
989989

990-
granularity_to_cxl(parent_ig, &peig);
991-
ways_to_cxl(parent_iw, &peiw);
990+
rc = granularity_to_cxl(parent_ig, &peig);
991+
if (rc) {
992+
dev_dbg(&cxlr->dev, "%s:%s: invalid parent granularity: %d\n",
993+
dev_name(parent_port->uport),
994+
dev_name(&parent_port->dev), parent_ig);
995+
return rc;
996+
}
997+
998+
rc = ways_to_cxl(parent_iw, &peiw);
999+
if (rc) {
1000+
dev_dbg(&cxlr->dev, "%s:%s: invalid parent interleave: %d\n",
1001+
dev_name(parent_port->uport),
1002+
dev_name(&parent_port->dev), parent_iw);
1003+
return rc;
1004+
}
9921005

9931006
iw = cxl_rr->nr_targets;
994-
ways_to_cxl(iw, &eiw);
1007+
rc = ways_to_cxl(iw, &eiw);
1008+
if (rc) {
1009+
dev_dbg(&cxlr->dev, "%s:%s: invalid port interleave: %d\n",
1010+
dev_name(port->uport), dev_name(&port->dev), iw);
1011+
return rc;
1012+
}
1013+
9951014
if (cxl_rr->nr_targets > 1) {
9961015
u32 address_bit = max(peig + peiw, eiw + peig);
9971016

0 commit comments

Comments
 (0)