diff options
author | Stephen Hemminger <shemminger@osdl.org> | 2006-01-30 14:37:55 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 02:00:35 -0500 |
commit | 2d42d21f11c20b94ea0222637e20e2630845afe4 (patch) | |
tree | ed740ea45977801bb9017291449a8c8fa57bb4fe /drivers/net/sky2.h | |
parent | 08c06d8a9063c81f6a21c9f275aa1ee49d4bf380 (diff) |
[PATCH] sky2: pci config space checking
There were bugs in mmconfig access to PCI space, up to and
include 2.6.16-rc1. These prevented the sky2 driver from being
able to clear PCI express errors.
This patch makes the driver check (during probe), for errors
in PCI config access and fail.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/sky2.h')
-rw-r--r-- | drivers/net/sky2.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index 95518921001c..70525ac501de 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h | |||
@@ -1867,14 +1867,6 @@ static inline u8 sky2_read8(const struct sky2_hw *hw, unsigned reg) | |||
1867 | return readb(hw->regs + reg); | 1867 | return readb(hw->regs + reg); |
1868 | } | 1868 | } |
1869 | 1869 | ||
1870 | /* This should probably go away, bus based tweeks suck */ | ||
1871 | static inline int is_pciex(const struct sky2_hw *hw) | ||
1872 | { | ||
1873 | u32 status; | ||
1874 | pci_read_config_dword(hw->pdev, PCI_DEV_STATUS, &status); | ||
1875 | return (status & PCI_OS_PCI_X) == 0; | ||
1876 | } | ||
1877 | |||
1878 | static inline void sky2_write32(const struct sky2_hw *hw, unsigned reg, u32 val) | 1870 | static inline void sky2_write32(const struct sky2_hw *hw, unsigned reg, u32 val) |
1879 | { | 1871 | { |
1880 | writel(val, hw->regs + reg); | 1872 | writel(val, hw->regs + reg); |