![Jean Delvare](/assets/img/avatar_default.png)
I noticed that many source files include <linux/pci.h> while they do not appear to need it. Here is an attempt to clean it all up. In order to find all possibly affected files, I searched for all files including <linux/pci.h> but without any other occurence of "pci" or "PCI". I removed the include statement from all of these, then I compiled an allmodconfig kernel on both i386 and x86_64 and fixed the false positives manually. My tests covered 66% of the affected files, so there could be false positives remaining. Untested files are: arch/alpha/kernel/err_common.c arch/alpha/kernel/err_ev6.c arch/alpha/kernel/err_ev7.c arch/ia64/sn/kernel/huberror.c arch/ia64/sn/kernel/xpnet.c arch/m68knommu/kernel/dma.c arch/mips/lib/iomap.c arch/powerpc/platforms/pseries/ras.c arch/ppc/8260_io/enet.c arch/ppc/8260_io/fcc_enet.c arch/ppc/8xx_io/enet.c arch/ppc/syslib/ppc4xx_sgdma.c arch/sh64/mach-cayman/iomap.c arch/xtensa/kernel/xtensa_ksyms.c arch/xtensa/platform-iss/setup.c drivers/i2c/busses/i2c-at91.c drivers/i2c/busses/i2c-mpc.c drivers/media/video/saa711x.c drivers/misc/hdpuftrs/hdpu_cpustate.c drivers/misc/hdpuftrs/hdpu_nexus.c drivers/net/au1000_eth.c drivers/net/fec_8xx/fec_main.c drivers/net/fec_8xx/fec_mii.c drivers/net/fs_enet/fs_enet-main.c drivers/net/fs_enet/mac-fcc.c drivers/net/fs_enet/mac-fec.c drivers/net/fs_enet/mac-scc.c drivers/net/fs_enet/mii-bitbang.c drivers/net/fs_enet/mii-fec.c drivers/net/ibm_emac/ibm_emac_core.c drivers/net/lasi_82596.c drivers/parisc/hppb.c drivers/sbus/sbus.c drivers/video/g364fb.c drivers/video/platinumfb.c drivers/video/stifb.c drivers/video/valkyriefb.c include/asm-arm/arch-ixp4xx/dma.h sound/oss/au1550_ac97.c I would welcome test reports for these files. I am fine with removing the untested files from the patch if the general opinion is that these changes aren't safe. The tested part would still be nice to have. Note that this patch depends on another header fixup patch I submitted to LKML yesterday: [PATCH] scatterlist.h needs types.h http://lkml.org/lkml/2007/3/01/141 Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Badari Pulavarty <pbadari@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
173 lines
5.3 KiB
C
173 lines
5.3 KiB
C
/*
|
|
drivers/net/tulip/pnic.c
|
|
|
|
Maintained by Valerie Henson <val_henson@linux.intel.com>
|
|
Copyright 2000,2001 The Linux Kernel Team
|
|
Written/copyright 1994-2001 by Donald Becker.
|
|
|
|
This software may be used and distributed according to the terms
|
|
of the GNU General Public License, incorporated herein by reference.
|
|
|
|
Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
|
|
for more information on this driver, or visit the project
|
|
Web page at http://sourceforge.net/projects/tulip/
|
|
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/jiffies.h>
|
|
#include "tulip.h"
|
|
|
|
|
|
void pnic_do_nway(struct net_device *dev)
|
|
{
|
|
struct tulip_private *tp = netdev_priv(dev);
|
|
void __iomem *ioaddr = tp->base_addr;
|
|
u32 phy_reg = ioread32(ioaddr + 0xB8);
|
|
u32 new_csr6 = tp->csr6 & ~0x40C40200;
|
|
|
|
if (phy_reg & 0x78000000) { /* Ignore baseT4 */
|
|
if (phy_reg & 0x20000000) dev->if_port = 5;
|
|
else if (phy_reg & 0x40000000) dev->if_port = 3;
|
|
else if (phy_reg & 0x10000000) dev->if_port = 4;
|
|
else if (phy_reg & 0x08000000) dev->if_port = 0;
|
|
tp->nwayset = 1;
|
|
new_csr6 = (dev->if_port & 1) ? 0x01860000 : 0x00420000;
|
|
iowrite32(0x32 | (dev->if_port & 1), ioaddr + CSR12);
|
|
if (dev->if_port & 1)
|
|
iowrite32(0x1F868, ioaddr + 0xB8);
|
|
if (phy_reg & 0x30000000) {
|
|
tp->full_duplex = 1;
|
|
new_csr6 |= 0x00000200;
|
|
}
|
|
if (tulip_debug > 1)
|
|
printk(KERN_DEBUG "%s: PNIC autonegotiated status %8.8x, %s.\n",
|
|
dev->name, phy_reg, medianame[dev->if_port]);
|
|
if (tp->csr6 != new_csr6) {
|
|
tp->csr6 = new_csr6;
|
|
/* Restart Tx */
|
|
tulip_restart_rxtx(tp);
|
|
dev->trans_start = jiffies;
|
|
}
|
|
}
|
|
}
|
|
|
|
void pnic_lnk_change(struct net_device *dev, int csr5)
|
|
{
|
|
struct tulip_private *tp = netdev_priv(dev);
|
|
void __iomem *ioaddr = tp->base_addr;
|
|
int phy_reg = ioread32(ioaddr + 0xB8);
|
|
|
|
if (tulip_debug > 1)
|
|
printk(KERN_DEBUG "%s: PNIC link changed state %8.8x, CSR5 %8.8x.\n",
|
|
dev->name, phy_reg, csr5);
|
|
if (ioread32(ioaddr + CSR5) & TPLnkFail) {
|
|
iowrite32((ioread32(ioaddr + CSR7) & ~TPLnkFail) | TPLnkPass, ioaddr + CSR7);
|
|
/* If we use an external MII, then we mustn't use the
|
|
* internal negotiation.
|
|
*/
|
|
if (tulip_media_cap[dev->if_port] & MediaIsMII)
|
|
return;
|
|
if (! tp->nwayset || time_after(jiffies, dev->trans_start + 1*HZ)) {
|
|
tp->csr6 = 0x00420000 | (tp->csr6 & 0x0000fdff);
|
|
iowrite32(tp->csr6, ioaddr + CSR6);
|
|
iowrite32(0x30, ioaddr + CSR12);
|
|
iowrite32(0x0201F078, ioaddr + 0xB8); /* Turn on autonegotiation. */
|
|
dev->trans_start = jiffies;
|
|
}
|
|
} else if (ioread32(ioaddr + CSR5) & TPLnkPass) {
|
|
if (tulip_media_cap[dev->if_port] & MediaIsMII) {
|
|
spin_lock(&tp->lock);
|
|
tulip_check_duplex(dev);
|
|
spin_unlock(&tp->lock);
|
|
} else {
|
|
pnic_do_nway(dev);
|
|
}
|
|
iowrite32((ioread32(ioaddr + CSR7) & ~TPLnkPass) | TPLnkFail, ioaddr + CSR7);
|
|
}
|
|
}
|
|
|
|
void pnic_timer(unsigned long data)
|
|
{
|
|
struct net_device *dev = (struct net_device *)data;
|
|
struct tulip_private *tp = netdev_priv(dev);
|
|
void __iomem *ioaddr = tp->base_addr;
|
|
int next_tick = 60*HZ;
|
|
|
|
if(!ioread32(ioaddr + CSR7)) {
|
|
/* the timer was called due to a work overflow
|
|
* in the interrupt handler. Skip the connection
|
|
* checks, the nic is definitively speaking with
|
|
* his link partner.
|
|
*/
|
|
goto too_good_connection;
|
|
}
|
|
|
|
if (tulip_media_cap[dev->if_port] & MediaIsMII) {
|
|
spin_lock_irq(&tp->lock);
|
|
if (tulip_check_duplex(dev) > 0)
|
|
next_tick = 3*HZ;
|
|
spin_unlock_irq(&tp->lock);
|
|
} else {
|
|
int csr12 = ioread32(ioaddr + CSR12);
|
|
int new_csr6 = tp->csr6 & ~0x40C40200;
|
|
int phy_reg = ioread32(ioaddr + 0xB8);
|
|
int csr5 = ioread32(ioaddr + CSR5);
|
|
|
|
if (tulip_debug > 1)
|
|
printk(KERN_DEBUG "%s: PNIC timer PHY status %8.8x, %s "
|
|
"CSR5 %8.8x.\n",
|
|
dev->name, phy_reg, medianame[dev->if_port], csr5);
|
|
if (phy_reg & 0x04000000) { /* Remote link fault */
|
|
iowrite32(0x0201F078, ioaddr + 0xB8);
|
|
next_tick = 1*HZ;
|
|
tp->nwayset = 0;
|
|
} else if (phy_reg & 0x78000000) { /* Ignore baseT4 */
|
|
pnic_do_nway(dev);
|
|
next_tick = 60*HZ;
|
|
} else if (csr5 & TPLnkFail) { /* 100baseTx link beat */
|
|
if (tulip_debug > 1)
|
|
printk(KERN_DEBUG "%s: %s link beat failed, CSR12 %4.4x, "
|
|
"CSR5 %8.8x, PHY %3.3x.\n",
|
|
dev->name, medianame[dev->if_port], csr12,
|
|
ioread32(ioaddr + CSR5), ioread32(ioaddr + 0xB8));
|
|
next_tick = 3*HZ;
|
|
if (tp->medialock) {
|
|
} else if (tp->nwayset && (dev->if_port & 1)) {
|
|
next_tick = 1*HZ;
|
|
} else if (dev->if_port == 0) {
|
|
dev->if_port = 3;
|
|
iowrite32(0x33, ioaddr + CSR12);
|
|
new_csr6 = 0x01860000;
|
|
iowrite32(0x1F868, ioaddr + 0xB8);
|
|
} else {
|
|
dev->if_port = 0;
|
|
iowrite32(0x32, ioaddr + CSR12);
|
|
new_csr6 = 0x00420000;
|
|
iowrite32(0x1F078, ioaddr + 0xB8);
|
|
}
|
|
if (tp->csr6 != new_csr6) {
|
|
tp->csr6 = new_csr6;
|
|
/* Restart Tx */
|
|
tulip_restart_rxtx(tp);
|
|
dev->trans_start = jiffies;
|
|
if (tulip_debug > 1)
|
|
printk(KERN_INFO "%s: Changing PNIC configuration to %s "
|
|
"%s-duplex, CSR6 %8.8x.\n",
|
|
dev->name, medianame[dev->if_port],
|
|
tp->full_duplex ? "full" : "half", new_csr6);
|
|
}
|
|
}
|
|
}
|
|
too_good_connection:
|
|
mod_timer(&tp->timer, RUN_AT(next_tick));
|
|
if(!ioread32(ioaddr + CSR7)) {
|
|
if (tulip_debug > 1)
|
|
printk(KERN_INFO "%s: sw timer wakeup.\n", dev->name);
|
|
disable_irq(dev->irq);
|
|
tulip_refill_rx(dev);
|
|
enable_irq(dev->irq);
|
|
iowrite32(tulip_tbl[tp->chip_id].valid_intrs, ioaddr + CSR7);
|
|
}
|
|
}
|