Skip to content

L
linux
Commit 0b9ded43 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

v2.4.8.3 -> v2.4.8.4 

  - Tim Hockin: NatSemi ethernet update
  - Kurt Garloff: make PS/2 mouse reconnect adjustable like 2.2.x
  - Daniel Phillips: unlazy use-once
  - David Miller: undo poll() limit braindamage
  - me: make return value from do_try_to_free_pages() meaningful
parent a45eec07
Hide whitespace changes
Inline Side-by-side
Showing with 475 additions and 145 deletions
Makefile
View file @ 0b9ded43
VERSION = 2 VERSION = 2
PATCHLEVEL = 4 PATCHLEVEL = 4
SUBLEVEL = 9 SUBLEVEL = 9
EXTRAVERSION =-pre3 EXTRAVERSION =-pre4
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
......
drivers/char/pc_keyb.c
View file @ 0b9ded43
...@@ -63,6 +63,7 @@ static void kbd_write_output_w(int data); ...@@ -63,6 +63,7 @@ static void kbd_write_output_w(int data);
#ifdef CONFIG_PSMOUSE #ifdef CONFIG_PSMOUSE
static void aux_write_ack(int val); static void aux_write_ack(int val);
static void __aux_write_ack(int val); static void __aux_write_ack(int val);
static int aux_reconnect = 0;
#endif #endif
static spinlock_t kbd_controller_lock = SPIN_LOCK_UNLOCKED; static spinlock_t kbd_controller_lock = SPIN_LOCK_UNLOCKED;
...@@ -81,7 +82,8 @@ static volatile unsigned char resend; ...@@ -81,7 +82,8 @@ static volatile unsigned char resend;
static int __init psaux_init(void); static int __init psaux_init(void);
#define AUX_RECONNECT 170 /* scancode when ps2 device is plugged (back) in */ #define AUX_RECONNECT1 0xaa /* scancode1 when ps2 device is plugged (back) in */
#define AUX_RECONNECT2 0x00 /* scancode2 when ps2 device is plugged (back) in */
static struct aux_queue *queue; /* Mouse data buffer. */ static struct aux_queue *queue; /* Mouse data buffer. */
static int aux_count; static int aux_count;
...@@ -396,6 +398,7 @@ char pckbd_unexpected_up(unsigned char keycode) ...@@ -396,6 +398,7 @@ char pckbd_unexpected_up(unsigned char keycode)
static inline void handle_mouse_event(unsigned char scancode) static inline void handle_mouse_event(unsigned char scancode)
{ {
#ifdef CONFIG_PSMOUSE #ifdef CONFIG_PSMOUSE
static unsigned char prev_code;
if (mouse_reply_expected) { if (mouse_reply_expected) {
if (scancode == AUX_ACK) { if (scancode == AUX_ACK) {
mouse_reply_expected--; mouse_reply_expected--;
...@@ -403,12 +406,15 @@ static inline void handle_mouse_event(unsigned char scancode) ...@@ -403,12 +406,15 @@ static inline void handle_mouse_event(unsigned char scancode)
} }
mouse_reply_expected = 0; mouse_reply_expected = 0;
} }
else if(scancode == AUX_RECONNECT){ else if(scancode == AUX_RECONNECT2 && prev_code == AUX_RECONNECT1
queue->head = queue->tail = 0; /* Flush input queue */ && aux_reconnect) {
printk (KERN_INFO "PS/2 mouse reconnect detected\n");
queue->head = queue->tail = 0; /* Flush input queue */
__aux_write_ack(AUX_ENABLE_DEV); /* ping the mouse :) */ __aux_write_ack(AUX_ENABLE_DEV); /* ping the mouse :) */
return; return;
} }
prev_code = scancode;
add_mouse_randomness(scancode); add_mouse_randomness(scancode);
if (aux_count) { if (aux_count) {
int head = queue->head; int head = queue->head;
...@@ -835,6 +841,14 @@ void __init pckbd_init_hw(void) ...@@ -835,6 +841,14 @@ void __init pckbd_init_hw(void)
#if defined CONFIG_PSMOUSE #if defined CONFIG_PSMOUSE
static int __init aux_reconnect_setup (char *str)
{
aux_reconnect = 1;
return 1;
}
__setup("psaux-reconnect", aux_reconnect_setup);
/* /*
* Check if this is a dual port controller. * Check if this is a dual port controller.
*/ */
......
drivers/net/natsemi.c
View file @ 0b9ded43
...@@ -60,16 +60,20 @@ ...@@ -60,16 +60,20 @@
from Myrio Corporation, Greg Smith] from Myrio Corporation, Greg Smith]
* suspend/resume * suspend/resume
version 1.0.8 (Tim Hockin <thockin@sun.com>)
* ETHTOOL_* support
* Wake on lan support (Erik Gilling)
* MXDMA fixes for serverworks
* EEPROM reload
TODO: TODO:
* big endian support with CFG:BEM instead of cpu_to_le32 * big endian support with CFG:BEM instead of cpu_to_le32
* support for an external PHY * support for an external PHY
* flow control * flow control
* Wake-On-LAN
*/ */
#define DRV_NAME "natsemi" #define DRV_NAME "natsemi"
#define DRV_VERSION "1.07+LK1.0.7" #define DRV_VERSION "1.07+LK1.0.8"
#define DRV_RELDATE "May 18, 2001" #define DRV_RELDATE "Aug 07, 2001"
/* Updated to recommendations in pci-skeleton v2.03. */ /* Updated to recommendations in pci-skeleton v2.03. */
...@@ -125,7 +129,7 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; ...@@ -125,7 +129,7 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
/* Time in jiffies before concluding the transmitter is hung. */ /* Time in jiffies before concluding the transmitter is hung. */
#define TX_TIMEOUT (2*HZ) #define TX_TIMEOUT (2*HZ)
#define NATSEMI_HW_TIMEOUT 200 #define NATSEMI_HW_TIMEOUT 400
#define PKT_BUF_SZ 1536 /* Size of each temporary Rx buffer.*/ #define PKT_BUF_SZ 1536 /* Size of each temporary Rx buffer.*/
...@@ -302,18 +306,30 @@ enum register_offsets { ...@@ -302,18 +306,30 @@ enum register_offsets {
WOLCmd=0x40, PauseCmd=0x44, RxFilterAddr=0x48, RxFilterData=0x4C, WOLCmd=0x40, PauseCmd=0x44, RxFilterAddr=0x48, RxFilterData=0x4C,
BootRomAddr=0x50, BootRomData=0x54, SiliconRev=0x58, StatsCtrl=0x5C, BootRomAddr=0x50, BootRomData=0x54, SiliconRev=0x58, StatsCtrl=0x5C,
StatsData=0x60, RxPktErrs=0x60, RxMissed=0x68, RxCRCErrs=0x64, StatsData=0x60, RxPktErrs=0x60, RxMissed=0x68, RxCRCErrs=0x64,
PCIPM=0x44, PhyStatus=0xC0, MIntrCtrl=0xC4, MIntrStatus=0xC8, BasicControl=0x80, BasicStatus=0x84,
AnegAdv=0x90, AnegPeer = 0x94, PhyStatus=0xC0, MIntrCtrl=0xC4,
MIntrStatus=0xC8, PhyCtrl=0xE4,
/* These are from the spec, around page 78... on a separate table. */ /* These are from the spec, around page 78... on a separate table.
* The meaning of these registers depend on the value of PGSEL. */
PGSEL=0xCC, PMDCSR=0xE4, TSTDAT=0xFC, DSPCFG=0xF4, SDCFG=0x8C PGSEL=0xCC, PMDCSR=0xE4, TSTDAT=0xFC, DSPCFG=0xF4, SDCFG=0x8C
}; };
/* misc PCI space registers */
enum PCISpaceRegs {
PCIPM=0x44,
};
/* Bit in ChipCmd. */ /* Bit in ChipCmd. */
enum ChipCmdBits { enum ChipCmdBits {
ChipReset=0x100, RxReset=0x20, TxReset=0x10, RxOff=0x08, RxOn=0x04, ChipReset=0x100, RxReset=0x20, TxReset=0x10, RxOff=0x08, RxOn=0x04,
TxOff=0x02, TxOn=0x01, TxOff=0x02, TxOn=0x01,
}; };
enum PCIBusCfgBits {
EepromReload=0x4,
};
/* Bits in the interrupt status/mask registers. */ /* Bits in the interrupt status/mask registers. */
enum intr_status_bits { enum intr_status_bits {
IntrRxDone=0x0001, IntrRxIntr=0x0002, IntrRxErr=0x0004, IntrRxEarly=0x0008, IntrRxDone=0x0001, IntrRxIntr=0x0002, IntrRxErr=0x0004, IntrRxEarly=0x0008,
...@@ -324,7 +340,7 @@ enum intr_status_bits { ...@@ -324,7 +340,7 @@ enum intr_status_bits {
WOLPkt=0x2000, WOLPkt=0x2000,
RxResetDone=0x1000000, TxResetDone=0x2000000, RxResetDone=0x1000000, TxResetDone=0x2000000,
IntrPCIErr=0x00f00000, IntrPCIErr=0x00f00000,
IntrNormalSummary=0x0251, IntrAbnormalSummary=0xED20, IntrNormalSummary=0x025f, IntrAbnormalSummary=0xCD20,
}; };
/* Bits in the RxMode register. */ /* Bits in the RxMode register. */
...@@ -335,6 +351,34 @@ enum rx_mode_bits { ...@@ -335,6 +351,34 @@ enum rx_mode_bits {
AcceptAllPhys=0x10000000, AcceptMyPhys=0x08000000, AcceptAllPhys=0x10000000, AcceptMyPhys=0x08000000,
}; };
/* Bits in WOLCmd register. */
enum wol_bits {
WakePhy=0x1, WakeUnicast=0x2, WakeMulticast=0x4, WakeBroadcast=0x8,
WakeArp=0x10, WakePMatch0=0x20, WakePMatch1=0x40, WakePMatch2=0x80,
WakePMatch3=0x100, WakeMagic=0x200, WakeMagicSecure=0x400,
SecureHack=0x100000, WokePhy=0x400000, WokeUnicast=0x800000,
WokeMulticast=0x1000000, WokeBroadcast=0x2000000, WokeArp=0x4000000,
WokePMatch0=0x8000000, WokePMatch1=0x10000000, WokePMatch2=0x20000000,
WokePMatch3=0x40000000, WokeMagic=0x80000000, WakeOptsSummary=0x7ff
};
enum aneg_bits {
Aneg10BaseT=0x20, Aneg10BaseTFull=0x40,
Aneg100BaseT=0x80, Aneg100BaseTFull=0x100,
};
enum config_bits {
CfgPhyDis=0x200, CfgPhyRst=0x400, CfgAnegEnable=0x2000,
CfgAneg100=0x4000, CfgAnegFull=0x8000, CfgAnegDone=0x8000000,
CfgFullDuplex=0x20000000,
CfgSpeed100=0x40000000, CfgLink=0x80000000,
};
enum bmcr_bits {
BMCRDuplex=0x100, BMCRAnegRestart=0x200, BMCRAnegEnable=0x1000,
BMCRSpeed=0x2000, BMCRPhyReset=0x8000,
};
/* The Rx and Tx buffer descriptors. */ /* The Rx and Tx buffer descriptors. */
/* Note that using only 32 bit fields simplifies conversion to big-endian /* Note that using only 32 bit fields simplifies conversion to big-endian
architectures. */ architectures. */
...@@ -408,6 +452,12 @@ static void set_rx_mode(struct net_device *dev); ...@@ -408,6 +452,12 @@ static void set_rx_mode(struct net_device *dev);
static void __get_stats(struct net_device *dev); static void __get_stats(struct net_device *dev);
static struct net_device_stats *get_stats(struct net_device *dev); static struct net_device_stats *get_stats(struct net_device *dev);
static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
static int netdev_set_wol(struct net_device *dev, u32 newval);
static int netdev_get_wol(struct net_device *dev, u32 *supported, u32 *cur);
static int netdev_set_sopass(struct net_device *dev, u8 *newval);
static int netdev_get_sopass(struct net_device *dev, u8 *data);
static int netdev_get_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd);
static int netdev_set_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd);
static int netdev_close(struct net_device *dev); static int netdev_close(struct net_device *dev);
...@@ -530,6 +580,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev, ...@@ -530,6 +580,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
return i; return i;
} }
netif_carrier_off(dev);
printk(KERN_INFO "%s: %s at 0x%lx, ", printk(KERN_INFO "%s: %s at 0x%lx, ",
dev->name, natsemi_pci_info[chip_idx].name, ioaddr); dev->name, natsemi_pci_info[chip_idx].name, ioaddr);
...@@ -548,7 +599,8 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev, ...@@ -548,7 +599,8 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
chip_config & 0x8000 ? "full" : "half"); chip_config & 0x8000 ? "full" : "half");
} }
printk(KERN_INFO "%s: Transceiver status 0x%4.4x advertising %4.4x.\n", printk(KERN_INFO "%s: Transceiver status 0x%4.4x advertising %4.4x.\n",
dev->name, (int)readl(ioaddr + 0x84), np->advertising); dev->name, (int)readl(ioaddr + BasicStatus),
np->advertising);
return 0; return 0;
} }
...@@ -617,7 +669,7 @@ static int eeprom_read(long addr, int location) ...@@ -617,7 +669,7 @@ static int eeprom_read(long addr, int location)
static int mdio_read(struct net_device *dev, int phy_id, int location) static int mdio_read(struct net_device *dev, int phy_id, int location)
{ {
if (phy_id == 1 && location < 32) if (phy_id == 1 && location < 32)
return readl(dev->base_addr + 0x80 + (location<<2)) & 0xffff; return readl(dev->base_addr+BasicControl+(location<<2))&0xffff;
else else
return 0xffff; return 0xffff;
} }
...@@ -639,6 +691,20 @@ static void natsemi_reset(struct net_device *dev) ...@@ -639,6 +691,20 @@ static void natsemi_reset(struct net_device *dev)
printk(KERN_DEBUG "%s: reset completed in %d usec.\n", printk(KERN_DEBUG "%s: reset completed in %d usec.\n",
dev->name, i*5); dev->name, i*5);
} }
writel(EepromReload, dev->base_addr + PCIBusCfg);
for (i=0;i<NATSEMI_HW_TIMEOUT;i++) {
if (!(readl(dev->base_addr + PCIBusCfg) & EepromReload))
break;
udelay(5);
}
if (i==NATSEMI_HW_TIMEOUT && debug) {
printk(KERN_INFO "%s: EEPROM did not reload in %d usec.\n",
dev->name, i*5);
} else if (debug > 2) {
printk(KERN_DEBUG "%s: EEPROM reloaded in %d usec.\n",
dev->name, i*5);
}
} }
...@@ -733,23 +799,20 @@ static void init_registers(struct net_device *dev) ...@@ -733,23 +799,20 @@ static void init_registers(struct net_device *dev)
if (debug > 4) if (debug > 4)
printk(KERN_DEBUG "%s: found silicon revision %xh.\n", printk(KERN_DEBUG "%s: found silicon revision %xh.\n",
dev->name, readl(ioaddr + SiliconRev)); dev->name, readl(ioaddr + SiliconRev));
/* On page 78 of the spec, they recommend some settings for "optimum /* On page 78 of the spec, they recommend some settings for "optimum
performance" to be done in sequence. These settings optimize some performance" to be done in sequence. These settings optimize some
of the 100Mbit autodetection circuitry. Also, we only want to do of the 100Mbit autodetection circuitry. They say we only want to
this for rev C of the chip. do this for rev C of the chip, but engineers at NSC (Bradley
Kennedy) recommends always setting them. If you don't, you get
There seems to be a typo on page 78, but there isn't. The fixup errors on some autonegotiations that make the device unusable.
should be performed for "DP83815CVNG (SRR = 203h)", which is a
pretty old rev. This is not to be confused with 302h, which is
current. Confirmed with engineers at NSC.
*/ */
if (readl(ioaddr + SiliconRev) == 0x203) { writew(0x0001, ioaddr + PGSEL);
writew(0x0001, ioaddr + PGSEL); writew(0x189C, ioaddr + PMDCSR);
writew(0x189C, ioaddr + PMDCSR); writew(0x0000, ioaddr + TSTDAT);
writew(0x0000, ioaddr + TSTDAT); writew(0x5040, ioaddr + DSPCFG);
writew(0x5040, ioaddr + DSPCFG); writew(0x008C, ioaddr + SDCFG);
writew(0x008C, ioaddr + SDCFG); writew(0x0000, ioaddr + PGSEL);
}
/* Enable PHY Specific event based interrupts. Link state change /* Enable PHY Specific event based interrupts. Link state change
and Auto-Negotiation Completion are among the affected. and Auto-Negotiation Completion are among the affected.
...@@ -774,16 +837,16 @@ static void init_registers(struct net_device *dev) ...@@ -774,16 +837,16 @@ static void init_registers(struct net_device *dev)
/* DRTH: 2: start tx if 64 bytes are in the fifo /* DRTH: 2: start tx if 64 bytes are in the fifo
* FLTH: 0x10: refill with next packet if 512 bytes are free * FLTH: 0x10: refill with next packet if 512 bytes are free
* MXDMA: 0: up to 512 byte bursts. * MXDMA: 0: up to 256 byte bursts.
* MXDMA must be <= FLTH * MXDMA must be <= FLTH
* ECRETRY=1 * ECRETRY=1
* ATP=1 * ATP=1
*/ */
np->tx_config = 0x10801002; np->tx_config = 0x10f01002;
/* DRTH 0x10: start copying to memory if 128 bytes are in the fifo /* DRTH 0x10: start copying to memory if 128 bytes are in the fifo
* MXDMA 0: up to 512 byte bursts * MXDMA 0: up to 256 byte bursts
*/ */
np->rx_config = 0x0020; np->rx_config = 0x700020;
writel(np->tx_config, ioaddr + TxConfig); writel(np->tx_config, ioaddr + TxConfig);
writel(np->rx_config, ioaddr + RxConfig); writel(np->rx_config, ioaddr + RxConfig);
...@@ -800,11 +863,11 @@ static void init_registers(struct net_device *dev) ...@@ -800,11 +863,11 @@ static void init_registers(struct net_device *dev)
__set_rx_mode(dev); __set_rx_mode(dev);
/* Enable interrupts by setting the interrupt mask. */ /* Enable interrupts by setting the interrupt mask. */
writel(IntrNormalSummary | IntrAbnormalSummary | 0x1f, ioaddr + IntrMask); writel(IntrNormalSummary | IntrAbnormalSummary, ioaddr + IntrMask);
writel(1, ioaddr + IntrEnable); writel(1, ioaddr + IntrEnable);
writel(RxOn | TxOn, ioaddr + ChipCmd); writel(RxOn | TxOn, ioaddr + ChipCmd);
writel(4, ioaddr + StatsCtrl); /* Clear Stats */ writel(4, ioaddr + StatsCtrl); /* Clear Stats */
} }
static void netdev_timer(unsigned long data) static void netdev_timer(unsigned long data)
...@@ -1190,7 +1253,8 @@ static void netdev_error(struct net_device *dev, int intr_status) ...@@ -1190,7 +1253,8 @@ static void netdev_error(struct net_device *dev, int intr_status)
if (intr_status & LinkChange) { if (intr_status & LinkChange) {
printk(KERN_NOTICE "%s: Link changed: Autonegotiation advertising" printk(KERN_NOTICE "%s: Link changed: Autonegotiation advertising"
" %4.4x partner %4.4x.\n", dev->name, " %4.4x partner %4.4x.\n", dev->name,
(int)readl(ioaddr + 0x90), (int)readl(ioaddr + 0x94)); (int)readl(ioaddr + AnegAdv),
(int)readl(ioaddr + AnegPeer));
/* read MII int status to clear the flag */ /* read MII int status to clear the flag */
readw(ioaddr + MIntrStatus); readw(ioaddr + MIntrStatus);
check_link(dev); check_link(dev);
...@@ -1208,7 +1272,7 @@ static void netdev_error(struct net_device *dev, int intr_status) ...@@ -1208,7 +1272,7 @@ static void netdev_error(struct net_device *dev, int intr_status)
} }
if (intr_status & WOLPkt) { if (intr_status & WOLPkt) {
int wol_status = readl(ioaddr + WOLCmd); int wol_status = readl(ioaddr + WOLCmd);
printk(KERN_NOTICE "%s: Link wake-up event %8.8x", printk(KERN_NOTICE "%s: Link wake-up event %8.8x\n",
dev->name, wol_status); dev->name, wol_status);
} }
if ((intr_status & ~(LinkChange|StatsMax|RxResetDone|TxResetDone|0xA7ff)) if ((intr_status & ~(LinkChange|StatsMax|RxResetDone|TxResetDone|0xA7ff))
...@@ -1230,7 +1294,7 @@ static void __get_stats(struct net_device *dev) ...@@ -1230,7 +1294,7 @@ static void __get_stats(struct net_device *dev)
/* The chip only need report frame silently dropped. */ /* The chip only need report frame silently dropped. */
np->stats.rx_crc_errors += readl(ioaddr + RxCRCErrs); np->stats.rx_crc_errors += readl(ioaddr + RxCRCErrs);
np->stats.rx_missed_errors += readl(ioaddr + RxMissed); np->stats.rx_missed_errors += readl(ioaddr + RxMissed);
} }
static struct net_device_stats *get_stats(struct net_device *dev) static struct net_device_stats *get_stats(struct net_device *dev)
...@@ -1349,12 +1413,12 @@ static void set_rx_mode(struct net_device *dev) ...@@ -1349,12 +1413,12 @@ static void set_rx_mode(struct net_device *dev)
static int netdev_ethtool_ioctl(struct net_device *dev, void *useraddr) static int netdev_ethtool_ioctl(struct net_device *dev, void *useraddr)
{ {
struct netdev_private *np = dev->priv; struct netdev_private *np = dev->priv;
u32 ethcmd; struct ethtool_cmd ecmd;
if (copy_from_user(&ethcmd, useraddr, sizeof(ethcmd))) if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
return -EFAULT; return -EFAULT;
switch (ethcmd) { switch (ecmd.cmd) {
case ETHTOOL_GDRVINFO: { case ETHTOOL_GDRVINFO: {
struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO}; struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
strcpy(info.driver, DRV_NAME); strcpy(info.driver, DRV_NAME);
...@@ -1364,12 +1428,257 @@ static int netdev_ethtool_ioctl(struct net_device *dev, void *useraddr) ...@@ -1364,12 +1428,257 @@ static int netdev_ethtool_ioctl(struct net_device *dev, void *useraddr)
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
case ETHTOOL_GSET: {
spin_lock_irq(&np->lock);
netdev_get_ecmd(dev, &ecmd);
spin_unlock_irq(&np->lock);
if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
return -EFAULT;
return 0;
}
case ETHTOOL_SSET: {
int r;
if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
return -EFAULT;
spin_lock_irq(&np->lock);
r = netdev_set_ecmd(dev, &ecmd);
spin_unlock_irq(&np->lock);
return r;
}
case ETHTOOL_GWOL: {
struct ethtool_wolinfo wol = {ETHTOOL_GWOL};
spin_lock_irq(&np->lock);
netdev_get_wol(dev, &wol.supported, &wol.wolopts);
netdev_get_sopass(dev, wol.sopass);
spin_unlock_irq(&np->lock);
if (copy_to_user(useraddr, &wol, sizeof(wol)))
return -EFAULT;
return 0;
}
case ETHTOOL_SWOL: {
struct ethtool_wolinfo wol;
int r;
if (copy_from_user(&wol, useraddr, sizeof(wol)))
return -EFAULT;
spin_lock_irq(&np->lock);
netdev_set_wol(dev, wol.wolopts);
r = netdev_set_sopass(dev, wol.sopass);
spin_unlock_irq(&np->lock);
return r;
}
} }
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
static int netdev_set_wol(struct net_device *dev, u32 newval)
{
u32 data = readl(dev->base_addr + WOLCmd) & ~WakeOptsSummary;
/* translate to bitmasks this chip understands */
if (newval & WAKE_PHY)
data |= WakePhy;
if (newval & WAKE_UCAST)
data |= WakeUnicast;
if (newval & WAKE_MCAST)
data |= WakeMulticast;
if (newval & WAKE_BCAST)
data |= WakeBroadcast;
if (newval & WAKE_ARP)
data |= WakeArp;
if (newval & WAKE_MAGIC)
data |= WakeMagic;
if (newval & WAKE_MAGICSECURE)
data |= WakeMagicSecure;
writel(data, dev->base_addr + WOLCmd);
/* should we burn these into the EEPROM? */
return 0;
}
static int netdev_get_wol(struct net_device *dev, u32 *supported, u32 *cur)
{
u32 regval = readl(dev->base_addr + WOLCmd);
*supported = (WAKE_PHY | WAKE_UCAST | WAKE_MCAST | WAKE_BCAST
| WAKE_ARP | WAKE_MAGIC | WAKE_MAGICSECURE);
*cur = 0;
/* translate from chip bitmasks */
if (regval & 0x1)
*cur |= WAKE_PHY;
if (regval & 0x2)
*cur |= WAKE_UCAST;
if (regval & 0x4)
*cur |= WAKE_MCAST;
if (regval & 0x8)
*cur |= WAKE_BCAST;
if (regval & 0x10)
*cur |= WAKE_ARP;
if (regval & 0x200)
*cur |= WAKE_MAGIC;
if (regval & 0x400)
*cur |= WAKE_MAGICSECURE;
return 0;
}
static int netdev_set_sopass(struct net_device *dev, u8 *newval)
{
u16 *sval = (u16 *)newval;
u32 addr = readl(dev->base_addr + RxFilterAddr) & ~0x3ff;
/* enable writing to these registers by disabling the RX filter */
addr &= ~0x80000000;
writel(addr, dev->base_addr + RxFilterAddr);
/* write the three words to (undocumented) RFCR vals 0xa, 0xc, 0xe */
writel(addr | 0xa, dev->base_addr + RxFilterAddr);
writew(sval[0], dev->base_addr + RxFilterData);
writel(addr | 0xc, dev->base_addr + RxFilterAddr);
writew(sval[1], dev->base_addr + RxFilterData);
writel(addr | 0xe, dev->base_addr + RxFilterAddr);
writew(sval[2], dev->base_addr + RxFilterData);
/* re-enable the RX filter */
writel(addr | 0x80000000, dev->base_addr + RxFilterAddr);
/* should we burn this into the EEPROM? */
return 0;
}
static int netdev_get_sopass(struct net_device *dev, u8 *data)
{
u16 *sval = (u16 *)data;
u32 addr = readl(dev->base_addr + RxFilterAddr) & ~0x3ff;
/* read the three words from (undocumented) RFCR vals 0xa, 0xc, 0xe */
writel(addr | 0xa, dev->base_addr + RxFilterAddr);
sval[0] = readw(dev->base_addr + RxFilterData);
writel(addr | 0xc, dev->base_addr + RxFilterAddr);
sval[1] = readw(dev->base_addr + RxFilterData);
writel(addr | 0xe, dev->base_addr + RxFilterAddr);
sval[2] = readw(dev->base_addr + RxFilterData);
return 0;
}
static int netdev_get_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd)
{
u32 tmp;
ecmd->supported =
(SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full |
SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full |
SUPPORTED_Autoneg | SUPPORTED_TP);
/* only supports twisted-pair */
ecmd->port = PORT_TP;
/* only supports internal transceiver */
ecmd->transceiver = XCVR_INTERNAL;
/* this isn't fully supported at higher layers */
ecmd->phy_address = readw(dev->base_addr + PhyCtrl) & 0xf;
tmp = readl(dev->base_addr + AnegAdv);
ecmd->advertising = ADVERTISED_TP;
if (tmp & Aneg10BaseT)
ecmd->advertising |= ADVERTISED_10baseT_Half;
if (tmp & Aneg10BaseTFull)
ecmd->advertising |= ADVERTISED_10baseT_Full;
if (tmp & Aneg100BaseT)
ecmd->advertising |= ADVERTISED_100baseT_Half;
if (tmp & Aneg100BaseTFull)
ecmd->advertising |= ADVERTISED_100baseT_Full;
tmp = readl(dev->base_addr + ChipConfig);
if (tmp & CfgAnegEnable) {
ecmd->advertising |= ADVERTISED_Autoneg;
ecmd->autoneg = AUTONEG_ENABLE;
} else {
ecmd->autoneg = AUTONEG_DISABLE;
}
if (tmp & CfgSpeed100) {
ecmd->speed = SPEED_100;
} else {
ecmd->speed = SPEED_10;
}
if (tmp & CfgFullDuplex) {
ecmd->duplex = DUPLEX_FULL;
} else {
ecmd->duplex = DUPLEX_HALF;
}
/* ignore maxtxpkt, maxrxpkt for now */
return 0;
}
static int netdev_set_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd)
{
struct netdev_private *np = dev->priv;
u32 tmp;
if (ecmd->speed != SPEED_10 && ecmd->speed != SPEED_100)
return -EINVAL;
if (ecmd->duplex != DUPLEX_HALF && ecmd->duplex != DUPLEX_FULL)
return -EINVAL;
if (ecmd->port != PORT_TP)
return -EINVAL;
if (ecmd->transceiver != XCVR_INTERNAL)
return -EINVAL;
if (ecmd->autoneg != AUTONEG_DISABLE && ecmd->autoneg != AUTONEG_ENABLE)
return -EINVAL;
/* ignore phy_address, maxtxpkt, maxrxpkt for now */
/* WHEW! now lets bang some bits */
if (ecmd->autoneg == AUTONEG_ENABLE) {
/* advertise only what has been requested */
tmp = readl(dev->base_addr + ChipConfig);
tmp &= ~(CfgAneg100 | CfgAnegFull);
tmp |= CfgAnegEnable;
if (ecmd->advertising & ADVERTISED_100baseT_Half
|| ecmd->advertising & ADVERTISED_100baseT_Full) {
tmp |= CfgAneg100;
}
if (ecmd->advertising & ADVERTISED_10baseT_Full
|| ecmd->advertising & ADVERTISED_100baseT_Full) {
tmp |= CfgAnegFull;
}
writel(tmp, dev->base_addr + ChipConfig);
/* turn on autonegotiation, and force a renegotiate */
tmp = readl(dev->base_addr + BasicControl);
tmp |= BMCRAnegEnable | BMCRAnegRestart;
writel(tmp, dev->base_addr + BasicControl);
np->advertising = mdio_read(dev, 1, 4);
} else {
/* turn off auto negotiation, set speed and duplexity */
tmp = readl(dev->base_addr + BasicControl);
tmp &= ~(BMCRAnegEnable | BMCRSpeed | BMCRDuplex);
if (ecmd->speed == SPEED_100) {
tmp |= BMCRSpeed;
}
if (ecmd->duplex == DUPLEX_FULL) {
tmp |= BMCRDuplex;
} else {
np->full_duplex = 0;
}
writel(tmp, dev->base_addr + BasicControl);
}
return 0;
}
static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{ {
struct netdev_private *np = dev->priv; struct netdev_private *np = dev->priv;
...@@ -1395,7 +1704,8 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ...@@ -1395,7 +1704,8 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
if (data->phy_id == 1) { if (data->phy_id == 1) {
u16 miireg = data->reg_num & 0x1f; u16 miireg = data->reg_num & 0x1f;
u16 value = data->val_in; u16 value = data->val_in;
writew(value, dev->base_addr + 0x80 + (miireg << 2)); writew(value, dev->base_addr + BasicControl
+ (miireg << 2));
switch (miireg) { switch (miireg) {
case 4: np->advertising = value; break; case 4: np->advertising = value; break;
} }
...@@ -1410,8 +1720,11 @@ static int netdev_close(struct net_device *dev) ...@@ -1410,8 +1720,11 @@ static int netdev_close(struct net_device *dev)
{ {
long ioaddr = dev->base_addr; long ioaddr = dev->base_addr;
struct netdev_private *np = dev->priv; struct netdev_private *np = dev->priv;
u32 wol = readl(ioaddr + WOLCmd) & WakeOptsSummary;
u32 clkrun;
netif_stop_queue(dev); netif_stop_queue(dev);
netif_carrier_off(dev);
if (debug > 1) { if (debug > 1) {
printk(KERN_DEBUG "%s: Shutting down ethercard, status was %4.4x.", printk(KERN_DEBUG "%s: Shutting down ethercard, status was %4.4x.",
...@@ -1420,14 +1733,23 @@ static int netdev_close(struct net_device *dev) ...@@ -1420,14 +1733,23 @@ static int netdev_close(struct net_device *dev)
dev->name, np->cur_tx, np->dirty_tx, np->cur_rx, np->dirty_rx); dev->name, np->cur_tx, np->dirty_tx, np->cur_rx, np->dirty_rx);
} }
/* Disable interrupts using the mask. */ /* Only shut down chip if wake on lan is not set */
writel(0, ioaddr + IntrMask); if (!wol) {
writel(0, ioaddr + IntrEnable); /* Disable interrupts using the mask. */
writel(2, ioaddr + StatsCtrl); /* Freeze Stats */ writel(0, ioaddr + IntrMask);
writel(0, ioaddr + IntrEnable);
/* Stop the chip's Tx and Rx processes. */ writel(2, ioaddr + StatsCtrl); /* Freeze Stats */
writel(RxOff | TxOff, ioaddr + ChipCmd);
/* Stop the chip's Tx and Rx processes. */
writel(RxOff | TxOff, ioaddr + ChipCmd);
} else if (debug > 1) {
printk(KERN_INFO "%s: remaining active for wake-on-lan\n",
dev->name);
/* spec says write 0 here */
writel(0, ioaddr + RxRingPtr);
/* allow wake-event interrupts now */
writel(readl(ioaddr + IntrMask) | WOLPkt, ioaddr + IntrMask);
}
del_timer_sync(&np->timer); del_timer_sync(&np->timer);
#ifdef __i386__ #ifdef __i386__
...@@ -1451,8 +1773,15 @@ static int netdev_close(struct net_device *dev) ...@@ -1451,8 +1773,15 @@ static int netdev_close(struct net_device *dev)
drain_ring(dev); drain_ring(dev);
free_ring(dev); free_ring(dev);
clkrun = np->SavedClkRun;
if (wol) {
/* make sure to enable PME */
clkrun |= 0x100;
}
/* Restore PME enable bit */ /* Restore PME enable bit */
writel(np->SavedClkRun, ioaddr + ClkRun); writel(np->SavedClkRun, ioaddr + ClkRun);
#if 0 #if 0
writel(0x0200, ioaddr + ChipConfig); /* Power down Xcvr. */ writel(0x0200, ioaddr + ChipConfig); /* Power down Xcvr. */
#endif #endif
......
fs/select.c
View file @ 0b9ded43
...@@ -419,9 +419,6 @@ asmlinkage long sys_poll(struct pollfd * ufds, unsigned int nfds, long timeout) ...@@ -419,9 +419,6 @@ asmlinkage long sys_poll(struct pollfd * ufds, unsigned int nfds, long timeout)
if (nfds > NR_OPEN) if (nfds > NR_OPEN)
return -EINVAL; return -EINVAL;
if (nfds > current->files->max_fds)
nfds = current->files->max_fds;
if (timeout) { if (timeout) {
/* Careful about overflow in the intermediate values */ /* Careful about overflow in the intermediate values */
if ((unsigned long) timeout < MAX_SCHEDULE_TIMEOUT / HZ) if ((unsigned long) timeout < MAX_SCHEDULE_TIMEOUT / HZ)
......
include/linux/ethtool.h
View file @ 0b9ded43
...@@ -38,11 +38,22 @@ struct ethtool_drvinfo { ...@@ -38,11 +38,22 @@ struct ethtool_drvinfo {
u32 regdump_len; /* Amount of data from ETHTOOL_GREGS */ u32 regdump_len; /* Amount of data from ETHTOOL_GREGS */
}; };
#define SOPASS_MAX 6
/* wake-on-lan settings */
struct ethtool_wolinfo {
u32 cmd;
u32 supported;
u32 wolopts;
u8 sopass[SOPASS_MAX]; /* SecureOn(tm) password */
};
/* CMDs currently supported */ /* CMDs currently supported */
#define ETHTOOL_GSET 0x00000001 /* Get settings. */ #define ETHTOOL_GSET 0x00000001 /* Get settings. */
#define ETHTOOL_SSET 0x00000002 /* Set settings, privileged. */ #define ETHTOOL_SSET 0x00000002 /* Set settings, privileged. */
#define ETHTOOL_GDRVINFO 0x00000003 /* Get driver info. */ #define ETHTOOL_GDRVINFO 0x00000003 /* Get driver info. */
#define ETHTOOL_GREGS 0x00000004 /* Get NIC registers, privileged. */ #define ETHTOOL_GREGS 0x00000004 /* Get NIC registers, privileged. */
#define ETHTOOL_GWOL 0x00000005 /* Get wake-on-lan options. */
#define ETHTOOL_SWOL 0x00000006 /* Set wake-on-lan options. */
/* compatibility with older code */ /* compatibility with older code */
#define SPARC_ETH_GSET ETHTOOL_GSET #define SPARC_ETH_GSET ETHTOOL_GSET
...@@ -109,4 +120,13 @@ struct ethtool_drvinfo { ...@@ -109,4 +120,13 @@ struct ethtool_drvinfo {
#define AUTONEG_DISABLE 0x00 #define AUTONEG_DISABLE 0x00
#define AUTONEG_ENABLE 0x01 #define AUTONEG_ENABLE 0x01
/* Wake-On-Lan options. */
#define WAKE_PHY (1 << 0)
#define WAKE_UCAST (1 << 1)
#define WAKE_MCAST (1 << 2)
#define WAKE_BCAST (1 << 3)
#define WAKE_ARP (1 << 4)
#define WAKE_MAGIC (1 << 5)
#define WAKE_MAGICSECURE (1 << 6) /* only meaningful if WAKE_MAGIC */
#endif /* _LINUX_ETHTOOL_H */ #endif /* _LINUX_ETHTOOL_H */
mm/filemap.c
View file @ 0b9ded43
...@@ -979,9 +979,13 @@ static void generic_file_readahead(int reada_ok, ...@@ -979,9 +979,13 @@ static void generic_file_readahead(int reada_ok,
static inline void check_used_once (struct page *page) static inline void check_used_once (struct page *page)
{ {
if (!page->age) { if (!PageActive(page)) {
page->age = PAGE_AGE_START; if (page->age)
ClearPageReferenced(page); activate_page(page);
else {
page->age = PAGE_AGE_START;
ClearPageReferenced(page);
}
} }
} }
......
mm/vmscan.c
View file @ 0b9ded43
...@@ -806,79 +806,70 @@ int inactive_shortage(void) ...@@ -806,79 +806,70 @@ int inactive_shortage(void)
} }
/* /*
* Refill_inactive is the function used to scan and age the pages on * Loop until we are no longer under an inactive or free
* the active list and in the working set of processes, moving the * shortage. Return 1 on success, 0 if we failed to get
* little-used pages to the inactive list. * there even after "maxtry" loops.
*
* When called by kswapd, we try to deactivate as many pages as needed
* to recover from the inactive page shortage. This makes it possible
* for kswapd to keep up with memory demand so user processes can get
* low latency on memory allocations.
*
* However, when the system starts to get overloaded we can get called
* by user processes. For user processes we want to both reduce the
* latency and make sure that multiple user processes together don't
* deactivate too many pages. To achieve this we simply do less work
* when called from a user process.
*/ */
#define INACTIVE_SHORTAGE 1
static int refill_inactive(unsigned int gfp_mask) #define FREE_SHORTAGE 2
#define GENERAL_SHORTAGE 4
static int do_try_to_free_pages(unsigned int gfp_mask, int user)
{ {
int progress = 0, maxtry; /* Always walk at least the active queue when called */
int shortage = INACTIVE_SHORTAGE;
int maxtry;
maxtry = 1 << DEF_PRIORITY; maxtry = 1 << DEF_PRIORITY;
do { do {
/*
* If needed, we move pages from the active list
* to the inactive list.
*/
if (shortage & INACTIVE_SHORTAGE) {
/* Walk the VM space for a bit.. */
swap_out(DEF_PRIORITY, gfp_mask);
/* ..and refill the inactive list */
refill_inactive_scan(DEF_PRIORITY);
}
/*
* If we're low on free pages, move pages from the
* inactive_dirty list to the inactive_clean list.
*
* Usually bdflush will have pre-cleaned the pages
* before we get around to moving them to the other
* list, so this is a relatively cheap operation.
*/
if (shortage & FREE_SHORTAGE)
page_launder(gfp_mask, user);
/*
* Reclaim unused slab cache if we were short on memory.
*/
if (shortage & GENERAL_SHORTAGE) {
shrink_dcache_memory(DEF_PRIORITY, gfp_mask);
shrink_icache_memory(DEF_PRIORITY, gfp_mask);
kmem_cache_reap(gfp_mask);
}
if (current->need_resched) { if (current->need_resched) {
__set_current_state(TASK_RUNNING); __set_current_state(TASK_RUNNING);
schedule(); schedule();
if (!inactive_shortage())
return 1;
} }
/* Walk the VM space for a bit.. */ shortage = 0;
swap_out(DEF_PRIORITY, gfp_mask); if (inactive_shortage())
shortage |= INACTIVE_SHORTAGE | GENERAL_SHORTAGE;
/* ..and refill the inactive list */ if (free_shortage())
progress += refill_inactive_scan(DEF_PRIORITY); shortage |= FREE_SHORTAGE | GENERAL_SHORTAGE;
if (--maxtry <= 0) if (--maxtry <= 0)
break; break;
} while (inactive_shortage()); } while (shortage);
return progress;
}
static int do_try_to_free_pages(unsigned int gfp_mask, int user)
{
int ret = 0;
/*
* If needed, we move pages from the active list
* to the inactive list.
*/
if (inactive_shortage())
ret += refill_inactive(gfp_mask);
/*
* If we're low on free pages, move pages from the
* inactive_dirty list to the inactive_clean list.
*
* Usually bdflush will have pre-cleaned the pages
* before we get around to moving them to the other
* list, so this is a relatively cheap operation.
*/
ret += page_launder(gfp_mask, user);
ret += shrink_dcache_memory(DEF_PRIORITY, gfp_mask);
ret += shrink_icache_memory(DEF_PRIORITY, gfp_mask);
/*
* Reclaim unused slab cache if memory is low.
*/
kmem_cache_reap(gfp_mask);
return ret; return !shortage;
} }
DECLARE_WAIT_QUEUE_HEAD(kswapd_wait); DECLARE_WAIT_QUEUE_HEAD(kswapd_wait);
...@@ -925,47 +916,22 @@ int kswapd(void *unused) ...@@ -925,47 +916,22 @@ int kswapd(void *unused)
for (;;) { for (;;) {
static long recalc = 0; static long recalc = 0;
/* If needed, try to free some memory. */
if (inactive_shortage() || free_shortage())
do_try_to_free_pages(GFP_KSWAPD, 0);
/* Once a second ... */ /* Once a second ... */
if (time_after(jiffies, recalc + HZ)) { if (time_after(jiffies, recalc + HZ)) {
recalc = jiffies; recalc = jiffies;
/* Recalculate VM statistics. */ /* Recalculate VM statistics. */
recalculate_vm_stats(); recalculate_vm_stats();
/* Do background page aging. */
refill_inactive_scan(DEF_PRIORITY);
} }
/* if (!do_try_to_free_pages(GFP_KSWAPD, 1)) {
* We go to sleep if either the free page shortage if (out_of_memory())
* or the inactive page shortage is gone. We do this oom_kill();
* because: continue;
* 1) we need no more free pages or
* 2) the inactive pages need to be flushed to disk,
* it wouldn't help to eat CPU time now ...
*
* We go to sleep for one second, but if it's needed
* we'll be woken up earlier...
*/
if (!free_shortage() || !inactive_shortage()) {
run_task_queue(&tq_disk);
interruptible_sleep_on_timeout(&kswapd_wait, HZ);
/*
* If we couldn't free enough memory, we see if it was
* due to the system just not having enough memory.
* If that is the case, the only solution is to kill
* a process (the alternative is enternal deadlock).
*
* If there still is enough memory around, we just loop
* and try free some more memory...
*/
} else if (out_of_memory()) {
oom_kill();
} }
run_task_queue(&tq_disk);
interruptible_sleep_on_timeout(&kswapd_wait, HZ);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7