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

staging: mt7621-pci: rewrite RC FTS configuration

Browse Source 
The RC FTS configuration is done using hardcoded registers
and bitshift operations. Make it a bit clean defining some
prepocessor definitions and simple macros.

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:51 +01:00 committed by Greg Kroah-Hartman
parent ce3368dc94
commit a4b2eb912b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,11 @@
/* RALINK_RSTCTRL bits */ /* RALINK_RSTCTRL bits */
#define RALINK_PCIE_RST BIT(23) #define RALINK_PCIE_RST BIT(23)
/* MediaTek specific configuration registers */
#define PCIE_FTS_NUM 0x70c
#define PCIE_FTS_NUM_MASK GENMASK(15, 8)
#define PCIE_FTS_NUM_L0(x) ((x) & 0xff << 8)
/* rt_sysc_membase relative registers */ /* rt_sysc_membase relative registers */
#define RALINK_PCIE_CLK_GEN 0x7c #define RALINK_PCIE_CLK_GEN 0x7c
#define RALINK_PCIE_CLK_GEN1 0x80 #define RALINK_PCIE_CLK_GEN1 0x80
@ -591,7 +596,7 @@ static int mt7621_pcie_init_port(struct mt7621_pcie_port *port)
mt7621_enable_phy(port); mt7621_enable_phy(port);
val = read_config(pcie, slot, 0x70c); val = read_config(pcie, slot, PCIE_FTS_NUM);
dev_info(dev, "Port %d N_FTS = %x\n", (unsigned int)val, slot); dev_info(dev, "Port %d N_FTS = %x\n", (unsigned int)val, slot);
return 0; return 0;
@ -642,10 +647,11 @@ static void mt7621_pcie_enable_ports(struct mt7621_pcie *pcie)
for (slot = 0; slot < num_slots_enabled; slot++) { for (slot = 0; slot < num_slots_enabled; slot++) {
val = read_config(pcie, slot, 0x4); val = read_config(pcie, slot, 0x4);
write_config(pcie, slot, 0x4, val | 0x4); write_config(pcie, slot, 0x4, val | 0x4);
val = read_config(pcie, slot, 0x70c); /* configure RC FTS number to 250 when it leaves L0s */
val &= ~(0xff) << 8; val = read_config(pcie, slot, PCIE_FTS_NUM);
val |= 0x50 << 8; val &= ~PCIE_FTS_NUM_MASK;
write_config(pcie, slot, 0x70c, val); val |= PCIE_FTS_NUM_L0(0x50);
write_config(pcie, slot, PCIE_FTS_NUM, val);
} }
} }