Skip to content

L
linux
Commit 02cc343b authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files
Options

staging: brcm80211: nicpci: Neatening 

Remove unnecessary casts of void *.
Spacing and removal of unnecessary parentheses.
80 column wrapping.
Comment neatening.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 84db550c
Show whitespace changes
Inline Side-by-side
Showing with 138 additions and 138 deletions
drivers/staging/brcm80211/brcmsmac/nicpci.c
View file @ 02cc343b
...@@ -38,28 +38,36 @@ ...@@ -38,28 +38,36 @@
#define SRSH_BD_OFFSET 6 /* word 6 */ #define SRSH_BD_OFFSET 6 /* word 6 */
/* chipcontrol */ /* chipcontrol */
#define CHIPCTRL_4321_PLL_DOWN 0x800000 /* serdes PLL down override */ #define CHIPCTRL_4321_PLL_DOWN 0x800000/* serdes PLL down override */
/* MDIO control */ /* MDIO control */
#define MDIOCTL_DIVISOR_MASK 0x7f /* clock to be used on MDIO */ #define MDIOCTL_DIVISOR_MASK 0x7f /* clock to be used on MDIO */
#define MDIOCTL_DIVISOR_VAL 0x2 #define MDIOCTL_DIVISOR_VAL 0x2
#define MDIOCTL_PREAM_EN 0x80 /* Enable preamble sequnce */ #define MDIOCTL_PREAM_EN 0x80 /* Enable preamble sequnce */
#define MDIOCTL_ACCESS_DONE 0x100 /* Tranaction complete */ #define MDIOCTL_ACCESS_DONE 0x100 /* Transaction complete */
/* MDIO Data */ /* MDIO Data */
#define MDIODATA_MASK 0x0000ffff /* data 2 bytes */ #define MDIODATA_MASK 0x0000ffff /* data 2 bytes */
#define MDIODATA_TA 0x00020000 /* Turnaround */ #define MDIODATA_TA 0x00020000 /* Turnaround */
#define MDIODATA_REGADDR_SHF_OLD 18 /* Regaddr shift (rev < 10) */
#define MDIODATA_REGADDR_MASK_OLD 0x003c0000 /* Regaddr Mask (rev < 10) */
#define MDIODATA_DEVADDR_SHF_OLD 22 /* Physmedia devaddr shift (rev < 10) */
#define MDIODATA_DEVADDR_MASK_OLD 0x0fc00000 /* Physmedia devaddr Mask (rev < 10) */
#define MDIODATA_REGADDR_SHF 18 /* Regaddr shift */ #define MDIODATA_REGADDR_SHF 18 /* Regaddr shift */
#define MDIODATA_REGADDR_MASK 0x007c0000 /* Regaddr Mask */ #define MDIODATA_REGADDR_MASK 0x007c0000 /* Regaddr Mask */
#define MDIODATA_DEVADDR_SHF 23 /* Physmedia devaddr shift */ #define MDIODATA_DEVADDR_SHF 23 /* Physmedia devaddr shift */
#define MDIODATA_DEVADDR_MASK 0x0f800000 /* Physmedia devaddr Mask */ #define MDIODATA_DEVADDR_MASK 0x0f800000
#define MDIODATA_WRITE 0x10000000 /* write Transaction */ /* Physmedia devaddr Mask */
#define MDIODATA_READ 0x20000000 /* Read Transaction */
#define MDIODATA_START 0x40000000 /* start of Transaction */ /* MDIO Data for older revisions < 10 */
#define MDIODATA_REGADDR_SHF_OLD 18 /* Regaddr shift */
#define MDIODATA_REGADDR_MASK_OLD 0x003c0000
/* Regaddr Mask */
#define MDIODATA_DEVADDR_SHF_OLD 22 /* Physmedia devaddr shift */
#define MDIODATA_DEVADDR_MASK_OLD 0x0fc00000
/* Physmedia devaddr Mask */
/* Transactions flags */
#define MDIODATA_WRITE 0x10000000
#define MDIODATA_READ 0x20000000
#define MDIODATA_START 0x40000000
#define MDIODATA_DEV_ADDR 0x0 /* dev address for serdes */ #define MDIODATA_DEV_ADDR 0x0 /* dev address for serdes */
#define MDIODATA_BLK_ADDR 0x1F /* blk address for serdes */ #define MDIODATA_BLK_ADDR 0x1F /* blk address for serdes */
...@@ -69,21 +77,21 @@ ...@@ -69,21 +77,21 @@
#define MDIODATA_DEV_TX 0x1e /* SERDES TX Dev */ #define MDIODATA_DEV_TX 0x1e /* SERDES TX Dev */
#define MDIODATA_DEV_RX 0x1f /* SERDES RX Dev */ #define MDIODATA_DEV_RX 0x1f /* SERDES RX Dev */
/* SERDES RX registers */ /* SERDES RX registers */
#define SERDES_RX_CTRL 1 /* Rx cntrl */ #define SERDES_RX_CTRL 1 /* Rx cntrl */
#define SERDES_RX_TIMER1 2 /* Rx Timer1 */ #define SERDES_RX_TIMER1 2 /* Rx Timer1 */
#define SERDES_RX_CDR 6 /* CDR */ #define SERDES_RX_CDR 6 /* CDR */
#define SERDES_RX_CDRBW 7 /* CDR BW */ #define SERDES_RX_CDRBW 7 /* CDR BW */
/* SERDES RX control register */ /* SERDES RX control register */
#define SERDES_RX_CTRL_FORCE 0x80 /* rxpolarity_force */ #define SERDES_RX_CTRL_FORCE 0x80 /* rxpolarity_force */
#define SERDES_RX_CTRL_POLARITY 0x40 /* rxpolarity_value */ #define SERDES_RX_CTRL_POLARITY 0x40 /* rxpolarity_value */
/* SERDES PLL registers */ /* SERDES PLL registers */
#define SERDES_PLL_CTRL 1 /* PLL control reg */ #define SERDES_PLL_CTRL 1 /* PLL control reg */
#define PLL_CTRL_FREQDET_EN 0x4000 /* bit 14 is FREQDET on */ #define PLL_CTRL_FREQDET_EN 0x4000 /* bit 14 is FREQDET on */
/* Linkcontrol reg offset in PCIE Cap */ /* Linkcontrol reg offset in PCIE Cap */
#define PCIE_CAP_LINKCTRL_OFFSET 16 /* linkctrl offset in pcie cap */ #define PCIE_CAP_LINKCTRL_OFFSET 16 /* offset in pcie cap */
#define PCIE_CAP_LCREG_ASPML0s 0x01 /* ASPM L0s in linkctrl */ #define PCIE_CAP_LCREG_ASPML0s 0x01 /* ASPM L0s in linkctrl */
#define PCIE_CAP_LCREG_ASPML1 0x02 /* ASPM L1 in linkctrl */ #define PCIE_CAP_LCREG_ASPML1 0x02 /* ASPM L1 in linkctrl */
#define PCIE_CLKREQ_ENAB 0x100 /* CLKREQ Enab in linkctrl */ #define PCIE_CLKREQ_ENAB 0x100 /* CLKREQ Enab in linkctrl */
...@@ -97,9 +105,12 @@ ...@@ -97,9 +105,12 @@
#define PCIE_L1THRESHOLDTIME_MASK 0xFF00 /* bits 8 - 15 */ #define PCIE_L1THRESHOLDTIME_MASK 0xFF00 /* bits 8 - 15 */
#define PCIE_L1THRESHOLDTIME_SHIFT 8 /* PCIE_L1THRESHOLDTIME_SHIFT */ #define PCIE_L1THRESHOLDTIME_SHIFT 8 /* PCIE_L1THRESHOLDTIME_SHIFT */
#define PCIE_L1THRESHOLD_WARVAL 0x72 /* WAR value */ #define PCIE_L1THRESHOLD_WARVAL 0x72 /* WAR value */
#define PCIE_ASPMTIMER_EXTEND 0x01000000 /* > rev7: enable extend ASPM timer */ #define PCIE_ASPMTIMER_EXTEND 0x01000000
/* > rev7:
* enable extend ASPM timer
*/
/* different register spaces to access thr'u pcie indirect access */ /* different register spaces to access thru pcie indirect access */
#define PCIE_CONFIGREGS 1 /* Access to config space */ #define PCIE_CONFIGREGS 1 /* Access to config space */
#define PCIE_PCIEREGS 2 /* Access to pcie registers */ #define PCIE_PCIEREGS 2 /* Access to pcie registers */
...@@ -170,7 +181,9 @@ struct sbpcieregs { ...@@ -170,7 +181,9 @@ struct sbpcieregs {
u32 mdiodata; /* Data to the mdio access: 0x12c */ u32 mdiodata; /* Data to the mdio access: 0x12c */
/* pcie protocol phy/dllp/tlp register indirect access mechanism */ /* pcie protocol phy/dllp/tlp register indirect access mechanism */
u32 pcieindaddr; /* indirect access to the internal register: 0x130 */ u32 pcieindaddr; /* indirect access to
* the internal register: 0x130
*/
u32 pcieinddata; /* Data to/from the internal regsiter: 0x134 */ u32 pcieinddata; /* Data to/from the internal regsiter: 0x134 */
u32 clkreqenctrl; /* >= rev 6, Clkreq rdma control : 0x138 */ u32 clkreqenctrl; /* >= rev 6, Clkreq rdma control : 0x138 */
...@@ -187,7 +200,9 @@ struct pcicore_info { ...@@ -187,7 +200,9 @@ struct pcicore_info {
struct si_pub *sih; /* System interconnect handle */ struct si_pub *sih; /* System interconnect handle */
struct pci_dev *dev; struct pci_dev *dev;
u8 pciecap_lcreg_offset; /* PCIE capability LCreg offset in the config space */ u8 pciecap_lcreg_offset;/* PCIE capability LCreg offset
* in the config space
*/
bool pcie_pr42767; bool pcie_pr42767;
u8 pcie_polarity; u8 pcie_polarity;
u8 pcie_war_aspm_ovr; /* Override ASPM/Clkreq settings */ u8 pcie_war_aspm_ovr; /* Override ASPM/Clkreq settings */
...@@ -199,7 +214,8 @@ struct pcicore_info { ...@@ -199,7 +214,8 @@ struct pcicore_info {
/* debug/trace */ /* debug/trace */
#define PCI_ERROR(args) #define PCI_ERROR(args)
#define PCIE_PUB(sih) \ #define PCIE_PUB(sih) \
(((sih)->bustype == PCI_BUS) && ((sih)->buscoretype == PCIE_CORE_ID)) (((sih)->bustype == PCI_BUS) && \
((sih)->buscoretype == PCIE_CORE_ID))
/* routines to access mdio slave device registers */ /* routines to access mdio slave device registers */
static bool pcie_mdiosetblock(struct pcicore_info *pi, uint blk); static bool pcie_mdiosetblock(struct pcicore_info *pi, uint blk);
...@@ -219,14 +235,17 @@ static void pcie_war_noplldown(struct pcicore_info *pi); ...@@ -219,14 +235,17 @@ static void pcie_war_noplldown(struct pcicore_info *pi);
static void pcie_war_polarity(struct pcicore_info *pi); static void pcie_war_polarity(struct pcicore_info *pi);
static void pcie_war_pci_setup(struct pcicore_info *pi); static void pcie_war_pci_setup(struct pcicore_info *pi);
#define PCIE_ASPM(sih) ((PCIE_PUB(sih)) && (((sih)->buscorerev >= 3) && ((sih)->buscorerev <= 5))) #define PCIE_ASPM(sih) \
((PCIE_PUB(sih)) && \
(((sih)->buscorerev >= 3) && \
((sih)->buscorerev <= 5)))
/* delay needed between the mdio control/ mdiodata register data access */ /* delay needed between the mdio control/ mdiodata register data access */
#define PR28829_DELAY() udelay(10) #define PR28829_DELAY() udelay(10)
/* Initialize the PCI core. It's caller's responsibility to make sure that this is done /* Initialize the PCI core.
* only once * It's caller's responsibility to make sure that this is done only once
*/ */
void *pcicore_init(struct si_pub *sih, void *pdev, void *regs) void *pcicore_init(struct si_pub *sih, void *pdev, void *regs)
{ {
...@@ -244,23 +263,19 @@ void *pcicore_init(struct si_pub *sih, void *pdev, void *regs) ...@@ -244,23 +263,19 @@ void *pcicore_init(struct si_pub *sih, void *pdev, void *regs)
if (sih->buscoretype == PCIE_CORE_ID) { if (sih->buscoretype == PCIE_CORE_ID) {
u8 cap_ptr; u8 cap_ptr;
pi->regs.pcieregs = (struct sbpcieregs *) regs; pi->regs.pcieregs = regs;
cap_ptr = pcicore_find_pci_capability(pi->dev, PCI_CAP_ID_EXP, cap_ptr = pcicore_find_pci_capability(pi->dev, PCI_CAP_ID_EXP,
NULL, NULL); NULL, NULL);
pi->pciecap_lcreg_offset = cap_ptr + PCIE_CAP_LINKCTRL_OFFSET; pi->pciecap_lcreg_offset = cap_ptr + PCIE_CAP_LINKCTRL_OFFSET;
} else } else
pi->regs.pciregs = (struct sbpciregs *) regs; pi->regs.pciregs = regs;
return pi; return pi;
} }
void pcicore_deinit(void *pch) void pcicore_deinit(void *pch)
{ {
struct pcicore_info *pi = (struct pcicore_info *) pch; kfree(pch);
if (pi == NULL)
return;
kfree(pi);
} }
/* return cap_offset if requested capability exists in the PCI config space */ /* return cap_offset if requested capability exists in the PCI config space */
...@@ -289,7 +304,9 @@ pcicore_find_pci_capability(void *dev, u8 req_cap_id, ...@@ -289,7 +304,9 @@ pcicore_find_pci_capability(void *dev, u8 req_cap_id,
if (cap_ptr == 0x00) if (cap_ptr == 0x00)
goto end; goto end;
/* loop thr'u the capability list and see if the pcie capabilty exists */ /* loop thru the capability list
* and see if the pcie capability exists
*/
pci_read_config_byte(dev, cap_ptr, &cap_id); pci_read_config_byte(dev, cap_ptr, &cap_id);
...@@ -299,18 +316,18 @@ pcicore_find_pci_capability(void *dev, u8 req_cap_id, ...@@ -299,18 +316,18 @@ pcicore_find_pci_capability(void *dev, u8 req_cap_id,
break; break;
pci_read_config_byte(dev, cap_ptr, &cap_id); pci_read_config_byte(dev, cap_ptr, &cap_id);
} }
if (cap_id != req_cap_id) { if (cap_id != req_cap_id)
goto end; goto end;
}
/* found the caller requested capability */ /* found the caller requested capability */
if ((buf != NULL) && (buflen != NULL)) { if (buf != NULL && buflen != NULL) {
u8 cap_data; u8 cap_data;
bufsize = *buflen; bufsize = *buflen;
if (!bufsize) if (!bufsize)
goto end; goto end;
*buflen = 0; *buflen = 0;
/* copy the cpability data excluding cap ID and next ptr */ /* copy the capability data excluding cap ID and next ptr */
cap_data = cap_ptr + 2; cap_data = cap_ptr + 2;
if ((bufsize + cap_data) > PCI_SZPCR) if ((bufsize + cap_data) > PCI_SZPCR)
bufsize = PCI_SZPCR - cap_data; bufsize = PCI_SZPCR - cap_data;
...@@ -321,29 +338,26 @@ pcicore_find_pci_capability(void *dev, u8 req_cap_id, ...@@ -321,29 +338,26 @@ pcicore_find_pci_capability(void *dev, u8 req_cap_id,
buf++; buf++;
} }
} }
end: end:
return cap_ptr; return cap_ptr;
} }
/* ***** Register Access API */ /* ***** Register Access API */
static uint static uint
pcie_readreg(struct sbpcieregs *pcieregs, uint addrtype, pcie_readreg(struct sbpcieregs *pcieregs, uint addrtype, uint offset)
uint offset)
{ {
uint retval = 0xFFFFFFFF; uint retval = 0xFFFFFFFF;
switch (addrtype) { switch (addrtype) {
case PCIE_CONFIGREGS: case PCIE_CONFIGREGS:
W_REG((&pcieregs->configaddr), offset); W_REG(&pcieregs->configaddr, offset);
(void)R_REG((&pcieregs->configaddr)); (void)R_REG((&pcieregs->configaddr));
retval = R_REG(&(pcieregs->configdata)); retval = R_REG(&pcieregs->configdata);
break; break;
case PCIE_PCIEREGS: case PCIE_PCIEREGS:
W_REG(&(pcieregs->pcieindaddr), offset); W_REG(&pcieregs->pcieindaddr, offset);
(void)R_REG((&pcieregs->pcieindaddr)); (void)R_REG(&pcieregs->pcieindaddr);
retval = R_REG(&(pcieregs->pcieinddata)); retval = R_REG(&pcieregs->pcieinddata);
break;
default:
break; break;
} }
...@@ -351,8 +365,7 @@ pcie_readreg(struct sbpcieregs *pcieregs, uint addrtype, ...@@ -351,8 +365,7 @@ pcie_readreg(struct sbpcieregs *pcieregs, uint addrtype,
} }
static uint static uint
pcie_writereg(struct sbpcieregs *pcieregs, uint addrtype, pcie_writereg(struct sbpcieregs *pcieregs, uint addrtype, uint offset, uint val)
uint offset, uint val)
{ {
switch (addrtype) { switch (addrtype) {
case PCIE_CONFIGREGS: case PCIE_CONFIGREGS:
...@@ -375,20 +388,17 @@ static bool pcie_mdiosetblock(struct pcicore_info *pi, uint blk) ...@@ -375,20 +388,17 @@ static bool pcie_mdiosetblock(struct pcicore_info *pi, uint blk)
uint mdiodata, i = 0; uint mdiodata, i = 0;
uint pcie_serdes_spinwait = 200; uint pcie_serdes_spinwait = 200;
mdiodata = mdiodata = (MDIODATA_START | MDIODATA_WRITE | MDIODATA_TA |
MDIODATA_START | MDIODATA_WRITE | (MDIODATA_DEV_ADDR << (MDIODATA_DEV_ADDR << MDIODATA_DEVADDR_SHF) |
MDIODATA_DEVADDR_SHF) | (MDIODATA_BLK_ADDR << MDIODATA_REGADDR_SHF) |
(MDIODATA_BLK_ADDR << MDIODATA_REGADDR_SHF) | MDIODATA_TA | (blk << (blk << 4));
4);
W_REG(&pcieregs->mdiodata, mdiodata); W_REG(&pcieregs->mdiodata, mdiodata);
PR28829_DELAY(); PR28829_DELAY();
/* retry till the transaction is complete */ /* retry till the transaction is complete */
while (i < pcie_serdes_spinwait) { while (i < pcie_serdes_spinwait) {
if (R_REG(&(pcieregs->mdiocontrol)) & if (R_REG(&pcieregs->mdiocontrol) & MDIOCTL_ACCESS_DONE)
MDIOCTL_ACCESS_DONE) {
break; break;
}
udelay(1000); udelay(1000);
i++; i++;
} }
...@@ -411,26 +421,27 @@ pcie_mdioop(struct pcicore_info *pi, uint physmedia, uint regaddr, bool write, ...@@ -411,26 +421,27 @@ pcie_mdioop(struct pcicore_info *pi, uint physmedia, uint regaddr, bool write,
uint pcie_serdes_spinwait = 10; uint pcie_serdes_spinwait = 10;
/* enable mdio access to SERDES */ /* enable mdio access to SERDES */
W_REG((&pcieregs->mdiocontrol), W_REG(&pcieregs->mdiocontrol, MDIOCTL_PREAM_EN | MDIOCTL_DIVISOR_VAL);
MDIOCTL_PREAM_EN | MDIOCTL_DIVISOR_VAL);
if (pi->sih->buscorerev >= 10) { if (pi->sih->buscorerev >= 10) {
/* new serdes is slower in rw, using two layers of reg address mapping */ /* new serdes is slower in rw,
* using two layers of reg address mapping
*/
if (!pcie_mdiosetblock(pi, physmedia)) if (!pcie_mdiosetblock(pi, physmedia))
return 1; return 1;
mdiodata = (MDIODATA_DEV_ADDR << MDIODATA_DEVADDR_SHF) | mdiodata = ((MDIODATA_DEV_ADDR << MDIODATA_DEVADDR_SHF) |
(regaddr << MDIODATA_REGADDR_SHF); (regaddr << MDIODATA_REGADDR_SHF));
pcie_serdes_spinwait *= 20; pcie_serdes_spinwait *= 20;
} else { } else {
mdiodata = (physmedia << MDIODATA_DEVADDR_SHF_OLD) | mdiodata = ((physmedia << MDIODATA_DEVADDR_SHF_OLD) |
(regaddr << MDIODATA_REGADDR_SHF_OLD); (regaddr << MDIODATA_REGADDR_SHF_OLD));
} }
if (!write) if (!write)
mdiodata |= (MDIODATA_START | MDIODATA_READ | MDIODATA_TA); mdiodata |= (MDIODATA_START | MDIODATA_READ | MDIODATA_TA);
else else
mdiodata |= mdiodata |= (MDIODATA_START | MDIODATA_WRITE | MDIODATA_TA |
(MDIODATA_START | MDIODATA_WRITE | MDIODATA_TA | *val); *val);
W_REG(&pcieregs->mdiodata, mdiodata); W_REG(&pcieregs->mdiodata, mdiodata);
...@@ -438,16 +449,14 @@ pcie_mdioop(struct pcicore_info *pi, uint physmedia, uint regaddr, bool write, ...@@ -438,16 +449,14 @@ pcie_mdioop(struct pcicore_info *pi, uint physmedia, uint regaddr, bool write,
/* retry till the transaction is complete */ /* retry till the transaction is complete */
while (i < pcie_serdes_spinwait) { while (i < pcie_serdes_spinwait) {
if (R_REG(&(pcieregs->mdiocontrol)) & if (R_REG(&pcieregs->mdiocontrol) & MDIOCTL_ACCESS_DONE) {
MDIOCTL_ACCESS_DONE) {
if (!write) { if (!write) {
PR28829_DELAY(); PR28829_DELAY();
*val = *val = (R_REG(&pcieregs->mdiodata) &
(R_REG(&(pcieregs->mdiodata)) &
MDIODATA_MASK); MDIODATA_MASK);
} }
/* Disable mdio access to SERDES */ /* Disable mdio access to SERDES */
W_REG((&pcieregs->mdiocontrol), 0); W_REG(&pcieregs->mdiocontrol, 0);
return 0; return 0;
} }
udelay(1000); udelay(1000);
...@@ -456,7 +465,7 @@ pcie_mdioop(struct pcicore_info *pi, uint physmedia, uint regaddr, bool write, ...@@ -456,7 +465,7 @@ pcie_mdioop(struct pcicore_info *pi, uint physmedia, uint regaddr, bool write,
PCI_ERROR(("pcie_mdioop: timed out op: %d\n", write)); PCI_ERROR(("pcie_mdioop: timed out op: %d\n", write));
/* Disable mdio access to SERDES */ /* Disable mdio access to SERDES */
W_REG((&pcieregs->mdiocontrol), 0); W_REG(&pcieregs->mdiocontrol, 0);
return 1; return 1;
} }
...@@ -478,7 +487,7 @@ pcie_mdiowrite(struct pcicore_info *pi, uint physmedia, uint regaddr, uint val) ...@@ -478,7 +487,7 @@ pcie_mdiowrite(struct pcicore_info *pi, uint physmedia, uint regaddr, uint val)
/* ***** Support functions ***** */ /* ***** Support functions ***** */
static u8 pcie_clkreq(void *pch, u32 mask, u32 val) static u8 pcie_clkreq(void *pch, u32 mask, u32 val)
{ {
struct pcicore_info *pi = (struct pcicore_info *) pch; struct pcicore_info *pi = pch;
u32 reg_val; u32 reg_val;
u8 offset; u8 offset;
...@@ -533,8 +542,8 @@ static void pcie_clkreq_upd(struct pcicore_info *pi, uint state) ...@@ -533,8 +542,8 @@ static void pcie_clkreq_upd(struct pcicore_info *pi, uint state)
case SI_PCIDOWN: case SI_PCIDOWN:
if (sih->buscorerev == 6) { /* turn on serdes PLL down */ if (sih->buscorerev == 6) { /* turn on serdes PLL down */
ai_corereg(sih, SI_CC_IDX, ai_corereg(sih, SI_CC_IDX,
offsetof(chipcregs_t, chipcontrol_addr), ~0, offsetof(chipcregs_t, chipcontrol_addr),
0); ~0, 0);
ai_corereg(sih, SI_CC_IDX, ai_corereg(sih, SI_CC_IDX,
offsetof(chipcregs_t, chipcontrol_data), offsetof(chipcregs_t, chipcontrol_data),
~0x40, 0); ~0x40, 0);
...@@ -545,8 +554,8 @@ static void pcie_clkreq_upd(struct pcicore_info *pi, uint state) ...@@ -545,8 +554,8 @@ static void pcie_clkreq_upd(struct pcicore_info *pi, uint state)
case SI_PCIUP: case SI_PCIUP:
if (sih->buscorerev == 6) { /* turn off serdes PLL down */ if (sih->buscorerev == 6) { /* turn off serdes PLL down */
ai_corereg(sih, SI_CC_IDX, ai_corereg(sih, SI_CC_IDX,
offsetof(chipcregs_t, chipcontrol_addr), ~0, offsetof(chipcregs_t, chipcontrol_addr),
0); ~0, 0);
ai_corereg(sih, SI_CC_IDX, ai_corereg(sih, SI_CC_IDX,
offsetof(chipcregs_t, chipcontrol_data), offsetof(chipcregs_t, chipcontrol_data),
~0x40, 0x40); ~0x40, 0x40);
...@@ -554,8 +563,6 @@ static void pcie_clkreq_upd(struct pcicore_info *pi, uint state) ...@@ -554,8 +563,6 @@ static void pcie_clkreq_upd(struct pcicore_info *pi, uint state)
pcie_clkreq((void *)pi, 1, 0); pcie_clkreq((void *)pi, 1, 0);
} }
break; break;
default:
break;
} }
} }
...@@ -568,17 +575,16 @@ static void pcie_war_polarity(struct pcicore_info *pi) ...@@ -568,17 +575,16 @@ static void pcie_war_polarity(struct pcicore_info *pi)
if (pi->pcie_polarity != 0) if (pi->pcie_polarity != 0)
return; return;
w = pcie_readreg(pi->regs.pcieregs, PCIE_PCIEREGS, w = pcie_readreg(pi->regs.pcieregs, PCIE_PCIEREGS, PCIE_PLP_STATUSREG);
PCIE_PLP_STATUSREG);
/* Detect the current polarity at attach and force that polarity and /* Detect the current polarity at attach and force that polarity and
* disable changing the polarity * disable changing the polarity
*/ */
if ((w & PCIE_PLP_POLARITYINV_STAT) == 0) if ((w & PCIE_PLP_POLARITYINV_STAT) == 0)
pi->pcie_polarity = (SERDES_RX_CTRL_FORCE); pi->pcie_polarity = SERDES_RX_CTRL_FORCE;
else else
pi->pcie_polarity = pi->pcie_polarity = (SERDES_RX_CTRL_FORCE |
(SERDES_RX_CTRL_FORCE | SERDES_RX_CTRL_POLARITY); SERDES_RX_CTRL_POLARITY);
} }
/* enable ASPM and CLKREQ if srom doesn't have it */ /* enable ASPM and CLKREQ if srom doesn't have it */
...@@ -683,7 +689,7 @@ static void pcie_war_pci_setup(struct pcicore_info *pi) ...@@ -683,7 +689,7 @@ static void pcie_war_pci_setup(struct pcicore_info *pi)
struct sbpcieregs *pcieregs = pi->regs.pcieregs; struct sbpcieregs *pcieregs = pi->regs.pcieregs;
u32 w; u32 w;
if ((sih->buscorerev == 0) || (sih->buscorerev == 1)) { if (sih->buscorerev == 0 || sih->buscorerev == 1) {
w = pcie_readreg(pcieregs, PCIE_PCIEREGS, w = pcie_readreg(pcieregs, PCIE_PCIEREGS,
PCIE_TLP_WORKAROUNDSREG); PCIE_TLP_WORKAROUNDSREG);
w |= 0x8; w |= 0x8;
...@@ -693,7 +699,7 @@ static void pcie_war_pci_setup(struct pcicore_info *pi) ...@@ -693,7 +699,7 @@ static void pcie_war_pci_setup(struct pcicore_info *pi)
if (sih->buscorerev == 1) { if (sih->buscorerev == 1) {
w = pcie_readreg(pcieregs, PCIE_PCIEREGS, PCIE_DLLP_LCREG); w = pcie_readreg(pcieregs, PCIE_PCIEREGS, PCIE_DLLP_LCREG);
w |= (0x40); w |= 0x40;
pcie_writereg(pcieregs, PCIE_PCIEREGS, PCIE_DLLP_LCREG, w); pcie_writereg(pcieregs, PCIE_PCIEREGS, PCIE_DLLP_LCREG, w);
} }
...@@ -705,8 +711,8 @@ static void pcie_war_pci_setup(struct pcicore_info *pi) ...@@ -705,8 +711,8 @@ static void pcie_war_pci_setup(struct pcicore_info *pi)
/* Change the L1 threshold for better performance */ /* Change the L1 threshold for better performance */
w = pcie_readreg(pcieregs, PCIE_PCIEREGS, w = pcie_readreg(pcieregs, PCIE_PCIEREGS,
PCIE_DLLP_PMTHRESHREG); PCIE_DLLP_PMTHRESHREG);
w &= ~(PCIE_L1THRESHOLDTIME_MASK); w &= ~PCIE_L1THRESHOLDTIME_MASK;
w |= (PCIE_L1THRESHOLD_WARVAL << PCIE_L1THRESHOLDTIME_SHIFT); w |= PCIE_L1THRESHOLD_WARVAL << PCIE_L1THRESHOLDTIME_SHIFT;
pcie_writereg(pcieregs, PCIE_PCIEREGS, pcie_writereg(pcieregs, PCIE_PCIEREGS,
PCIE_DLLP_PMTHRESHREG, w); PCIE_DLLP_PMTHRESHREG, w);
...@@ -716,7 +722,9 @@ static void pcie_war_pci_setup(struct pcicore_info *pi) ...@@ -716,7 +722,9 @@ static void pcie_war_pci_setup(struct pcicore_info *pi)
} else if (pi->sih->buscorerev == 7) } else if (pi->sih->buscorerev == 7)
pcie_war_noplldown(pi); pcie_war_noplldown(pi);
/* Note that the fix is actually in the SROM, that's why this is open-ended */ /* Note that the fix is actually in the SROM,
* that's why this is open-ended
*/
if (pi->sih->buscorerev >= 6) if (pi->sih->buscorerev >= 6)
pcie_misc_config_fixup(pi); pcie_misc_config_fixup(pi);
} }
...@@ -724,17 +732,16 @@ static void pcie_war_pci_setup(struct pcicore_info *pi) ...@@ -724,17 +732,16 @@ static void pcie_war_pci_setup(struct pcicore_info *pi)
/* ***** Functions called during driver state changes ***** */ /* ***** Functions called during driver state changes ***** */
void pcicore_attach(void *pch, char *pvars, int state) void pcicore_attach(void *pch, char *pvars, int state)
{ {
struct pcicore_info *pi = (struct pcicore_info *) pch; struct pcicore_info *pi = pch;
struct si_pub *sih = pi->sih; struct si_pub *sih = pi->sih;
/* Determine if this board needs override */ /* Determine if this board needs override */
if (PCIE_ASPM(sih)) { if (PCIE_ASPM(sih)) {
if ((u32) getintvar(pvars, "boardflags2") & BFL2_PCIEWAR_OVR) { if ((u32)getintvar(pvars, "boardflags2") & BFL2_PCIEWAR_OVR)
pi->pcie_war_aspm_ovr = PCIE_ASPM_DISAB; pi->pcie_war_aspm_ovr = PCIE_ASPM_DISAB;
} else { else
pi->pcie_war_aspm_ovr = PCIE_ASPM_ENAB; pi->pcie_war_aspm_ovr = PCIE_ASPM_ENAB;
} }
}
/* These need to happen in this order only */ /* These need to happen in this order only */
pcie_war_polarity(pi); pcie_war_polarity(pi);
...@@ -749,7 +756,7 @@ void pcicore_attach(void *pch, char *pvars, int state) ...@@ -749,7 +756,7 @@ void pcicore_attach(void *pch, char *pvars, int state)
void pcicore_hwup(void *pch) void pcicore_hwup(void *pch)
{ {
struct pcicore_info *pi = (struct pcicore_info *) pch; struct pcicore_info *pi = pch;
if (!pi || !PCIE_PUB(pi->sih)) if (!pi || !PCIE_PUB(pi->sih))
return; return;
...@@ -759,7 +766,7 @@ void pcicore_hwup(void *pch) ...@@ -759,7 +766,7 @@ void pcicore_hwup(void *pch)
void pcicore_up(void *pch, int state) void pcicore_up(void *pch, int state)
{ {
struct pcicore_info *pi = (struct pcicore_info *) pch; struct pcicore_info *pi = pch;
if (!pi || !PCIE_PUB(pi->sih)) if (!pi || !PCIE_PUB(pi->sih))
return; return;
...@@ -770,10 +777,12 @@ void pcicore_up(void *pch, int state) ...@@ -770,10 +777,12 @@ void pcicore_up(void *pch, int state)
pcie_clkreq_upd(pi, state); pcie_clkreq_upd(pi, state);
} }
/* When the device is going to enter D3 state (or the system is going to enter S3/S4 states */ /* When the device is going to enter D3 state
* (or the system is going to enter S3/S4 states)
*/
void pcicore_sleep(void *pch) void pcicore_sleep(void *pch)
{ {
struct pcicore_info *pi = (struct pcicore_info *) pch; struct pcicore_info *pi = pch;
u32 w; u32 w;
if (!pi || !PCIE_ASPM(pi->sih)) if (!pi || !PCIE_ASPM(pi->sih))
...@@ -788,7 +797,7 @@ void pcicore_sleep(void *pch) ...@@ -788,7 +797,7 @@ void pcicore_sleep(void *pch)
void pcicore_down(void *pch, int state) void pcicore_down(void *pch, int state)
{ {
struct pcicore_info *pi = (struct pcicore_info *) pch; struct pcicore_info *pi = pch;
if (!pi || !PCIE_PUB(pi->sih)) if (!pi || !PCIE_PUB(pi->sih))
return; return;
...@@ -799,12 +808,10 @@ void pcicore_down(void *pch, int state) ...@@ -799,12 +808,10 @@ void pcicore_down(void *pch, int state)
pcie_extendL1timer(pi, false); pcie_extendL1timer(pi, false);
} }
/* /* precondition: current core is sii->buscoretype */
* precondition: current core is sii->buscoretype
*/
void pcicore_fixcfg(void *pch, void *regs) void pcicore_fixcfg(void *pch, void *regs)
{ {
struct pcicore_info *pi = (struct pcicore_info *) pch; struct pcicore_info *pi = pch;
struct si_info *sii = SI_INFO(pi->sih); struct si_info *sii = SI_INFO(pi->sih);
struct sbpciregs *pciregs = regs; struct sbpciregs *pciregs = regs;
struct sbpcieregs *pcieregs = regs; struct sbpcieregs *pcieregs = regs;
...@@ -812,39 +819,32 @@ void pcicore_fixcfg(void *pch, void *regs) ...@@ -812,39 +819,32 @@ void pcicore_fixcfg(void *pch, void *regs)
uint pciidx; uint pciidx;
/* check 'pi' is correct and fix it if not */ /* check 'pi' is correct and fix it if not */
if (sii->pub.buscoretype == PCIE_CORE_ID) { if (sii->pub.buscoretype == PCIE_CORE_ID)
reg16 = &pcieregs->sprom[SRSH_PI_OFFSET]; reg16 = &pcieregs->sprom[SRSH_PI_OFFSET];
} else if (sii->pub.buscoretype == PCI_CORE_ID) { else if (sii->pub.buscoretype == PCI_CORE_ID)
reg16 = &pciregs->sprom[SRSH_PI_OFFSET]; reg16 = &pciregs->sprom[SRSH_PI_OFFSET];
}
pciidx = ai_coreidx(&sii->pub); pciidx = ai_coreidx(&sii->pub);
val16 = R_REG(reg16); val16 = R_REG(reg16);
if (((val16 & SRSH_PI_MASK) >> SRSH_PI_SHIFT) != (u16) pciidx) { if (((val16 & SRSH_PI_MASK) >> SRSH_PI_SHIFT) != (u16)pciidx) {
val16 = val16 = (u16)(pciidx << SRSH_PI_SHIFT) |
(u16) (pciidx << SRSH_PI_SHIFT) | (val16 & (val16 & ~SRSH_PI_MASK);
~SRSH_PI_MASK);
W_REG(reg16, val16); W_REG(reg16, val16);
} }
} }
/* /* precondition: current core is pci core */
* precondition: current core is pci core
*/
void pcicore_pci_setup(void *pch, void *regs) void pcicore_pci_setup(void *pch, void *regs)
{ {
struct pcicore_info *pi = (struct pcicore_info *) pch; struct pcicore_info *pi = pch;
struct sbpciregs *pciregs = regs; struct sbpciregs *pciregs = regs;
u32 w; u32 w;
OR_REG(&pciregs->sbtopci2, OR_REG(&pciregs->sbtopci2, SBTOPCI_PREF | SBTOPCI_BURST);
(SBTOPCI_PREF | SBTOPCI_BURST));
if (SI_INFO(pi->sih)->pub.buscorerev >= 11) { if (SI_INFO(pi->sih)->pub.buscorerev >= 11) {
OR_REG(&pciregs->sbtopci2, OR_REG(&pciregs->sbtopci2, SBTOPCI_RC_READMULTI);
SBTOPCI_RC_READMULTI);
w = R_REG(&pciregs->clkrun); w = R_REG(&pciregs->clkrun);
W_REG(&pciregs->clkrun, W_REG(&pciregs->clkrun, w | PCI_CLKRUN_DSBL);
(w | PCI_CLKRUN_DSBL));
w = R_REG(&pciregs->clkrun); w = R_REG(&pciregs->clkrun);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7