aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000/e1000_main.c
diff options
context:
space:
mode:
authorPeter Oruba <peter.oruba@amd.com>2007-09-29 01:42:06 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:53:50 -0400
commit007755eb86c3953bb8615bd016246fc99056580c (patch)
treee981b57164e776ef9dcad02f6c519ff7d8e70372 /drivers/net/e1000/e1000_main.c
parent7c32f470f4f6a0fdc6944cefcd22f288e59a0ae2 (diff)
PCI-X/PCI-Express read control interfaces: use them in e1000
These driver changes incorporate the proposed PCI-X / PCI-Express read byte count interface. Reading and setting those valuse doesn't take place "manually", instead wrapping functions are called to allow quirks for some PCI bridges. Signed-off by: Peter Oruba <peter.oruba@amd.com> Based on work by Stephen Hemminger <shemminger@linux-foundation.org> Acked-by: Auke Kok <auke-jan.h.kok@intel.com> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
-rw-r--r--drivers/net/e1000/e1000_main.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index ad444c9a5d04..10505de00bcc 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -4903,6 +4903,20 @@ e1000_write_pci_cfg(struct e1000_hw *hw, uint32_t reg, uint16_t *value)
4903 pci_write_config_word(adapter->pdev, reg, *value); 4903 pci_write_config_word(adapter->pdev, reg, *value);
4904} 4904}
4905 4905
4906int
4907e1000_pcix_get_mmrbc(struct e1000_hw *hw)
4908{
4909 struct e1000_adapter *adapter = hw->back;
4910 return pcix_get_mmrbc(adapter->pdev);
4911}
4912
4913void
4914e1000_pcix_set_mmrbc(struct e1000_hw *hw, int mmrbc)
4915{
4916 struct e1000_adapter *adapter = hw->back;
4917 pcix_set_mmrbc(adapter->pdev, mmrbc);
4918}
4919
4906int32_t 4920int32_t
4907e1000_read_pcie_cap_reg(struct e1000_hw *hw, uint32_t reg, uint16_t *value) 4921e1000_read_pcie_cap_reg(struct e1000_hw *hw, uint32_t reg, uint16_t *value)
4908{ 4922{