Commit 48b3adf3 authored Jul 14, 2016 by Ian Munsie Committed by Michael Ellerman Jul 14, 2016

cxl: Enable bus mastering for devices using CAPP DMA mode



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>
Reviewed-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent 4e56f858

drivers/misc/cxl/pci.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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)))		if ((rc = adapter->native->sl_ops->adapter_regs_init(adapter, dev)))
	goto err;		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)))		if ((rc = pnv_phb_to_cxl_mode(dev, adapter->native->sl_ops->capi_mode)))
	goto err;		goto err;

Admin message