ucc_geth: changes to ucc_geth driver as a result of qe_lib changes and bugfixes
Subsystems (2)
PATCH RESEND 1/1 ucc_geth: changes to ucc_geth driver as a result of qe_lib changes and bugfixes
From: Li Yang <[email protected]>
changes due to qe_lib changes include:
o removed inclusion of platform header file
o removed platform_device code, replaced with of_device
o removed typedefs
o uint -> u32 conversions
o removed following defines:
QE_SIZEOF_BD, BD_BUFFER_ARG, BD_BUFFER_CLEAR, BD_BUFFER, BD_STATUS_AND_LENGTH_SET, BD_STATUS_AND_LENGTH, and BD_BUFFER_SET because they hid sizeof/in_be32/out_be32 operations from the reader.
o removed irrelevant comments, added others to resemble removed BD_ defines
o const'd and uncasted all get_property() assignments
bugfixes, courtesy of Scott Wood, include:
- Read phy_address as a u32, not u8.
- Match on type == "network" as well as compatible == "ucc_geth", as
device_is_compatible() will only compare up to the length of the
test string, allowing "ucc_geth_phy" to match as well.
- fixes the MAC setting code in ucc_geth.c. The old code was overwriting and dereferencing random stack contents.
---
Jeff, this is a bugfix. ucc_geth does not currently build, let alone run. It's a re-send of this:
http://ozlabs.org/pipermail/linuxppc-dev/2006-October/026690.html
but with the removal of the inclusion of a platform header file. So, this patch fixes all buildtime and runtime errors; please apply.
drivers/net/Kconfig | 2 drivers/net/ucc_geth.c | 633 ++++++++++++++++++++++++-------------------- drivers/net/ucc_geth.h | 248 +++++++++-------- drivers/net/ucc_geth_phy.c | 26 -- drivers/net/ucc_geth_phy.h | 2 5 files changed, 475 insertions(+), 436 deletions(-)
drivers/net/Kconfig +1 -1
@@ -2288,7 +2288,7 @@ config UGETH_TX_ON_DEMOND config UGETH_HAS_GIGA bool - depends on UCC_GETH && MPC836x + depends on UCC_GETH && PPC_MPC836x config MV643XX_ETH tristate "MV-643XX Ethernet support"
drivers/net/ucc_geth.c +344 -289
1,553 lines not on this page · raw message
drivers/net/ucc_geth.h +123 -125
539 lines not on this page · raw message
drivers/net/ucc_geth_phy.c +6 -20
@@ -42,7 +42,6 @@ #include <asm/uaccess.h>#include "ucc_geth.h" #include "ucc_geth_phy.h" -#include <platforms/83xx/mpc8360e_pb.h> #define ugphy_printk(level, format, arg...) \ printk(level format "\n", ## arg)
@@ -72,16 +71,14 @@ static int genmii_read_status(struct ugeu16 phy_read (struct ugeth_mii_info *mii_info,u16 regnum);void phy_write (struct ugeth_mii_info *mii_info,u16 regnum,u16 val); -static u8 *bcsr_regs =NULL ; -/* Write value to the PHY for this device to the register at regnum, */ /* waiting until the write is done before it returns. All PHY */ /* configuration has to be done through the TSEC1 MIIM regs */ void write_phy_reg (struct net_device *dev,int mii_id,int regnum,int value) { -ucc_geth_private_t *ugeth =netdev_priv (dev); -ucc_mii_mng_t *mii_regs; -enet_tbi_mii_reg_e mii_reg = (enet_tbi_mii_reg_e ) regnum; +struct ucc_geth_private *ugeth =netdev_priv (dev); +struct ucc_mii_mng *mii_regs; +enum enet_tbi_mii_reg mii_reg = (enum enet_tbi_mii_reg ) regnum;u32 tmp_reg;ugphy_vdbg ("%s: IN" , __FUNCTION__);
@@ -116,9 +113,9 @@ void write_phy_reg(struct net_device *de/* configuration has to be done through the TSEC1 MIIM regs */ int read_phy_reg (struct net_device *dev,int mii_id,int regnum) { -ucc_geth_private_t *ugeth =netdev_priv (dev); -ucc_mii_mng_t *mii_regs; -enet_tbi_mii_reg_e mii_reg = (enet_tbi_mii_reg_e ) regnum; +struct ucc_geth_private *ugeth =netdev_priv (dev); +struct ucc_mii_mng *mii_regs; +enum enet_tbi_mii_reg mii_reg = (enum enet_tbi_mii_reg ) regnum;u32 tmp_reg;u16 value;
@@ -634,11 +631,6 @@ static void dm9161_close(struct ugeth_mistatic int dm9161_ack_interrupt (struct ugeth_mii_info *mii_info) { -/* FIXME: This lines are for BUG fixing in the mpc8325. -Remove this from here when it's fixed */ -if (bcsr_regs ==NULL ) - bcsr_regs = (u8 *)ioremap (BCSR_PHYS_ADDR ,BCSR_SIZE ); - bcsr_regs[14 ] |=0x40 ;ugphy_vdbg ("%s: IN" , __FUNCTION__);/* Clear the interrupts by reading the reg */
@@ -650,12 +642,6 @@ Remove this from here when it's fixed */static int dm9161_config_intr (struct ugeth_mii_info *mii_info) { -/* FIXME: This lines are for BUG fixing in the mpc8325. -Remove this from here when it's fixed */ -if (bcsr_regs ==NULL ) { - bcsr_regs = (u8 *)ioremap (BCSR_PHYS_ADDR ,BCSR_SIZE ); - bcsr_regs[14 ] &= ~0x40 ; - }ugphy_vdbg ("%s: IN" , __FUNCTION__);if (mii_info->interrupts ==MII_INTERRUPT_ENABLED )
drivers/net/ucc_geth_phy.h +1 -1
@@ -126,7 +126,7 @@ struct ugeth_mii_info {/* And management functions */ struct phy_info *phyinfo; -ucc_mii_mng_t *mii_regs; +struct ucc_mii_mng *mii_regs;/* forced speed & duplex (no autoneg) * partner speed & duplex & pause (autoneg)
Signature · 1 line
1.4.2.3