Message ID | 1467638532-9250-4-git-send-email-imunsie@au.ibm.com (mailing list archive) |
---|---|
State | Changes Requested |
Headers | show |
On 04/07/16 23:22, Ian Munsie wrote: > From: Ian Munsie <imunsie@au1.ibm.com> > > Devices that use CAPP DMA mode (such as the Mellanox CX4) require bus > master to be enabled in order for the CAPI traffic to flow. This should > be harmless to enable for other cxl devices, so unconditionally enable > it in the adapter init flow. > > Signed-off-by: Ian Munsie <imunsie@au1.ibm.com> Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Le 04/07/2016 15:22, Ian Munsie a écrit : > From: Ian Munsie <imunsie@au1.ibm.com> > > Devices that use CAPP DMA mode (such as the Mellanox CX4) require bus > master to be enabled in order for the CAPI traffic to flow. This should > be harmless to enable for other cxl devices, so unconditionally enable > it in the adapter init flow. > > Signed-off-by: Ian Munsie <imunsie@au1.ibm.com> Reviewed-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com>
diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c index 9530280..6c0597d 100644 --- a/drivers/misc/cxl/pci.c +++ b/drivers/misc/cxl/pci.c @@ -1264,6 +1264,9 @@ static int cxl_configure_adapter(struct cxl *adapter, struct pci_dev *dev) if ((rc = adapter->native->sl_ops->adapter_regs_init(adapter, dev))) goto err; + /* Required for devices using CAPP DMA mode, harmless for others */ + pci_set_master(dev); + if ((rc = pnv_phb_to_cxl_mode(dev, adapter->native->sl_ops->capi_mode))) goto err;