Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 864ad85f authored by Huang, Xiong's avatar Huang, Xiong Committed by David S. Miller
Browse files

atl1c: remove VPD register 



VPD register is only used for L1(devid=PCI_DEVICE_ID_ATTANSIC_L1) to
access external NV-memory.
l1c & later chip doesn't use it any more.
PHY 0/1 registers occupy the last 2 slots of the dump table.

Signed-off-by: default avatarxiong <xiong@qca.qualcomm.com>
Tested-by: default avatarLiu David <dwliu@qca.qualcomm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f4e5db2b

drivers/net/ethernet/atheros/atl1c/atl1c.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
#define ATL1C_ASPM_L0s_ENABLE		0x0001

#define ATL1C_ASPM_L1_ENABLE		0x0002



#define AT_REGS_LEN	(75 * sizeof(u32))

#define AT_REGS_LEN	(74 * sizeof(u32))

#define AT_EEPROM_LEN 	512



#define ATL1C_GET_DESC(R, i, type)	(&(((type *)((R)->desc))[i]))

drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c

+3 −4
Original line number Diff line number Diff line
@@ -141,8 +141,7 @@ static void atl1c_get_regs(struct net_device *netdev, 


	memset(p, 0, AT_REGS_LEN);



	regs->version = 0;

	AT_READ_REG(hw, REG_VPD_CAP, 		  p++);

	regs->version = 1;

	AT_READ_REG(hw, REG_PM_CTRL, 		  p++);

	AT_READ_REG(hw, REG_MAC_HALF_DUPLX_CTRL,  p++);

	AT_READ_REG(hw, REG_TWSI_CTRL, 		  p++);
@@ -167,9 +166,9 @@ static void atl1c_get_regs(struct net_device *netdev, 
	AT_READ_REG(hw, REG_WOL_CTRL, 		  p++);



	atl1c_read_phy_reg(hw, MII_BMCR, &phy_data);

	regs_buff[73] =	(u32) phy_data;

	regs_buff[AT_REGS_LEN/sizeof(u32) - 2] = (u32) phy_data;

	atl1c_read_phy_reg(hw, MII_BMSR, &phy_data);

	regs_buff[74] = (u32) phy_data;

	regs_buff[AT_REGS_LEN/sizeof(u32) - 1] = (u32) phy_data;

}



static int atl1c_get_eeprom_len(struct net_device *netdev)

drivers/net/ethernet/atheros/atl1c/atl1c_hw.h

+0 −11
Original line number Diff line number Diff line
@@ -59,17 +59,6 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw); 
#define LINK_CTRL_L1_EN			0x02

#define LINK_CTRL_EXT_SYNC		0x80



#define REG_VPD_CAP			0x6C

#define VPD_CAP_ID_MASK                 0xff

#define VPD_CAP_ID_SHIFT                0

#define VPD_CAP_NEXT_PTR_MASK           0xFF

#define VPD_CAP_NEXT_PTR_SHIFT          8

#define VPD_CAP_VPD_ADDR_MASK           0x7FFF

#define VPD_CAP_VPD_ADDR_SHIFT          16

#define VPD_CAP_VPD_FLAG                0x80000000



#define REG_VPD_DATA                	0x70



#define REG_PCIE_UC_SEVERITY		0x10C

#define PCIE_UC_SERVRITY_TRN		0x00000001

#define PCIE_UC_SERVRITY_DLP		0x00000010