Tulip dmfe carrier detection
Hi,
The dmfe module lacks netif stuff for carrier detection, while the board does report carrier status. Here is a patch.
Note: there are probably a lot more ethtool stuff that could be added, but carrier sense is really a must.
Samuel
net/tulip/dmfe.c renamed from net/tulip/dmfe-orig.c +7 -1
@@ -187,7 +187,7 @@ struct rx_desc {struct dmfe_board_info {u32 chip_id;/* Chip vendor/Device ID */ u32 chip_revision;/* Chip revision */ -struct DEVICE *next_dev;/* next device */ +struct DEVICE *dev;/* net device */ struct pci_dev *pdev;/* PCI device */ spinlock_t lock;
@@ -399,6 +399,8 @@ static int __devinit dmfe_init_one (stru/* Init system & device */ db =netdev_priv (dev); + db->dev = dev; +/* Allocate Tx/Rx descriptor memory */ db->desc_pool_ptr =pci_alloc_consistent (pdev,sizeof (struct tx_desc ) *DESC_ALL_CNT +0x20 , &db->desc_pool_dma_ptr); db->buf_pool_ptr =pci_alloc_consistent (pdev,TX_BUF_ALLOC *TX_DESC_CNT +4 , &db->buf_pool_dma_ptr);
@@ -1050,6 +1052,7 @@ static void netdev_get_drvinfo(struct nestatic struct ethtool_ops netdev_ethtool_ops = { .get_drvinfo = netdev_get_drvinfo, + .get_link = ethtool_op_get_link, };/*
@@ -1144,6 +1147,7 @@ static void dmfe_timer(unsigned long dat/* Link Failed */ DMFE_DBUG (0 ,"Link Failed" , tmp_cr12); db->link_failed =1 ; +netif_carrier_off (db->dev);/* For Force 10/100M Half/Full mode: Enable Auto-Nego mode */ /* AUTO or force 1M Homerun/Longrun don't need */
@@ -1166,6 +1170,8 @@ static void dmfe_timer(unsigned long datif ( (db->media_mode &DMFE_AUTO ) &&dmfe_sense_speed (db) ) db->link_failed =1 ; +else +netif_carrier_on (db->dev);dmfe_process_mode (db);/* SHOW_MEDIA_TYPE(db->op_mode); */ }
Hi,
Quoted 2 lines · Samuel Thibault, le Fri 10 Nov 2006 15:49:19 +0100, a écrit :
The dmfe module lacks netif stuff for carrier detection, while the board does report carrier status. Here is a patch.
Just an additional fixup: the default state should be carrier off. This fixes boot carrier detection.
Samuel
net/tulip/dmfe.c renamed from net/tulip/dmfe-orig.c +1 -0
@@ -426,6 +426,7 @@ dev->poll_controller = &poll_dmfe;#endif dev->ethtool_ops = &netdev_ethtool_ops; +netif_carrier_off (db->dev);spin_lock_init (&db->lock);pci_read_config_dword (pdev,0x50 , &pci_pmr);