2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2002 Petko Manolov (petkan@users.sourceforge.net)
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* version 2 as published by the Free Software Foundation.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/signal.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/etherdevice.h>
|
|
|
|
#include <linux/mii.h>
|
|
|
|
#include <linux/ethtool.h>
|
|
|
|
#include <linux/usb.h>
|
|
|
|
#include <asm/uaccess.h>
|
|
|
|
|
|
|
|
/* Version Information */
|
|
|
|
#define DRIVER_VERSION "v0.6.2 (2004/08/27)"
|
|
|
|
#define DRIVER_AUTHOR "Petko Manolov <petkan@users.sourceforge.net>"
|
|
|
|
#define DRIVER_DESC "rtl8150 based usb-ethernet driver"
|
|
|
|
|
|
|
|
#define IDR 0x0120
|
|
|
|
#define MAR 0x0126
|
|
|
|
#define CR 0x012e
|
|
|
|
#define TCR 0x012f
|
|
|
|
#define RCR 0x0130
|
|
|
|
#define TSR 0x0132
|
|
|
|
#define RSR 0x0133
|
|
|
|
#define CON0 0x0135
|
|
|
|
#define CON1 0x0136
|
|
|
|
#define MSR 0x0137
|
|
|
|
#define PHYADD 0x0138
|
|
|
|
#define PHYDAT 0x0139
|
|
|
|
#define PHYCNT 0x013b
|
|
|
|
#define GPPC 0x013d
|
|
|
|
#define BMCR 0x0140
|
|
|
|
#define BMSR 0x0142
|
|
|
|
#define ANAR 0x0144
|
|
|
|
#define ANLP 0x0146
|
|
|
|
#define AER 0x0148
|
|
|
|
#define CSCR 0x014C /* This one has the link status */
|
|
|
|
#define CSCR_LINK_STATUS (1 << 3)
|
|
|
|
|
|
|
|
#define IDR_EEPROM 0x1202
|
|
|
|
|
|
|
|
#define PHY_READ 0
|
|
|
|
#define PHY_WRITE 0x20
|
|
|
|
#define PHY_GO 0x40
|
|
|
|
|
|
|
|
#define MII_TIMEOUT 10
|
|
|
|
#define INTBUFSIZE 8
|
|
|
|
|
|
|
|
#define RTL8150_REQT_READ 0xc0
|
|
|
|
#define RTL8150_REQT_WRITE 0x40
|
|
|
|
#define RTL8150_REQ_GET_REGS 0x05
|
|
|
|
#define RTL8150_REQ_SET_REGS 0x05
|
|
|
|
|
|
|
|
|
|
|
|
/* Transmit status register errors */
|
|
|
|
#define TSR_ECOL (1<<5)
|
|
|
|
#define TSR_LCOL (1<<4)
|
|
|
|
#define TSR_LOSS_CRS (1<<3)
|
|
|
|
#define TSR_JBR (1<<2)
|
|
|
|
#define TSR_ERRORS (TSR_ECOL | TSR_LCOL | TSR_LOSS_CRS | TSR_JBR)
|
|
|
|
/* Receive status register errors */
|
|
|
|
#define RSR_CRC (1<<2)
|
|
|
|
#define RSR_FAE (1<<1)
|
|
|
|
#define RSR_ERRORS (RSR_CRC | RSR_FAE)
|
|
|
|
|
|
|
|
/* Media status register definitions */
|
|
|
|
#define MSR_DUPLEX (1<<4)
|
|
|
|
#define MSR_SPEED (1<<3)
|
|
|
|
#define MSR_LINK (1<<2)
|
|
|
|
|
|
|
|
/* Interrupt pipe data */
|
|
|
|
#define INT_TSR 0x00
|
|
|
|
#define INT_RSR 0x01
|
|
|
|
#define INT_MSR 0x02
|
|
|
|
#define INT_WAKSR 0x03
|
|
|
|
#define INT_TXOK_CNT 0x04
|
|
|
|
#define INT_RXLOST_CNT 0x05
|
|
|
|
#define INT_CRERR_CNT 0x06
|
|
|
|
#define INT_COL_CNT 0x07
|
|
|
|
|
|
|
|
/* Transmit status register errors */
|
|
|
|
#define TSR_ECOL (1<<5)
|
|
|
|
#define TSR_LCOL (1<<4)
|
|
|
|
#define TSR_LOSS_CRS (1<<3)
|
|
|
|
#define TSR_JBR (1<<2)
|
|
|
|
#define TSR_ERRORS (TSR_ECOL | TSR_LCOL | TSR_LOSS_CRS | TSR_JBR)
|
|
|
|
/* Receive status register errors */
|
|
|
|
#define RSR_CRC (1<<2)
|
|
|
|
#define RSR_FAE (1<<1)
|
|
|
|
#define RSR_ERRORS (RSR_CRC | RSR_FAE)
|
|
|
|
|
|
|
|
/* Media status register definitions */
|
|
|
|
#define MSR_DUPLEX (1<<4)
|
|
|
|
#define MSR_SPEED (1<<3)
|
|
|
|
#define MSR_LINK (1<<2)
|
|
|
|
|
|
|
|
/* Interrupt pipe data */
|
|
|
|
#define INT_TSR 0x00
|
|
|
|
#define INT_RSR 0x01
|
|
|
|
#define INT_MSR 0x02
|
|
|
|
#define INT_WAKSR 0x03
|
|
|
|
#define INT_TXOK_CNT 0x04
|
|
|
|
#define INT_RXLOST_CNT 0x05
|
|
|
|
#define INT_CRERR_CNT 0x06
|
|
|
|
#define INT_COL_CNT 0x07
|
|
|
|
|
|
|
|
|
|
|
|
#define RTL8150_MTU 1540
|
|
|
|
#define RTL8150_TX_TIMEOUT (HZ)
|
|
|
|
#define RX_SKB_POOL_SIZE 4
|
|
|
|
|
|
|
|
/* rtl8150 flags */
|
|
|
|
#define RTL8150_HW_CRC 0
|
|
|
|
#define RX_REG_SET 1
|
|
|
|
#define RTL8150_UNPLUG 2
|
|
|
|
#define RX_URB_FAIL 3
|
|
|
|
|
|
|
|
/* Define these values to match your device */
|
2006-12-04 15:27:36 +03:00
|
|
|
#define VENDOR_ID_REALTEK 0x0bda
|
2005-04-17 02:20:36 +04:00
|
|
|
#define VENDOR_ID_MELCO 0x0411
|
2006-12-04 15:27:36 +03:00
|
|
|
#define VENDOR_ID_MICRONET 0x3980
|
2005-04-17 02:20:36 +04:00
|
|
|
#define VENDOR_ID_LONGSHINE 0x07b8
|
2006-12-04 15:27:36 +03:00
|
|
|
#define VENDOR_ID_OQO 0x1557
|
2006-07-06 03:17:27 +04:00
|
|
|
#define VENDOR_ID_ZYXEL 0x0586
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
#define PRODUCT_ID_RTL8150 0x8150
|
|
|
|
#define PRODUCT_ID_LUAKTX 0x0012
|
|
|
|
#define PRODUCT_ID_LCS8138TX 0x401a
|
|
|
|
#define PRODUCT_ID_SP128AR 0x0003
|
2006-07-06 03:17:27 +04:00
|
|
|
#define PRODUCT_ID_PRESTIGE 0x401a
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
#undef EEPROM_WRITE
|
|
|
|
|
|
|
|
/* table of devices that work with this driver */
|
|
|
|
static struct usb_device_id rtl8150_table[] = {
|
|
|
|
{USB_DEVICE(VENDOR_ID_REALTEK, PRODUCT_ID_RTL8150)},
|
|
|
|
{USB_DEVICE(VENDOR_ID_MELCO, PRODUCT_ID_LUAKTX)},
|
|
|
|
{USB_DEVICE(VENDOR_ID_MICRONET, PRODUCT_ID_SP128AR)},
|
|
|
|
{USB_DEVICE(VENDOR_ID_LONGSHINE, PRODUCT_ID_LCS8138TX)},
|
2006-12-04 15:27:36 +03:00
|
|
|
{USB_DEVICE(VENDOR_ID_OQO, PRODUCT_ID_RTL8150)},
|
2006-07-06 03:17:27 +04:00
|
|
|
{USB_DEVICE(VENDOR_ID_ZYXEL, PRODUCT_ID_PRESTIGE)},
|
2005-04-17 02:20:36 +04:00
|
|
|
{}
|
|
|
|
};
|
|
|
|
|
|
|
|
MODULE_DEVICE_TABLE(usb, rtl8150_table);
|
|
|
|
|
|
|
|
struct rtl8150 {
|
|
|
|
unsigned long flags;
|
|
|
|
struct usb_device *udev;
|
|
|
|
struct tasklet_struct tl;
|
|
|
|
struct net_device *netdev;
|
|
|
|
struct urb *rx_urb, *tx_urb, *intr_urb, *ctrl_urb;
|
|
|
|
struct sk_buff *tx_skb, *rx_skb;
|
|
|
|
struct sk_buff *rx_skb_pool[RX_SKB_POOL_SIZE];
|
|
|
|
spinlock_t rx_pool_lock;
|
|
|
|
struct usb_ctrlrequest dr;
|
|
|
|
int intr_interval;
|
|
|
|
__le16 rx_creg;
|
|
|
|
u8 *intr_buff;
|
|
|
|
u8 phy;
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct rtl8150 rtl8150_t;
|
|
|
|
|
|
|
|
static void fill_skb_pool(rtl8150_t *);
|
|
|
|
static void free_skb_pool(rtl8150_t *);
|
|
|
|
static inline struct sk_buff *pull_skb(rtl8150_t *);
|
|
|
|
static void rtl8150_disconnect(struct usb_interface *intf);
|
|
|
|
static int rtl8150_probe(struct usb_interface *intf,
|
|
|
|
const struct usb_device_id *id);
|
2006-07-25 14:39:14 +04:00
|
|
|
static int rtl8150_suspend(struct usb_interface *intf, pm_message_t message);
|
|
|
|
static int rtl8150_resume(struct usb_interface *intf);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
static const char driver_name [] = "rtl8150";
|
|
|
|
|
|
|
|
static struct usb_driver rtl8150_driver = {
|
|
|
|
.name = driver_name,
|
|
|
|
.probe = rtl8150_probe,
|
|
|
|
.disconnect = rtl8150_disconnect,
|
|
|
|
.id_table = rtl8150_table,
|
2006-07-25 14:39:14 +04:00
|
|
|
.suspend = rtl8150_suspend,
|
|
|
|
.resume = rtl8150_resume
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
**
|
|
|
|
** device related part of the code
|
|
|
|
**
|
|
|
|
*/
|
|
|
|
static int get_registers(rtl8150_t * dev, u16 indx, u16 size, void *data)
|
|
|
|
{
|
|
|
|
return usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0),
|
|
|
|
RTL8150_REQ_GET_REGS, RTL8150_REQT_READ,
|
|
|
|
indx, 0, data, size, 500);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int set_registers(rtl8150_t * dev, u16 indx, u16 size, void *data)
|
|
|
|
{
|
|
|
|
return usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0),
|
|
|
|
RTL8150_REQ_SET_REGS, RTL8150_REQT_WRITE,
|
|
|
|
indx, 0, data, size, 500);
|
|
|
|
}
|
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 17:55:46 +04:00
|
|
|
static void ctrl_callback(struct urb *urb)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
rtl8150_t *dev;
|
2008-12-19 10:00:59 +03:00
|
|
|
int status = urb->status;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2008-12-19 10:00:59 +03:00
|
|
|
switch (status) {
|
2005-04-17 02:20:36 +04:00
|
|
|
case 0:
|
|
|
|
break;
|
|
|
|
case -EINPROGRESS:
|
|
|
|
break;
|
|
|
|
case -ENOENT:
|
|
|
|
break;
|
|
|
|
default:
|
2009-05-30 09:13:58 +04:00
|
|
|
if (printk_ratelimit())
|
|
|
|
dev_warn(&urb->dev->dev, "ctrl urb status %d\n", status);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
dev = urb->context;
|
|
|
|
clear_bit(RX_REG_SET, &dev->flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int async_set_registers(rtl8150_t * dev, u16 indx, u16 size)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (test_bit(RX_REG_SET, &dev->flags))
|
|
|
|
return -EAGAIN;
|
|
|
|
|
|
|
|
dev->dr.bRequestType = RTL8150_REQT_WRITE;
|
|
|
|
dev->dr.bRequest = RTL8150_REQ_SET_REGS;
|
|
|
|
dev->dr.wValue = cpu_to_le16(indx);
|
|
|
|
dev->dr.wIndex = 0;
|
|
|
|
dev->dr.wLength = cpu_to_le16(size);
|
|
|
|
dev->ctrl_urb->transfer_buffer_length = size;
|
|
|
|
usb_fill_control_urb(dev->ctrl_urb, dev->udev,
|
|
|
|
usb_sndctrlpipe(dev->udev, 0), (char *) &dev->dr,
|
|
|
|
&dev->rx_creg, size, ctrl_callback, dev);
|
2006-07-25 14:39:14 +04:00
|
|
|
if ((ret = usb_submit_urb(dev->ctrl_urb, GFP_ATOMIC))) {
|
|
|
|
if (ret == -ENODEV)
|
|
|
|
netif_device_detach(dev->netdev);
|
2005-04-17 02:20:36 +04:00
|
|
|
err("control request submission failed: %d", ret);
|
2006-07-25 14:39:14 +04:00
|
|
|
} else
|
2005-04-17 02:20:36 +04:00
|
|
|
set_bit(RX_REG_SET, &dev->flags);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int read_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 * reg)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
u8 data[3], tmp;
|
|
|
|
|
|
|
|
data[0] = phy;
|
|
|
|
data[1] = data[2] = 0;
|
|
|
|
tmp = indx | PHY_READ | PHY_GO;
|
|
|
|
i = 0;
|
|
|
|
|
|
|
|
set_registers(dev, PHYADD, sizeof(data), data);
|
|
|
|
set_registers(dev, PHYCNT, 1, &tmp);
|
|
|
|
do {
|
|
|
|
get_registers(dev, PHYCNT, 1, data);
|
|
|
|
} while ((data[0] & PHY_GO) && (i++ < MII_TIMEOUT));
|
|
|
|
|
2009-12-27 14:22:08 +03:00
|
|
|
if (i <= MII_TIMEOUT) {
|
2005-04-17 02:20:36 +04:00
|
|
|
get_registers(dev, PHYDAT, 2, data);
|
|
|
|
*reg = data[0] | (data[1] << 8);
|
|
|
|
return 0;
|
|
|
|
} else
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int write_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 reg)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
u8 data[3], tmp;
|
|
|
|
|
|
|
|
data[0] = phy;
|
2007-02-04 06:02:17 +03:00
|
|
|
data[1] = reg & 0xff;
|
|
|
|
data[2] = (reg >> 8) & 0xff;
|
2005-04-17 02:20:36 +04:00
|
|
|
tmp = indx | PHY_WRITE | PHY_GO;
|
|
|
|
i = 0;
|
|
|
|
|
|
|
|
set_registers(dev, PHYADD, sizeof(data), data);
|
|
|
|
set_registers(dev, PHYCNT, 1, &tmp);
|
|
|
|
do {
|
|
|
|
get_registers(dev, PHYCNT, 1, data);
|
|
|
|
} while ((data[0] & PHY_GO) && (i++ < MII_TIMEOUT));
|
|
|
|
|
2009-12-27 14:22:08 +03:00
|
|
|
if (i <= MII_TIMEOUT)
|
2005-04-17 02:20:36 +04:00
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void set_ethernet_addr(rtl8150_t * dev)
|
|
|
|
{
|
|
|
|
u8 node_id[6];
|
|
|
|
|
|
|
|
get_registers(dev, IDR, sizeof(node_id), node_id);
|
|
|
|
memcpy(dev->netdev->dev_addr, node_id, sizeof(node_id));
|
|
|
|
}
|
|
|
|
|
|
|
|
static int rtl8150_set_mac_address(struct net_device *netdev, void *p)
|
|
|
|
{
|
|
|
|
struct sockaddr *addr = p;
|
|
|
|
rtl8150_t *dev = netdev_priv(netdev);
|
|
|
|
|
|
|
|
if (netif_running(netdev))
|
|
|
|
return -EBUSY;
|
|
|
|
|
|
|
|
memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
|
2009-12-30 07:03:28 +03:00
|
|
|
dbg("%s: Setting MAC address to %pM\n", netdev->name, netdev->dev_addr);
|
2005-04-17 02:20:36 +04:00
|
|
|
/* Set the IDR registers. */
|
2009-12-13 08:47:04 +03:00
|
|
|
set_registers(dev, IDR, netdev->addr_len, netdev->dev_addr);
|
2005-04-17 02:20:36 +04:00
|
|
|
#ifdef EEPROM_WRITE
|
|
|
|
{
|
2009-12-30 07:03:28 +03:00
|
|
|
int i;
|
2005-04-17 02:20:36 +04:00
|
|
|
u8 cr;
|
|
|
|
/* Get the CR contents. */
|
|
|
|
get_registers(dev, CR, 1, &cr);
|
|
|
|
/* Set the WEPROM bit (eeprom write enable). */
|
|
|
|
cr |= 0x20;
|
|
|
|
set_registers(dev, CR, 1, &cr);
|
|
|
|
/* Write the MAC address into eeprom. Eeprom writes must be word-sized,
|
|
|
|
so we need to split them up. */
|
|
|
|
for (i = 0; i * 2 < netdev->addr_len; i++) {
|
|
|
|
set_registers(dev, IDR_EEPROM + (i * 2), 2,
|
|
|
|
netdev->dev_addr + (i * 2));
|
|
|
|
}
|
|
|
|
/* Clear the WEPROM bit (preventing accidental eeprom writes). */
|
|
|
|
cr &= 0xdf;
|
|
|
|
set_registers(dev, CR, 1, &cr);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int rtl8150_reset(rtl8150_t * dev)
|
|
|
|
{
|
|
|
|
u8 data = 0x10;
|
|
|
|
int i = HZ;
|
|
|
|
|
|
|
|
set_registers(dev, CR, 1, &data);
|
|
|
|
do {
|
|
|
|
get_registers(dev, CR, 1, &data);
|
|
|
|
} while ((data & 0x10) && --i);
|
|
|
|
|
|
|
|
return (i > 0) ? 1 : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int alloc_all_urbs(rtl8150_t * dev)
|
|
|
|
{
|
|
|
|
dev->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
|
|
|
|
if (!dev->rx_urb)
|
|
|
|
return 0;
|
|
|
|
dev->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
|
|
|
|
if (!dev->tx_urb) {
|
|
|
|
usb_free_urb(dev->rx_urb);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
dev->intr_urb = usb_alloc_urb(0, GFP_KERNEL);
|
|
|
|
if (!dev->intr_urb) {
|
|
|
|
usb_free_urb(dev->rx_urb);
|
|
|
|
usb_free_urb(dev->tx_urb);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
dev->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL);
|
2008-03-10 03:44:52 +03:00
|
|
|
if (!dev->ctrl_urb) {
|
2005-04-17 02:20:36 +04:00
|
|
|
usb_free_urb(dev->rx_urb);
|
|
|
|
usb_free_urb(dev->tx_urb);
|
|
|
|
usb_free_urb(dev->intr_urb);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void free_all_urbs(rtl8150_t * dev)
|
|
|
|
{
|
|
|
|
usb_free_urb(dev->rx_urb);
|
|
|
|
usb_free_urb(dev->tx_urb);
|
|
|
|
usb_free_urb(dev->intr_urb);
|
|
|
|
usb_free_urb(dev->ctrl_urb);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void unlink_all_urbs(rtl8150_t * dev)
|
|
|
|
{
|
|
|
|
usb_kill_urb(dev->rx_urb);
|
|
|
|
usb_kill_urb(dev->tx_urb);
|
|
|
|
usb_kill_urb(dev->intr_urb);
|
|
|
|
usb_kill_urb(dev->ctrl_urb);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct sk_buff *pull_skb(rtl8150_t *dev)
|
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < RX_SKB_POOL_SIZE; i++) {
|
|
|
|
if (dev->rx_skb_pool[i]) {
|
|
|
|
skb = dev->rx_skb_pool[i];
|
|
|
|
dev->rx_skb_pool[i] = NULL;
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 17:55:46 +04:00
|
|
|
static void read_bulk_callback(struct urb *urb)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
rtl8150_t *dev;
|
|
|
|
unsigned pkt_len, res;
|
|
|
|
struct sk_buff *skb;
|
|
|
|
struct net_device *netdev;
|
|
|
|
u16 rx_stat;
|
2008-12-19 10:00:59 +03:00
|
|
|
int status = urb->status;
|
|
|
|
int result;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
dev = urb->context;
|
|
|
|
if (!dev)
|
|
|
|
return;
|
|
|
|
if (test_bit(RTL8150_UNPLUG, &dev->flags))
|
|
|
|
return;
|
|
|
|
netdev = dev->netdev;
|
|
|
|
if (!netif_device_present(netdev))
|
|
|
|
return;
|
|
|
|
|
2008-12-19 10:00:59 +03:00
|
|
|
switch (status) {
|
2005-04-17 02:20:36 +04:00
|
|
|
case 0:
|
|
|
|
break;
|
|
|
|
case -ENOENT:
|
|
|
|
return; /* the urb is in unlink state */
|
2006-09-19 09:49:02 +04:00
|
|
|
case -ETIME:
|
2009-05-30 09:13:58 +04:00
|
|
|
if (printk_ratelimit())
|
|
|
|
dev_warn(&urb->dev->dev, "may be reset is needed?..\n");
|
2005-04-17 02:20:36 +04:00
|
|
|
goto goon;
|
|
|
|
default:
|
2009-05-30 09:13:58 +04:00
|
|
|
if (printk_ratelimit())
|
|
|
|
dev_warn(&urb->dev->dev, "Rx status %d\n", status);
|
2005-04-17 02:20:36 +04:00
|
|
|
goto goon;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!dev->rx_skb)
|
|
|
|
goto resched;
|
|
|
|
/* protect against short packets (tell me why we got some?!?) */
|
|
|
|
if (urb->actual_length < 4)
|
|
|
|
goto goon;
|
|
|
|
|
|
|
|
res = urb->actual_length;
|
|
|
|
rx_stat = le16_to_cpu(*(__le16 *)(urb->transfer_buffer + res - 4));
|
|
|
|
pkt_len = res - 4;
|
|
|
|
|
|
|
|
skb_put(dev->rx_skb, pkt_len);
|
|
|
|
dev->rx_skb->protocol = eth_type_trans(dev->rx_skb, netdev);
|
|
|
|
netif_rx(dev->rx_skb);
|
2009-03-20 22:35:50 +03:00
|
|
|
netdev->stats.rx_packets++;
|
|
|
|
netdev->stats.rx_bytes += pkt_len;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
spin_lock(&dev->rx_pool_lock);
|
|
|
|
skb = pull_skb(dev);
|
|
|
|
spin_unlock(&dev->rx_pool_lock);
|
|
|
|
if (!skb)
|
|
|
|
goto resched;
|
|
|
|
|
|
|
|
dev->rx_skb = skb;
|
|
|
|
goon:
|
|
|
|
usb_fill_bulk_urb(dev->rx_urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1),
|
|
|
|
dev->rx_skb->data, RTL8150_MTU, read_bulk_callback, dev);
|
2008-12-19 10:00:59 +03:00
|
|
|
result = usb_submit_urb(dev->rx_urb, GFP_ATOMIC);
|
|
|
|
if (result == -ENODEV)
|
2006-07-25 14:39:14 +04:00
|
|
|
netif_device_detach(dev->netdev);
|
2008-12-19 10:00:59 +03:00
|
|
|
else if (result) {
|
2005-04-17 02:20:36 +04:00
|
|
|
set_bit(RX_URB_FAIL, &dev->flags);
|
|
|
|
goto resched;
|
|
|
|
} else {
|
|
|
|
clear_bit(RX_URB_FAIL, &dev->flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
resched:
|
|
|
|
tasklet_schedule(&dev->tl);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void rx_fixup(unsigned long data)
|
|
|
|
{
|
|
|
|
rtl8150_t *dev;
|
|
|
|
struct sk_buff *skb;
|
2006-07-25 14:39:14 +04:00
|
|
|
int status;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
dev = (rtl8150_t *)data;
|
|
|
|
|
|
|
|
spin_lock_irq(&dev->rx_pool_lock);
|
|
|
|
fill_skb_pool(dev);
|
|
|
|
spin_unlock_irq(&dev->rx_pool_lock);
|
|
|
|
if (test_bit(RX_URB_FAIL, &dev->flags))
|
|
|
|
if (dev->rx_skb)
|
|
|
|
goto try_again;
|
|
|
|
spin_lock_irq(&dev->rx_pool_lock);
|
|
|
|
skb = pull_skb(dev);
|
|
|
|
spin_unlock_irq(&dev->rx_pool_lock);
|
|
|
|
if (skb == NULL)
|
|
|
|
goto tlsched;
|
|
|
|
dev->rx_skb = skb;
|
|
|
|
usb_fill_bulk_urb(dev->rx_urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1),
|
|
|
|
dev->rx_skb->data, RTL8150_MTU, read_bulk_callback, dev);
|
|
|
|
try_again:
|
2006-07-25 14:39:14 +04:00
|
|
|
status = usb_submit_urb(dev->rx_urb, GFP_ATOMIC);
|
|
|
|
if (status == -ENODEV) {
|
|
|
|
netif_device_detach(dev->netdev);
|
|
|
|
} else if (status) {
|
2005-04-17 02:20:36 +04:00
|
|
|
set_bit(RX_URB_FAIL, &dev->flags);
|
|
|
|
goto tlsched;
|
2006-07-25 14:39:14 +04:00
|
|
|
} else {
|
2005-04-17 02:20:36 +04:00
|
|
|
clear_bit(RX_URB_FAIL, &dev->flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
tlsched:
|
|
|
|
tasklet_schedule(&dev->tl);
|
|
|
|
}
|
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 17:55:46 +04:00
|
|
|
static void write_bulk_callback(struct urb *urb)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
rtl8150_t *dev;
|
2008-12-19 10:00:59 +03:00
|
|
|
int status = urb->status;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
dev = urb->context;
|
|
|
|
if (!dev)
|
|
|
|
return;
|
|
|
|
dev_kfree_skb_irq(dev->tx_skb);
|
|
|
|
if (!netif_device_present(dev->netdev))
|
|
|
|
return;
|
2008-12-19 10:00:59 +03:00
|
|
|
if (status)
|
2008-08-19 00:21:04 +04:00
|
|
|
dev_info(&urb->dev->dev, "%s: Tx status %d\n",
|
2008-12-19 10:00:59 +03:00
|
|
|
dev->netdev->name, status);
|
2005-04-17 02:20:36 +04:00
|
|
|
dev->netdev->trans_start = jiffies;
|
|
|
|
netif_wake_queue(dev->netdev);
|
|
|
|
}
|
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 17:55:46 +04:00
|
|
|
static void intr_callback(struct urb *urb)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
rtl8150_t *dev;
|
|
|
|
__u8 *d;
|
2008-12-19 10:00:59 +03:00
|
|
|
int status = urb->status;
|
|
|
|
int res;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
dev = urb->context;
|
|
|
|
if (!dev)
|
|
|
|
return;
|
2008-12-19 10:00:59 +03:00
|
|
|
switch (status) {
|
2005-04-17 02:20:36 +04:00
|
|
|
case 0: /* success */
|
|
|
|
break;
|
|
|
|
case -ECONNRESET: /* unlink */
|
|
|
|
case -ENOENT:
|
|
|
|
case -ESHUTDOWN:
|
|
|
|
return;
|
|
|
|
/* -EPIPE: should clear the halt */
|
|
|
|
default:
|
2008-08-19 00:21:04 +04:00
|
|
|
dev_info(&urb->dev->dev, "%s: intr status %d\n",
|
2008-12-19 10:00:59 +03:00
|
|
|
dev->netdev->name, status);
|
2005-04-17 02:20:36 +04:00
|
|
|
goto resubmit;
|
|
|
|
}
|
|
|
|
|
|
|
|
d = urb->transfer_buffer;
|
|
|
|
if (d[0] & TSR_ERRORS) {
|
2009-03-20 22:35:50 +03:00
|
|
|
dev->netdev->stats.tx_errors++;
|
2005-04-17 02:20:36 +04:00
|
|
|
if (d[INT_TSR] & (TSR_ECOL | TSR_JBR))
|
2009-03-20 22:35:50 +03:00
|
|
|
dev->netdev->stats.tx_aborted_errors++;
|
2005-04-17 02:20:36 +04:00
|
|
|
if (d[INT_TSR] & TSR_LCOL)
|
2009-03-20 22:35:50 +03:00
|
|
|
dev->netdev->stats.tx_window_errors++;
|
2005-04-17 02:20:36 +04:00
|
|
|
if (d[INT_TSR] & TSR_LOSS_CRS)
|
2009-03-20 22:35:50 +03:00
|
|
|
dev->netdev->stats.tx_carrier_errors++;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
/* Report link status changes to the network stack */
|
|
|
|
if ((d[INT_MSR] & MSR_LINK) == 0) {
|
|
|
|
if (netif_carrier_ok(dev->netdev)) {
|
|
|
|
netif_carrier_off(dev->netdev);
|
|
|
|
dbg("%s: LINK LOST\n", __func__);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (!netif_carrier_ok(dev->netdev)) {
|
|
|
|
netif_carrier_on(dev->netdev);
|
|
|
|
dbg("%s: LINK CAME BACK\n", __func__);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
resubmit:
|
2008-12-19 10:00:59 +03:00
|
|
|
res = usb_submit_urb (urb, GFP_ATOMIC);
|
|
|
|
if (res == -ENODEV)
|
2006-07-25 14:39:14 +04:00
|
|
|
netif_device_detach(dev->netdev);
|
2008-12-19 10:00:59 +03:00
|
|
|
else if (res)
|
2005-04-17 02:20:36 +04:00
|
|
|
err ("can't resubmit intr, %s-%s/input0, status %d",
|
|
|
|
dev->udev->bus->bus_name,
|
2008-12-19 10:00:59 +03:00
|
|
|
dev->udev->devpath, res);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2006-07-25 14:39:14 +04:00
|
|
|
static int rtl8150_suspend(struct usb_interface *intf, pm_message_t message)
|
|
|
|
{
|
|
|
|
rtl8150_t *dev = usb_get_intfdata(intf);
|
|
|
|
|
|
|
|
netif_device_detach(dev->netdev);
|
|
|
|
|
|
|
|
if (netif_running(dev->netdev)) {
|
|
|
|
usb_kill_urb(dev->rx_urb);
|
|
|
|
usb_kill_urb(dev->intr_urb);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int rtl8150_resume(struct usb_interface *intf)
|
|
|
|
{
|
|
|
|
rtl8150_t *dev = usb_get_intfdata(intf);
|
|
|
|
|
|
|
|
netif_device_attach(dev->netdev);
|
|
|
|
if (netif_running(dev->netdev)) {
|
|
|
|
dev->rx_urb->status = 0;
|
|
|
|
dev->rx_urb->actual_length = 0;
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 17:55:46 +04:00
|
|
|
read_bulk_callback(dev->rx_urb);
|
2006-07-25 14:39:14 +04:00
|
|
|
|
|
|
|
dev->intr_urb->status = 0;
|
|
|
|
dev->intr_urb->actual_length = 0;
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 17:55:46 +04:00
|
|
|
intr_callback(dev->intr_urb);
|
2006-07-25 14:39:14 +04:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
**
|
|
|
|
** network related part of the code
|
|
|
|
**
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void fill_skb_pool(rtl8150_t *dev)
|
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < RX_SKB_POOL_SIZE; i++) {
|
|
|
|
if (dev->rx_skb_pool[i])
|
|
|
|
continue;
|
|
|
|
skb = dev_alloc_skb(RTL8150_MTU + 2);
|
|
|
|
if (!skb) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
skb_reserve(skb, 2);
|
|
|
|
dev->rx_skb_pool[i] = skb;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void free_skb_pool(rtl8150_t *dev)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < RX_SKB_POOL_SIZE; i++)
|
|
|
|
if (dev->rx_skb_pool[i])
|
|
|
|
dev_kfree_skb(dev->rx_skb_pool[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int enable_net_traffic(rtl8150_t * dev)
|
|
|
|
{
|
|
|
|
u8 cr, tcr, rcr, msr;
|
|
|
|
|
|
|
|
if (!rtl8150_reset(dev)) {
|
2008-08-14 20:37:34 +04:00
|
|
|
dev_warn(&dev->udev->dev, "device reset failed\n");
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
/* RCR bit7=1 attach Rx info at the end; =0 HW CRC (which is broken) */
|
|
|
|
rcr = 0x9e;
|
|
|
|
dev->rx_creg = cpu_to_le16(rcr);
|
|
|
|
tcr = 0xd8;
|
|
|
|
cr = 0x0c;
|
|
|
|
if (!(rcr & 0x80))
|
|
|
|
set_bit(RTL8150_HW_CRC, &dev->flags);
|
|
|
|
set_registers(dev, RCR, 1, &rcr);
|
|
|
|
set_registers(dev, TCR, 1, &tcr);
|
|
|
|
set_registers(dev, CR, 1, &cr);
|
|
|
|
get_registers(dev, MSR, 1, &msr);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void disable_net_traffic(rtl8150_t * dev)
|
|
|
|
{
|
|
|
|
u8 cr;
|
|
|
|
|
|
|
|
get_registers(dev, CR, 1, &cr);
|
|
|
|
cr &= 0xf3;
|
|
|
|
set_registers(dev, CR, 1, &cr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void rtl8150_tx_timeout(struct net_device *netdev)
|
|
|
|
{
|
|
|
|
rtl8150_t *dev = netdev_priv(netdev);
|
2008-08-14 20:37:34 +04:00
|
|
|
dev_warn(&netdev->dev, "Tx timeout.\n");
|
2005-04-17 02:20:36 +04:00
|
|
|
usb_unlink_urb(dev->tx_urb);
|
2009-03-20 22:35:50 +03:00
|
|
|
netdev->stats.tx_errors++;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void rtl8150_set_multicast(struct net_device *netdev)
|
|
|
|
{
|
|
|
|
rtl8150_t *dev = netdev_priv(netdev);
|
|
|
|
netif_stop_queue(netdev);
|
|
|
|
if (netdev->flags & IFF_PROMISC) {
|
|
|
|
dev->rx_creg |= cpu_to_le16(0x0001);
|
2008-08-19 00:21:04 +04:00
|
|
|
dev_info(&netdev->dev, "%s: promiscuous mode\n", netdev->name);
|
2010-02-08 07:30:35 +03:00
|
|
|
} else if (!netdev_mc_empty(netdev) ||
|
2005-04-17 02:20:36 +04:00
|
|
|
(netdev->flags & IFF_ALLMULTI)) {
|
|
|
|
dev->rx_creg &= cpu_to_le16(0xfffe);
|
|
|
|
dev->rx_creg |= cpu_to_le16(0x0002);
|
2008-08-19 00:21:04 +04:00
|
|
|
dev_info(&netdev->dev, "%s: allmulti set\n", netdev->name);
|
2005-04-17 02:20:36 +04:00
|
|
|
} else {
|
|
|
|
/* ~RX_MULTICAST, ~RX_PROMISCUOUS */
|
|
|
|
dev->rx_creg &= cpu_to_le16(0x00fc);
|
|
|
|
}
|
|
|
|
async_set_registers(dev, RCR, 2);
|
|
|
|
netif_wake_queue(netdev);
|
|
|
|
}
|
|
|
|
|
2009-08-31 23:50:45 +04:00
|
|
|
static netdev_tx_t rtl8150_start_xmit(struct sk_buff *skb,
|
|
|
|
struct net_device *netdev)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
rtl8150_t *dev = netdev_priv(netdev);
|
|
|
|
int count, res;
|
|
|
|
|
|
|
|
netif_stop_queue(netdev);
|
|
|
|
count = (skb->len < 60) ? 60 : skb->len;
|
|
|
|
count = (count & 0x3f) ? count : count + 1;
|
|
|
|
dev->tx_skb = skb;
|
|
|
|
usb_fill_bulk_urb(dev->tx_urb, dev->udev, usb_sndbulkpipe(dev->udev, 2),
|
|
|
|
skb->data, count, write_bulk_callback, dev);
|
|
|
|
if ((res = usb_submit_urb(dev->tx_urb, GFP_ATOMIC))) {
|
2006-07-25 14:39:14 +04:00
|
|
|
/* Can we get/handle EPIPE here? */
|
|
|
|
if (res == -ENODEV)
|
|
|
|
netif_device_detach(dev->netdev);
|
|
|
|
else {
|
2008-08-14 20:37:34 +04:00
|
|
|
dev_warn(&netdev->dev, "failed tx_urb %d\n", res);
|
2009-03-20 22:35:50 +03:00
|
|
|
netdev->stats.tx_errors++;
|
2006-07-25 14:39:14 +04:00
|
|
|
netif_start_queue(netdev);
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
} else {
|
2009-03-20 22:35:50 +03:00
|
|
|
netdev->stats.tx_packets++;
|
|
|
|
netdev->stats.tx_bytes += skb->len;
|
2005-04-17 02:20:36 +04:00
|
|
|
netdev->trans_start = jiffies;
|
|
|
|
}
|
|
|
|
|
2009-06-23 10:03:08 +04:00
|
|
|
return NETDEV_TX_OK;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void set_carrier(struct net_device *netdev)
|
|
|
|
{
|
|
|
|
rtl8150_t *dev = netdev_priv(netdev);
|
|
|
|
short tmp;
|
|
|
|
|
|
|
|
get_registers(dev, CSCR, 2, &tmp);
|
|
|
|
if (tmp & CSCR_LINK_STATUS)
|
|
|
|
netif_carrier_on(netdev);
|
|
|
|
else
|
|
|
|
netif_carrier_off(netdev);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int rtl8150_open(struct net_device *netdev)
|
|
|
|
{
|
|
|
|
rtl8150_t *dev = netdev_priv(netdev);
|
|
|
|
int res;
|
|
|
|
|
|
|
|
if (dev->rx_skb == NULL)
|
|
|
|
dev->rx_skb = pull_skb(dev);
|
|
|
|
if (!dev->rx_skb)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
set_registers(dev, IDR, 6, netdev->dev_addr);
|
|
|
|
|
|
|
|
usb_fill_bulk_urb(dev->rx_urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1),
|
|
|
|
dev->rx_skb->data, RTL8150_MTU, read_bulk_callback, dev);
|
2006-07-25 14:39:14 +04:00
|
|
|
if ((res = usb_submit_urb(dev->rx_urb, GFP_KERNEL))) {
|
|
|
|
if (res == -ENODEV)
|
|
|
|
netif_device_detach(dev->netdev);
|
2008-08-14 20:37:34 +04:00
|
|
|
dev_warn(&netdev->dev, "rx_urb submit failed: %d\n", res);
|
2006-07-25 14:39:14 +04:00
|
|
|
return res;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
usb_fill_int_urb(dev->intr_urb, dev->udev, usb_rcvintpipe(dev->udev, 3),
|
|
|
|
dev->intr_buff, INTBUFSIZE, intr_callback,
|
|
|
|
dev, dev->intr_interval);
|
2006-07-25 14:39:14 +04:00
|
|
|
if ((res = usb_submit_urb(dev->intr_urb, GFP_KERNEL))) {
|
|
|
|
if (res == -ENODEV)
|
|
|
|
netif_device_detach(dev->netdev);
|
2008-08-14 20:37:34 +04:00
|
|
|
dev_warn(&netdev->dev, "intr_urb submit failed: %d\n", res);
|
2006-07-25 14:39:14 +04:00
|
|
|
usb_kill_urb(dev->rx_urb);
|
|
|
|
return res;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
enable_net_traffic(dev);
|
|
|
|
set_carrier(netdev);
|
2006-07-25 14:39:14 +04:00
|
|
|
netif_start_queue(netdev);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int rtl8150_close(struct net_device *netdev)
|
|
|
|
{
|
|
|
|
rtl8150_t *dev = netdev_priv(netdev);
|
|
|
|
int res = 0;
|
|
|
|
|
|
|
|
netif_stop_queue(netdev);
|
|
|
|
if (!test_bit(RTL8150_UNPLUG, &dev->flags))
|
|
|
|
disable_net_traffic(dev);
|
|
|
|
unlink_all_urbs(dev);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void rtl8150_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *info)
|
|
|
|
{
|
|
|
|
rtl8150_t *dev = netdev_priv(netdev);
|
|
|
|
|
|
|
|
strncpy(info->driver, driver_name, ETHTOOL_BUSINFO_LEN);
|
|
|
|
strncpy(info->version, DRIVER_VERSION, ETHTOOL_BUSINFO_LEN);
|
|
|
|
usb_make_path(dev->udev, info->bus_info, sizeof info->bus_info);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int rtl8150_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
|
|
|
|
{
|
|
|
|
rtl8150_t *dev = netdev_priv(netdev);
|
|
|
|
short lpa, bmcr;
|
|
|
|
|
|
|
|
ecmd->supported = (SUPPORTED_10baseT_Half |
|
|
|
|
SUPPORTED_10baseT_Full |
|
|
|
|
SUPPORTED_100baseT_Half |
|
|
|
|
SUPPORTED_100baseT_Full |
|
|
|
|
SUPPORTED_Autoneg |
|
|
|
|
SUPPORTED_TP | SUPPORTED_MII);
|
|
|
|
ecmd->port = PORT_TP;
|
|
|
|
ecmd->transceiver = XCVR_INTERNAL;
|
|
|
|
ecmd->phy_address = dev->phy;
|
|
|
|
get_registers(dev, BMCR, 2, &bmcr);
|
|
|
|
get_registers(dev, ANLP, 2, &lpa);
|
|
|
|
if (bmcr & BMCR_ANENABLE) {
|
2011-04-27 22:32:40 +04:00
|
|
|
u32 speed = ((lpa & (LPA_100HALF | LPA_100FULL)) ?
|
|
|
|
SPEED_100 : SPEED_10);
|
|
|
|
ethtool_cmd_speed_set(ecmd, speed);
|
2005-04-17 02:20:36 +04:00
|
|
|
ecmd->autoneg = AUTONEG_ENABLE;
|
2011-04-27 22:32:40 +04:00
|
|
|
if (speed == SPEED_100)
|
2005-04-17 02:20:36 +04:00
|
|
|
ecmd->duplex = (lpa & LPA_100FULL) ?
|
|
|
|
DUPLEX_FULL : DUPLEX_HALF;
|
|
|
|
else
|
|
|
|
ecmd->duplex = (lpa & LPA_10FULL) ?
|
|
|
|
DUPLEX_FULL : DUPLEX_HALF;
|
|
|
|
} else {
|
|
|
|
ecmd->autoneg = AUTONEG_DISABLE;
|
2011-04-27 22:32:40 +04:00
|
|
|
ethtool_cmd_speed_set(ecmd, ((bmcr & BMCR_SPEED100) ?
|
|
|
|
SPEED_100 : SPEED_10));
|
2005-04-17 02:20:36 +04:00
|
|
|
ecmd->duplex = (bmcr & BMCR_FULLDPLX) ?
|
|
|
|
DUPLEX_FULL : DUPLEX_HALF;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-09-02 12:03:33 +04:00
|
|
|
static const struct ethtool_ops ops = {
|
2005-04-17 02:20:36 +04:00
|
|
|
.get_drvinfo = rtl8150_get_drvinfo,
|
|
|
|
.get_settings = rtl8150_get_settings,
|
|
|
|
.get_link = ethtool_op_get_link
|
|
|
|
};
|
|
|
|
|
|
|
|
static int rtl8150_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
|
|
|
|
{
|
|
|
|
rtl8150_t *dev = netdev_priv(netdev);
|
|
|
|
u16 *data = (u16 *) & rq->ifr_ifru;
|
|
|
|
int res = 0;
|
|
|
|
|
|
|
|
switch (cmd) {
|
|
|
|
case SIOCDEVPRIVATE:
|
|
|
|
data[0] = dev->phy;
|
|
|
|
case SIOCDEVPRIVATE + 1:
|
|
|
|
read_mii_word(dev, dev->phy, (data[1] & 0x1f), &data[3]);
|
|
|
|
break;
|
|
|
|
case SIOCDEVPRIVATE + 2:
|
|
|
|
if (!capable(CAP_NET_ADMIN))
|
|
|
|
return -EPERM;
|
|
|
|
write_mii_word(dev, dev->phy, (data[1] & 0x1f), data[2]);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
res = -EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2009-03-20 22:35:51 +03:00
|
|
|
static const struct net_device_ops rtl8150_netdev_ops = {
|
|
|
|
.ndo_open = rtl8150_open,
|
|
|
|
.ndo_stop = rtl8150_close,
|
|
|
|
.ndo_do_ioctl = rtl8150_ioctl,
|
|
|
|
.ndo_start_xmit = rtl8150_start_xmit,
|
|
|
|
.ndo_tx_timeout = rtl8150_tx_timeout,
|
|
|
|
.ndo_set_multicast_list = rtl8150_set_multicast,
|
|
|
|
.ndo_set_mac_address = rtl8150_set_mac_address,
|
|
|
|
|
|
|
|
.ndo_change_mtu = eth_change_mtu,
|
|
|
|
.ndo_validate_addr = eth_validate_addr,
|
|
|
|
};
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
static int rtl8150_probe(struct usb_interface *intf,
|
|
|
|
const struct usb_device_id *id)
|
|
|
|
{
|
|
|
|
struct usb_device *udev = interface_to_usbdev(intf);
|
|
|
|
rtl8150_t *dev;
|
|
|
|
struct net_device *netdev;
|
|
|
|
|
|
|
|
netdev = alloc_etherdev(sizeof(rtl8150_t));
|
|
|
|
if (!netdev) {
|
|
|
|
err("Out of memory");
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
|
|
|
dev = netdev_priv(netdev);
|
|
|
|
|
|
|
|
dev->intr_buff = kmalloc(INTBUFSIZE, GFP_KERNEL);
|
|
|
|
if (!dev->intr_buff) {
|
|
|
|
free_netdev(netdev);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
|
|
|
tasklet_init(&dev->tl, rx_fixup, (unsigned long)dev);
|
|
|
|
spin_lock_init(&dev->rx_pool_lock);
|
|
|
|
|
|
|
|
dev->udev = udev;
|
|
|
|
dev->netdev = netdev;
|
2009-03-20 22:35:51 +03:00
|
|
|
netdev->netdev_ops = &rtl8150_netdev_ops;
|
2005-04-17 02:20:36 +04:00
|
|
|
netdev->watchdog_timeo = RTL8150_TX_TIMEOUT;
|
|
|
|
SET_ETHTOOL_OPS(netdev, &ops);
|
|
|
|
dev->intr_interval = 100; /* 100ms */
|
|
|
|
|
|
|
|
if (!alloc_all_urbs(dev)) {
|
|
|
|
err("out of memory");
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (!rtl8150_reset(dev)) {
|
|
|
|
err("couldn't reset the device");
|
|
|
|
goto out1;
|
|
|
|
}
|
|
|
|
fill_skb_pool(dev);
|
|
|
|
set_ethernet_addr(dev);
|
|
|
|
|
|
|
|
usb_set_intfdata(intf, dev);
|
|
|
|
SET_NETDEV_DEV(netdev, &intf->dev);
|
|
|
|
if (register_netdev(netdev) != 0) {
|
|
|
|
err("couldn't register the device");
|
|
|
|
goto out2;
|
|
|
|
}
|
2006-03-15 17:29:38 +03:00
|
|
|
|
2008-08-19 00:21:04 +04:00
|
|
|
dev_info(&intf->dev, "%s: rtl8150 is detected\n", netdev->name);
|
2006-03-15 17:29:38 +03:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
out2:
|
|
|
|
usb_set_intfdata(intf, NULL);
|
|
|
|
free_skb_pool(dev);
|
|
|
|
out1:
|
|
|
|
free_all_urbs(dev);
|
|
|
|
out:
|
|
|
|
kfree(dev->intr_buff);
|
|
|
|
free_netdev(netdev);
|
|
|
|
return -EIO;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void rtl8150_disconnect(struct usb_interface *intf)
|
|
|
|
{
|
|
|
|
rtl8150_t *dev = usb_get_intfdata(intf);
|
|
|
|
|
|
|
|
usb_set_intfdata(intf, NULL);
|
|
|
|
if (dev) {
|
|
|
|
set_bit(RTL8150_UNPLUG, &dev->flags);
|
2006-08-15 10:11:09 +04:00
|
|
|
tasklet_kill(&dev->tl);
|
2005-04-17 02:20:36 +04:00
|
|
|
unregister_netdev(dev->netdev);
|
|
|
|
unlink_all_urbs(dev);
|
|
|
|
free_all_urbs(dev);
|
|
|
|
free_skb_pool(dev);
|
|
|
|
if (dev->rx_skb)
|
|
|
|
dev_kfree_skb(dev->rx_skb);
|
|
|
|
kfree(dev->intr_buff);
|
|
|
|
free_netdev(dev->netdev);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __init usb_rtl8150_init(void)
|
|
|
|
{
|
2008-08-19 00:21:04 +04:00
|
|
|
printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
|
|
|
|
DRIVER_DESC "\n");
|
2005-04-17 02:20:36 +04:00
|
|
|
return usb_register(&rtl8150_driver);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __exit usb_rtl8150_exit(void)
|
|
|
|
{
|
|
|
|
usb_deregister(&rtl8150_driver);
|
|
|
|
}
|
|
|
|
|
|
|
|
module_init(usb_rtl8150_init);
|
|
|
|
module_exit(usb_rtl8150_exit);
|
|
|
|
|
|
|
|
MODULE_AUTHOR(DRIVER_AUTHOR);
|
|
|
|
MODULE_DESCRIPTION(DRIVER_DESC);
|
|
|
|
MODULE_LICENSE("GPL");
|