summaryrefslogtreecommitdiffstats
path: root/sys/dev/vr
diff options
context:
space:
mode:
authorwpaul <wpaul@FreeBSD.org>2001-02-21 20:54:22 +0000
committerwpaul <wpaul@FreeBSD.org>2001-02-21 20:54:22 +0000
commitd314c28e74fad228397fe7016c254f0b7863f0d5 (patch)
treef0ddb6671f9dc8b3b92c6340ff6494e08c374f82 /sys/dev/vr
parente9eddbfc4a0506b08f0f036101a6f3d1b152c265 (diff)
downloadFreeBSD-src-d314c28e74fad228397fe7016c254f0b7863f0d5.zip
FreeBSD-src-d314c28e74fad228397fe7016c254f0b7863f0d5.tar.gz
Big round of minor updates:
- Use pci_get_powerstate()/pci_set_powerstate() in all the other drivers that need them so we don't have to fiddle with the PCI power management registers directly. - Use pci_enable_busmaster()/pci_enable_io() to turn on busmastering and PIO/memory mapped accesses. - Add support to the RealTek driver for the D-Link DFE-530TX+ which has a RealTek 8139 with its own PCI ID. (Submitted by Jason Wright) - Have the SiS 900/National DP83815 driver be sure to disable PME mode in sis_reset(). This apparently fixes a problem on some motherboards where the DP83815 chip fails to receive packets. (Submitted by Chuck McCrobie <mccrobie@cablespeed.com>)
Diffstat (limited to 'sys/dev/vr')
-rw-r--r--sys/dev/vr/if_vr.c40
1 files changed, 17 insertions, 23 deletions
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 0f44a1d..9c6591b 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -648,38 +648,32 @@ static int vr_attach(dev)
/*
* Handle power management nonsense.
*/
+ if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) {
+ u_int32_t iobase, membase, irq;
- command = pci_read_config(dev, VR_PCI_CAPID, 4) & 0x000000FF;
- if (command == 0x01) {
+ /* Save important PCI config data. */
+ iobase = pci_read_config(dev, VR_PCI_LOIO, 4);
+ membase = pci_read_config(dev, VR_PCI_LOMEM, 4);
+ irq = pci_read_config(dev, VR_PCI_INTLINE, 4);
- command = pci_read_config(dev, VR_PCI_PWRMGMTCTRL, 4);
- if (command & VR_PSTATE_MASK) {
- u_int32_t iobase, membase, irq;
-
- /* Save important PCI config data. */
- iobase = pci_read_config(dev, VR_PCI_LOIO, 4);
- membase = pci_read_config(dev, VR_PCI_LOMEM, 4);
- irq = pci_read_config(dev, VR_PCI_INTLINE, 4);
-
- /* Reset the power state. */
- printf("vr%d: chip is in D%d power mode "
- "-- setting to D0\n", unit, command & VR_PSTATE_MASK);
- command &= 0xFFFFFFFC;
- pci_write_config(dev, VR_PCI_PWRMGMTCTRL, command, 4);
+ /* Reset the power state. */
+ printf("vr%d: chip is in D%d power mode "
+ "-- setting to D0\n", unit,
+ pci_get_powerstate(dev));
+ pci_set_powerstate(dev, PCI_POWERSTATE_D0);
/* Restore PCI config data. */
- pci_write_config(dev, VR_PCI_LOIO, iobase, 4);
- pci_write_config(dev, VR_PCI_LOMEM, membase, 4);
- pci_write_config(dev, VR_PCI_INTLINE, irq, 4);
- }
+ pci_write_config(dev, VR_PCI_LOIO, iobase, 4);
+ pci_write_config(dev, VR_PCI_LOMEM, membase, 4);
+ pci_write_config(dev, VR_PCI_INTLINE, irq, 4);
}
/*
* Map control/status registers.
*/
- command = pci_read_config(dev, PCIR_COMMAND, 4);
- command |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN);
- pci_write_config(dev, PCIR_COMMAND, command, 4);
+ pci_enable_busmaster(dev);
+ pci_enable_io(dev, PCIM_CMD_PORTEN);
+ pci_enable_io(dev, PCIM_CMD_MEMEN);
command = pci_read_config(dev, PCIR_COMMAND, 4);
#ifdef VR_USEIOSPACE
OpenPOWER on IntegriCloud