| Message ID | 1473676663-11057-1-git-send-email-fbarrat@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 12/09/16 20:37, Frederic Barrat wrote: > When set_sl_ops() is called, the adapter data structure is not fully > initialized yet. Therefore the device name is not showing up in the > trace. Fix is simply to get the device name from the pci_dev > structure. > > Fixes: 6d382616ac22 ("cxl: Abstract the differences between the PSL and XSL") > Signed-off-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com> Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > drivers/misc/cxl/pci.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c > index 6f0c4ac..cd922a8 100644 > --- a/drivers/misc/cxl/pci.c > +++ b/drivers/misc/cxl/pci.c > @@ -1530,11 +1530,11 @@ static void set_sl_ops(struct cxl *adapter, struct pci_dev *dev) > { > if (dev->vendor == PCI_VENDOR_ID_MELLANOX && dev->device == 0x1013) { > /* Mellanox CX-4 */ > - dev_info(&adapter->dev, "Device uses an XSL\n"); > + dev_info(&dev->dev, "Device uses an XSL\n"); > adapter->native->sl_ops = &xsl_ops; > adapter->min_pe = 1; /* Workaround for CX-4 hardware bug */ > } else { > - dev_info(&adapter->dev, "Device uses a PSL\n"); > + dev_info(&dev->dev, "Device uses a PSL\n"); > adapter->native->sl_ops = &psl_ops; > } > } >
On Mon, 2016-12-09 at 10:37:43 UTC, Frederic Barrat wrote: > When set_sl_ops() is called, the adapter data structure is not fully > initialized yet. Therefore the device name is not showing up in the > trace. Fix is simply to get the device name from the pci_dev > structure. > > Fixes: 6d382616ac22 ("cxl: Abstract the differences between the PSL and XSL") > Signed-off-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/b135077b83f01549c2a0685b16 cheers
diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c index 6f0c4ac..cd922a8 100644 --- a/drivers/misc/cxl/pci.c +++ b/drivers/misc/cxl/pci.c @@ -1530,11 +1530,11 @@ static void set_sl_ops(struct cxl *adapter, struct pci_dev *dev) { if (dev->vendor == PCI_VENDOR_ID_MELLANOX && dev->device == 0x1013) { /* Mellanox CX-4 */ - dev_info(&adapter->dev, "Device uses an XSL\n"); + dev_info(&dev->dev, "Device uses an XSL\n"); adapter->native->sl_ops = &xsl_ops; adapter->min_pe = 1; /* Workaround for CX-4 hardware bug */ } else { - dev_info(&adapter->dev, "Device uses a PSL\n"); + dev_info(&dev->dev, "Device uses a PSL\n"); adapter->native->sl_ops = &psl_ops; } }
When set_sl_ops() is called, the adapter data structure is not fully initialized yet. Therefore the device name is not showing up in the trace. Fix is simply to get the device name from the pci_dev structure. Fixes: 6d382616ac22 ("cxl: Abstract the differences between the PSL and XSL") Signed-off-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com> --- drivers/misc/cxl/pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)