mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (34 commits) PCI: Only build PCI syscalls on architectures that want them PCI: limit pci_get_bus_and_slot to domain 0 PCI: hotplug: acpiphp: avoid acpiphp "cannot get bridge info" PCI hotplug failure PCI: hotplug: acpiphp: remove hot plug parameter write to PCI host bridge PCI: hotplug: acpiphp: fix slot poweroff problem on systems without _PS3 PCI: hotplug: pciehp: wait for 1 second after power off slot PCI: pci_set_power_state(): check for PM capabilities earlier PCI: cpci_hotplug: Convert to use the kthread API PCI: add pci_try_set_mwi PCI: pcie: remove SPIN_LOCK_UNLOCKED PCI: ROUND_UP macro cleanup in drivers/pci PCI: remove pci_dac_dma_... APIs PCI: pci-x-pci-express-read-control-interfaces cleanups PCI: Fix typo in include/linux/pci.h PCI: pci_ids, remove double or more empty lines PCI: pci_ids, add atheros and 3com_2 vendors PCI: pci_ids, reorder some entries PCI: i386: traps, change VENDOR to DEVICE PCI: ATM: lanai, change VENDOR to DEVICE PCI: Change all drivers to use pci_device->revision ...
This commit is contained in:
Linus Torvalds
commit
21ba0f88ae
172 changed files with 760 additions and 1401 deletions
|
|
@ -1799,7 +1799,6 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
void __iomem *regs;
|
||||
resource_size_t pciaddr;
|
||||
unsigned int addr_len, i, pci_using_dac;
|
||||
u8 pci_rev;
|
||||
|
||||
#ifndef MODULE
|
||||
static int version_printed;
|
||||
|
|
@ -1807,13 +1806,11 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
printk("%s", version);
|
||||
#endif
|
||||
|
||||
pci_read_config_byte(pdev, PCI_REVISION_ID, &pci_rev);
|
||||
|
||||
if (pdev->vendor == PCI_VENDOR_ID_REALTEK &&
|
||||
pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pci_rev < 0x20) {
|
||||
pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pdev->revision < 0x20) {
|
||||
dev_err(&pdev->dev,
|
||||
"This (id %04x:%04x rev %02x) is not an 8139C+ compatible chip\n",
|
||||
pdev->vendor, pdev->device, pci_rev);
|
||||
pdev->vendor, pdev->device, pdev->revision);
|
||||
dev_err(&pdev->dev, "Try the \"8139too\" driver instead.\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -931,7 +931,6 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
|
|||
int i, addr_len, option;
|
||||
void __iomem *ioaddr;
|
||||
static int board_idx = -1;
|
||||
u8 pci_rev;
|
||||
|
||||
assert (pdev != NULL);
|
||||
assert (ent != NULL);
|
||||
|
|
@ -949,13 +948,11 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
|
|||
}
|
||||
#endif
|
||||
|
||||
pci_read_config_byte(pdev, PCI_REVISION_ID, &pci_rev);
|
||||
|
||||
if (pdev->vendor == PCI_VENDOR_ID_REALTEK &&
|
||||
pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pci_rev >= 0x20) {
|
||||
pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pdev->revision >= 0x20) {
|
||||
dev_info(&pdev->dev,
|
||||
"This (id %04x:%04x rev %02x) is an enhanced 8139C+ chip\n",
|
||||
pdev->vendor, pdev->device, pci_rev);
|
||||
pdev->vendor, pdev->device, pdev->revision);
|
||||
dev_info(&pdev->dev,
|
||||
"Use the \"8139cp\" driver for improved performance and stability.\n");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -210,7 +210,6 @@ struct atl1_hw {
|
|||
u16 phy_spd_default;
|
||||
|
||||
u16 dev_rev;
|
||||
u8 revision_id;
|
||||
|
||||
/* spi flash */
|
||||
u8 flash_vendor;
|
||||
|
|
|
|||
|
|
@ -118,10 +118,6 @@ static int __devinit atl1_sw_init(struct atl1_adapter *adapter)
|
|||
{
|
||||
struct atl1_hw *hw = &adapter->hw;
|
||||
struct net_device *netdev = adapter->netdev;
|
||||
struct pci_dev *pdev = adapter->pdev;
|
||||
|
||||
/* PCI config space info */
|
||||
pci_read_config_byte(pdev, PCI_REVISION_ID, &hw->revision_id);
|
||||
|
||||
hw->max_frame_size = netdev->mtu + ENET_HEADER_SIZE + ETHERNET_FCS_SIZE;
|
||||
hw->min_frame_size = MINIMUM_ETHERNET_FRAME_SIZE;
|
||||
|
|
|
|||
|
|
@ -6736,10 +6736,9 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
|
|||
while ((amd_8132 = pci_get_device(PCI_VENDOR_ID_AMD,
|
||||
PCI_DEVICE_ID_AMD_8132_BRIDGE,
|
||||
amd_8132))) {
|
||||
u8 rev;
|
||||
|
||||
pci_read_config_byte(amd_8132, PCI_REVISION_ID, &rev);
|
||||
if (rev >= 0x10 && rev <= 0x13) {
|
||||
if (amd_8132->revision >= 0x10 &&
|
||||
amd_8132->revision <= 0x13) {
|
||||
disable_msi = 1;
|
||||
pci_dev_put(amd_8132);
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -3422,21 +3422,19 @@ done:
|
|||
static void cas_check_pci_invariants(struct cas *cp)
|
||||
{
|
||||
struct pci_dev *pdev = cp->pdev;
|
||||
u8 rev;
|
||||
|
||||
cp->cas_flags = 0;
|
||||
pci_read_config_byte(pdev, PCI_REVISION_ID, &rev);
|
||||
if ((pdev->vendor == PCI_VENDOR_ID_SUN) &&
|
||||
(pdev->device == PCI_DEVICE_ID_SUN_CASSINI)) {
|
||||
if (rev >= CAS_ID_REVPLUS)
|
||||
if (pdev->revision >= CAS_ID_REVPLUS)
|
||||
cp->cas_flags |= CAS_FLAG_REG_PLUS;
|
||||
if (rev < CAS_ID_REVPLUS02u)
|
||||
if (pdev->revision < CAS_ID_REVPLUS02u)
|
||||
cp->cas_flags |= CAS_FLAG_TARGET_ABORT;
|
||||
|
||||
/* Original Cassini supports HW CSUM, but it's not
|
||||
* enabled by default as it can trigger TX hangs.
|
||||
*/
|
||||
if (rev < CAS_ID_REV2)
|
||||
if (pdev->revision < CAS_ID_REV2)
|
||||
cp->cas_flags |= CAS_FLAG_NO_HW_CSUM;
|
||||
} else {
|
||||
/* Only sun has original cassini chips. */
|
||||
|
|
@ -4919,13 +4917,13 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
|
|||
pci_cmd &= ~PCI_COMMAND_SERR;
|
||||
pci_cmd |= PCI_COMMAND_PARITY;
|
||||
pci_write_config_word(pdev, PCI_COMMAND, pci_cmd);
|
||||
if (pci_set_mwi(pdev))
|
||||
if (pci_try_set_mwi(pdev))
|
||||
printk(KERN_WARNING PFX "Could not enable MWI for %s\n",
|
||||
pci_name(pdev));
|
||||
|
||||
/*
|
||||
* On some architectures, the default cache line size set
|
||||
* by pci_set_mwi reduces perforamnce. We have to increase
|
||||
* by pci_try_set_mwi reduces perforamnce. We have to increase
|
||||
* it for this case. To start, we'll print some configuration
|
||||
* data.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -250,7 +250,6 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
np->an_enable = 1;
|
||||
mii_set_media (dev);
|
||||
}
|
||||
pci_read_config_byte(pdev, PCI_REVISION_ID, &np->pci_rev_id);
|
||||
|
||||
err = register_netdev (dev);
|
||||
if (err)
|
||||
|
|
@ -879,7 +878,7 @@ receive_packet (struct net_device *dev)
|
|||
skb->protocol = eth_type_trans (skb, dev);
|
||||
#if 0
|
||||
/* Checksum done by hw, but csum value unavailable. */
|
||||
if (np->pci_rev_id >= 0x0c &&
|
||||
if (np->pdev->pci_rev_id >= 0x0c &&
|
||||
!(frame_status & (TCPError | UDPError | IPError))) {
|
||||
skb->ip_summed = CHECKSUM_UNNECESSARY;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -668,7 +668,6 @@ struct netdev_private {
|
|||
unsigned int rx_flow:1; /* Rx flow control enable */
|
||||
unsigned int phy_media:1; /* 1: fiber, 0: copper */
|
||||
unsigned int link_status:1; /* Current link status */
|
||||
unsigned char pci_rev_id; /* PCI revision ID */
|
||||
struct netdev_desc *last_tx; /* Last Tx descriptor used. */
|
||||
unsigned long cur_rx, old_rx; /* Producer/consumer ring indices */
|
||||
unsigned long cur_tx, old_tx;
|
||||
|
|
|
|||
|
|
@ -583,7 +583,6 @@ struct nic {
|
|||
u32 rx_tco_frames;
|
||||
u32 rx_over_length_errors;
|
||||
|
||||
u8 rev_id;
|
||||
u16 leds;
|
||||
u16 eeprom_wc;
|
||||
u16 eeprom[256];
|
||||
|
|
@ -937,9 +936,8 @@ static void e100_get_defaults(struct nic *nic)
|
|||
struct param_range rfds = { .min = 16, .max = 256, .count = 256 };
|
||||
struct param_range cbs = { .min = 64, .max = 256, .count = 128 };
|
||||
|
||||
pci_read_config_byte(nic->pdev, PCI_REVISION_ID, &nic->rev_id);
|
||||
/* MAC type is encoded as rev ID; exception: ICH is treated as 82559 */
|
||||
nic->mac = (nic->flags & ich) ? mac_82559_D101M : nic->rev_id;
|
||||
nic->mac = (nic->flags & ich) ? mac_82559_D101M : nic->pdev->revision;
|
||||
if(nic->mac == mac_unknown)
|
||||
nic->mac = mac_82557_D100_A;
|
||||
|
||||
|
|
@ -1279,7 +1277,7 @@ static void e100_setup_ucode(struct nic *nic, struct cb *cb, struct sk_buff *skb
|
|||
if (nic->flags & ich)
|
||||
goto noloaducode;
|
||||
|
||||
/* Search for ucode match against h/w rev_id */
|
||||
/* Search for ucode match against h/w revision */
|
||||
for (opts = ucode_opts; opts->mac; opts++) {
|
||||
int i;
|
||||
u32 *ucode = opts->ucode;
|
||||
|
|
@ -2238,7 +2236,7 @@ static void e100_get_regs(struct net_device *netdev,
|
|||
u32 *buff = p;
|
||||
int i;
|
||||
|
||||
regs->version = (1 << 24) | nic->rev_id;
|
||||
regs->version = (1 << 24) | nic->pdev->revision;
|
||||
buff[0] = ioread8(&nic->csr->scb.cmd_hi) << 24 |
|
||||
ioread8(&nic->csr->scb.cmd_lo) << 16 |
|
||||
ioread16(&nic->csr->scb.status);
|
||||
|
|
|
|||
|
|
@ -1266,8 +1266,7 @@ e1000_sw_init(struct e1000_adapter *adapter)
|
|||
hw->device_id = pdev->device;
|
||||
hw->subsystem_vendor_id = pdev->subsystem_vendor;
|
||||
hw->subsystem_id = pdev->subsystem_device;
|
||||
|
||||
pci_read_config_byte(pdev, PCI_REVISION_ID, &hw->revision_id);
|
||||
hw->revision_id = pdev->revision;
|
||||
|
||||
pci_read_config_word(pdev, PCI_COMMAND, &hw->pci_cmd_word);
|
||||
|
||||
|
|
|
|||
|
|
@ -5084,15 +5084,13 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
|
|||
np->wolenabled = 0;
|
||||
|
||||
if (id->driver_data & DEV_HAS_POWER_CNTRL) {
|
||||
u8 revision_id;
|
||||
pci_read_config_byte(pci_dev, PCI_REVISION_ID, &revision_id);
|
||||
|
||||
/* take phy and nic out of low power mode */
|
||||
powerstate = readl(base + NvRegPowerState2);
|
||||
powerstate &= ~NVREG_POWERSTATE2_POWERUP_MASK;
|
||||
if ((id->device == PCI_DEVICE_ID_NVIDIA_NVENET_12 ||
|
||||
id->device == PCI_DEVICE_ID_NVIDIA_NVENET_13) &&
|
||||
revision_id >= 0xA3)
|
||||
pci_dev->revision >= 0xA3)
|
||||
powerstate |= NVREG_POWERSTATE2_POWERUP_REV_A3;
|
||||
writel(powerstate, base + NvRegPowerState2);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,8 +54,6 @@ static char netxen_nic_driver_string[] = "NetXen Network Driver version "
|
|||
#define NETXEN_ADAPTER_UP_MAGIC 777
|
||||
#define NETXEN_NIC_PEG_TUNE 0
|
||||
|
||||
u8 nx_p2_id = NX_P2_C0;
|
||||
|
||||
#define DMA_32BIT_MASK 0x00000000ffffffffULL
|
||||
#define DMA_35BIT_MASK 0x00000007ffffffffULL
|
||||
|
||||
|
|
@ -307,8 +305,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
goto err_out_disable_pdev;
|
||||
|
||||
pci_set_master(pdev);
|
||||
pci_read_config_byte(pdev, PCI_REVISION_ID, &nx_p2_id);
|
||||
if (nx_p2_id == NX_P2_C1 &&
|
||||
if (pdev->revision == NX_P2_C1 &&
|
||||
(pci_set_dma_mask(pdev, DMA_35BIT_MASK) == 0) &&
|
||||
(pci_set_consistent_dma_mask(pdev, DMA_35BIT_MASK) == 0)) {
|
||||
pci_using_dac = 1;
|
||||
|
|
@ -552,7 +549,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
INIT_WORK(&adapter->watchdog_task, netxen_watchdog_task);
|
||||
adapter->ahw.pdev = pdev;
|
||||
adapter->proc_cmd_buf_counter = 0;
|
||||
adapter->ahw.revision_id = nx_p2_id;
|
||||
adapter->ahw.revision_id = pdev->revision;
|
||||
|
||||
/* make sure Window == 1 */
|
||||
netxen_nic_pci_change_crbwindow(adapter, 1);
|
||||
|
|
|
|||
|
|
@ -1135,7 +1135,7 @@ static int init_nic(struct s2io_nic *nic)
|
|||
* SXE-008 TRANSMIT DMA ARBITRATION ISSUE.
|
||||
*/
|
||||
if ((nic->device_type == XFRAME_I_DEVICE) &&
|
||||
(get_xena_rev_id(nic->pdev) < 4))
|
||||
(nic->pdev->revision < 4))
|
||||
writeq(PCC_ENABLE_FOUR, &bar0->pcc_enable);
|
||||
|
||||
val64 = readq(&bar0->tx_fifo_partition_0);
|
||||
|
|
@ -1873,7 +1873,7 @@ static int verify_pcc_quiescent(struct s2io_nic *sp, int flag)
|
|||
herc = (sp->device_type == XFRAME_II_DEVICE);
|
||||
|
||||
if (flag == FALSE) {
|
||||
if ((!herc && (get_xena_rev_id(sp->pdev) >= 4)) || herc) {
|
||||
if ((!herc && (sp->pdev->revision >= 4)) || herc) {
|
||||
if (!(val64 & ADAPTER_STATUS_RMAC_PCC_IDLE))
|
||||
ret = 1;
|
||||
} else {
|
||||
|
|
@ -1881,7 +1881,7 @@ static int verify_pcc_quiescent(struct s2io_nic *sp, int flag)
|
|||
ret = 1;
|
||||
}
|
||||
} else {
|
||||
if ((!herc && (get_xena_rev_id(sp->pdev) >= 4)) || herc) {
|
||||
if ((!herc && (sp->pdev->revision >= 4)) || herc) {
|
||||
if (((val64 & ADAPTER_STATUS_RMAC_PCC_IDLE) ==
|
||||
ADAPTER_STATUS_RMAC_PCC_IDLE))
|
||||
ret = 1;
|
||||
|
|
@ -7075,23 +7075,6 @@ static void s2io_link(struct s2io_nic * sp, int link)
|
|||
sp->start_time = jiffies;
|
||||
}
|
||||
|
||||
/**
|
||||
* get_xena_rev_id - to identify revision ID of xena.
|
||||
* @pdev : PCI Dev structure
|
||||
* Description:
|
||||
* Function to identify the Revision ID of xena.
|
||||
* Return value:
|
||||
* returns the revision ID of the device.
|
||||
*/
|
||||
|
||||
static int get_xena_rev_id(struct pci_dev *pdev)
|
||||
{
|
||||
u8 id = 0;
|
||||
int ret;
|
||||
ret = pci_read_config_byte(pdev, PCI_REVISION_ID, (u8 *) & id);
|
||||
return id;
|
||||
}
|
||||
|
||||
/**
|
||||
* s2io_init_pci -Initialization of PCI and PCI-X configuration registers .
|
||||
* @sp : private member of the device structure, which is a pointer to the
|
||||
|
|
@ -7550,7 +7533,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
|
|||
s2io_vpd_read(sp);
|
||||
DBG_PRINT(ERR_DBG, "Copyright(c) 2002-2007 Neterion Inc.\n");
|
||||
DBG_PRINT(ERR_DBG, "%s: Neterion %s (rev %d)\n",dev->name,
|
||||
sp->product_name, get_xena_rev_id(sp->pdev));
|
||||
sp->product_name, pdev->revision);
|
||||
DBG_PRINT(ERR_DBG, "%s: Driver version %s\n", dev->name,
|
||||
s2io_driver_version);
|
||||
DBG_PRINT(ERR_DBG, "%s: MAC ADDR: "
|
||||
|
|
|
|||
|
|
@ -1033,7 +1033,6 @@ static void s2io_set_link(struct work_struct *work);
|
|||
static int s2io_set_swapper(struct s2io_nic * sp);
|
||||
static void s2io_card_down(struct s2io_nic *nic);
|
||||
static int s2io_card_up(struct s2io_nic *nic);
|
||||
static int get_xena_rev_id(struct pci_dev *pdev);
|
||||
static int wait_for_cmd_complete(void __iomem *addr, u64 busy_bit,
|
||||
int bit_state);
|
||||
static int s2io_add_isr(struct s2io_nic * sp);
|
||||
|
|
|
|||
|
|
@ -740,7 +740,7 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
|
|||
pci_set_master(pdev);
|
||||
|
||||
/* enable MWI -- it vastly improves Rx performance on sparc64 */
|
||||
pci_set_mwi(pdev);
|
||||
pci_try_set_mwi(pdev);
|
||||
|
||||
#ifdef ZEROCOPY
|
||||
/* Starfire can do TCP/UDP checksumming */
|
||||
|
|
|
|||
|
|
@ -397,7 +397,6 @@ struct netdev_private {
|
|||
unsigned char phys[MII_CNT]; /* MII device addresses, only first one used. */
|
||||
struct pci_dev *pci_dev;
|
||||
void __iomem *base;
|
||||
unsigned char pci_rev_id;
|
||||
};
|
||||
|
||||
/* The station address location in the EEPROM. */
|
||||
|
|
@ -544,8 +543,6 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
|
|||
dev->change_mtu = &change_mtu;
|
||||
pci_set_drvdata(pdev, dev);
|
||||
|
||||
pci_read_config_byte(pdev, PCI_REVISION_ID, &np->pci_rev_id);
|
||||
|
||||
i = register_netdev(dev);
|
||||
if (i)
|
||||
goto err_out_unmap_rx;
|
||||
|
|
@ -828,7 +825,7 @@ static int netdev_open(struct net_device *dev)
|
|||
iowrite8(100, ioaddr + RxDMAPollPeriod);
|
||||
iowrite8(127, ioaddr + TxDMAPollPeriod);
|
||||
/* Fix DFE-580TX packet drop issue */
|
||||
if (np->pci_rev_id >= 0x14)
|
||||
if (np->pci_dev->revision >= 0x14)
|
||||
iowrite8(0x01, ioaddr + DebugCtrl1);
|
||||
netif_start_queue(dev);
|
||||
|
||||
|
|
@ -1194,7 +1191,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)
|
|||
hw_frame_id = ioread8(ioaddr + TxFrameId);
|
||||
}
|
||||
|
||||
if (np->pci_rev_id >= 0x14) {
|
||||
if (np->pci_dev->revision >= 0x14) {
|
||||
spin_lock(&np->lock);
|
||||
for (; np->cur_tx - np->dirty_tx > 0; np->dirty_tx++) {
|
||||
int entry = np->dirty_tx % TX_RING_SIZE;
|
||||
|
|
|
|||
|
|
@ -3095,12 +3095,8 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
|
|||
|
||||
#ifdef CONFIG_SPARC
|
||||
hp->hm_revision = of_getintprop_default(dp, "hm-rev", 0xff);
|
||||
if (hp->hm_revision == 0xff) {
|
||||
unsigned char prev;
|
||||
|
||||
pci_read_config_byte(pdev, PCI_REVISION_ID, &prev);
|
||||
hp->hm_revision = 0xc0 | (prev & 0x0f);
|
||||
}
|
||||
if (hp->hm_revision == 0xff)
|
||||
hp->hm_revision = 0xc0 | (pdev->revision & 0x0f);
|
||||
#else
|
||||
/* works with this on non-sparc hosts */
|
||||
hp->hm_revision = 0x20;
|
||||
|
|
|
|||
|
|
@ -10551,11 +10551,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
|
|||
continue;
|
||||
}
|
||||
if (pci_id->rev != PCI_ANY_ID) {
|
||||
u8 rev;
|
||||
|
||||
pci_read_config_byte(bridge, PCI_REVISION_ID,
|
||||
&rev);
|
||||
if (rev > pci_id->rev)
|
||||
if (bridge->revision > pci_id->rev)
|
||||
continue;
|
||||
}
|
||||
if (bridge->subordinate &&
|
||||
|
|
|
|||
|
|
@ -533,7 +533,6 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
|
|||
|
||||
struct net_device *dev;
|
||||
TLanPrivateInfo *priv;
|
||||
u8 pci_rev;
|
||||
u16 device_id;
|
||||
int reg, rc = -ENODEV;
|
||||
|
||||
|
|
@ -577,8 +576,6 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
|
|||
goto err_out_free_dev;
|
||||
}
|
||||
|
||||
pci_read_config_byte ( pdev, PCI_REVISION_ID, &pci_rev);
|
||||
|
||||
for ( reg= 0; reg <= 5; reg ++ ) {
|
||||
if (pci_resource_flags(pdev, reg) & IORESOURCE_IO) {
|
||||
pci_io_base = pci_resource_start(pdev, reg);
|
||||
|
|
@ -595,7 +592,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
|
|||
|
||||
dev->base_addr = pci_io_base;
|
||||
dev->irq = pdev->irq;
|
||||
priv->adapterRev = pci_rev;
|
||||
priv->adapterRev = pdev->revision;
|
||||
pci_set_master(pdev);
|
||||
pci_set_drvdata(pdev, dev);
|
||||
|
||||
|
|
|
|||
|
|
@ -2134,7 +2134,7 @@ srom_search(struct net_device *dev, struct pci_dev *pdev)
|
|||
u_short vendor, status;
|
||||
u_int irq = 0, device;
|
||||
u_long iobase = 0; /* Clear upper 32 bits in Alphas */
|
||||
int i, j, cfrv;
|
||||
int i, j;
|
||||
struct de4x5_private *lp = netdev_priv(dev);
|
||||
struct list_head *walk;
|
||||
|
||||
|
|
@ -2150,7 +2150,6 @@ srom_search(struct net_device *dev, struct pci_dev *pdev)
|
|||
|
||||
/* Get the chip configuration revision register */
|
||||
pb = this_dev->bus->number;
|
||||
pci_read_config_dword(this_dev, PCI_REVISION_ID, &cfrv);
|
||||
|
||||
/* Set the device number information */
|
||||
lp->device = PCI_SLOT(this_dev->devfn);
|
||||
|
|
@ -2158,7 +2157,8 @@ srom_search(struct net_device *dev, struct pci_dev *pdev)
|
|||
|
||||
/* Set the chipset information */
|
||||
if (is_DC2114x) {
|
||||
device = ((cfrv & CFRV_RN) < DC2114x_BRK ? DC21142 : DC21143);
|
||||
device = ((this_dev->revision & CFRV_RN) < DC2114x_BRK
|
||||
? DC21142 : DC21143);
|
||||
}
|
||||
lp->chipset = device;
|
||||
|
||||
|
|
@ -2254,7 +2254,7 @@ static int __devinit de4x5_pci_probe (struct pci_dev *pdev,
|
|||
}
|
||||
|
||||
/* Get the chip configuration revision register */
|
||||
pci_read_config_dword(pdev, PCI_REVISION_ID, &lp->cfrv);
|
||||
lp->cfrv = pdev->revision;
|
||||
|
||||
/* Set the device number information */
|
||||
lp->device = dev_num;
|
||||
|
|
|
|||
|
|
@ -181,11 +181,12 @@
|
|||
udelay(5);
|
||||
|
||||
#define __CHK_IO_SIZE(pci_id, dev_rev) \
|
||||
(( ((pci_id)==PCI_DM9132_ID) || ((dev_rev) >= 0x02000030) ) ? \
|
||||
(( ((pci_id)==PCI_DM9132_ID) || ((dev_rev) >= 0x30) ) ? \
|
||||
DM9102A_IO_SIZE: DM9102_IO_SIZE)
|
||||
|
||||
#define CHK_IO_SIZE(pci_dev, dev_rev) \
|
||||
(__CHK_IO_SIZE(((pci_dev)->device << 16) | (pci_dev)->vendor, dev_rev))
|
||||
#define CHK_IO_SIZE(pci_dev) \
|
||||
(__CHK_IO_SIZE(((pci_dev)->device << 16) | (pci_dev)->vendor, \
|
||||
(pci_dev)->revision))
|
||||
|
||||
/* Sten Check */
|
||||
#define DEVICE net_device
|
||||
|
|
@ -205,7 +206,7 @@ struct rx_desc {
|
|||
|
||||
struct dmfe_board_info {
|
||||
u32 chip_id; /* Chip vendor/Device ID */
|
||||
u32 chip_revision; /* Chip revision */
|
||||
u8 chip_revision; /* Chip revision */
|
||||
struct DEVICE *next_dev; /* next device */
|
||||
struct pci_dev *pdev; /* PCI device */
|
||||
spinlock_t lock;
|
||||
|
|
@ -359,7 +360,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
|
|||
{
|
||||
struct dmfe_board_info *db; /* board information structure */
|
||||
struct net_device *dev;
|
||||
u32 dev_rev, pci_pmr;
|
||||
u32 pci_pmr;
|
||||
int i, err;
|
||||
|
||||
DMFE_DBUG(0, "dmfe_init_one()", 0);
|
||||
|
|
@ -392,10 +393,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
|
|||
goto err_out_disable;
|
||||
}
|
||||
|
||||
/* Read Chip revision */
|
||||
pci_read_config_dword(pdev, PCI_REVISION_ID, &dev_rev);
|
||||
|
||||
if (pci_resource_len(pdev, 0) < (CHK_IO_SIZE(pdev, dev_rev)) ) {
|
||||
if (pci_resource_len(pdev, 0) < (CHK_IO_SIZE(pdev)) ) {
|
||||
printk(KERN_ERR DRV_NAME ": Allocated I/O size too small\n");
|
||||
err = -ENODEV;
|
||||
goto err_out_disable;
|
||||
|
|
@ -433,7 +431,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
|
|||
|
||||
db->chip_id = ent->driver_data;
|
||||
db->ioaddr = pci_resource_start(pdev, 0);
|
||||
db->chip_revision = dev_rev;
|
||||
db->chip_revision = pdev->revision;
|
||||
db->wol_mode = 0;
|
||||
|
||||
db->pdev = pdev;
|
||||
|
|
@ -455,7 +453,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
|
|||
|
||||
pci_read_config_dword(pdev, 0x50, &pci_pmr);
|
||||
pci_pmr &= 0x70000;
|
||||
if ( (pci_pmr == 0x10000) && (dev_rev == 0x02000031) )
|
||||
if ( (pci_pmr == 0x10000) && (db->chip_revision == 0x31) )
|
||||
db->chip_type = 1; /* DM9102A E3 */
|
||||
else
|
||||
db->chip_type = 0;
|
||||
|
|
@ -553,7 +551,7 @@ static int dmfe_open(struct DEVICE *dev)
|
|||
|
||||
/* CR6 operation mode decision */
|
||||
if ( !chkmode || (db->chip_id == PCI_DM9132_ID) ||
|
||||
(db->chip_revision >= 0x02000030) ) {
|
||||
(db->chip_revision >= 0x30) ) {
|
||||
db->cr6_data |= DMFE_TXTH_256;
|
||||
db->cr0_data = CR0_DEFAULT;
|
||||
db->dm910x_chk_mode=4; /* Enter the normal mode */
|
||||
|
|
@ -1199,9 +1197,9 @@ static void dmfe_timer(unsigned long data)
|
|||
tmp_cr12 = inb(db->ioaddr + DCR12); /* DM9102/DM9102A */
|
||||
|
||||
if ( ((db->chip_id == PCI_DM9102_ID) &&
|
||||
(db->chip_revision == 0x02000030)) ||
|
||||
(db->chip_revision == 0x30)) ||
|
||||
((db->chip_id == PCI_DM9132_ID) &&
|
||||
(db->chip_revision == 0x02000010)) ) {
|
||||
(db->chip_revision == 0x10)) ) {
|
||||
/* DM9102A Chip */
|
||||
if (tmp_cr12 & 2)
|
||||
link_ok = 0;
|
||||
|
|
|
|||
|
|
@ -1155,7 +1155,7 @@ static void __devinit tulip_mwi_config (struct pci_dev *pdev,
|
|||
/* set or disable MWI in the standard PCI command bit.
|
||||
* Check for the case where mwi is desired but not available
|
||||
*/
|
||||
if (csr0 & MWI) pci_set_mwi(pdev);
|
||||
if (csr0 & MWI) pci_try_set_mwi(pdev);
|
||||
else pci_clear_mwi(pdev);
|
||||
|
||||
/* read result from hardware (in case bit refused to enable) */
|
||||
|
|
@ -1238,7 +1238,6 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
|
|||
};
|
||||
static int last_irq;
|
||||
static int multiport_cnt; /* For four-port boards w/one EEPROM */
|
||||
u8 chip_rev;
|
||||
int i, irq;
|
||||
unsigned short sum;
|
||||
unsigned char *ee_data;
|
||||
|
|
@ -1274,10 +1273,8 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
|
|||
|
||||
if (pdev->vendor == 0x1282 && pdev->device == 0x9100)
|
||||
{
|
||||
u32 dev_rev;
|
||||
/* Read Chip revision */
|
||||
pci_read_config_dword(pdev, PCI_REVISION_ID, &dev_rev);
|
||||
if(dev_rev < 0x02000030)
|
||||
if (pdev->revision < 0x02000030)
|
||||
{
|
||||
printk(KERN_ERR PFX "skipping early DM9100 with Crc bug (use dmfe)\n");
|
||||
return -ENODEV;
|
||||
|
|
@ -1360,8 +1357,6 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
|
|||
if (!ioaddr)
|
||||
goto err_out_free_res;
|
||||
|
||||
pci_read_config_byte (pdev, PCI_REVISION_ID, &chip_rev);
|
||||
|
||||
/*
|
||||
* initialize private data structure 'tp'
|
||||
* it is zeroed and aligned in alloc_etherdev
|
||||
|
|
@ -1382,7 +1377,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
|
|||
tp->flags = tulip_tbl[chip_idx].flags;
|
||||
tp->pdev = pdev;
|
||||
tp->base_addr = ioaddr;
|
||||
tp->revision = chip_rev;
|
||||
tp->revision = pdev->revision;
|
||||
tp->csr0 = csr0;
|
||||
spin_lock_init(&tp->lock);
|
||||
spin_lock_init(&tp->mii_lock);
|
||||
|
|
@ -1399,7 +1394,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
|
|||
tulip_mwi_config (pdev, dev);
|
||||
#else
|
||||
/* MWI is broken for DC21143 rev 65... */
|
||||
if (chip_idx == DC21143 && chip_rev == 65)
|
||||
if (chip_idx == DC21143 && pdev->revision == 65)
|
||||
tp->csr0 &= ~MWI;
|
||||
#endif
|
||||
|
||||
|
|
@ -1640,7 +1635,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
|
|||
#else
|
||||
"Port"
|
||||
#endif
|
||||
" %#llx,", dev->name, chip_name, chip_rev,
|
||||
" %#llx,", dev->name, chip_name, pdev->revision,
|
||||
(unsigned long long) pci_resource_start(pdev, TULIP_BAR));
|
||||
pci_set_drvdata(pdev, dev);
|
||||
|
||||
|
|
|
|||
|
|
@ -205,7 +205,6 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
|
|||
{
|
||||
struct net_device *dev = NULL;
|
||||
struct xircom_private *private;
|
||||
unsigned char chip_rev;
|
||||
unsigned long flags;
|
||||
unsigned short tmp16;
|
||||
enter("xircom_probe");
|
||||
|
|
@ -224,8 +223,6 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
|
|||
pci_read_config_word (pdev,PCI_STATUS, &tmp16);
|
||||
pci_write_config_word (pdev, PCI_STATUS,tmp16);
|
||||
|
||||
pci_read_config_byte(pdev, PCI_REVISION_ID, &chip_rev);
|
||||
|
||||
if (!request_region(pci_resource_start(pdev, 0), 128, "xircom_cb")) {
|
||||
printk(KERN_ERR "xircom_probe: failed to allocate io-region\n");
|
||||
return -ENODEV;
|
||||
|
|
@ -286,7 +283,7 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
|
|||
goto reg_fail;
|
||||
}
|
||||
|
||||
printk(KERN_INFO "%s: Xircom cardbus revision %i at irq %i \n", dev->name, chip_rev, pdev->irq);
|
||||
printk(KERN_INFO "%s: Xircom cardbus revision %i at irq %i \n", dev->name, pdev->revision, pdev->irq);
|
||||
/* start the transmitter to get a heartbeat */
|
||||
/* TODO: send 2 dummy packets here */
|
||||
transceiver_voodoo(private);
|
||||
|
|
|
|||
|
|
@ -524,7 +524,6 @@ static int __devinit xircom_init_one(struct pci_dev *pdev, const struct pci_devi
|
|||
int chip_idx = id->driver_data;
|
||||
long ioaddr;
|
||||
int i;
|
||||
u8 chip_rev;
|
||||
|
||||
/* when built into the kernel, we only print version if device is found */
|
||||
#ifndef MODULE
|
||||
|
|
@ -620,9 +619,8 @@ static int __devinit xircom_init_one(struct pci_dev *pdev, const struct pci_devi
|
|||
if (register_netdev(dev))
|
||||
goto err_out_cleardev;
|
||||
|
||||
pci_read_config_byte(pdev, PCI_REVISION_ID, &chip_rev);
|
||||
printk(KERN_INFO "%s: %s rev %d at %#3lx,",
|
||||
dev->name, xircom_tbl[chip_idx].chip_name, chip_rev, ioaddr);
|
||||
dev->name, xircom_tbl[chip_idx].chip_name, pdev->revision, ioaddr);
|
||||
for (i = 0; i < 6; i++)
|
||||
printk("%c%2.2X", i ? ':' : ' ', dev->dev_addr[i]);
|
||||
printk(", IRQ %d.\n", dev->irq);
|
||||
|
|
|
|||
|
|
@ -2267,12 +2267,6 @@ need_resume:
|
|||
typhoon_resume(pdev);
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
static int
|
||||
typhoon_enable_wake(struct pci_dev *pdev, pci_power_t state, int enable)
|
||||
{
|
||||
return pci_enable_wake(pdev, state, enable);
|
||||
}
|
||||
#endif
|
||||
|
||||
static int __devinit
|
||||
|
|
@ -2636,7 +2630,6 @@ static struct pci_driver typhoon_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = typhoon_suspend,
|
||||
.resume = typhoon_resume,
|
||||
.enable_wake = typhoon_enable_wake,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -622,7 +622,6 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
|
|||
struct net_device *dev;
|
||||
struct rhine_private *rp;
|
||||
int i, rc;
|
||||
u8 pci_rev;
|
||||
u32 quirks;
|
||||
long pioaddr;
|
||||
long memaddr;
|
||||
|
|
@ -642,27 +641,25 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
|
|||
printk(version);
|
||||
#endif
|
||||
|
||||
pci_read_config_byte(pdev, PCI_REVISION_ID, &pci_rev);
|
||||
|
||||
io_size = 256;
|
||||
phy_id = 0;
|
||||
quirks = 0;
|
||||
name = "Rhine";
|
||||
if (pci_rev < VTunknown0) {
|
||||
if (pdev->revision < VTunknown0) {
|
||||
quirks = rqRhineI;
|
||||
io_size = 128;
|
||||
}
|
||||
else if (pci_rev >= VT6102) {
|
||||
else if (pdev->revision >= VT6102) {
|
||||
quirks = rqWOL | rqForceReset;
|
||||
if (pci_rev < VT6105) {
|
||||
if (pdev->revision < VT6105) {
|
||||
name = "Rhine II";
|
||||
quirks |= rqStatusWBRace; /* Rhine-II exclusive */
|
||||
}
|
||||
else {
|
||||
phy_id = 1; /* Integrated PHY, phy_id fixed to 1 */
|
||||
if (pci_rev >= VT6105_B0)
|
||||
if (pdev->revision >= VT6105_B0)
|
||||
quirks |= rq6patterns;
|
||||
if (pci_rev < VT6105M)
|
||||
if (pdev->revision < VT6105M)
|
||||
name = "Rhine III";
|
||||
else
|
||||
name = "Rhine III (Management Adapter)";
|
||||
|
|
|
|||
|
|
@ -890,8 +890,7 @@ static void __devinit velocity_init_info(struct pci_dev *pdev,
|
|||
|
||||
static int __devinit velocity_get_pci_info(struct velocity_info *vptr, struct pci_dev *pdev)
|
||||
{
|
||||
if (pci_read_config_byte(pdev, PCI_REVISION_ID, &vptr->rev_id) < 0)
|
||||
return -EIO;
|
||||
vptr->rev_id = pdev->revision;
|
||||
|
||||
pci_set_master(pdev);
|
||||
|
||||
|
|
|
|||
|
|
@ -3439,7 +3439,6 @@ static int __devinit
|
|||
cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
{
|
||||
static int first_time = 1;
|
||||
ucchar cpc_rev_id;
|
||||
int err, eeprom_outdated = 0;
|
||||
ucshort device_id;
|
||||
pc300_t *card;
|
||||
|
|
@ -3480,7 +3479,6 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
card->hw.falcsize = pci_resource_len(pdev, 4);
|
||||
card->hw.plxphys = pci_resource_start(pdev, 5);
|
||||
card->hw.plxsize = pci_resource_len(pdev, 5);
|
||||
pci_read_config_byte(pdev, PCI_REVISION_ID, &cpc_rev_id);
|
||||
|
||||
switch (device_id) {
|
||||
case PCI_DEVICE_ID_PC300_RX_1:
|
||||
|
|
@ -3498,7 +3496,7 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
}
|
||||
#ifdef PC300_DEBUG_PCI
|
||||
printk("cpc (bus=0x0%x,pci_id=0x%x,", pdev->bus->number, pdev->devfn);
|
||||
printk("rev_id=%d) IRQ%d\n", cpc_rev_id, card->hw.irq);
|
||||
printk("rev_id=%d) IRQ%d\n", pdev->revision, card->hw.irq);
|
||||
printk("cpc:found ramaddr=0x%08lx plxaddr=0x%08lx "
|
||||
"ctladdr=0x%08lx falcaddr=0x%08lx\n",
|
||||
card->hw.ramphys, card->hw.plxphys, card->hw.scaphys,
|
||||
|
|
|
|||
|
|
@ -311,7 +311,6 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
|
|||
const struct pci_device_id *ent)
|
||||
{
|
||||
card_t *card;
|
||||
u8 rev_id;
|
||||
u32 __iomem *p;
|
||||
int i;
|
||||
u32 ramsize;
|
||||
|
|
@ -366,7 +365,6 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
pci_read_config_byte(pdev, PCI_REVISION_ID, &rev_id);
|
||||
if (pci_resource_len(pdev, 0) != PC300_PLX_SIZE ||
|
||||
pci_resource_len(pdev, 2) != PC300_SCA_SIZE ||
|
||||
pci_resource_len(pdev, 3) < 16384) {
|
||||
|
|
|
|||
|
|
@ -289,7 +289,6 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
|
|||
const struct pci_device_id *ent)
|
||||
{
|
||||
card_t *card;
|
||||
u8 rev_id;
|
||||
u32 __iomem *p;
|
||||
int i;
|
||||
u32 ramsize;
|
||||
|
|
@ -330,7 +329,6 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
pci_read_config_byte(pdev, PCI_REVISION_ID, &rev_id);
|
||||
if (pci_resource_len(pdev, 0) != PCI200SYN_PLX_SIZE ||
|
||||
pci_resource_len(pdev, 2) != PCI200SYN_SCA_SIZE ||
|
||||
pci_resource_len(pdev, 3) < 16384) {
|
||||
|
|
|
|||
|
|
@ -3741,10 +3741,8 @@ static int bcm43xx_attach_board(struct bcm43xx_private *bcm)
|
|||
&bcm->board_type);
|
||||
if (err)
|
||||
goto err_iounmap;
|
||||
err = bcm43xx_pci_read_config16(bcm, PCI_REVISION_ID,
|
||||
&bcm->board_revision);
|
||||
if (err)
|
||||
goto err_iounmap;
|
||||
|
||||
bcm->board_revision = bcm->pci_dev->revision;
|
||||
|
||||
err = bcm43xx_chipset_attach(bcm);
|
||||
if (err)
|
||||
|
|
|
|||
|
|
@ -453,8 +453,6 @@ static struct pci_driver prism2_pci_drv_id = {
|
|||
.suspend = prism2_pci_suspend,
|
||||
.resume = prism2_pci_resume,
|
||||
#endif /* CONFIG_PM */
|
||||
/* Linux 2.4.6 added save_state and enable_wake that are not used here
|
||||
*/
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -613,9 +613,6 @@ static struct pci_driver prism2_plx_drv_id = {
|
|||
.id_table = prism2_plx_id_table,
|
||||
.probe = prism2_plx_probe,
|
||||
.remove = prism2_plx_remove,
|
||||
.suspend = NULL,
|
||||
.resume = NULL,
|
||||
.enable_wake = NULL
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -87,7 +87,6 @@ static struct pci_driver prism54_driver = {
|
|||
.remove = prism54_remove,
|
||||
.suspend = prism54_suspend,
|
||||
.resume = prism54_resume,
|
||||
/* .enable_wake ; we don't support this yet */
|
||||
};
|
||||
|
||||
/******************************************************************************
|
||||
|
|
@ -167,8 +166,7 @@ prism54_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||
pci_set_master(pdev);
|
||||
|
||||
/* enable MWI */
|
||||
if (!pci_set_mwi(pdev))
|
||||
printk(KERN_INFO "%s: pci_set_mwi(pdev) succeeded\n", DRV_NAME);
|
||||
pci_try_set_mwi(pdev);
|
||||
|
||||
/* setup the network device interface and its structure */
|
||||
if (!(ndev = islpci_setup(pdev))) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue