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

staging: mt7621-pci: factor out 'mt7621_pcie_enable_port' function

Browse Source 
Function 'mt7621_pcie_enable_ports' tries to enable all PCI ports.
To make it more readable the single port initialization part has
been factor out into a new 'mt7621_pcie_enable_port' function.

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sergio Paracuellos 2018-11-04 11:49:57 +01:00 committed by Greg Kroah-Hartman
parent 1e80699fd6
commit 802a2f7b2f
1 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/staging/mt7621-pci/pci-mt7621.c
View File

@ -628,21 +628,14 @@ static void mt7621_pcie_init_ports(struct mt7621_pcie *pcie)
} }
} }
static void mt7621_pcie_enable_ports(struct mt7621_pcie *pcie) static int mt7621_pcie_enable_port(struct mt7621_pcie_port *port)
{ {
struct device *dev = pcie->dev; struct mt7621_pcie *pcie = port->pcie;
struct mt7621_pcie_port *port; u32 slot = port->slot;
u8 num_slots_enabled = 0; u32 offset = MT7621_PCIE_OFFSET + (slot * MT7621_NEXT_PORT);
u32 offset;
u32 slot;
u32 val; u32 val;
int err; int err;
list_for_each_entry(port, &pcie->ports, list) {
slot = port->slot;
offset = MT7621_PCIE_OFFSET + (slot * MT7621_NEXT_PORT);
if (port->enabled) {
/* assert port PERST_N */ /* assert port PERST_N */
val = pcie_read(pcie, RALINK_PCI_PCICFG_ADDR); val = pcie_read(pcie, RALINK_PCI_PCICFG_ADDR);
val |= PCIE_PORT_PERST(slot); val |= PCIE_PORT_PERST(slot);
@ -655,13 +648,10 @@ static void mt7621_pcie_enable_ports(struct mt7621_pcie *pcie)
/* 100ms timeout value should be enough for Gen1 training */ /* 100ms timeout value should be enough for Gen1 training */
err = readl_poll_timeout(port->base + RALINK_PCI_STATUS, err = readl_poll_timeout(port->base + RALINK_PCI_STATUS,
val,!!(val & PCIE_PORT_LINKUP), val, !!(val & PCIE_PORT_LINKUP),
20, 100 * USEC_PER_MSEC); 20, 100 * USEC_PER_MSEC);
if (err) { if (err)
dev_err(dev, "de-assert port %d PERST_N\n", return -ETIMEDOUT;
slot);
continue;
}
/* enable pcie interrupt */ /* enable pcie interrupt */
val = pcie_read(pcie, RALINK_PCI_PCIMSK_ADDR); val = pcie_read(pcie, RALINK_PCI_PCIMSK_ADDR);
@ -673,9 +663,29 @@ static void mt7621_pcie_enable_ports(struct mt7621_pcie *pcie)
offset + RALINK_PCI_BAR0SETUP_ADDR); offset + RALINK_PCI_BAR0SETUP_ADDR);
pcie_write(pcie, MEMORY_BASE, pcie_write(pcie, MEMORY_BASE,
offset + RALINK_PCI_IMBASEBAR0_ADDR); offset + RALINK_PCI_IMBASEBAR0_ADDR);
/* configure class code and revision ID */ /* configure class code and revision ID */
pcie_write(pcie, PCIE_CLASS_CODE | PCIE_REVISION_ID, pcie_write(pcie, PCIE_CLASS_CODE | PCIE_REVISION_ID,
offset + RALINK_PCI_CLASS); offset + RALINK_PCI_CLASS);
return 0;
}
static void mt7621_pcie_enable_ports(struct mt7621_pcie *pcie)
{
struct device *dev = pcie->dev;
struct mt7621_pcie_port *port;
u8 num_slots_enabled = 0;
u32 slot;
u32 val;
list_for_each_entry(port, &pcie->ports, list) {
if (port->enabled) {
if (!mt7621_pcie_enable_port(port)) {
dev_err(dev, "de-assert port %d PERST_N\n",
port->slot);
continue;
}
dev_info(dev, "PCIE%d enabled\n", slot); dev_info(dev, "PCIE%d enabled\n", slot);
num_slots_enabled++; num_slots_enabled++;
} }