* Re: wireless-dev: warnings while removing bcm43xx-d80211
From: Jiri Benc @ 2006-04-30 19:18 UTC (permalink / raw)
To: Michael Buesch; +Cc: netdev, Broadcom Linux, Johannes Berg
In-Reply-To: <200604301449.46431.mb@bu3sch.de>
Sun, 30 Apr 2006 14:49:45 +0200, Michael Buesch pise:
> Hm, seems like I did not listen to you. :P
> How does this happen? I never saw it.
Usually when a net interface is renamed (by udev for example). The stack
then tries to remove wrong procfs directory.
Jiri
--
Jiri Benc
SUSE Labs
^ permalink raw reply
* Re: [PATCH 2/3] Eleminate HZ from NET/ROM kernel interfaces
From: Bernard Pidoux @ 2006-04-30 19:34 UTC (permalink / raw)
To: Ralf Baechle; +Cc: David S. Miller, netdev, linux-hams
In-Reply-To: <20060429141613.GA2811@linux-mips.org>
Ralf Baechle wrote :
> Convert all NET/ROM sysctl time values from jiffies to ms as units.
>
> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
>
With such extensive patches for netrom and rose modules that will go
into a future 2.6.x kernel, I think it would be justified to update the
following banners in af_rose.c and af_netrom.c respectively for they
appear during boot :
static const char banner[] = KERN_INFO "F6FBB/G4KLX ROSE for Linux.
Version 0.62 for AX25.037 Linux 2.4\n";
static char banner[] __initdata = KERN_INFO "G4KLX NET/ROM for Linux.
Version 0.7 for AX25.037 Linux 2.4\n";
73 de Bernard, f6bvp
http://f6bvp.org
http://rose.fpac.free.fr/MINI-HOWTO/
http://rose.fpac.free.fr/MINI-HOWTO-FR/
^ permalink raw reply
* Re: [PATCH] softmac: make non-operational after being stopped
From: Johannes Berg @ 2006-04-30 20:23 UTC (permalink / raw)
To: Daniel Drake; +Cc: linville, netdev, softmac-dev
In-Reply-To: <20060430173353.16363886AB1@zog.reactivated.net>
[-- Attachment #1: Type: text/plain, Size: 483 bytes --]
On Sun, 2006-04-30 at 18:33 +0100, Daniel Drake wrote:
> dprintk("deauth without deauth packet. eek!n");
> dprintk(KERN_INFO PFX "got disassoc framen");
> dprintkl(KERN_INFO PFX "reassoc request from unknown networkn");
> dprintk(PFX "Not probing Channel %d (not allowed here)n", si->channels[current_channel_idx].channel);
It seems to have lost some backslashes there, or is that just me? In any
case, it won't apply properly, can you resend?
johannes
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 793 bytes --]
^ permalink raw reply
* [PATCH resend] softmac: make non-operational after being stopped
From: Daniel Drake @ 2006-04-30 21:09 UTC (permalink / raw)
To: linville; +Cc: netdev, johannes, softmac-dev
zd1211 with softmac and wpa_supplicant revealed an issue with softmac and the
use of workqueues. Some of the work functions actually reschedule themselves,
so this meant that there could still be pending work after
flush_scheduled_work() had been called during ieee80211softmac_stop().
This patch introduces a "running" flag which is used to ensure that
rescheduling does not happen in this situation.
I also used this flag to ensure that softmac's hooks into ieee80211 are
non-operational once the stop operation has been started. This simply makes
softmac a little more robust, because I could crash it easily by receiving
frames in the short timeframe after shutting down softmac and before turning
off the ZD1211 radio. (ZD1211 is now fixed as well!)
Signed-off-by: Daniel Drake <dsd@gentoo.org>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
--
Sorry, the first version was mangled by my mailer (backslashes missing). This
one should be better.
Index: linux/net/ieee80211/softmac/ieee80211softmac_module.c
===================================================================
--- linux.orig/net/ieee80211/softmac/ieee80211softmac_module.c
+++ linux/net/ieee80211/softmac/ieee80211softmac_module.c
@@ -89,6 +89,8 @@ ieee80211softmac_clear_pending_work(stru
ieee80211softmac_wait_for_scan(sm);
spin_lock_irqsave(&sm->lock, flags);
+ sm->running = 0;
+
/* Free all pending assoc work items */
cancel_delayed_work(&sm->associnfo.work);
@@ -204,6 +206,8 @@ void ieee80211softmac_start(struct net_d
assert(0);
if (mac->txrates_change)
mac->txrates_change(dev, change, &oldrates);
+
+ mac->running = 1;
}
EXPORT_SYMBOL_GPL(ieee80211softmac_start);
Index: linux/include/net/ieee80211softmac.h
===================================================================
--- linux.orig/include/net/ieee80211softmac.h
+++ linux/include/net/ieee80211softmac.h
@@ -204,7 +204,8 @@ struct ieee80211softmac_device {
/* couple of flags */
u8 scanning:1, /* protects scanning from being done multiple times at once */
- associated:1;
+ associated:1,
+ running:1;
struct ieee80211softmac_scaninfo *scaninfo;
struct ieee80211softmac_assoc_info associnfo;
Index: linux/net/ieee80211/softmac/ieee80211softmac_auth.c
===================================================================
--- linux.orig/net/ieee80211/softmac/ieee80211softmac_auth.c
+++ linux/net/ieee80211/softmac/ieee80211softmac_auth.c
@@ -86,6 +86,11 @@ ieee80211softmac_auth_queue(void *data)
/* Lock and set flags */
spin_lock_irqsave(&mac->lock, flags);
+ if (unlikely(!mac->running)) {
+ /* Prevent reschedule on workqueue flush */
+ spin_unlock_irqrestore(&mac->lock, flags);
+ return;
+ }
net->authenticated = 0;
net->authenticating = 1;
/* add a timeout call so we eventually give up waiting for an auth reply */
@@ -124,6 +129,9 @@ ieee80211softmac_auth_resp(struct net_de
unsigned long flags;
u8 * data;
+ if (unlikely(!mac->running))
+ return -ENODEV;
+
/* Find correct auth queue item */
spin_lock_irqsave(&mac->lock, flags);
list_for_each(list_ptr, &mac->auth_queue) {
@@ -338,6 +346,9 @@ ieee80211softmac_deauth_resp(struct net_
struct ieee80211softmac_network *net = NULL;
struct ieee80211softmac_device *mac = ieee80211_priv(dev);
+ if (unlikely(!mac->running))
+ return -ENODEV;
+
if (!deauth) {
dprintk("deauth without deauth packet. eek!\n");
return 0;
Index: linux/net/ieee80211/softmac/ieee80211softmac_assoc.c
===================================================================
--- linux.orig/net/ieee80211/softmac/ieee80211softmac_assoc.c
+++ linux/net/ieee80211/softmac/ieee80211softmac_assoc.c
@@ -51,11 +51,12 @@ ieee80211softmac_assoc(struct ieee80211s
spin_lock_irqsave(&mac->lock, flags);
mac->associnfo.associating = 1;
mac->associated = 0; /* just to make sure */
- spin_unlock_irqrestore(&mac->lock, flags);
/* Set a timer for timeout */
/* FIXME: make timeout configurable */
- schedule_delayed_work(&mac->associnfo.timeout, 5 * HZ);
+ if (likely(mac->running))
+ schedule_delayed_work(&mac->associnfo.timeout, 5 * HZ);
+ spin_unlock_irqrestore(&mac->lock, flags);
}
void
@@ -319,6 +320,9 @@ ieee80211softmac_handle_assoc_response(s
u16 status = le16_to_cpup(&resp->status);
struct ieee80211softmac_network *network = NULL;
unsigned long flags;
+
+ if (unlikely(!mac->running))
+ return -ENODEV;
spin_lock_irqsave(&mac->lock, flags);
@@ -377,10 +381,16 @@ ieee80211softmac_handle_disassoc(struct
{
struct ieee80211softmac_device *mac = ieee80211_priv(dev);
unsigned long flags;
+
+ if (unlikely(!mac->running))
+ return -ENODEV;
+
if (memcmp(disassoc->header.addr2, mac->associnfo.bssid, ETH_ALEN))
return 0;
+
if (memcmp(disassoc->header.addr1, mac->dev->dev_addr, ETH_ALEN))
return 0;
+
dprintk(KERN_INFO PFX "got disassoc frame\n");
netif_carrier_off(dev);
spin_lock_irqsave(&mac->lock, flags);
@@ -400,6 +410,9 @@ ieee80211softmac_handle_reassoc_req(stru
struct ieee80211softmac_device *mac = ieee80211_priv(dev);
struct ieee80211softmac_network *network;
+ if (unlikely(!mac->running))
+ return -ENODEV;
+
network = ieee80211softmac_get_network_by_bssid(mac, resp->header.addr3);
if (!network) {
dprintkl(KERN_INFO PFX "reassoc request from unknown network\n");
Index: linux/net/ieee80211/softmac/ieee80211softmac_scan.c
===================================================================
--- linux.orig/net/ieee80211/softmac/ieee80211softmac_scan.c
+++ linux/net/ieee80211/softmac/ieee80211softmac_scan.c
@@ -115,7 +115,15 @@ void ieee80211softmac_scan(void *d)
// TODO: is this if correct, or should we do this only if scanning from assoc request?
if (sm->associnfo.req_essid.len)
ieee80211softmac_send_mgt_frame(sm, &sm->associnfo.req_essid, IEEE80211_STYPE_PROBE_REQ, 0);
+
+ spin_lock_irqsave(&sm->lock, flags);
+ if (unlikely(!sm->running)) {
+ /* Prevent reschedule on workqueue flush */
+ spin_unlock_irqrestore(&sm->lock, flags);
+ break;
+ }
schedule_delayed_work(&si->softmac_scan, IEEE80211SOFTMAC_PROBE_DELAY);
+ spin_unlock_irqrestore(&sm->lock, flags);
return;
} else {
dprintk(PFX "Not probing Channel %d (not allowed here)\n", si->channels[current_channel_idx].channel);
^ permalink raw reply
* Re: IP1000 gigabit nic driver
From: David Vrabel @ 2006-04-30 23:40 UTC (permalink / raw)
To: Pekka Enberg; +Cc: romieu, linux-kernel, netdev, david
In-Reply-To: <1146389171.11524.1.camel@localhost>
[-- Attachment #1: Type: text/plain, Size: 1844 bytes --]
Pekka Enberg wrote:
> On Sat, 2006-04-29 at 14:21 +0200, David Gómez wrote:
>>> I already had it modified, just needed to create the patch... Anyway,
>>> have you submitted it to netdev?
>
> On Sat, 2006-04-29 at 23:35 +0300, Pekka Enberg wrote:
>> No, I haven't. I don't have the hardware, so I can't test the driver.
>> Furthermore, there's plenty of stuff to fix before it's in any shape for
>> submission. If someone wants to give this patch a spin, I would love to
>> hear the results.
Thanks for doing this Pekka. I've fixed up some stuff and given it some
brief testing on a 100BaseT network and it seems to work now.
> Subject: [PATCH] IP1000 Gigabit Ethernet device driver
>
> This is a cleaned up fork of the IP1000A device driver:
>
> <http://www.icplus.com.tw/driver-pp-IP1000A.html>
>
> Open issues include but are not limited to:
>
> - ipg_probe() looks really fishy and doesn't handle all errors
> (e.g. ioremap failing).
> - ipg_nic_do_ioctl() is playing games with user-space pointer.
> We should use ethtool ioctl instead as suggested by Arjan.
Still pending. Also:
- something (PHY reset/auto negotiation?) takes 2-3 seconds and
appears to be done with interrupts disabled.
> - For multiple devices, the driver uses a global root_dev and
> ipg_remove() play some tricks which look fishy.
Killed this. It was broke and ugly as hell.
Attached is patch with some more changes:
- Remove changelogs
- Remove ether_crc_le() -- use crc32_le() instead.
- No more nonsense with root_dev -- ipg_remove() now works.
- Move PHY and MAC address initialization into the ipg_probe(). It was
previously filling in the MAC address on open which breaks some user
space.
- Folded ipg_nic_init into ipg_probe since it was broke otherwise.
Signed-off-by: David Vrabel <dvrabel@cantab.net>
[-- Attachment #2: working --]
[-- Type: text/plain, Size: 22818 bytes --]
Index: linux-source-2.6.16/drivers/net/ipg.c
===================================================================
--- linux-source-2.6.16.orig/drivers/net/ipg.c 2006-04-30 22:26:05.788013667 +0100
+++ linux-source-2.6.16/drivers/net/ipg.c 2006-05-01 00:23:28.358641581 +0100
@@ -13,149 +13,14 @@
* 408 873 4117
* www.sundanceti.com
* craig_rich@sundanceti.com
- *
- * Rev Date Description
- * --------------------------------------------------------------
- * 0.1 11/8/99 Initial revision work begins.
- *
- * 0.2 11/12/99 Basic operation achieved, continuing work.
- *
- * 0.3 11/19/99 MAC Loop Back for sync problem testing.
- *
- * 0.4 12/22/99 ioctl for diagnotic program 'hunter' support.
- *
- * 0.5 4/13/00 Updates to
- *
- * 0.6 6/14/00 Slight correction to handling TFDDONE, and
- * preservation of PHYCTRL polarity bits.
- *
- * 0.7 7/27/00 Modifications to accomodate triple speed
- * autonegotiation. Also change to ioctl routine
- * to handle unknown PHY address.
- *
- * 0.8 8/11/00 Added change_mtu function.
- *
- * 0.9 8/15/00 Corrected autonegotiation resolution.
- *
- * 0.10 8/30/00 Changed constants to use IPG in place
- * of RIO. Also, removed most of debug
- * code in preparation for production release.
- *
- * 0.11 8/31/00 Utilize 64 bit data types where appropriate.
- *
- * 0.12 9/1/00 Move some constants to include file and utilize
- * RxDMAInt register.
- *
- * 0.13 10/31/00 Several minor modifications to improve stability.
- *
- * 0.14 11/28/00 Added call to nic_tx_free if TFD not available.
- *
- * 0.15 12/5/00 Corrected problem with receive errors, always set
- * receive buffer address to NULL. Release RX buffers
- * on errors.
- *
- * 0.16 12/20/00 Corrected autoneg resolution issue, must detect
- * speed via PHYCTRL register. Also, perform only 1
- * loop in the nic_txcleanup routine.
- *
- * 0.17 2/7/01 Changed all references of ST2021 to IPG.
- * When next TFD not available, return -ENOMEM instead
- * of 0. Removed references to RUBICON.
- *
- * 0.18 2/14/01 Corrected problem when unexpected jumbo frames are
- * received (now dropped properly.) Changed
- * "DROP_ON_ERRORS" breaking out Ethernet errors and
- * TCP/IP errors serparately. Corrected Gigabit
- * copper PAUSE autonegotiation.
- *
- * 0.19 2/22/01 Changed interrupt handling of RFD_LIST_END,
- * INT_REQUESTED, and RX_DMA_COMPLETE. Masked off
- * RMON statistics and unused MIB statistics.
- * Make sure *all* statistics are accounted for
- * (either masked or read in get_stats) to avoid
- * perpetual UpdateStats interrupt from causing
- * driver to crash.
- *
- * 0.20 3/2/01 Corrected error in nic_stop. Need to set
- * TxBuff[] = NULL after freeing TxBuff and
- * RxBuff[] = NULL after freeing RxBuff.
- *
- * 0.21 3/5/01 Correct 10/100Mbit PAUSE autonegotiation.
- *
- * 0.22 3/16/01 Used TxDMAIndicate for 100/1000Mbps modes. Add
- * "TFD unavailable" and "RFD list end" counters
- * to assist with performance measurement. Added
- * check for maxtfdcnt != 0 to while loop within
- * txcleanup.
- *
- * 0.23 3/22/01 Set the CurrentTxFrameID to 1 upon detecting
- * a TxDMAComplete to reduce the number of TxDMAComplete.
- * Also, indicate IP/TCP/UDP checksum is unneseccary
- * if IPG indicates checksum validates.
- *
- * 0.24 3/23/01 Changed the txfree routine, eliminating the margin
- * between the last freed TFD and the current TFD.
- *
- * 0.25 4/3/01 Corrected errors in config_autoneg to deal with
- * fiber flag properly.
- *
- * 0.26 5/1/01 Port for operation with Linux 2.2 or 2.4 kernel.
- *
- * 0.27 5/22/01 Cleaned up some extraneous comments.
- *
- * 0.28 6/20/01 Added auto IP, TCP, and UDP checksum addition
- * on transmit based on compilation option.
- *
- * 0.29 7/26/01 Comment out #include <asm/spinlock.h> from ipg.h
- * for compatibility with RedHat 7.1. Unkown reason.
- *
- * 0.30 8/10/01 Added debug message to each function, print function
- * name when entered. Added DEBUGCTRL register bit 5 for
- * Rx DMA Poll Now bug work around. Added ifdef IPG_DEBUG
- * flags to IPG_TFDlistunabvail and IPG_RFDlistend
- * counters. Removed clearing of sp->stat struct from
- * nic_open and added check in get_stats to make sure
- * NIC is initialized before reading statistic registers.
- * Corrected erroneous MACCTRL setting for Fiber based
- * 10/100 boards. Corrected storage of phyctrlpolarity
- * variable.
- *
- * 0.31 8/13/01 Incorporate STI or TMI fiber based NIC detection.
- * Corrected problem with _pciremove_linux2_4 routine.
- * Corrected setting of IP/TCP/UDP checksumming on receive
- * and transmit.
- *
- * 0.32 8/15/01 Changed the tmi_fiber_detect routine.
- *
- * 0.33 8/16/01 Changed PHY reset method in nic_open routine. Added
- * a chip reset in nic_stop to shut down the IPG.
- *
- * 0.34 9/5/01 Corrected some misuage of dev_kfree_skb.
- *
- * 0.35 10/30/01 Unmap register space (IO or memory) in the nic_stop
- * routine instead of in the cleanup or remove routines.
- * Corrects driver up/down/up problem when using IO
- * register mapping.
- *
- * 0.36 10/31/01 Modify the constant IPG_FRAMESBETWEENTXDMACOMPLETES
- * from 0x10 to 1.
- * 0.37 11/05/03 Modify the IPG_PHY_1000BASETCONTROL
- * in IP1000A this register is without 1000BPS Ability by default
- * so enable 1000BPS ability before PHY RESET/RESTART_AN
- * 0.38 11/05/03 update ipg_config_autoneg routine
- * 0.39 11/05/03 add Vendor_ID=13F0/Device_ID=1023 into support_cards
- * 2.05 10/16/04 Remove IPG_IE_RFD_LIST_END for pass SmartBit test.
- * (see 20041019Jesse_For_SmartBit.)
- * 2.06 10/27/04 Support for kernel 2.6.x
- * 2.06a 11/03/04 remove some compile warring message.
- * 2.09b 06/03/05 Support 4k jumbo (IC Plus, Jesse)
- * 2.09d 06/22/05 Support 10k jumbo, more than 4k will using copy mode (IC Plus, Jesse)
*/
#define JUMBO_FRAME_4k_ONLY
enum {
netdev_io_size = 128
};
+#include <linux/crc32.h>
+
#include "ipg.h"
#define DRV_NAME "ipg"
@@ -214,14 +79,12 @@
static int ipg_nic_hard_start_xmit(struct sk_buff *, struct net_device *);
static struct net_device_stats *ipg_nic_get_stats(struct net_device *);
static void ipg_nic_set_multicast_list(struct net_device *);
-static int ipg_nic_init(struct net_device *);
static int ipg_nic_rx(struct net_device *);
static int ipg_nic_rxrestore(struct net_device *);
static int init_rfdlist(struct net_device *);
static int init_tfdlist(struct net_device *);
static int ipg_get_rxbuff(struct net_device *, int);
static int ipg_config_autoneg(struct net_device *);
-static unsigned ether_crc_le(int, unsigned char *);
static int ipg_nic_do_ioctl(struct net_device *, struct ifreq *, int);
static int ipg_nic_change_mtu(struct net_device *, int);
@@ -1637,60 +1500,12 @@
* by ifconfig.
*/
- int phyaddr = 0;
int error = 0;
- int i;
void __iomem *ioaddr = ipg_ioaddr(dev);
- u8 revisionid = 0;
struct ipg_nic_private *sp = netdev_priv(dev);
IPG_DEBUG_MSG("_nic_open\n");
- /* Reset all functions within the IPG. Do not assert
- * RST_OUT as not compatible with some PHYs.
- */
- i = IPG_AC_GLOBAL_RESET | IPG_AC_RX_RESET |
- IPG_AC_TX_RESET | IPG_AC_DMA |
- IPG_AC_FIFO | IPG_AC_NETWORK | IPG_AC_HOST | IPG_AC_AUTO_INIT;
- /* Read/Write and Reset EEPROM Value Jesse20040128EEPROM_VALUE */
- /* Read LED Mode Configuration from EEPROM */
- sp->LED_Mode = read_eeprom(dev, 6);
-
- error = ipg_reset(dev, i);
- if (error < 0) {
- return error;
- }
-
- /* Reset PHY. */
- phyaddr = ipg_find_phyaddr(dev);
-
- if (phyaddr != -1) {
- u16 mii_phyctrl, mii_1000cr;
- mii_1000cr = read_phy_register(dev,
- phyaddr,
- GMII_PHY_1000BASETCONTROL);
- write_phy_register(dev, phyaddr,
- GMII_PHY_1000BASETCONTROL,
- mii_1000cr |
- GMII_PHY_1000BASETCONTROL_FULL_DUPLEX |
- GMII_PHY_1000BASETCONTROL_HALF_DUPLEX |
- GMII_PHY_1000BASETCONTROL_PreferMaster);
-
- mii_phyctrl = read_phy_register(dev, phyaddr, GMII_PHY_CONTROL);
- /* Set default phyparam */
- pci_read_config_byte(sp->pdev, PCI_REVISION_ID, &revisionid);
- ipg_set_phy_default_param(revisionid, dev, phyaddr);
-
- /* reset Phy */
- write_phy_register(dev,
- phyaddr, GMII_PHY_CONTROL,
- (mii_phyctrl | GMII_PHY_CONTROL_RESET |
- MII_PHY_CONTROL_RESTARTAN));
-
- }
-
- spin_lock_init(&sp->lock);
-
/* Check for interrupt line conflicts, and request interrupt
* line for IPG.
*
@@ -1743,26 +1558,6 @@
return error;
}
- /* Read MAC Address from EERPOM Jesse20040128EEPROM_VALUE */
- sp->StationAddr0 = read_eeprom(dev, 16);
- sp->StationAddr1 = read_eeprom(dev, 17);
- sp->StationAddr2 = read_eeprom(dev, 18);
- /* Write MAC Address to Station Address */
- iowrite16(sp->StationAddr0, ioaddr + IPG_STATIONADDRESS0);
- iowrite16(sp->StationAddr1, ioaddr + IPG_STATIONADDRESS1);
- iowrite16(sp->StationAddr2, ioaddr + IPG_STATIONADDRESS2);
-
- /* Set station address in ethernet_device structure. */
- dev->dev_addr[0] = ioread16(ioaddr + IPG_STATIONADDRESS0) & 0x00FF;
- dev->dev_addr[1] =
- (ioread16(ioaddr + IPG_STATIONADDRESS0) & 0xFF00) >> 8;
- dev->dev_addr[2] = ioread16(ioaddr + IPG_STATIONADDRESS1) & 0x00FF;
- dev->dev_addr[3] =
- (ioread16(ioaddr + IPG_STATIONADDRESS1) & 0xFF00) >> 8;
- dev->dev_addr[4] = ioread16(ioaddr + IPG_STATIONADDRESS2) & 0x00FF;
- dev->dev_addr[5] =
- (ioread16(ioaddr + IPG_STATIONADDRESS2) & 0xFF00) >> 8;
-
/* Configure IPG I/O registers. */
error = ipg_io_config(dev);
if (error < 0) {
@@ -2860,7 +2655,8 @@
for (mc_list_ptr = dev->mc_list;
mc_list_ptr != NULL; mc_list_ptr = mc_list_ptr->next) {
/* Calculate CRC result for each multicast address. */
- hashindex = ether_crc_le(ETH_ALEN, mc_list_ptr->dmi_addr);
+ hashindex = crc32_le(0xffffffff, mc_list_ptr->dmi_addr,
+ ETH_ALEN);
/* Use only the least significant 6 bits. */
hashindex = hashindex & 0x3F;
@@ -2883,86 +2679,79 @@
ioread8(ioaddr + IPG_RECEIVEMODE));
}
-/*
- * The following code fragment was authored by Donald Becker.
- */
-
-/* The little-endian AUTODIN II ethernet CRC calculations.
- A big-endian version is also available.
- This is slow but compact code. Do not use this routine for bulk data,
- use a table-based routine instead.
- This is common code and should be moved to net/core/crc.c.
- Chips may use the upper or lower CRC bits, and may reverse and/or invert
- them. Select the endian-ness that results in minimal calculations.
-*/
-static unsigned const ethernet_polynomial_le = 0xedb88320U;
-static unsigned ether_crc_le(int length, unsigned char *data)
+static int ipg_hw_init(struct net_device *dev)
{
- unsigned int crc = 0xffffffff; /* Initial value. */
- while (--length >= 0) {
- unsigned char current_octet = *data++;
- int bit;
- for (bit = 8; --bit >= 0; current_octet >>= 1) {
- if ((crc ^ current_octet) & 1) {
- crc >>= 1;
- crc ^= ethernet_polynomial_le;
- } else
- crc >>= 1;
- }
- }
- return crc;
-}
+ int phyaddr = 0;
+ int error = 0;
+ int i;
+ void __iomem *ioaddr = ipg_ioaddr(dev);
+ u8 revisionid = 0;
+ struct ipg_nic_private *sp = netdev_priv(dev);
-/*
- * End of code fragment authored by Donald Becker.
- */
+ /* Reset all functions within the IPG. Do not assert
+ * RST_OUT as not compatible with some PHYs.
+ */
+ i = IPG_AC_GLOBAL_RESET | IPG_AC_RX_RESET |
+ IPG_AC_TX_RESET | IPG_AC_DMA |
+ IPG_AC_FIFO | IPG_AC_NETWORK | IPG_AC_HOST | IPG_AC_AUTO_INIT;
+ /* Read/Write and Reset EEPROM Value Jesse20040128EEPROM_VALUE */
+ /* Read LED Mode Configuration from EEPROM */
+ sp->LED_Mode = read_eeprom(dev, 6);
-static int ipg_nic_init(struct net_device *dev)
-{
- /* Initialize IPG NIC. */
+ error = ipg_reset(dev, i);
+ if (error < 0) {
+ return error;
+ }
- struct ipg_nic_private *sp = NULL;
+ ioaddr = ipg_ioaddr(dev);
- IPG_DEBUG_MSG("_nic_init\n");
+ /* Reset PHY. */
+ phyaddr = ipg_find_phyaddr(dev);
- /* Register the IPG NIC in the list of Ethernet devices. */
- dev = alloc_etherdev(sizeof(struct ipg_nic_private));
+ if (phyaddr != -1) {
+ u16 mii_phyctrl, mii_1000cr;
+ mii_1000cr = read_phy_register(dev,
+ phyaddr,
+ GMII_PHY_1000BASETCONTROL);
+ write_phy_register(dev, phyaddr,
+ GMII_PHY_1000BASETCONTROL,
+ mii_1000cr |
+ GMII_PHY_1000BASETCONTROL_FULL_DUPLEX |
+ GMII_PHY_1000BASETCONTROL_HALF_DUPLEX |
+ GMII_PHY_1000BASETCONTROL_PreferMaster);
- if (dev == NULL) {
- printk(KERN_INFO "Could not initialize IP1000 based NIC.\n");
- return -ENODEV;
- }
+ mii_phyctrl = read_phy_register(dev, phyaddr, GMII_PHY_CONTROL);
+ /* Set default phyparam */
+ pci_read_config_byte(sp->pdev, PCI_REVISION_ID, &revisionid);
+ ipg_set_phy_default_param(revisionid, dev, phyaddr);
- /* Reserve memory for ipg_nic_private structure. */
- sp = kmalloc(sizeof(struct ipg_nic_private), GFP_KERNEL);
+ /* reset Phy */
+ write_phy_register(dev,
+ phyaddr, GMII_PHY_CONTROL,
+ (mii_phyctrl | GMII_PHY_CONTROL_RESET |
+ MII_PHY_CONTROL_RESTARTAN));
- if (sp == NULL) {
- printk(KERN_INFO
- "%s: No memory available for IP1000 private strucutre.\n",
- dev->name);
- return -ENOMEM;
- } else {
- /* Fill the allocated memory space with 0s.
- * Essentially sets all ipg_nic_private
- * structure fields to 0.
- */
- memset(sp, 0, sizeof(*sp));
- dev->priv = sp;
}
- /* Assign the new device to the list of IPG Ethernet devices. */
- sp->next_dev = root_dev;
- root_dev = dev;
+ /* Read MAC Address from EERPOM Jesse20040128EEPROM_VALUE */
+ sp->StationAddr0 = read_eeprom(dev, 16);
+ sp->StationAddr1 = read_eeprom(dev, 17);
+ sp->StationAddr2 = read_eeprom(dev, 18);
+ /* Write MAC Address to Station Address */
+ iowrite16(sp->StationAddr0, ioaddr + IPG_STATIONADDRESS0);
+ iowrite16(sp->StationAddr1, ioaddr + IPG_STATIONADDRESS1);
+ iowrite16(sp->StationAddr2, ioaddr + IPG_STATIONADDRESS2);
- /* Declare IPG NIC functions for Ethernet device methods.
- */
- dev->open = &ipg_nic_open;
- dev->stop = &ipg_nic_stop;
- dev->hard_start_xmit = &ipg_nic_hard_start_xmit;
- dev->get_stats = &ipg_nic_get_stats;
- dev->set_multicast_list = &ipg_nic_set_multicast_list;
- dev->do_ioctl = &ipg_nic_do_ioctl;
- dev->change_mtu = &ipg_nic_change_mtu;
+ /* Set station address in ethernet_device structure. */
+ dev->dev_addr[0] = ioread16(ioaddr + IPG_STATIONADDRESS0) & 0x00FF;
+ dev->dev_addr[1] =
+ (ioread16(ioaddr + IPG_STATIONADDRESS0) & 0xFF00) >> 8;
+ dev->dev_addr[2] = ioread16(ioaddr + IPG_STATIONADDRESS1) & 0x00FF;
+ dev->dev_addr[3] =
+ (ioread16(ioaddr + IPG_STATIONADDRESS1) & 0xFF00) >> 8;
+ dev->dev_addr[4] = ioread16(ioaddr + IPG_STATIONADDRESS2) & 0x00FF;
+ dev->dev_addr[5] =
+ (ioread16(ioaddr + IPG_STATIONADDRESS2) & 0xFF00) >> 8;
return 0;
}
@@ -3144,99 +2933,23 @@
static void ipg_remove(struct pci_dev *pdev)
{
- /* Remove function called when a IPG device is
- * to be shut down.
- */
-
- struct net_device *prev_dev = NULL;
- struct net_device *dev = NULL;
- struct net_device *dev_to_remove = NULL;
- struct ipg_nic_private *prev_sp = NULL;
- struct ipg_nic_private *sp = NULL;
- struct ipg_nic_private *sp_to_remove = NULL;
-
- IPG_DEBUG_MSG("_pciremove_linux2_4\n");
-
- dev = root_dev;
-
- /* Move through list of Ethernet devices looking for
- * a match.
- */
- while (dev) {
- sp = netdev_priv(dev);
-
- if (sp->pdev == pdev) {
- /* Save the pointer to the previous Ethernet
- * device.
- */
- dev_to_remove = dev;
-
- sp_to_remove = sp;
-
- break;
- }
-
- /* Save the "previous" device in the list. */
- prev_dev = dev;
-
- /* Retrieve next Ethernet device to be
- * released.
- */
- dev = sp->next_dev;
- }
-
- /* Check if there is a device to remove. */
- if (dev_to_remove == NULL) {
- /* There are no Ethernet devices to remove. */
- printk(KERN_INFO
- "A device remove request does not match with any Ethernet devices.\n");
-
- return;
- }
-
- /* Check to see if we are removing the root device in the list. */
- if (root_dev == dev_to_remove) {
- /* Change the root Ethernet device to the next device to be
- * released.
- */
- root_dev = sp_to_remove->next_dev;
- } else if (sp_to_remove->next_dev != NULL)
- /* Check if we need to re-link the list of devices. */
- {
- /* If the "previous" Ethernet device is NULL,
- * the device is at the head of the list, and
- * no re-linking is needed.
- */
- prev_sp = netdev_priv(prev_dev);
-
- prev_sp->next_dev = sp_to_remove->next_dev;
- }
-
- /* Free memory associated with Ethernet device's
- * private data structure.
- */
- if (sp_to_remove) {
- kfree(sp_to_remove);
- }
+ struct net_device *dev = pci_get_drvdata(pdev);
+ struct ipg_nic_private *sp = netdev_priv(dev);
- printk(KERN_INFO "Un-registering Ethernet device %s\n",
- dev_to_remove->name);
+ IPG_DEBUG_MSG("_remove\n");
/* Un-register Ethernet device. */
- unregister_netdev(dev_to_remove);
+ unregister_netdev(dev);
#ifdef USE_IO_OPS
ioport_unmap(ioaddr);
#else
iounmap(sp->ioaddr);
#endif
-
pci_release_regions(pdev);
- /* Free memory associated with Ethernet device. */
- if (dev_to_remove) {
- kfree(dev_to_remove);
- }
+ free_netdev(dev);
+ pci_disable_device(pdev);
pci_set_drvdata(pdev, NULL);
}
@@ -3269,13 +2982,31 @@
goto out;
}
- err = ipg_nic_init(dev);
- if (err) {
- printk(KERN_INFO "Could not intialize IP1000 based NIC.\n");
+ /*
+ * Initialize net device.
+ */
+ dev = alloc_etherdev(sizeof(struct ipg_nic_private));
+ if (!dev) {
+ printk(KERN_ERR "ipg: alloc_etherdev failed\n");
+ err = -ENOMEM;
goto out;
}
- dev = root_dev;
+
+ sp = netdev_priv(dev);
+ spin_lock_init(&sp->lock);
+
+ /* Declare IPG NIC functions for Ethernet device methods.
+ */
+ dev->open = &ipg_nic_open;
+ dev->stop = &ipg_nic_stop;
+ dev->hard_start_xmit = &ipg_nic_hard_start_xmit;
+ dev->get_stats = &ipg_nic_get_stats;
+ dev->set_multicast_list = &ipg_nic_set_multicast_list;
+ dev->do_ioctl = &ipg_nic_do_ioctl;
+ dev->change_mtu = &ipg_nic_change_mtu;
+
SET_MODULE_OWNER(dev);
+ SET_NETDEV_DEV(dev, &pdev->dev);
err = pci_request_regions(pdev, DRV_NAME);
if (err)
@@ -3300,13 +3031,17 @@
goto out;
}
#endif
- sp = netdev_priv(root_dev);
+ sp = netdev_priv(dev);
/* Save the pointer to the PCI device information. */
sp->ioaddr = ioaddr;
sp->pdev = pdev;
pci_set_drvdata(pdev, dev);
+ err = ipg_hw_init(dev);
+ if (err)
+ goto out;
+
err = register_netdev(dev);
if (err)
goto out;
Index: linux-source-2.6.16/drivers/net/ipg.h
===================================================================
--- linux-source-2.6.16.orig/drivers/net/ipg.h 2006-04-30 23:02:09.861345105 +0100
+++ linux-source-2.6.16/drivers/net/ipg.h 2006-05-01 00:11:14.974349454 +0100
@@ -15,85 +15,6 @@
* 408 873 4117
* www.sundanceti.com
* craig_rich@sundanceti.com
- *
- * Rev Date Description
- * --------------------------------------------------------------
- * 0.1 11/8/99 Initial revision work begins
- *
- * 0.2 12/1/99 Minor update to modversions.h inclusion.
- *
- * 0.3 12/30/99 Updates to fully comply with IPG spec.
- *
- * 0.4 4/24/00 Updates to allow for removal of FCS generation
- * and verification.
- * 0.5 8/15/00 Updates for MII PHY registers and fields.
- *
- * 0.6 8/31/00 Updates to change to using 64 bit data types
- *
- * 0.7 10/31/00 Added DDEBUG_MSG to allow for easy activation of
- * individual DEBUG_MSGs.
- *
- * 0.8 11/06/00 Changed LastFreedRxBuff to LastRestoredRxBuff for
- * clarity.
- *
- * 0.9 11/10/00 Changed Sundance DeviceID to 0x9020
- *
- * 0.10 2/14/01 Changed "DROP_ON_ERRORS", breaking out Ethernet from
- * TCP/IP errors.
- *
- * 0.11 3/16/01 Changed "IPG_FRAMESBETWEENTXCOMPLETES" to
- * "IPG_FRAMESBETWEENTXDMACOMPLETES" since will
- * be using TxDMAIndicate instead of TxIndicate to
- * improve performance. Added TFDunavailCount and
- * RFDlistendCount to aid in performance improvement.
- *
- * 0.12 3/22/01 Removed IPG_DROP_ON_RX_TCPIP_ERRORS.
- *
- * 0.13 3/23/01 Removed IPG_TXQUEUE_MARGIN.
- *
- * 0.14 3/30/01 Broke out sections into multiple files and added
- * OS version specific detection and settings.
- */
-
-/*
- * Linux header utilization:
- *
- * config.h For PCI support, namely CONFIG_PCI macro.
- *
- * version.h For Linux kernel version detection.
- *
- * module.h For modularized driver support.
- *
- * kernel.h For 'printk'.
- *
- * pci.h PCI support, including ID, VENDOR, and CLASS
- * standard definitions; PCI specific structures,
- * including pci_dev struct.
- *
- * ioport.h I/O ports, check_region, request_region,
- * release_region.
- *
- * errno.h Standard error numbers, e.g. ENODEV.
- *
- * asm/io.h For reading/writing I/O ports, and for virt_to_bus
- * function.
- *
- * delay.h For milisecond delays.
- *
- * types.h For specific typedefs (i.e. u32, u16, u8).
- *
- * netdevice.h For device structure needed for network support.
- *
- * etherdevice.h For ethernet device support.
- *
- * init.h For __initfunc.
- *
- * skbuff.h Socket buffer (skbuff) definition.
- *
- * asm/bitops.h For test_and_set_bit, clear_bit functions.
- *
- * asm/spinlock.h For spin_lock_irqsave, spin_lock_irqrestore functions.
- *
*/
#ifndef __LINUX_IPG_H
#define __LINUX_IPG_H
@@ -1000,9 +921,6 @@
* End miscellaneous macros.
*/
-/* IPG Ethernet device structure, used for removing module. */
-struct net_device *root_dev = NULL;
-
/* Transmit Frame Descriptor. The IPG supports 15 fragments,
* however Linux requires only a single fragment. Note, each
* TFD field is 64 bits wide.
@@ -1054,7 +972,6 @@
int RxBuffNotReady;
struct pci_dev *pdev;
struct net_device_stats stats;
- struct net_device *next_dev;
spinlock_t lock;
int tenmbpsmode;
^ permalink raw reply
* Re: [PATCH 2/3] Eleminate HZ from NET/ROM kernel interfaces
From: David S. Miller @ 2006-05-01 0:21 UTC (permalink / raw)
To: pidoux; +Cc: ralf, netdev, linux-hams
In-Reply-To: <44551148.5010503@ccr.jussieu.fr>
From: Bernard Pidoux <pidoux@ccr.jussieu.fr>
Date: Sun, 30 Apr 2006 21:34:32 +0200
> Ralf Baechle wrote :
>
> > Convert all NET/ROM sysctl time values from jiffies to ms as units.
> >
> > Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
> >
>
> With such extensive patches for netrom and rose modules that will go
> into a future 2.6.x kernel, I think it would be justified to update the
> following banners in af_rose.c and af_netrom.c respectively for they
> appear during boot :
It might be worthwhile to remove the messages altogether.
IPV4 and the core networking used to output similar initialization
log messages and it really doesn't really add anything but pollute
the already voluminous kernel log.
So I say we just remove it.
^ permalink raw reply
* Re: [Bugme-new] [Bug 6468] New: sky2 driver doesnt work in 2.6.16-r3, -r4 but was working in 2.6.15-r8
From: Andrew Morton @ 2006-05-01 1:15 UTC (permalink / raw)
To: a.kulakov; +Cc: netdev, bugme-daemon@kernel-bugs.osdl.org
In-Reply-To: <200605010011.k410BCd1023886@fire-2.osdl.org>
(Please resond via reply-to-all, not via the bugzilla UI)
bugme-daemon@bugzilla.kernel.org wrote:
>
> http://bugzilla.kernel.org/show_bug.cgi?id=6468
>
> Summary: sky2 driver doesnt work in 2.6.16-r3,-r4 but was working
> in 2.6.15-r8
> Kernel Version: 2.6.16-r4
> Status: NEW
> Severity: high
> Owner: jgarzik@pobox.com
> Submitter: a.kulakov@mail.ru
>
>
> Most recent kernel where this bug did not occur:
> 2.6.15-r8
>
> Distribution:
> gentoo
>
> Hardware Environment:
> Asus A38, Pentium-M 2.0GHz, 1024M RAM, Marvell Technology Group Ltd. 88E8053
> PCI-E Gigabit Ethernet Controller (rev 19)
>
> Problem Description:
> No packets are received by programs while ifconfig counts them. No iptables
> rules in effect and all chans policies set to ACCEPT.
> dhcpcd fails to get response from server. tcpdump doesnt show any incoming
> packets while shows outgoing. ifconfig indicates that both rx and tx get increased!
>
> That driver was working for me till 2.6.15-r8. It doesn't work with 2.6.16-r3
> nor -r4. I didn't try earlier 2.6.16 kernels but will do that if needed.
>
> I tried to load module with disable_msi=1 but it didn't make any difference.
>
> Steps to reproduce:
> modprobe sky2 debug=16
> dhcpcd eth0
> tcpdump -n -i eth0
>
I assume that when you say "2.6.16-r4" you actually mean "2.6.16-rc4"? Or
do you mean 2.6.16.4? It matters rather a lot.
So, please confirm the earliest known-to-be-broken kernel version and the
latest known-to-be-working version, using the correct release
identification, thanks.
^ permalink raw reply
* Re: [Bugme-new] [Bug 6468] New: sky2 driver doesnt work in 2.6.16-r3, -r4 but was working in 2.6.15-r8
From: Alexander Kulakov @ 2006-05-01 4:32 UTC (permalink / raw)
To: Andrew Morton; +Cc: netdev, bugme-daemon@kernel-bugs.osdl.org
In-Reply-To: <20060430181543.6e38a842.akpm@osdl.org>
Andrew Morton wrote:
> (Please resond via reply-to-all, not via the bugzilla UI)
>
> bugme-daemon@bugzilla.kernel.org wrote:
>
>> http://bugzilla.kernel.org/show_bug.cgi?id=6468
>>
>> Summary: sky2 driver doesnt work in 2.6.16-r3,-r4 but was working
>> in 2.6.15-r8
>> Kernel Version: 2.6.16-r4
>> Status: NEW
>> Severity: high
>> Owner: jgarzik@pobox.com
>> Submitter: a.kulakov@mail.ru
>>
>>
>> Most recent kernel where this bug did not occur:
>> 2.6.15-r8
>>
>> Distribution:
>> gentoo
>>
>> Hardware Environment:
>> Asus A38, Pentium-M 2.0GHz, 1024M RAM, Marvell Technology Group Ltd. 88E8053
>> PCI-E Gigabit Ethernet Controller (rev 19)
>>
>> Problem Description:
>> No packets are received by programs while ifconfig counts them. No iptables
>> rules in effect and all chans policies set to ACCEPT.
>> dhcpcd fails to get response from server. tcpdump doesnt show any incoming
>> packets while shows outgoing. ifconfig indicates that both rx and tx get increased!
>>
>> That driver was working for me till 2.6.15-r8. It doesn't work with 2.6.16-r3
>> nor -r4. I didn't try earlier 2.6.16 kernels but will do that if needed.
>>
>> I tried to load module with disable_msi=1 but it didn't make any difference.
>>
>> Steps to reproduce:
>> modprobe sky2 debug=16
>> dhcpcd eth0
>> tcpdump -n -i eth0
>>
>>
>
> I assume that when you say "2.6.16-r4" you actually mean "2.6.16-rc4"? Or
> do you mean 2.6.16.4? It matters rather a lot.
>
> So, please confirm the earliest known-to-be-broken kernel version and the
> latest known-to-be-working version, using the correct release
> identification, thanks.
>
>
>
My apologies. That was false alert. It seems to be Gentoo kernel patches
problem.
I just finished checking kernels from kernel.org and found 2.6.16,
2.6.16.6 and 2.6.16.11 to be working well.
Sorry for wasting your time
^ permalink raw reply
* Re: [PATCH 2/6] tg3: Add phy workaround
From: Michael Chan @ 2006-05-01 4:45 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev
David S. Miller wrote:
> From: "Michael Chan" <mchan@broadcom.com>
> Date: Fri, 28 Apr 2006 16:35:19 -0700
>
> > Add some PHY workaround code to reduce jitter on some PHYs.
> >
> > Signed-off-by: Michael Chan <mchan@broadcom.com>
>
> Applied, thanks.
>
> It really bugs me that all of this indirect addressing into
> the DSP is done with magic addresses and register values. It
> would be great to get some defined in tg3.h that documented
> the DSP register set properly.
>
Ok, will add some constants next time.
^ permalink raw reply
* Re: tw32_f() in tg3_write_mem()
From: Michael Chan @ 2006-05-01 5:05 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev
David S. Miller wrote:
> At least for the TG3PCI_MEM_WIN_DATA register, I don't know how safe
> it is to use tw32_f() there. Reads from a location can have side
> effects, so doing a forced readback after a write could be dangerous.
>
> And it isn't needed, as the tw32_f() done as we set the
> TG3PCI_MEM_WIN_BASE_ADDR back to zero will flush all posted
> writes.
>
> Agreed?
>
>
The TG3PCI_MEM_WIN_BASE_ADDR and DATA registers are very tricky. If you
do not read back the address register before you read or write the data
register, you may not read or write to the proper address.
Reading back the data register is a safe thing to do. This guarantees
that
the data is written before we change the address register to the zero
value. Without the read, there is a danger of the value being written to
SRAM address 0 instead of the desired address.
No additional reads are required if we use config. cycles on these
registers.
^ permalink raw reply
* Re: tw32_f() in tg3_write_mem()
From: David S. Miller @ 2006-05-01 6:07 UTC (permalink / raw)
To: mchan; +Cc: netdev
In-Reply-To: <1551EAE59135BE47B544934E30FC4FC041BBEE@NT-IRVA-0751.brcm.ad.broadcom.com>
From: "Michael Chan" <mchan@broadcom.com>
Date: Sun, 30 Apr 2006 22:05:40 -0700
> Reading back the data register is a safe thing to do. This
> guarantees that the data is written before we change the address
> register to the zero value. Without the read, there is a danger of
> the value being written to SRAM address 0 instead of the desired
> address.
Writes can be posted, but they cannot be reordered can they?
^ permalink raw reply
* More Orinoco patches
From: Pavel Roskin @ 2006-05-01 6:13 UTC (permalink / raw)
To: Netdev List, John W. Linville
Hello!
I'm about to send some more patches for Orinoco drivers. Unlike the
previous set, the new patches are mostly cosmetic changes based on the
feedback I received from the already submitted patches. Please apply to
the trees that have the previous patches.
--
Regards,
Pavel Roskin
^ permalink raw reply
* [PATCH 1/5] orinoco: unregister network device before releasing PCMCIA resources
From: Pavel Roskin @ 2006-05-01 6:13 UTC (permalink / raw)
To: netdev, linville
From: Pavel Roskin <proski@gnu.org>
Hardware resources should not be made available to other devices while
the network device is still registered. Also remove the related debug
statements.
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
drivers/net/wireless/orinoco_cs.c | 9 +++------
drivers/net/wireless/spectrum_cs.c | 9 +++------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index d2c48ac..ee05ec6 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -147,14 +147,11 @@ static void orinoco_cs_detach(struct pcm
{
struct net_device *dev = link->priv;
+ if (link->dev_node)
+ unregister_netdev(dev);
+
orinoco_cs_release(link);
- DEBUG(0, PFX "detach: link=%p link->dev_node=%p\n", link, link->dev_node);
- if (link->dev_node) {
- DEBUG(0, PFX "About to unregister net device %p\n",
- dev);
- unregister_netdev(dev);
- }
free_orinocodev(dev);
} /* orinoco_cs_detach */
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c
index aeb38d9..0921162 100644
--- a/drivers/net/wireless/spectrum_cs.c
+++ b/drivers/net/wireless/spectrum_cs.c
@@ -625,14 +625,11 @@ static void spectrum_cs_detach(struct pc
{
struct net_device *dev = link->priv;
+ if (link->dev_node)
+ unregister_netdev(dev);
+
spectrum_cs_release(link);
- DEBUG(0, PFX "detach: link=%p link->dev_node=%p\n", link, link->dev_node);
- if (link->dev_node) {
- DEBUG(0, PFX "About to unregister net device %p\n",
- dev);
- unregister_netdev(dev);
- }
free_orinocodev(dev);
} /* spectrum_cs_detach */
^ permalink raw reply related
* [PATCH 2/5] orinoco: report more relevant data on startup
From: Pavel Roskin @ 2006-05-01 6:13 UTC (permalink / raw)
To: netdev, linville
In-Reply-To: <20060501061324.13342.58195.stgit@dv.roinet.com>
From: Pavel Roskin <proski@gnu.org>
Report only the first I/O window and IRQ, and also add the driver name.
The second I/O window, Vpp and configuration index are not interesting
to most users. They can be found by PCMCIA debug tools if needed.
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
drivers/net/wireless/orinoco_cs.c | 17 ++++-------------
drivers/net/wireless/spectrum_cs.c | 17 ++++-------------
2 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index ee05ec6..1c19c76 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -343,19 +343,10 @@ orinoco_cs_config(struct pcmcia_device *
net_device has been registered */
/* Finally, report what we've done */
- printk(KERN_DEBUG "%s: index 0x%02x: ",
- dev->name, link->conf.ConfigIndex);
- if (link->conf.Vpp)
- printk(", Vpp %d.%d", link->conf.Vpp / 10,
- link->conf.Vpp % 10);
- printk(", irq %d", link->irq.AssignedIRQ);
- if (link->io.NumPorts1)
- printk(", io 0x%04x-0x%04x", link->io.BasePort1,
- link->io.BasePort1 + link->io.NumPorts1 - 1);
- if (link->io.NumPorts2)
- printk(" & 0x%04x-0x%04x", link->io.BasePort2,
- link->io.BasePort2 + link->io.NumPorts2 - 1);
- printk("\n");
+ printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s, irq %d, io "
+ "0x%04x-0x%04x\n", dev->name, dev->class_dev.dev->bus_id,
+ link->irq.AssignedIRQ, link->io.BasePort1,
+ link->io.BasePort1 + link->io.NumPorts1 - 1);
return 0;
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c
index 0921162..e9172ee 100644
--- a/drivers/net/wireless/spectrum_cs.c
+++ b/drivers/net/wireless/spectrum_cs.c
@@ -822,19 +822,10 @@ spectrum_cs_config(struct pcmcia_device
net_device has been registered */
/* Finally, report what we've done */
- printk(KERN_DEBUG "%s: index 0x%02x: ",
- dev->name, link->conf.ConfigIndex);
- if (link->conf.Vpp)
- printk(", Vpp %d.%d", link->conf.Vpp / 10,
- link->conf.Vpp % 10);
- printk(", irq %d", link->irq.AssignedIRQ);
- if (link->io.NumPorts1)
- printk(", io 0x%04x-0x%04x", link->io.BasePort1,
- link->io.BasePort1 + link->io.NumPorts1 - 1);
- if (link->io.NumPorts2)
- printk(" & 0x%04x-0x%04x", link->io.BasePort2,
- link->io.BasePort2 + link->io.NumPorts2 - 1);
- printk("\n");
+ printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s, irq %d, io "
+ "0x%04x-0x%04x\n", dev->name, dev->class_dev.dev->bus_id,
+ link->irq.AssignedIRQ, link->io.BasePort1,
+ link->io.BasePort1 + link->io.NumPorts1 - 1);
return 0;
^ permalink raw reply related
* [PATCH 3/5] orinoco: simplify locking, fix error handling in PCMCIA resume
From: Pavel Roskin @ 2006-05-01 6:13 UTC (permalink / raw)
To: netdev, linville
In-Reply-To: <20060501061324.13342.58195.stgit@dv.roinet.com>
From: Pavel Roskin <proski@gnu.org>
Don't use flags in the spinlocks - the PCMCIA resume functions may not
be called under lock. Don't ignore any errors.
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
drivers/net/wireless/orinoco_cs.c | 7 +++----
drivers/net/wireless/spectrum_cs.c | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index 1c19c76..b2aec4d 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -415,7 +415,6 @@ static int orinoco_cs_resume(struct pcmc
struct orinoco_private *priv = netdev_priv(dev);
struct orinoco_pccard *card = priv->card;
int err = 0;
- unsigned long flags;
if (! test_bit(0, &card->hard_reset_in_progress)) {
err = orinoco_reinit_firmware(dev);
@@ -425,7 +424,7 @@ static int orinoco_cs_resume(struct pcmc
return -EIO;
}
- spin_lock_irqsave(&priv->lock, flags);
+ spin_lock(&priv->lock);
netif_device_attach(dev);
priv->hw_unavailable--;
@@ -437,10 +436,10 @@ static int orinoco_cs_resume(struct pcmc
dev->name, err);
}
- spin_unlock_irqrestore(&priv->lock, flags);
+ spin_unlock(&priv->lock);
}
- return 0;
+ return err;
}
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c
index e9172ee..7f9aa13 100644
--- a/drivers/net/wireless/spectrum_cs.c
+++ b/drivers/net/wireless/spectrum_cs.c
@@ -866,11 +866,10 @@ spectrum_cs_suspend(struct pcmcia_device
{
struct net_device *dev = link->priv;
struct orinoco_private *priv = netdev_priv(dev);
- unsigned long flags;
int err = 0;
/* Mark the device as stopped, to block IO until later */
- spin_lock_irqsave(&priv->lock, flags);
+ spin_lock(&priv->lock);
err = __orinoco_down(dev);
if (err)
@@ -880,9 +879,9 @@ spectrum_cs_suspend(struct pcmcia_device
netif_device_detach(dev);
priv->hw_unavailable++;
- spin_unlock_irqrestore(&priv->lock, flags);
+ spin_unlock(&priv->lock);
- return 0;
+ return err;
}
static int
^ permalink raw reply related
* [PATCH 4/5] orinoco: eliminate the suspend/resume functions if CONFIG_PM is unset
From: Pavel Roskin @ 2006-05-01 6:13 UTC (permalink / raw)
To: netdev, linville
In-Reply-To: <20060501061324.13342.58195.stgit@dv.roinet.com>
From: Pavel Roskin <proski@gnu.org>
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
drivers/net/wireless/orinoco_pci.h | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/orinoco_pci.h b/drivers/net/wireless/orinoco_pci.h
index b05a9a5..4e8da4e 100644
--- a/drivers/net/wireless/orinoco_pci.h
+++ b/drivers/net/wireless/orinoco_pci.h
@@ -44,6 +44,7 @@ static inline void orinoco_pci_setup_net
pci_name(pdev), pdev->irq, range_type, start, end);
}
+#ifdef CONFIG_PM
static int orinoco_pci_suspend(struct pci_dev *pdev, pm_message_t state)
{
struct net_device *dev = pci_get_drvdata(pdev);
@@ -121,5 +122,9 @@ static int orinoco_pci_resume(struct pci
return 0;
}
+#else
+#define orinoco_pci_suspend NULL
+#define orinoco_pci_resume NULL
+#endif
#endif /* _ORINOCO_PCI_H */
^ permalink raw reply related
* [PATCH 5/5] orinoco: don't put PCI resource data to the network device
From: Pavel Roskin @ 2006-05-01 6:13 UTC (permalink / raw)
To: netdev, linville
In-Reply-To: <20060501061324.13342.58195.stgit@dv.roinet.com>
From: Pavel Roskin <proski@gnu.org>
The resource data in the network device is intended for ISA and other
older busses, but not for PCI. Don't put PCI data there. Don't (ab)use
the network device for keeping the IRQ number.
Retire orinoco_pci_setup_netdev(), and print some minimal information to
the kernel log instead, identifying the network device and the driver
mostly to identify problems at startup. Scripts should rely on sysfs.
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
drivers/net/wireless/orinoco_nortel.c | 5 +++--
drivers/net/wireless/orinoco_pci.c | 5 +++--
drivers/net/wireless/orinoco_pci.h | 26 --------------------------
drivers/net/wireless/orinoco_plx.c | 5 +++--
drivers/net/wireless/orinoco_tmd.c | 5 +++--
5 files changed, 12 insertions(+), 34 deletions(-)
diff --git a/drivers/net/wireless/orinoco_nortel.c b/drivers/net/wireless/orinoco_nortel.c
index 1596182..74b9d5b 100644
--- a/drivers/net/wireless/orinoco_nortel.c
+++ b/drivers/net/wireless/orinoco_nortel.c
@@ -206,7 +206,6 @@ static int orinoco_nortel_init_one(struc
err = -EBUSY;
goto fail_irq;
}
- orinoco_pci_setup_netdev(dev, pdev, 2);
err = orinoco_nortel_hw_init(card);
if (err) {
@@ -227,6 +226,8 @@ static int orinoco_nortel_init_one(struc
}
pci_set_drvdata(pdev, dev);
+ printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s\n", dev->name,
+ pci_name(pdev));
return 0;
@@ -265,7 +266,7 @@ static void __devexit orinoco_nortel_rem
iowrite16(0, card->bridge_io + 10);
unregister_netdev(dev);
- free_irq(dev->irq, dev);
+ free_irq(pdev->irq, dev);
pci_set_drvdata(pdev, NULL);
free_orinocodev(dev);
pci_iounmap(pdev, priv->hw.iobase);
diff --git a/drivers/net/wireless/orinoco_pci.c b/drivers/net/wireless/orinoco_pci.c
index df37b95..1c105f4 100644
--- a/drivers/net/wireless/orinoco_pci.c
+++ b/drivers/net/wireless/orinoco_pci.c
@@ -161,7 +161,6 @@ static int orinoco_pci_init_one(struct p
err = -EBUSY;
goto fail_irq;
}
- orinoco_pci_setup_netdev(dev, pdev, 0);
err = orinoco_pci_cor_reset(priv);
if (err) {
@@ -176,6 +175,8 @@ static int orinoco_pci_init_one(struct p
}
pci_set_drvdata(pdev, dev);
+ printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s\n", dev->name,
+ pci_name(pdev));
return 0;
@@ -204,7 +205,7 @@ static void __devexit orinoco_pci_remove
struct orinoco_private *priv = netdev_priv(dev);
unregister_netdev(dev);
- free_irq(dev->irq, dev);
+ free_irq(pdev->irq, dev);
pci_set_drvdata(pdev, NULL);
free_orinocodev(dev);
pci_iounmap(pdev, priv->hw.iobase);
diff --git a/drivers/net/wireless/orinoco_pci.h b/drivers/net/wireless/orinoco_pci.h
index 4e8da4e..7eb1e08 100644
--- a/drivers/net/wireless/orinoco_pci.h
+++ b/drivers/net/wireless/orinoco_pci.h
@@ -18,32 +18,6 @@ struct orinoco_pci_card {
void __iomem *attr_io;
};
-/* Set base address or memory range of the network device based on
- * the PCI device it's using. Specify BAR of the "main" resource.
- * To be used after request_irq(). */
-static inline void orinoco_pci_setup_netdev(struct net_device *dev,
- struct pci_dev *pdev, int bar)
-{
- char *range_type;
- unsigned long start = pci_resource_start(pdev, bar);
- unsigned long len = pci_resource_len(pdev, bar);
- unsigned long flags = pci_resource_flags(pdev, bar);
- unsigned long end = start + len - 1;
-
- dev->irq = pdev->irq;
- if (flags & IORESOURCE_IO) {
- dev->base_addr = start;
- range_type = "ports";
- } else {
- dev->mem_start = start;
- dev->mem_end = end;
- range_type = "memory";
- }
-
- printk(KERN_DEBUG PFX "%s: irq %d, %s 0x%lx-0x%lx\n",
- pci_name(pdev), pdev->irq, range_type, start, end);
-}
-
#ifdef CONFIG_PM
static int orinoco_pci_suspend(struct pci_dev *pdev, pm_message_t state)
{
diff --git a/drivers/net/wireless/orinoco_plx.c b/drivers/net/wireless/orinoco_plx.c
index 7b94050..84f696c 100644
--- a/drivers/net/wireless/orinoco_plx.c
+++ b/drivers/net/wireless/orinoco_plx.c
@@ -245,7 +245,6 @@ static int orinoco_plx_init_one(struct p
err = -EBUSY;
goto fail_irq;
}
- orinoco_pci_setup_netdev(dev, pdev, 2);
err = orinoco_plx_hw_init(card);
if (err) {
@@ -266,6 +265,8 @@ static int orinoco_plx_init_one(struct p
}
pci_set_drvdata(pdev, dev);
+ printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s\n", dev->name,
+ pci_name(pdev));
return 0;
@@ -301,7 +302,7 @@ static void __devexit orinoco_plx_remove
struct orinoco_pci_card *card = priv->card;
unregister_netdev(dev);
- free_irq(dev->irq, dev);
+ free_irq(pdev->irq, dev);
pci_set_drvdata(pdev, NULL);
free_orinocodev(dev);
pci_iounmap(pdev, priv->hw.iobase);
diff --git a/drivers/net/wireless/orinoco_tmd.c b/drivers/net/wireless/orinoco_tmd.c
index 0496663..d2b4dec 100644
--- a/drivers/net/wireless/orinoco_tmd.c
+++ b/drivers/net/wireless/orinoco_tmd.c
@@ -147,7 +147,6 @@ static int orinoco_tmd_init_one(struct p
err = -EBUSY;
goto fail_irq;
}
- orinoco_pci_setup_netdev(dev, pdev, 2);
err = orinoco_tmd_cor_reset(priv);
if (err) {
@@ -162,6 +161,8 @@ static int orinoco_tmd_init_one(struct p
}
pci_set_drvdata(pdev, dev);
+ printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s\n", dev->name,
+ pci_name(pdev));
return 0;
@@ -194,7 +195,7 @@ static void __devexit orinoco_tmd_remove
struct orinoco_pci_card *card = priv->card;
unregister_netdev(dev);
- free_irq(dev->irq, dev);
+ free_irq(pdev->irq, dev);
pci_set_drvdata(pdev, NULL);
free_orinocodev(dev);
pci_iounmap(pdev, priv->hw.iobase);
^ permalink raw reply related
* Re: [PATCH 0/3] Eleminate HZ from AX.25, NETROM and ROSE kernel interfaces
From: David S. Miller @ 2006-05-01 8:00 UTC (permalink / raw)
To: ralf; +Cc: netdev, linux-hams
In-Reply-To: <20060429140327.GA2173@linux-mips.org>
Ralf, I have all of your patches queued up, I'll review them
and merge them in soon.
Thanks a lot.
^ permalink raw reply
* Re: IP1000 gigabit nic driver
From: Pekka Enberg @ 2006-05-01 9:31 UTC (permalink / raw)
To: David Vrabel; +Cc: romieu, linux-kernel, netdev, david
In-Reply-To: <44554ADE.8030200@cantab.net>
On Mon, 2006-05-01 at 00:40 +0100, David Vrabel wrote:
> Thanks for doing this Pekka. I've fixed up some stuff and given it some
> brief testing on a 100BaseT network and it seems to work now.
Thanks! I merged your stuff and pushed out an updated patch.
Pekka
[PATCH] IP1000 Gigabit Ethernet device driver
This is a cleaned up fork of the IP1000A device driver:
http://www.icplus.com.tw/driver-pp-IP1000A.html
Open issues:
- ipg_probe() looks really fishy and doesn't handle all errors
(e.g. ioremap failing).
- ipg_nic_do_ioctl() is playing games with user-space pointer.
We should use ethtool ioctl instead as suggested by Arjan.
- something (PHY reset/auto negotiation?) takes 2-3 seconds and
appears to be done with interrupts disabled.
Changelog:
- Kill 2.2 and 2.4 compatability macros
- Use proper module API
- Use proper PCI API
- Use netdev_priv
- Consolidate headers to one file
- Use __iomem annotations
- Use iomap instead of read/out for I/O
- Remove obfuscating register access macros
- Remove changelogs
- Remove ether_crc_le() -- use crc32_le() instead.
- No more nonsense with root_dev -- ipg_remove() now works.
- Move PHY and MAC address initialization into the ipg_probe(). It was
previously filling in the MAC address on open which breaks some user
space.
- Folded ipg_nic_init into ipg_probe since it was broke otherwise.
I don't have the hardware, so I don't know if I broke anything.
The patch is 128 KB in size, so I am not including it in this
mail. You can find the patch here:
http://www.cs.helsinki.fi/u/penberg/linux/ip1000-driver.patch
Signed-off-by: David Vrabel <dvrabel@cantab.net>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
^ permalink raw reply
* Re: IP1000 gigabit nic driver
From: Pekka Enberg @ 2006-05-01 9:43 UTC (permalink / raw)
To: David Vrabel; +Cc: romieu, linux-kernel, netdev, david
In-Reply-To: <44554ADE.8030200@cantab.net>
On Mon, 2006-05-01 at 00:40 +0100, David Vrabel wrote:
> Still pending. Also:
>
> - something (PHY reset/auto negotiation?) takes 2-3 seconds and
> appears to be done with interrupts disabled.
Are you seeing this at module initialization? Does Sysrq-t show anything
useful?
Pekka
^ permalink raw reply
* [PATCH 001/100] TCP congestion module: add TCP-LP supporting for 2.6.16
From: Wong Edison @ 2006-05-01 10:05 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
TCP Low Priority is a distributed algorithm whose goal is to utilize only
the excess network bandwidth as compared to the ``fair share`` of
bandwidth as targeted by TCP. Available from:
http://www.ece.rice.edu/~akuzma/Doc/akuzma/TCP-LP.pdf
See http://www-ece.rice.edu/networks/TCP-LP/ for their implementation.
Our group take the following changes from
the original TCP-LP implementation:
o We use newReno in most core CA handling. Only add some checking
within cong_avoid.
o Error correcting in remote HZ, therefore remote HZ will be keeped
on checking and updating.
o Handling calculation of One-Way-Delay (OWD) within rtt_sample, sicne
OWD have a similar meaning as RTT. Also correct the buggy formular.
o Handle reaction for Early Congestion Indication (ECI) within
pkts_acked, as mentioned within pseudo code.
o OWD is handled in relative format, where local time stamp will in
tcp_time_stamp format.
Port from 2.4.19 to 2.6.16 as module by:
Wong Hoi Sing Edison <hswong3i@gmail.com>
Hung Hing Lun <hlhung3i@gmail.com>
Signed-off-by: Wong Hoi Sing Edison <hswong3i@gmail.com>
diff -urN linux-2.6.16.1/net/ipv4/Kconfig linux/net/ipv4/Kconfig
--- linux-2.6.16.1/net/ipv4/Kconfig 2006-03-28 14:49:02.000000000 +0800
+++ linux/net/ipv4/Kconfig 2006-04-19 02:40:27.000000000 +0800
@@ -531,6 +531,27 @@
properties, though is known to have fairness issues.
See http://www-lce.eng.cam.ac.uk/~ctk21/scalable/
+config TCP_CONG_LP
+ tristate "TCP Low Priority"
+ depends on EXPERIMENTAL
+ default n
+ ---help---
+ TCP Low Priority (TCP-LP), a distributed algorithm whose goal is
+ to utiliza only the excess network bandwidth as compared to the
+ ``fair share`` of bandwidth as targeted by TCP.
+ See http://www-ece.rice.edu/networks/TCP-LP/
+
+config TCP_CONG_LP_DEBUG
+ bool "TCP-LP Debug"
+ depends on TCP_CONG_LP
+ default n
+ ---help---
+ Turn on/off the debug message for TCP-LP. The debug message will
+ print to default kernel debug log file, e.g. /var/log/debug as
+ default. You can use dmesg to obtain the log too.
+
+ If unsure, say N.
+
endmenu
config TCP_CONG_BIC
diff -urN linux-2.6.16.1/net/ipv4/Makefile linux/net/ipv4/Makefile
--- linux-2.6.16.1/net/ipv4/Makefile 2006-03-28 14:49:02.000000000 +0800
+++ linux/net/ipv4/Makefile 2006-04-19 02:40:27.000000000 +0800
@@ -41,6 +41,7 @@
obj-$(CONFIG_TCP_CONG_HTCP) += tcp_htcp.o
obj-$(CONFIG_TCP_CONG_VEGAS) += tcp_vegas.o
obj-$(CONFIG_TCP_CONG_SCALABLE) += tcp_scalable.o
+obj-$(CONFIG_TCP_CONG_LP) += tcp_lp.o
obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \
xfrm4_output.o
diff -urN linux-2.6.16.1/net/ipv4/tcp_lp.c linux/net/ipv4/tcp_lp.c
--- linux-2.6.16.1/net/ipv4/tcp_lp.c 1970-01-01 08:00:00.000000000 +0800
+++ linux/net/ipv4/tcp_lp.c 2006-04-25 15:54:54.000000000 +0800
@@ -0,0 +1,343 @@
+/*
+ * TCP Low Priority (TCP-LP)
+ *
+ * TCP Low Priority is a distributed algorithm whose goal is to utilize only
+ * the excess network bandwidth as compared to the ``fair share`` of
+ * bandwidth as targeted by TCP. Available from:
+ * http://www.ece.rice.edu/~akuzma/Doc/akuzma/TCP-LP.pdf
+ *
+ * Original Author:
+ * Aleksandar Kuzmanovic <akuzma@northwestern.edu>
+ *
+ * See http://www-ece.rice.edu/networks/TCP-LP/ for their implementation.
+ * As of 2.6.13, Linux supports pluggable congestion control algorithms.
+ * Due to the limitation of the API, we take the following changes from
+ * the original TCP-LP implementation:
+ * o We use newReno in most core CA handling. Only add some checking
+ * within cong_avoid.
+ * o Error correcting in remote HZ, therefore remote HZ will be keeped
+ * on checking and updating.
+ * o Handling calculation of One-Way-Delay (OWD) within rtt_sample, sicne
+ * OWD have a similar meaning as RTT. Also correct the buggy formular.
+ * o Handle reaction for Early Congestion Indication (ECI) within
+ * pkts_acked, as mentioned within pseudo code.
+ * o OWD is handled in relative format, where local time stamp will in
+ * tcp_time_stamp format.
+ *
+ * Port from 2.4.19 to 2.6.16 as module by:
+ * Wong Hoi Sing Edison <hswong3i@gmail.com>
+ * Hung Hing Lun <hlhung3i@gmail.com>
+ *
+ * Version: $Id: tcp_lp.c,v 1.20 2006-04-22 06:34:20 hswong3i Exp $
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <net/tcp.h>
+
+#ifndef CONFIG_TCP_CONG_LP_DEBUG
+#define CONFIG_TCP_CONG_LP_DEBUG 0
+#endif
+
+/* resolution of owd */
+#define LP_RESOL 1000
+
+/**
+ * enum tcp_lp_state
+ * @LP_VALID_RHZ: is remote HZ valid?
+ * @LP_VALID_OWD: is OWD valid?
+ * @LP_WITHIN_THR: are we within threshold?
+ * @LP_WITHIN_INF: are we within inference?
+ *
+ * TCP-LP's state flags.
+ * We create this set of state flag mainly for debugging.
+ */
+enum tcp_lp_state {
+ LP_VALID_RHZ = (1 << 0),
+ LP_VALID_OWD = (1 << 1),
+ LP_WITHIN_THR = (1 << 3),
+ LP_WITHIN_INF = (1 << 4),
+};
+
+/**
+ * struct lp
+ * @flag: TCP-LP state flag
+ * @sowd: smoothed OWD << 3
+ * @owd_min: min OWD
+ * @owd_max: max OWD
+ * @owd_max_rsv: resrved max owd
+ * @RHZ: estimated remote HZ
+ * @remote_ref_time: remote reference time
+ * @local_ref_time: local reference time
+ * @last_drop: time for last active drop
+ * @inference: current inference
+ *
+ * TCP-LP's private struct.
+ * We get the idea from original TCP-LP implementation where only left those we
+ * found are really useful.
+ */
+struct lp {
+ u32 flag;
+ u32 sowd;
+ u32 owd_min;
+ u32 owd_max;
+ u32 owd_max_rsv;
+ u32 RHZ;
+ u32 remote_ref_time;
+ u32 local_ref_time;
+ u32 last_drop;
+ u32 inference;
+};
+
+/**
+ * tcp_lp_init
+ *
+ * Init all required variables.
+ * Clone the handling from Vegas module implementation.
+ */
+static void tcp_lp_init(struct sock *sk)
+{
+ struct lp *lp = inet_csk_ca(sk);
+
+ lp->flag = 0;
+ lp->sowd = 0;
+ lp->owd_min = 0xffffffff;
+ lp->owd_max = 0;
+ lp->owd_max_rsv = 0;
+ lp->RHZ = 0;
+ lp->remote_ref_time = 0;
+ lp->local_ref_time = 0;
+ lp->last_drop = 0;
+ lp->inference = 0;
+}
+
+/**
+ * tcp_lp_cong_avoid
+ *
+ * Implementation of cong_avoid.
+ * Will only call newReno CA when away from inference.
+ * From TCP-LP's paper, this will be handled in additive increasement.
+ */
+static void tcp_lp_cong_avoid(struct sock *sk, u32 ack, u32 rtt, u32 in_flight,
+ int flag)
+{
+ struct lp *lp = inet_csk_ca(sk);
+
+ if (!(lp->flag & LP_WITHIN_INF))
+ tcp_reno_cong_avoid(sk, ack, rtt, in_flight, flag);
+}
+
+/**
+ * tcp_lp_remote_hz_estimator
+ *
+ * Estimate remote HZ.
+ * We keep on updating the estimated value, where original TCP-LP
+ * implementation only guest it for once and use forever.
+ */
+static inline u32 tcp_lp_remote_hz_estimator(struct sock *sk)
+{
+ struct tcp_sock *tp = tcp_sk(sk);
+ struct lp *lp = inet_csk_ca(sk);
+ s64 rhz = lp->RHZ << 6; /* remote HZ << 6 */
+ s64 m = 0;
+
+ /* not yet record reference time
+ * go away!! record it before come back!! */
+ if (lp->remote_ref_time == 0 || lp->local_ref_time == 0)
+ goto out;
+
+ /* we can't calc remote HZ with no different!! */
+ if (tp->rx_opt.rcv_tsval == lp->remote_ref_time
+ || tp->rx_opt.rcv_tsecr == lp->local_ref_time)
+ goto out;
+
+ m = HZ * (tp->rx_opt.rcv_tsval -
+ lp->remote_ref_time) / (tp->rx_opt.rcv_tsecr -
+ lp->local_ref_time);
+ if (m < 0)
+ m = -m;
+
+ if (rhz != 0) {
+ m -= (rhz >> 6); /* m is now error in remote HZ est */
+ rhz += m; /* 63/64 old + 1/64 new */
+ } else
+ rhz = m << 6;
+
+ /* record time for successful remote HZ calc */
+ lp->flag |= LP_VALID_RHZ;
+
+ out:
+ /* record reference time stamp */
+ lp->remote_ref_time = tp->rx_opt.rcv_tsval;
+ lp->local_ref_time = tp->rx_opt.rcv_tsecr;
+
+ return rhz >> 6;
+}
+
+/**
+ * tcp_lp_owd_calculator
+ *
+ * Calculate one way delay (in relative format).
+ * Original implement OWD as minus of remote time difference to local time
+ * difference directly. As this time difference just simply equal to RTT, when
+ * the network status is stable, remote RTT will equal to local RTT, and result
+ * OWD into zero.
+ * It seems to be a bug and so we fixed it.
+ */
+static inline u32 tcp_lp_owd_calculator(struct sock *sk)
+{
+ struct tcp_sock *tp = tcp_sk(sk);
+ struct lp *lp = inet_csk_ca(sk);
+ s64 owd = 0;
+
+ lp->RHZ = tcp_lp_remote_hz_estimator(sk);
+
+ if (lp->flag & LP_VALID_RHZ) {
+ owd =
+ tp->rx_opt.rcv_tsval * (LP_RESOL / lp->RHZ) -
+ tp->rx_opt.rcv_tsecr * (LP_RESOL / HZ);
+ if (owd < 0)
+ owd = -owd;
+ }
+
+ if (owd > 0)
+ lp->flag |= LP_VALID_OWD;
+ else
+ lp->flag &= ~LP_VALID_OWD;
+
+ return owd;
+}
+
+/**
+ * tcp_lp_rtt_sample
+ *
+ * Implementation or rtt_sample.
+ * Will take the following action,
+ * 1. calc OWD,
+ * 2. record the min/max OWD,
+ * 3. calc smoothed OWD (SOWD).
+ * Most ideas come from the original TCP-LP implementation.
+ */
+static void tcp_lp_rtt_sample(struct sock *sk, u32 usrtt)
+{
+ struct lp *lp = inet_csk_ca(sk);
+ s64 mowd = tcp_lp_owd_calculator(sk);
+
+ /* sorry that we don't have valid data */
+ if (!(lp->flag & LP_VALID_RHZ) || !(lp->flag & LP_VALID_OWD))
+ return;
+
+ /* record the next min owd */
+ if (mowd < lp->owd_min)
+ lp->owd_min = mowd;
+
+ /* always forget the max of the max
+ * we just set owd_max as one below it */
+ if (mowd > lp->owd_max) {
+ if (mowd > lp->owd_max_rsv) {
+ if (lp->owd_max_rsv == 0)
+ lp->owd_max = mowd;
+ else
+ lp->owd_max = lp->owd_max_rsv;
+ lp->owd_max_rsv = mowd;
+ } else
+ lp->owd_max = mowd;
+ }
+
+ /* calc for smoothed owd */
+ if (lp->sowd != 0) {
+ mowd -= (lp->sowd >> 3); /* m is now error in owd est */
+ lp->sowd += mowd; /* owd = 7/8 owd + 1/8 new */
+ } else
+ lp->sowd = mowd << 3; /* take the measured time be owd */
+}
+
+/**
+ * tcp_lp_pkts_acked
+ *
+ * Implementation of pkts_acked.
+ * Deal with active drop under Early Congestion Indication.
+ * Only drop to half and 1 will be handle, because we hope to use back
+ * newReno in increase case.
+ * We work it out by following the idea from TCP-LP's paper directly
+ */
+static void tcp_lp_pkts_acked(struct sock *sk, u32 num_acked)
+{
+ struct tcp_sock *tp = tcp_sk(sk);
+ struct lp *lp = inet_csk_ca(sk);
+
+ /* calc inference */
+ if (tcp_time_stamp > tp->rx_opt.rcv_tsecr)
+ lp->inference = 3 * (tcp_time_stamp - tp->rx_opt.rcv_tsecr);
+
+ /* test if within inference */
+ if (lp->last_drop && (tcp_time_stamp - lp->last_drop < lp->inference))
+ lp->flag |= LP_WITHIN_INF;
+ else
+ lp->flag &= ~LP_WITHIN_INF;
+
+ /* test if within threshold */
+ if (lp->sowd >> 3 <
+ lp->owd_min + 15 * (lp->owd_max - lp->owd_min) / 100)
+ lp->flag |= LP_WITHIN_THR;
+ else
+ lp->flag &= ~LP_WITHIN_THR;
+
+#if CONFIG_TCP_CONG_LP_DEBUG == 1
+ printk(KERN_DEBUG "TCP-LP: %05o|%5u|%5u|%15u|%15u|%15u\n", lp->flag,
+ tp->snd_cwnd, lp->RHZ, lp->owd_min, lp->owd_max, lp->sowd >> 3);
+#endif
+
+ if (lp->flag & LP_WITHIN_THR)
+ return;
+
+ /* FIXME: try to reset owd_min and owd_max here
+ * so decrease the chance the min/max is no longer suitable
+ * and will usually within threshold when whithin inference */
+ lp->owd_min = (lp->sowd >> 3);
+ lp->owd_max = (lp->sowd >> 2);
+ lp->owd_max_rsv = (lp->sowd >> 2);
+
+ /* happened within inference
+ * drop snd_cwnd into 1 */
+ if (lp->flag & LP_WITHIN_INF)
+ tp->snd_cwnd = 1U;
+
+ /* happened after inference
+ * cut snd_cwnd into half */
+ else
+ tp->snd_cwnd = max(tp->snd_cwnd >> 1U, 1U);
+
+ /* record this drop time */
+ lp->last_drop = tcp_time_stamp;
+}
+
+static struct tcp_congestion_ops tcp_lp = {
+ .init = tcp_lp_init,
+ .ssthresh = tcp_reno_ssthresh,
+ .cong_avoid = tcp_lp_cong_avoid,
+ .min_cwnd = tcp_reno_min_cwnd,
+ .rtt_sample = tcp_lp_rtt_sample,
+ .pkts_acked = tcp_lp_pkts_acked,
+
+ .owner = THIS_MODULE,
+ .name = "lp"
+};
+
+static int __init lp_register(void)
+{
+ BUG_ON(sizeof(struct lp) > ICSK_CA_PRIV_SIZE);
+ return tcp_register_congestion_control(&tcp_lp);
+}
+
+static void __exit lp_unregister(void)
+{
+ tcp_unregister_congestion_control(&tcp_lp);
+}
+
+module_init(lp_register);
+module_exit(lp_unregister);
+
+MODULE_AUTHOR("Wong Hoi Sing Edison, Hung Hing Lun");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("TCP Low Priority");
^ permalink raw reply
* Re: IP1000 gigabit nic driver
From: David Vrabel @ 2006-05-01 11:32 UTC (permalink / raw)
To: David Vrabel; +Cc: Pekka Enberg, romieu, linux-kernel, netdev, david
In-Reply-To: <44554ADE.8030200@cantab.net>
[-- Attachment #1: Type: text/plain, Size: 441 bytes --]
David Vrabel wrote:
>
> - something (PHY reset/auto negotiation?) takes 2-3 seconds and
> appears to be done with interrupts disabled.
It was clocking the MII management interface (MDC) at 500 Hz so each PHY
register access took some 130 ms, and many registers accesses were being
done on initialization. According to the datasheet, the maximum
frequency for MDC is 2.5 MHz. Delays have been adjusted accordingly.
David Vrabel
[-- Attachment #2: drivers-net-ipg-speed-up-phy-access --]
[-- Type: text/plain, Size: 3542 bytes --]
Reduce delays when reading/writing the PHY registers so we clock the
MII management interface at 2.5 MHz (the maximum according to the
datasheet) instead of 500 Hz.
Signed-off-by: David Vrabel <dvrabel@cantab.net>
Index: linux-source-2.6.16/drivers/net/ipg.c
===================================================================
--- linux-source-2.6.16.orig/drivers/net/ipg.c 2006-05-01 11:52:32.555800238 +0100
+++ linux-source-2.6.16/drivers/net/ipg.c 2006-05-01 12:08:45.316188064 +0100
@@ -176,13 +176,13 @@
(IPG_PC_MGMTCLK_LO | (IPG_PC_MGMTDATA & 0) | IPG_PC_MGMTDIR |
phyctrlpolarity), ioaddr + IPG_PHYCTRL);
- mdelay(IPG_PC_PHYCTRLWAIT);
+ ndelay(IPG_PC_PHYCTRLWAIT_NS);
iowrite8(IPG_PC_RSVD_MASK &
(IPG_PC_MGMTCLK_HI | (IPG_PC_MGMTDATA & 0) | IPG_PC_MGMTDIR |
phyctrlpolarity), ioaddr + IPG_PHYCTRL);
- mdelay(IPG_PC_PHYCTRLWAIT);
+ ndelay(IPG_PC_PHYCTRLWAIT_NS);
}
static void send_end(void __iomem * ioaddr, u8 phyctrlpolarity)
@@ -198,7 +198,7 @@
iowrite8(IPG_PC_RSVD_MASK & (IPG_PC_MGMTCLK_LO | phyctrlpolarity),
ioaddr + IPG_PHYCTRL);
- mdelay(IPG_PC_PHYCTRLWAIT);
+ ndelay(IPG_PC_PHYCTRLWAIT_NS);
bit_data =
((ioread8(ioaddr + IPG_PHYCTRL) & IPG_PC_MGMTDATA) >> 1) & 1;
@@ -206,7 +206,7 @@
iowrite8(IPG_PC_RSVD_MASK & (IPG_PC_MGMTCLK_HI | phyctrlpolarity),
ioaddr + IPG_PHYCTRL);
- mdelay(IPG_PC_PHYCTRLWAIT);
+ ndelay(IPG_PC_PHYCTRLWAIT_NS);
return bit_data;
}
@@ -290,14 +290,14 @@
(IPG_PC_MGMTDATA & databit) | IPG_PC_MGMTDIR |
phyctrlpolarity), ioaddr + IPG_PHYCTRL);
- mdelay(IPG_PC_PHYCTRLWAIT);
+ ndelay(IPG_PC_PHYCTRLWAIT_NS);
iowrite8(IPG_PC_RSVD_MASK &
(IPG_PC_MGMTCLK_HI |
(IPG_PC_MGMTDATA & databit) | IPG_PC_MGMTDIR |
phyctrlpolarity), ioaddr + IPG_PHYCTRL);
- mdelay(IPG_PC_PHYCTRLWAIT);
+ ndelay(IPG_PC_PHYCTRLWAIT_NS);
}
send_three_state(ioaddr, phyctrlpolarity);
@@ -403,14 +403,14 @@
(IPG_PC_MGMTDATA & databit) | IPG_PC_MGMTDIR |
phyctrlpolarity), ioaddr + IPG_PHYCTRL);
- mdelay(IPG_PC_PHYCTRLWAIT);
+ ndelay(IPG_PC_PHYCTRLWAIT_NS);
iowrite8(IPG_PC_RSVD_MASK &
(IPG_PC_MGMTCLK_HI |
(IPG_PC_MGMTDATA & databit) | IPG_PC_MGMTDIR |
phyctrlpolarity), ioaddr + IPG_PHYCTRL);
- mdelay(IPG_PC_PHYCTRLWAIT);
+ ndelay(IPG_PC_PHYCTRLWAIT_NS);
}
/* The last cycle is a tri-state, so read from the PHY.
@@ -421,7 +421,7 @@
(IPG_PC_MGMTCLK_LO | phyctrlpolarity),
ioaddr + IPG_PHYCTRL);
- mdelay(IPG_PC_PHYCTRLWAIT);
+ ndelay(IPG_PC_PHYCTRLWAIT_NS);
field[j] |= ((ioread8(ioaddr + IPG_PHYCTRL) &
IPG_PC_MGMTDATA) >> 1)
@@ -431,7 +431,7 @@
(IPG_PC_MGMTCLK_HI | phyctrlpolarity),
ioaddr + IPG_PHYCTRL);
- mdelay(IPG_PC_PHYCTRLWAIT);
+ ndelay(IPG_PC_PHYCTRLWAIT_NS);
}
}
Index: linux-source-2.6.16/drivers/net/ipg.h
===================================================================
--- linux-source-2.6.16.orig/drivers/net/ipg.h 2006-05-01 12:08:58.343035854 +0100
+++ linux-source-2.6.16/drivers/net/ipg.h 2006-05-01 12:09:37.282602113 +0100
@@ -672,10 +672,10 @@
/* Number of IPG_AC_RESETWAIT timeperiods before declaring timeout. */
#define IPG_AC_RESET_TIMEOUT 0x0A
-/* Minimum number of miliseconds used to toggle MDC clock during
+/* Minimum number of nanoseconds used to toggle MDC clock during
* MII/GMII register access.
*/
-#define IPG_PC_PHYCTRLWAIT 0x01
+#define IPG_PC_PHYCTRLWAIT_NS 200
#define IPG_TFDLIST_LENGTH 0x100
^ permalink raw reply
* [PATCH] au1000_eth.c: use ether_crc() from <linux/crc32.h>
From: Herbert Valerio Riedel @ 2006-05-01 13:46 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, linux-mips, sshtylyov
since the au1000 driver already selects the CRC32 routines, simply replace
the internal ether_crc() implementation with the semantically equivalent
one from <linux/crc32.h>
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
---
drivers/net/au1000_eth.c | 18 +-----------------
1 files changed, 1 insertions(+), 17 deletions(-)
9360df5368deaaaa8fc7dcaacf9b7ca446af94c4
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index 29adebb..0823cb8 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -52,6 +52,7 @@
#include <linux/mii.h>
#include <linux/skbuff.h>
#include <linux/delay.h>
+#include <linux/crc32.h>
#include <asm/mipsregs.h>
#include <asm/irq.h>
#include <asm/io.h>
@@ -2070,23 +2071,6 @@ static void au1000_tx_timeout(struct net
netif_wake_queue(dev);
}
-
-static unsigned const ethernet_polynomial = 0x04c11db7U;
-static inline u32 ether_crc(int length, unsigned char *data)
-{
- int crc = -1;
-
- while(--length >= 0) {
- unsigned char current_octet = *data++;
- int bit;
- for (bit = 0; bit < 8; bit++, current_octet >>= 1)
- crc = (crc << 1) ^
- ((crc < 0) ^ (current_octet & 1) ?
- ethernet_polynomial : 0);
- }
- return crc;
-}
-
static void set_rx_mode(struct net_device *dev)
{
struct au1000_private *aup = (struct au1000_private *) dev->priv;
--
1.2.6
^ permalink raw reply related
* [PATCH] au1000_eth.c: use ether_crc() from <linux/crc32.h>
From: Herbert Valerio Riedel @ 2006-05-01 13:46 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, linux-mips, sshtylyov
since the au1000 driver already selects the CRC32 routines, simply replace
the internal ether_crc() implementation with the semantically equivalent
one from <linux/crc32.h>
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
---
drivers/net/au1000_eth.c | 18 +-----------------
1 files changed, 1 insertions(+), 17 deletions(-)
9360df5368deaaaa8fc7dcaacf9b7ca446af94c4
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index 29adebb..0823cb8 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -52,6 +52,7 @@
#include <linux/mii.h>
#include <linux/skbuff.h>
#include <linux/delay.h>
+#include <linux/crc32.h>
#include <asm/mipsregs.h>
#include <asm/irq.h>
#include <asm/io.h>
@@ -2070,23 +2071,6 @@ static void au1000_tx_timeout(struct net
netif_wake_queue(dev);
}
-
-static unsigned const ethernet_polynomial = 0x04c11db7U;
-static inline u32 ether_crc(int length, unsigned char *data)
-{
- int crc = -1;
-
- while(--length >= 0) {
- unsigned char current_octet = *data++;
- int bit;
- for (bit = 0; bit < 8; bit++, current_octet >>= 1)
- crc = (crc << 1) ^
- ((crc < 0) ^ (current_octet & 1) ?
- ethernet_polynomial : 0);
- }
- return crc;
-}
-
static void set_rx_mode(struct net_device *dev)
{
struct au1000_private *aup = (struct au1000_private *) dev->priv;
--
1.2.6
^ permalink raw reply related
* wireless softmac origin (net/ieee80211/softmac)
From: Ian Brown @ 2006-05-01 14:19 UTC (permalink / raw)
To: netdev
Hello,
I am looking at 2.6.17-rc3 kernel.
I wonder: what is the origin of softmac in
2.6.17-rc3 kernel ?
I see in the *.c files under that folder:
Copyright (c) 2005, 2006 Johannes Berg <johannes@sipsolutions.net>
* Joseph Jezak <josejx@gentoo.org>
* Larry Finger <Larry.Finger@lwfinger.net>
* Danny van Dyk <kugelfang@gentoo.org>
* Michael Buesch <mbuesch@freenet.de>
Is this softmac layer was written from scratch ? or was it
taken (fully/partially) from softmac in the devicescape linux kernel stack ?
http://devicescape.com/
Best,
IB
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox