iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pci/host-mvebu' into next

Browse Source 
* pci/host-mvebu:
  PCI: mvebu: Avoid changing the SCC bit in the Link Status register
This commit is contained in:
Bjorn Helgaas 2017-04-28 10:33:05 -05:00
commit 443b1b0671
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/pci/host/pci-mvebu.c
View File

@ -752,10 +752,11 @@ static int mvebu_sw_pci_bridge_write(struct mvebu_pcie_port *port,
* If the mask is 0xffff0000, then we only want to write * If the mask is 0xffff0000, then we only want to write
* the link control register, rather than clearing the * the link control register, rather than clearing the
* RW1C bits in the link status register. Mask out the * RW1C bits in the link status register. Mask out the
* status register bits. * RW1C status register bits.
*/ */
if (mask == 0xffff0000) if (mask == 0xffff0000)
value &= 0xffff; value &= ~((PCI_EXP_LNKSTA_LABS |
PCI_EXP_LNKSTA_LBMS) << 16);
mvebu_writel(port, value, PCIE_CAP_PCIEXP + PCI_EXP_LNKCTL); mvebu_writel(port, value, PCIE_CAP_PCIEXP + PCI_EXP_LNKCTL);
break; break;