Skip to content

Commit

Permalink
[media] cobalt: allow fewer than 8 PCIe lanes
Browse files Browse the repository at this point in the history
Currently the cobalt driver refuses to load if fewer than 8 PCIe lanes
are assigned. This patch changes this and just issues a warning. The
only time it will refuse to load is if the number of assigned lanes is less
than what the PCIe host is capable of since this suggests that the card
isn't seated correctly in the slot.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Jul 22, 2015
1 parent 810c168 commit 55b858b
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions drivers/media/pci/cobalt/cobalt-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -339,15 +339,16 @@ static int cobalt_setup_pci(struct cobalt *cobalt, struct pci_dev *pci_dev,
}

if (pcie_link_get_lanes(cobalt) != 8) {
cobalt_err("PCI Express link width is not 8 lanes (%d)\n",
cobalt_warn("PCI Express link width is %d lanes.\n",
pcie_link_get_lanes(cobalt));
if (pcie_bus_link_get_lanes(cobalt) < 8)
cobalt_err("The current slot only supports %d lanes, at least 8 are needed\n",
cobalt_warn("The current slot only supports %d lanes, for best performance 8 are needed\n",
pcie_bus_link_get_lanes(cobalt));
else
if (pcie_link_get_lanes(cobalt) != pcie_bus_link_get_lanes(cobalt)) {
cobalt_err("The card is most likely not seated correctly in the PCIe slot\n");
ret = -EIO;
goto err_disable;
ret = -EIO;
goto err_disable;
}
}

if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(64))) {
Expand Down

0 comments on commit 55b858b

Please sign in to comment.