projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1be5bd0
)
ixp4xx: remove bogus 'eth%d: MII PHY x on NPE-x' messages
author
Gabor Juhos
<juhosg@openwrt.org>
Sat, 31 Oct 2009 20:10:30 +0000
(20:10 +0000)
committer
Gabor Juhos
<juhosg@openwrt.org>
Sat, 31 Oct 2009 20:10:30 +0000
(20:10 +0000)
SVN-Revision: 18251
target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch
patch
|
blob
|
history
target/linux/ixp4xx/patches-2.6.30/206-npe_driver_add_update_link_function.patch
patch
|
blob
|
history
target/linux/ixp4xx/patches-2.6.30/207-npe_driver_multiphy_support.patch
patch
|
blob
|
history
target/linux/ixp4xx/patches-2.6.30/304-ixp4xx_eth_jumboframe.patch
patch
|
blob
|
history
target/linux/ixp4xx/patches-2.6.31/205-npe_driver_separate_phy_functions.patch
patch
|
blob
|
history
target/linux/ixp4xx/patches-2.6.31/206-npe_driver_add_update_link_function.patch
patch
|
blob
|
history
target/linux/ixp4xx/patches-2.6.31/207-npe_driver_multiphy_support.patch
patch
|
blob
|
history
target/linux/ixp4xx/patches-2.6.31/304-ixp4xx_eth_jumboframe.patch
patch
|
blob
|
history
diff --git
a/target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch
b/target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch
index 6120176b6cf8db2f66997ffa8847f329d8812af4..d962658122aa64df51ed60f739569da111d0bcdb 100644
(file)
--- a/
target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch
+++ b/
target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
-@@ -396,6 +396,5
3
@@ static void ixp4xx_adjust_link(struct ne
+@@ -396,6 +396,5
0
@@ static void ixp4xx_adjust_link(struct ne
dev->name, port->speed, port->duplex ? "full" : "half");
}
dev->name, port->speed, port->duplex ? "full" : "half");
}
@@
-24,9
+24,6
@@
+
+ port->phydev->irq = PHY_POLL;
+
+
+ port->phydev->irq = PHY_POLL;
+
-+ printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy,
-+ npe_name(port->npe));
-+
+ return 0;
+}
+
+ return 0;
+}
+
@@
-54,7
+51,7
@@
static inline void debug_pkt(struct net_device *dev, const char *func,
u8 *data, int len)
static inline void debug_pkt(struct net_device *dev, const char *func,
u8 *data, int len)
-@@ -1003,8 +10
50
,7 @@ static int eth_open(struct net_device *d
+@@ -1003,8 +10
47
,7 @@ static int eth_open(struct net_device *d
return err;
}
return err;
}
@@
-64,7
+61,7
@@
for (i = 0; i < ETH_ALEN; i++)
__raw_writel(dev->dev_addr[i], &port->regs->hw_addr[i]);
for (i = 0; i < ETH_ALEN; i++)
__raw_writel(dev->dev_addr[i], &port->regs->hw_addr[i]);
-@@ -1125,7 +11
71
,7 @@ static int eth_close(struct net_device *
+@@ -1125,7 +11
68
,7 @@ static int eth_close(struct net_device *
printk(KERN_CRIT "%s: unable to disable loopback\n",
dev->name);
printk(KERN_CRIT "%s: unable to disable loopback\n",
dev->name);
@@
-73,7
+70,7
@@
if (!ports_open)
qmgr_disable_irq(TXDONE_QUEUE);
if (!ports_open)
qmgr_disable_irq(TXDONE_QUEUE);
-@@ -1151,7 +119
7
,6 @@ static int __devinit eth_init_one(struct
+@@ -1151,7 +119
4
,6 @@ static int __devinit eth_init_one(struct
struct net_device *dev;
struct eth_plat_info *plat = pdev->dev.platform_data;
u32 regs_phys;
struct net_device *dev;
struct eth_plat_info *plat = pdev->dev.platform_data;
u32 regs_phys;
@@
-81,7
+78,7
@@
int err;
if (!(dev = alloc_etherdev(sizeof(struct port))))
int err;
if (!(dev = alloc_etherdev(sizeof(struct port))))
-@@ -1209,18 +125
4
,10 @@ static int __devinit eth_init_one(struct
+@@ -1209,18 +125
1
,10 @@ static int __devinit eth_init_one(struct
__raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
udelay(50);
__raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
udelay(50);
@@
-102,7
+99,7
@@
if ((err = register_netdev(dev)))
goto err_phy_dis;
if ((err = register_netdev(dev)))
goto err_phy_dis;
-@@ -1247,7 +128
4
,7 @@ static int __devexit eth_remove_one(stru
+@@ -1247,7 +128
1
,7 @@ static int __devexit eth_remove_one(stru
struct net_device *dev = platform_get_drvdata(pdev);
struct port *port = netdev_priv(dev);
struct net_device *dev = platform_get_drvdata(pdev);
struct port *port = netdev_priv(dev);
diff --git
a/target/linux/ixp4xx/patches-2.6.30/206-npe_driver_add_update_link_function.patch
b/target/linux/ixp4xx/patches-2.6.30/206-npe_driver_add_update_link_function.patch
index 9529cce2cc939171afbb77d488fe5f411a9ddfd9..f12c671a31c6bbb682fd2c98db17e467a2a33c63 100644
(file)
--- a/
target/linux/ixp4xx/patches-2.6.30/206-npe_driver_add_update_link_function.patch
+++ b/
target/linux/ixp4xx/patches-2.6.30/206-npe_driver_add_update_link_function.patch
@@
-77,9
+77,17
@@
static int ixp4xx_phy_connect(struct net_device *dev)
{
struct port *port = netdev_priv(dev);
static int ixp4xx_phy_connect(struct net_device *dev)
{
struct port *port = netdev_priv(dev);
-@@ -416,6 +431,10 @@ static int ixp4xx_phy_connect(struct net
+@@ -430,7 +445,6 @@ static void ixp4xx_phy_start(struct net_
+ {
+ struct port *port = netdev_priv(dev);
- port->phydev->irq = PHY_POLL;
+- port->speed = 0; /* force "link up" message */
+ phy_start(port->phydev);
+ }
+
+@@ -1258,6 +1272,10 @@ static int __devinit eth_init_one(struct
+ if ((err = register_netdev(dev)))
+ goto err_phy_dis;
+ port->link = 0;
+ port->speed = 0;
+ port->link = 0;
+ port->speed = 0;
@@
-88,11
+96,3
@@
printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy,
npe_name(port->npe));
printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy,
npe_name(port->npe));
-@@ -433,7 +452,6 @@ static void ixp4xx_phy_start(struct net_
- {
- struct port *port = netdev_priv(dev);
-
-- port->speed = 0; /* force "link up" message */
- phy_start(port->phydev);
- }
-
diff --git
a/target/linux/ixp4xx/patches-2.6.30/207-npe_driver_multiphy_support.patch
b/target/linux/ixp4xx/patches-2.6.30/207-npe_driver_multiphy_support.patch
index 4f2f8bbdb9f1d66fe5ab08a4c2f409ffc060316e..a3866a908ad6452d495f9e001f4235188a1b71d9 100644
(file)
--- a/
target/linux/ixp4xx/patches-2.6.30/207-npe_driver_multiphy_support.patch
+++ b/
target/linux/ixp4xx/patches-2.6.30/207-npe_driver_multiphy_support.patch
@@
-75,7
+75,7
@@
TODO: take care of additional PHYs through the PHY abstraction layer
snprintf(phy_id, BUS_ID_SIZE, PHY_ID_FMT, "0", plat->phy);
port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0,
PHY_INTERFACE_MODE_MII);
snprintf(phy_id, BUS_ID_SIZE, PHY_ID_FMT, "0", plat->phy);
port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0,
PHY_INTERFACE_MODE_MII);
-@@ -4
45,21 +476
,32 @@ static void ixp4xx_phy_disconnect(struct
+@@ -4
38,21 +469
,32 @@ static void ixp4xx_phy_disconnect(struct
{
struct port *port = netdev_priv(dev);
{
struct port *port = netdev_priv(dev);
@@
-111,7
+111,7
@@
TODO: take care of additional PHYs through the PHY abstraction layer
}
static inline void debug_pkt(struct net_device *dev, const char *func,
}
static inline void debug_pkt(struct net_device *dev, const char *func,
-@@ -8
31,6 +873
,10 @@ static int eth_ioctl(struct net_device *
+@@ -8
24,6 +866
,10 @@ static int eth_ioctl(struct net_device *
if (!netif_running(dev))
return -EINVAL;
if (!netif_running(dev))
return -EINVAL;
@@
-122,7
+122,7
@@
TODO: take care of additional PHYs through the PHY abstraction layer
return phy_mii_ioctl(port->phydev, if_mii(req), cmd);
}
return phy_mii_ioctl(port->phydev, if_mii(req), cmd);
}
-@@ -8
50,18 +896
,30 @@ static void ixp4xx_get_drvinfo(struct ne
+@@ -8
43,18 +889
,30 @@ static void ixp4xx_get_drvinfo(struct ne
static int ixp4xx_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
struct port *port = netdev_priv(dev);
static int ixp4xx_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
struct port *port = netdev_priv(dev);
diff --git
a/target/linux/ixp4xx/patches-2.6.30/304-ixp4xx_eth_jumboframe.patch
b/target/linux/ixp4xx/patches-2.6.30/304-ixp4xx_eth_jumboframe.patch
index d7f5a1f56fba2a6c4629445b67f671350a46f005..9ee3c904c0aaf7a49da73b39e5edfb3985bb2d54 100644
(file)
--- a/
target/linux/ixp4xx/patches-2.6.30/304-ixp4xx_eth_jumboframe.patch
+++ b/
target/linux/ixp4xx/patches-2.6.30/304-ixp4xx_eth_jumboframe.patch
@@
-9,7
+9,7
@@
#define RX_BUFF_SIZE ALIGN((NET_IP_ALIGN) + MAX_MRU, 4)
#define NAPI_WEIGHT 16
#define RX_BUFF_SIZE ALIGN((NET_IP_ALIGN) + MAX_MRU, 4)
#define NAPI_WEIGHT 16
-@@ -10
66,6 +1066
,32 @@ static void destroy_queues(struct port *
+@@ -10
59,6 +1059
,32 @@ static void destroy_queues(struct port *
}
}
}
}
@@
-42,7
+42,7
@@
static int eth_open(struct net_device *dev)
{
struct port *port = netdev_priv(dev);
static int eth_open(struct net_device *dev)
{
struct port *port = netdev_priv(dev);
-@@ -111
7,6 +1143
,8 @@ static int eth_open(struct net_device *d
+@@ -111
0,6 +1136
,8 @@ static int eth_open(struct net_device *d
if (npe_send_recv_message(port->npe, &msg, "ETH_SET_FIREWALL_MODE"))
return -EIO;
if (npe_send_recv_message(port->npe, &msg, "ETH_SET_FIREWALL_MODE"))
return -EIO;
@@
-51,7
+51,7
@@
if ((err = request_queues(port)) != 0)
return err;
if ((err = request_queues(port)) != 0)
return err;
-@@ -12
56,7 +1284
,26 @@ static int eth_close(struct net_device *
+@@ -12
49,7 +1277
,26 @@ static int eth_close(struct net_device *
return 0;
}
return 0;
}
diff --git
a/target/linux/ixp4xx/patches-2.6.31/205-npe_driver_separate_phy_functions.patch
b/target/linux/ixp4xx/patches-2.6.31/205-npe_driver_separate_phy_functions.patch
index c1fc76d2aab4ac5b42a86abff166a87d9b4eb347..857d959a4ef00b7adaa71fdb63bea9e63dbc0d15 100644
(file)
--- a/
target/linux/ixp4xx/patches-2.6.31/205-npe_driver_separate_phy_functions.patch
+++ b/
target/linux/ixp4xx/patches-2.6.31/205-npe_driver_separate_phy_functions.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
-@@ -396,6 +396,5
3
@@ static void ixp4xx_adjust_link(struct ne
+@@ -396,6 +396,5
0
@@ static void ixp4xx_adjust_link(struct ne
dev->name, port->speed, port->duplex ? "full" : "half");
}
dev->name, port->speed, port->duplex ? "full" : "half");
}
@@
-24,9
+24,6
@@
+
+ port->phydev->irq = PHY_POLL;
+
+
+ port->phydev->irq = PHY_POLL;
+
-+ printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy,
-+ npe_name(port->npe));
-+
+ return 0;
+}
+
+ return 0;
+}
+
@@
-54,7
+51,7
@@
static inline void debug_pkt(struct net_device *dev, const char *func,
u8 *data, int len)
static inline void debug_pkt(struct net_device *dev, const char *func,
u8 *data, int len)
-@@ -1005,8 +10
52
,7 @@ static int eth_open(struct net_device *d
+@@ -1005,8 +10
49
,7 @@ static int eth_open(struct net_device *d
return err;
}
return err;
}
@@
-64,7
+61,7
@@
for (i = 0; i < ETH_ALEN; i++)
__raw_writel(dev->dev_addr[i], &port->regs->hw_addr[i]);
for (i = 0; i < ETH_ALEN; i++)
__raw_writel(dev->dev_addr[i], &port->regs->hw_addr[i]);
-@@ -1127,7 +117
3
,7 @@ static int eth_close(struct net_device *
+@@ -1127,7 +117
0
,7 @@ static int eth_close(struct net_device *
printk(KERN_CRIT "%s: unable to disable loopback\n",
dev->name);
printk(KERN_CRIT "%s: unable to disable loopback\n",
dev->name);
@@
-73,7
+70,7
@@
if (!ports_open)
qmgr_disable_irq(TXDONE_QUEUE);
if (!ports_open)
qmgr_disable_irq(TXDONE_QUEUE);
-@@ -1153,7 +119
9
,6 @@ static int __devinit eth_init_one(struct
+@@ -1153,7 +119
6
,6 @@ static int __devinit eth_init_one(struct
struct net_device *dev;
struct eth_plat_info *plat = pdev->dev.platform_data;
u32 regs_phys;
struct net_device *dev;
struct eth_plat_info *plat = pdev->dev.platform_data;
u32 regs_phys;
@@
-81,7
+78,7
@@
int err;
if (!(dev = alloc_etherdev(sizeof(struct port))))
int err;
if (!(dev = alloc_etherdev(sizeof(struct port))))
-@@ -1211,18 +125
6
,10 @@ static int __devinit eth_init_one(struct
+@@ -1211,18 +125
3
,10 @@ static int __devinit eth_init_one(struct
__raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
udelay(50);
__raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
udelay(50);
@@
-102,7
+99,7
@@
if ((err = register_netdev(dev)))
goto err_phy_dis;
if ((err = register_netdev(dev)))
goto err_phy_dis;
-@@ -1249,7 +128
6
,7 @@ static int __devexit eth_remove_one(stru
+@@ -1249,7 +128
3
,7 @@ static int __devexit eth_remove_one(stru
struct net_device *dev = platform_get_drvdata(pdev);
struct port *port = netdev_priv(dev);
struct net_device *dev = platform_get_drvdata(pdev);
struct port *port = netdev_priv(dev);
diff --git
a/target/linux/ixp4xx/patches-2.6.31/206-npe_driver_add_update_link_function.patch
b/target/linux/ixp4xx/patches-2.6.31/206-npe_driver_add_update_link_function.patch
index 9529cce2cc939171afbb77d488fe5f411a9ddfd9..419ec4cdb2264bbd4e8d1f76e85c807b6004d68c 100644
(file)
--- a/
target/linux/ixp4xx/patches-2.6.31/206-npe_driver_add_update_link_function.patch
+++ b/
target/linux/ixp4xx/patches-2.6.31/206-npe_driver_add_update_link_function.patch
@@
-77,9
+77,17
@@
static int ixp4xx_phy_connect(struct net_device *dev)
{
struct port *port = netdev_priv(dev);
static int ixp4xx_phy_connect(struct net_device *dev)
{
struct port *port = netdev_priv(dev);
-@@ -416,6 +431,10 @@ static int ixp4xx_phy_connect(struct net
+@@ -430,7 +445,6 @@ static void ixp4xx_phy_start(struct net_
+ {
+ struct port *port = netdev_priv(dev);
- port->phydev->irq = PHY_POLL;
+- port->speed = 0; /* force "link up" message */
+ phy_start(port->phydev);
+ }
+
+@@ -1260,6 +1274,10 @@ static int __devinit eth_init_one(struct
+ if ((err = register_netdev(dev)))
+ goto err_phy_dis;
+ port->link = 0;
+ port->speed = 0;
+ port->link = 0;
+ port->speed = 0;
@@
-88,11
+96,3
@@
printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy,
npe_name(port->npe));
printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy,
npe_name(port->npe));
-@@ -433,7 +452,6 @@ static void ixp4xx_phy_start(struct net_
- {
- struct port *port = netdev_priv(dev);
-
-- port->speed = 0; /* force "link up" message */
- phy_start(port->phydev);
- }
-
diff --git
a/target/linux/ixp4xx/patches-2.6.31/207-npe_driver_multiphy_support.patch
b/target/linux/ixp4xx/patches-2.6.31/207-npe_driver_multiphy_support.patch
index 3eefdcc8c3674e695a7a9f6a7acc4d50df7743b1..afcf7e15616d1044149aa2232c31862b44008447 100644
(file)
--- a/
target/linux/ixp4xx/patches-2.6.31/207-npe_driver_multiphy_support.patch
+++ b/
target/linux/ixp4xx/patches-2.6.31/207-npe_driver_multiphy_support.patch
@@
-75,7
+75,7
@@
TODO: take care of additional PHYs through the PHY abstraction layer
snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, "0", plat->phy);
port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0,
PHY_INTERFACE_MODE_MII);
snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, "0", plat->phy);
port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0,
PHY_INTERFACE_MODE_MII);
-@@ -4
45,21 +476
,32 @@ static void ixp4xx_phy_disconnect(struct
+@@ -4
38,21 +469
,32 @@ static void ixp4xx_phy_disconnect(struct
{
struct port *port = netdev_priv(dev);
{
struct port *port = netdev_priv(dev);
@@
-111,7
+111,7
@@
TODO: take care of additional PHYs through the PHY abstraction layer
}
static inline void debug_pkt(struct net_device *dev, const char *func,
}
static inline void debug_pkt(struct net_device *dev, const char *func,
-@@ -8
33,6 +875
,10 @@ static int eth_ioctl(struct net_device *
+@@ -8
26,6 +868
,10 @@ static int eth_ioctl(struct net_device *
if (!netif_running(dev))
return -EINVAL;
if (!netif_running(dev))
return -EINVAL;
@@
-122,7
+122,7
@@
TODO: take care of additional PHYs through the PHY abstraction layer
return phy_mii_ioctl(port->phydev, if_mii(req), cmd);
}
return phy_mii_ioctl(port->phydev, if_mii(req), cmd);
}
-@@ -8
52,18 +898
,30 @@ static void ixp4xx_get_drvinfo(struct ne
+@@ -8
45,18 +891
,30 @@ static void ixp4xx_get_drvinfo(struct ne
static int ixp4xx_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
struct port *port = netdev_priv(dev);
static int ixp4xx_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
struct port *port = netdev_priv(dev);
diff --git
a/target/linux/ixp4xx/patches-2.6.31/304-ixp4xx_eth_jumboframe.patch
b/target/linux/ixp4xx/patches-2.6.31/304-ixp4xx_eth_jumboframe.patch
index d3d8af6ab89317e849807d43d2cab5426a336fe2..26f5bd953de42547cd82688402f1660a6bdbb6c5 100644
(file)
--- a/
target/linux/ixp4xx/patches-2.6.31/304-ixp4xx_eth_jumboframe.patch
+++ b/
target/linux/ixp4xx/patches-2.6.31/304-ixp4xx_eth_jumboframe.patch
@@
-9,7
+9,7
@@
#define RX_BUFF_SIZE ALIGN((NET_IP_ALIGN) + MAX_MRU, 4)
#define NAPI_WEIGHT 16
#define RX_BUFF_SIZE ALIGN((NET_IP_ALIGN) + MAX_MRU, 4)
#define NAPI_WEIGHT 16
-@@ -106
8,6 +1068
,32 @@ static void destroy_queues(struct port *
+@@ -106
1,6 +1061
,32 @@ static void destroy_queues(struct port *
}
}
}
}
@@
-42,7
+42,7
@@
static int eth_open(struct net_device *dev)
{
struct port *port = netdev_priv(dev);
static int eth_open(struct net_device *dev)
{
struct port *port = netdev_priv(dev);
-@@ -111
9,6 +1145
,8 @@ static int eth_open(struct net_device *d
+@@ -111
2,6 +1138
,8 @@ static int eth_open(struct net_device *d
if (npe_send_recv_message(port->npe, &msg, "ETH_SET_FIREWALL_MODE"))
return -EIO;
if (npe_send_recv_message(port->npe, &msg, "ETH_SET_FIREWALL_MODE"))
return -EIO;
@@
-51,7
+51,7
@@
if ((err = request_queues(port)) != 0)
return err;
if ((err = request_queues(port)) != 0)
return err;
-@@ -125
8,7 +1286
,26 @@ static int eth_close(struct net_device *
+@@ -125
1,7 +1279
,26 @@ static int eth_close(struct net_device *
return 0;
}
return 0;
}