mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 17:59:32 +00:00
[PATCH] skge: clear PCI PHY COMA mode on boot
When skge is booted up, the PHY may be stuck in power down state by the previous OS. So we may need to turn it on. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
parent
3133c5e896
commit
adba9e23b4
2 changed files with 12 additions and 0 deletions
|
@ -2893,6 +2893,7 @@ static const char *skge_board_name(const struct skge_hw *hw)
|
|||
*/
|
||||
static int skge_reset(struct skge_hw *hw)
|
||||
{
|
||||
u32 reg;
|
||||
u16 ctst;
|
||||
u8 t8, mac_cfg, pmd_type, phy_type;
|
||||
int i;
|
||||
|
@ -2971,6 +2972,7 @@ static int skge_reset(struct skge_hw *hw)
|
|||
/* switch power to VCC (WA for VAUX problem) */
|
||||
skge_write8(hw, B0_POWER_CTRL,
|
||||
PC_VAUX_ENA | PC_VCC_ENA | PC_VAUX_OFF | PC_VCC_ON);
|
||||
|
||||
/* avoid boards with stuck Hardware error bits */
|
||||
if ((skge_read32(hw, B0_ISRC) & IS_HW_ERR) &&
|
||||
(skge_read32(hw, B0_HWE_ISRC) & IS_IRQ_SENSOR)) {
|
||||
|
@ -2978,6 +2980,14 @@ static int skge_reset(struct skge_hw *hw)
|
|||
hw->intr_mask &= ~IS_HW_ERR;
|
||||
}
|
||||
|
||||
/* Clear PHY COMA */
|
||||
skge_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
|
||||
pci_read_config_dword(hw->pdev, PCI_DEV_REG1, ®);
|
||||
reg &= ~PCI_PHY_COMA;
|
||||
pci_write_config_dword(hw->pdev, PCI_DEV_REG1, reg);
|
||||
skge_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
|
||||
|
||||
|
||||
for (i = 0; i < hw->ports; i++) {
|
||||
skge_write16(hw, SK_REG(i, GMAC_LINK_CTRL), GMLC_RST_SET);
|
||||
skge_write16(hw, SK_REG(i, GMAC_LINK_CTRL), GMLC_RST_CLR);
|
||||
|
|
|
@ -6,6 +6,8 @@
|
|||
|
||||
/* PCI config registers */
|
||||
#define PCI_DEV_REG1 0x40
|
||||
#define PCI_PHY_COMA 0x8000000
|
||||
#define PCI_VIO 0x2000000
|
||||
#define PCI_DEV_REG2 0x44
|
||||
#define PCI_REV_DESC 0x4
|
||||
|
||||
|
|
Loading…
Reference in a new issue