| Message ID | 163072205089.2250120.8103605864156687395.stgit@dwillia2-desk3.amr.corp.intel.com |
|---|---|
| State | Accepted |
| Commit | da582aa5ad5787c46e3f475ab3f4602ec84c1617 |
| Headers | show |
| Series | cxl fixes for v5.15-rc1 | expand |
On Fri, 3 Sep 2021 19:20:50 -0700 Dan Williams <dan.j.williams@intel.com> wrote: > From: Li Qiang (Johnny Li) <johnny.li@montage-tech.com> > > Indicator string for mbox and memdev register set to status > incorrectly in error message. > > Cc: <stable@vger.kernel.org> > Fixes: 30af97296f48 ("cxl/pci: Map registers based on capabilities") > Signed-off-by: Li Qiang (Johnny Li) <johnny.li@montage-tech.com> > Signed-off-by: Dan Williams <dan.j.williams@intel.com> fwiw obviously correct. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/cxl/pci.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c > index 37903259ee79..8e45aa07d662 100644 > --- a/drivers/cxl/pci.c > +++ b/drivers/cxl/pci.c > @@ -1041,8 +1041,8 @@ static int cxl_probe_regs(struct cxl_mem *cxlm, void __iomem *base, > !dev_map->memdev.valid) { > dev_err(dev, "registers not found: %s%s%s\n", > !dev_map->status.valid ? "status " : "", > - !dev_map->mbox.valid ? "status " : "", > - !dev_map->memdev.valid ? "status " : ""); > + !dev_map->mbox.valid ? "mbox " : "", > + !dev_map->memdev.valid ? "memdev " : ""); > return -ENXIO; > } > >
diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c index 37903259ee79..8e45aa07d662 100644 --- a/drivers/cxl/pci.c +++ b/drivers/cxl/pci.c @@ -1041,8 +1041,8 @@ static int cxl_probe_regs(struct cxl_mem *cxlm, void __iomem *base, !dev_map->memdev.valid) { dev_err(dev, "registers not found: %s%s%s\n", !dev_map->status.valid ? "status " : "", - !dev_map->mbox.valid ? "status " : "", - !dev_map->memdev.valid ? "status " : ""); + !dev_map->mbox.valid ? "mbox " : "", + !dev_map->memdev.valid ? "memdev " : ""); return -ENXIO; }