2009-01-15 03:17:06 +08:00
|
|
|
/*
|
2009-03-13 11:37:23 +08:00
|
|
|
* Copyright (c) 2008-2009 Atheros Communications Inc.
|
2009-01-15 03:17:06 +08:00
|
|
|
*
|
|
|
|
* Permission to use, copy, modify, and/or distribute this software for any
|
|
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
|
|
* copyright notice and this permission notice appear in all copies.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/nl80211.h>
|
|
|
|
#include <linux/pci.h>
|
2010-11-17 11:25:33 +08:00
|
|
|
#include <linux/ath9k_platform.h>
|
2009-02-09 15:56:54 +08:00
|
|
|
#include "ath9k.h"
|
2009-01-15 03:17:06 +08:00
|
|
|
|
2010-01-07 19:58:11 +08:00
|
|
|
static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
|
2009-01-15 03:17:06 +08:00
|
|
|
{ PCI_VDEVICE(ATHEROS, 0x0023) }, /* PCI */
|
|
|
|
{ PCI_VDEVICE(ATHEROS, 0x0024) }, /* PCI-E */
|
|
|
|
{ PCI_VDEVICE(ATHEROS, 0x0027) }, /* PCI */
|
|
|
|
{ PCI_VDEVICE(ATHEROS, 0x0029) }, /* PCI */
|
|
|
|
{ PCI_VDEVICE(ATHEROS, 0x002A) }, /* PCI-E */
|
|
|
|
{ PCI_VDEVICE(ATHEROS, 0x002B) }, /* PCI-E */
|
2010-02-03 00:58:33 +08:00
|
|
|
{ PCI_VDEVICE(ATHEROS, 0x002C) }, /* PCI-E 802.11n bonded out */
|
2009-07-23 13:29:57 +08:00
|
|
|
{ PCI_VDEVICE(ATHEROS, 0x002D) }, /* PCI */
|
|
|
|
{ PCI_VDEVICE(ATHEROS, 0x002E) }, /* PCI-E */
|
2010-06-12 12:34:02 +08:00
|
|
|
{ PCI_VDEVICE(ATHEROS, 0x0030) }, /* PCI-E AR9300 */
|
2010-12-06 20:28:00 +08:00
|
|
|
{ PCI_VDEVICE(ATHEROS, 0x0032) }, /* PCI-E AR9485 */
|
2009-01-15 03:17:06 +08:00
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
/* return bus cachesize in 4B word units */
|
2009-09-14 15:55:09 +08:00
|
|
|
static void ath_pci_read_cachesize(struct ath_common *common, int *csz)
|
2009-01-15 03:17:06 +08:00
|
|
|
{
|
2009-09-28 14:54:40 +08:00
|
|
|
struct ath_softc *sc = (struct ath_softc *) common->priv;
|
2009-01-15 03:17:06 +08:00
|
|
|
u8 u8tmp;
|
|
|
|
|
2009-09-07 20:16:50 +08:00
|
|
|
pci_read_config_byte(to_pci_dev(sc->dev), PCI_CACHE_LINE_SIZE, &u8tmp);
|
2009-01-15 03:17:06 +08:00
|
|
|
*csz = (int)u8tmp;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This check was put in to avoid "unplesant" consequences if
|
|
|
|
* the bootrom has not fully initialized all PCI devices.
|
|
|
|
* Sometimes the cache line size register is not set
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (*csz == 0)
|
|
|
|
*csz = DEFAULT_CACHELINE >> 2; /* Use the default size */
|
|
|
|
}
|
|
|
|
|
2009-09-14 15:55:09 +08:00
|
|
|
static bool ath_pci_eeprom_read(struct ath_common *common, u32 off, u16 *data)
|
2009-01-15 03:17:08 +08:00
|
|
|
{
|
2010-11-17 11:25:33 +08:00
|
|
|
struct ath_softc *sc = (struct ath_softc *) common->priv;
|
|
|
|
struct ath9k_platform_data *pdata = sc->dev->platform_data;
|
|
|
|
|
|
|
|
if (pdata) {
|
|
|
|
if (off >= (ARRAY_SIZE(pdata->eeprom_data))) {
|
2010-12-03 11:12:36 +08:00
|
|
|
ath_err(common,
|
|
|
|
"%s: eeprom read failed, offset %08x is out of range\n",
|
|
|
|
__func__, off);
|
2010-11-17 11:25:33 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
*data = pdata->eeprom_data[off];
|
|
|
|
} else {
|
|
|
|
struct ath_hw *ah = (struct ath_hw *) common->ah;
|
|
|
|
|
|
|
|
common->ops->read(ah, AR5416_EEPROM_OFFSET +
|
|
|
|
(off << AR5416_EEPROM_S));
|
|
|
|
|
|
|
|
if (!ath9k_hw_wait(ah,
|
|
|
|
AR_EEPROM_STATUS_DATA,
|
|
|
|
AR_EEPROM_STATUS_DATA_BUSY |
|
|
|
|
AR_EEPROM_STATUS_DATA_PROT_ACCESS, 0,
|
|
|
|
AH_WAIT_TIMEOUT)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
*data = MS(common->ops->read(ah, AR_EEPROM_STATUS_DATA),
|
|
|
|
AR_EEPROM_STATUS_DATA_VAL);
|
2009-01-15 03:17:08 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2009-09-11 03:12:23 +08:00
|
|
|
/*
|
|
|
|
* Bluetooth coexistance requires disabling ASPM.
|
|
|
|
*/
|
2009-09-14 15:55:09 +08:00
|
|
|
static void ath_pci_bt_coex_prep(struct ath_common *common)
|
2009-09-11 03:12:23 +08:00
|
|
|
{
|
2009-09-28 14:54:40 +08:00
|
|
|
struct ath_softc *sc = (struct ath_softc *) common->priv;
|
2009-09-11 03:12:23 +08:00
|
|
|
struct pci_dev *pdev = to_pci_dev(sc->dev);
|
|
|
|
u8 aspm;
|
|
|
|
|
|
|
|
if (!pdev->is_pcie)
|
|
|
|
return;
|
|
|
|
|
|
|
|
pci_read_config_byte(pdev, ATH_PCIE_CAP_LINK_CTRL, &aspm);
|
|
|
|
aspm &= ~(ATH_PCIE_CAP_LINK_L0S | ATH_PCIE_CAP_LINK_L1);
|
|
|
|
pci_write_config_byte(pdev, ATH_PCIE_CAP_LINK_CTRL, aspm);
|
|
|
|
}
|
|
|
|
|
2010-12-06 20:27:42 +08:00
|
|
|
static void ath_pci_extn_synch_enable(struct ath_common *common)
|
|
|
|
{
|
|
|
|
struct ath_softc *sc = (struct ath_softc *) common->priv;
|
|
|
|
struct pci_dev *pdev = to_pci_dev(sc->dev);
|
|
|
|
u8 lnkctl;
|
|
|
|
|
|
|
|
pci_read_config_byte(pdev, sc->sc_ah->caps.pcie_lcr_offset, &lnkctl);
|
|
|
|
lnkctl |= PCI_EXP_LNKCTL_ES;
|
|
|
|
pci_write_config_byte(pdev, sc->sc_ah->caps.pcie_lcr_offset, lnkctl);
|
|
|
|
}
|
|
|
|
|
2009-12-23 21:04:43 +08:00
|
|
|
static const struct ath_bus_ops ath_pci_bus_ops = {
|
2010-04-01 12:58:20 +08:00
|
|
|
.ath_bus_type = ATH_PCI,
|
2009-01-15 03:17:06 +08:00
|
|
|
.read_cachesize = ath_pci_read_cachesize,
|
2009-01-15 03:17:08 +08:00
|
|
|
.eeprom_read = ath_pci_eeprom_read,
|
2009-09-11 03:12:23 +08:00
|
|
|
.bt_coex_prep = ath_pci_bt_coex_prep,
|
2010-12-06 20:27:42 +08:00
|
|
|
.extn_synch_en = ath_pci_extn_synch_enable,
|
2009-01-15 03:17:06 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|
|
|
{
|
|
|
|
void __iomem *mem;
|
2009-03-04 01:23:28 +08:00
|
|
|
struct ath_wiphy *aphy;
|
2009-01-15 03:17:06 +08:00
|
|
|
struct ath_softc *sc;
|
|
|
|
struct ieee80211_hw *hw;
|
|
|
|
u8 csz;
|
2009-09-09 17:55:49 +08:00
|
|
|
u16 subsysid;
|
ath9k: Fix PCI FATAL interrupts by restoring RETRY_TIMEOUT disabling
An earlier commit, 'ath9k: remove dummy PCI "retry timeout" fix', removed
code that was documented to disable RETRY_TIMEOUT register (PCI reg
0x41) since it was claimed to be a no-op. However, it turns out that
there are some combinations of hosts and ath9k-supported cards for
which this is not a no-op (reg 0x41 has value 0x80, not 0) and this
code (or something similar) is needed. In such cases, the driver may
be next to unusable due to very frequent PCI FATAL interrupts from the
card.
Reverting the earlier commit, i.e., restoring the RETRY_TIMEOUT
disabling, seems to resolve the issue. Since the removal of this code
was not based on any known issue and was purely a cleanup change, the
safest option here is to just revert that commit. Should there be
desire to clean this up in the future, the change will need to be
tested with a more complete coverage of cards and host systems.
http://bugzilla.kernel.org/show_bug.cgi?id=13483
Cc: stable@kernel.org
Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-06-16 16:59:23 +08:00
|
|
|
u32 val;
|
2009-01-15 03:17:06 +08:00
|
|
|
int ret = 0;
|
2009-10-28 00:59:34 +08:00
|
|
|
char hw_name[64];
|
2009-01-15 03:17:06 +08:00
|
|
|
|
|
|
|
if (pci_enable_device(pdev))
|
|
|
|
return -EIO;
|
|
|
|
|
2009-04-14 05:40:14 +08:00
|
|
|
ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
|
2009-01-15 03:17:06 +08:00
|
|
|
if (ret) {
|
|
|
|
printk(KERN_ERR "ath9k: 32-bit DMA not available\n");
|
2010-01-08 13:06:07 +08:00
|
|
|
goto err_dma;
|
2009-01-15 03:17:06 +08:00
|
|
|
}
|
|
|
|
|
2009-04-14 05:40:14 +08:00
|
|
|
ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
|
2009-01-15 03:17:06 +08:00
|
|
|
if (ret) {
|
|
|
|
printk(KERN_ERR "ath9k: 32-bit DMA consistent "
|
|
|
|
"DMA enable failed\n");
|
2010-01-08 13:06:07 +08:00
|
|
|
goto err_dma;
|
2009-01-15 03:17:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Cache line size is used to size and align various
|
|
|
|
* structures used to communicate with the hardware.
|
|
|
|
*/
|
|
|
|
pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &csz);
|
|
|
|
if (csz == 0) {
|
|
|
|
/*
|
|
|
|
* Linux 2.4.18 (at least) writes the cache line size
|
|
|
|
* register as a 16-bit wide register which is wrong.
|
|
|
|
* We must have this setup properly for rx buffer
|
|
|
|
* DMA to work so force a reasonable value here if it
|
|
|
|
* comes up zero.
|
|
|
|
*/
|
|
|
|
csz = L1_CACHE_BYTES / sizeof(u32);
|
|
|
|
pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, csz);
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* The default setting of latency timer yields poor results,
|
|
|
|
* set it to the value used by other systems. It may be worth
|
|
|
|
* tweaking this setting more.
|
|
|
|
*/
|
|
|
|
pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0xa8);
|
|
|
|
|
|
|
|
pci_set_master(pdev);
|
|
|
|
|
ath9k: Fix PCI FATAL interrupts by restoring RETRY_TIMEOUT disabling
An earlier commit, 'ath9k: remove dummy PCI "retry timeout" fix', removed
code that was documented to disable RETRY_TIMEOUT register (PCI reg
0x41) since it was claimed to be a no-op. However, it turns out that
there are some combinations of hosts and ath9k-supported cards for
which this is not a no-op (reg 0x41 has value 0x80, not 0) and this
code (or something similar) is needed. In such cases, the driver may
be next to unusable due to very frequent PCI FATAL interrupts from the
card.
Reverting the earlier commit, i.e., restoring the RETRY_TIMEOUT
disabling, seems to resolve the issue. Since the removal of this code
was not based on any known issue and was purely a cleanup change, the
safest option here is to just revert that commit. Should there be
desire to clean this up in the future, the change will need to be
tested with a more complete coverage of cards and host systems.
http://bugzilla.kernel.org/show_bug.cgi?id=13483
Cc: stable@kernel.org
Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-06-16 16:59:23 +08:00
|
|
|
/*
|
|
|
|
* Disable the RETRY_TIMEOUT register (0x41) to keep
|
|
|
|
* PCI Tx retries from interfering with C3 CPU state.
|
|
|
|
*/
|
|
|
|
pci_read_config_dword(pdev, 0x40, &val);
|
|
|
|
if ((val & 0x0000ff00) != 0)
|
|
|
|
pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
|
|
|
|
|
2009-01-15 03:17:06 +08:00
|
|
|
ret = pci_request_region(pdev, 0, "ath9k");
|
|
|
|
if (ret) {
|
|
|
|
dev_err(&pdev->dev, "PCI memory region reserve error\n");
|
|
|
|
ret = -ENODEV;
|
2010-01-08 13:06:07 +08:00
|
|
|
goto err_region;
|
2009-01-15 03:17:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
mem = pci_iomap(pdev, 0, 0);
|
|
|
|
if (!mem) {
|
|
|
|
printk(KERN_ERR "PCI memory map error\n") ;
|
|
|
|
ret = -EIO;
|
2010-01-08 13:06:07 +08:00
|
|
|
goto err_iomap;
|
2009-01-15 03:17:06 +08:00
|
|
|
}
|
|
|
|
|
2009-03-04 01:23:28 +08:00
|
|
|
hw = ieee80211_alloc_hw(sizeof(struct ath_wiphy) +
|
|
|
|
sizeof(struct ath_softc), &ath9k_ops);
|
2009-09-03 07:34:57 +08:00
|
|
|
if (!hw) {
|
2010-01-08 13:06:07 +08:00
|
|
|
dev_err(&pdev->dev, "No memory for ieee80211_hw\n");
|
2009-09-03 07:34:57 +08:00
|
|
|
ret = -ENOMEM;
|
2010-01-08 13:06:07 +08:00
|
|
|
goto err_alloc_hw;
|
2009-01-15 03:17:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
SET_IEEE80211_DEV(hw, &pdev->dev);
|
|
|
|
pci_set_drvdata(pdev, hw);
|
|
|
|
|
2009-03-04 01:23:28 +08:00
|
|
|
aphy = hw->priv;
|
|
|
|
sc = (struct ath_softc *) (aphy + 1);
|
|
|
|
aphy->sc = sc;
|
|
|
|
aphy->hw = hw;
|
|
|
|
sc->pri_wiphy = aphy;
|
2009-01-15 03:17:06 +08:00
|
|
|
sc->hw = hw;
|
|
|
|
sc->dev = &pdev->dev;
|
|
|
|
sc->mem = mem;
|
|
|
|
|
2010-01-14 12:50:57 +08:00
|
|
|
/* Will be cleared in ath9k_start() */
|
|
|
|
sc->sc_flags |= SC_OP_INVALID;
|
2009-01-15 03:17:06 +08:00
|
|
|
|
2009-09-03 08:06:21 +08:00
|
|
|
ret = request_irq(pdev->irq, ath_isr, IRQF_SHARED, "ath9k", sc);
|
2009-09-03 08:02:18 +08:00
|
|
|
if (ret) {
|
|
|
|
dev_err(&pdev->dev, "request_irq failed\n");
|
2010-01-08 13:06:07 +08:00
|
|
|
goto err_irq;
|
2009-01-15 03:17:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
sc->irq = pdev->irq;
|
|
|
|
|
2010-01-08 13:06:07 +08:00
|
|
|
pci_read_config_word(pdev, PCI_SUBSYSTEM_ID, &subsysid);
|
|
|
|
ret = ath9k_init_device(id->device, sc, subsysid, &ath_pci_bus_ops);
|
|
|
|
if (ret) {
|
|
|
|
dev_err(&pdev->dev, "Failed to initialize device\n");
|
|
|
|
goto err_init;
|
|
|
|
}
|
|
|
|
|
|
|
|
ath9k_hw_name(sc->sc_ah, hw_name, sizeof(hw_name));
|
2010-07-27 05:39:58 +08:00
|
|
|
wiphy_info(hw->wiphy, "%s mem=0x%lx, irq=%d\n",
|
|
|
|
hw_name, (unsigned long)mem, pdev->irq);
|
2009-01-15 03:17:06 +08:00
|
|
|
|
|
|
|
return 0;
|
2010-01-08 13:06:07 +08:00
|
|
|
|
|
|
|
err_init:
|
|
|
|
free_irq(sc->irq, sc);
|
|
|
|
err_irq:
|
2009-01-15 03:17:06 +08:00
|
|
|
ieee80211_free_hw(hw);
|
2010-01-08 13:06:07 +08:00
|
|
|
err_alloc_hw:
|
2009-01-15 03:17:06 +08:00
|
|
|
pci_iounmap(pdev, mem);
|
2010-01-08 13:06:07 +08:00
|
|
|
err_iomap:
|
2009-01-15 03:17:06 +08:00
|
|
|
pci_release_region(pdev, 0);
|
2010-01-08 13:06:07 +08:00
|
|
|
err_region:
|
|
|
|
/* Nothing */
|
|
|
|
err_dma:
|
2009-01-15 03:17:06 +08:00
|
|
|
pci_disable_device(pdev);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ath_pci_remove(struct pci_dev *pdev)
|
|
|
|
{
|
|
|
|
struct ieee80211_hw *hw = pci_get_drvdata(pdev);
|
2009-03-04 01:23:28 +08:00
|
|
|
struct ath_wiphy *aphy = hw->priv;
|
|
|
|
struct ath_softc *sc = aphy->sc;
|
2010-01-31 10:37:24 +08:00
|
|
|
void __iomem *mem = sc->mem;
|
2009-01-15 03:17:06 +08:00
|
|
|
|
2010-01-08 13:06:07 +08:00
|
|
|
ath9k_deinit_device(sc);
|
|
|
|
free_irq(sc->irq, sc);
|
|
|
|
ieee80211_free_hw(sc->hw);
|
2010-01-31 10:37:24 +08:00
|
|
|
|
|
|
|
pci_iounmap(pdev, mem);
|
|
|
|
pci_disable_device(pdev);
|
|
|
|
pci_release_region(pdev, 0);
|
2009-01-15 03:17:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_PM
|
|
|
|
|
2010-10-16 06:36:17 +08:00
|
|
|
static int ath_pci_suspend(struct device *device)
|
2009-01-15 03:17:06 +08:00
|
|
|
{
|
2010-10-16 06:36:17 +08:00
|
|
|
struct pci_dev *pdev = to_pci_dev(device);
|
2009-01-15 03:17:06 +08:00
|
|
|
struct ieee80211_hw *hw = pci_get_drvdata(pdev);
|
2009-03-04 01:23:28 +08:00
|
|
|
struct ath_wiphy *aphy = hw->priv;
|
|
|
|
struct ath_softc *sc = aphy->sc;
|
2009-01-15 03:17:06 +08:00
|
|
|
|
2009-08-14 14:00:52 +08:00
|
|
|
ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, 1);
|
2009-01-15 03:17:06 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-10-16 06:36:17 +08:00
|
|
|
static int ath_pci_resume(struct device *device)
|
2009-01-15 03:17:06 +08:00
|
|
|
{
|
2010-10-16 06:36:17 +08:00
|
|
|
struct pci_dev *pdev = to_pci_dev(device);
|
2009-01-15 03:17:06 +08:00
|
|
|
struct ieee80211_hw *hw = pci_get_drvdata(pdev);
|
2009-03-04 01:23:28 +08:00
|
|
|
struct ath_wiphy *aphy = hw->priv;
|
|
|
|
struct ath_softc *sc = aphy->sc;
|
ath9k: Fix PCI FATAL interrupts by restoring RETRY_TIMEOUT disabling
An earlier commit, 'ath9k: remove dummy PCI "retry timeout" fix', removed
code that was documented to disable RETRY_TIMEOUT register (PCI reg
0x41) since it was claimed to be a no-op. However, it turns out that
there are some combinations of hosts and ath9k-supported cards for
which this is not a no-op (reg 0x41 has value 0x80, not 0) and this
code (or something similar) is needed. In such cases, the driver may
be next to unusable due to very frequent PCI FATAL interrupts from the
card.
Reverting the earlier commit, i.e., restoring the RETRY_TIMEOUT
disabling, seems to resolve the issue. Since the removal of this code
was not based on any known issue and was purely a cleanup change, the
safest option here is to just revert that commit. Should there be
desire to clean this up in the future, the change will need to be
tested with a more complete coverage of cards and host systems.
http://bugzilla.kernel.org/show_bug.cgi?id=13483
Cc: stable@kernel.org
Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-06-16 16:59:23 +08:00
|
|
|
u32 val;
|
2009-08-13 12:04:35 +08:00
|
|
|
|
ath9k: Fix PCI FATAL interrupts by restoring RETRY_TIMEOUT disabling
An earlier commit, 'ath9k: remove dummy PCI "retry timeout" fix', removed
code that was documented to disable RETRY_TIMEOUT register (PCI reg
0x41) since it was claimed to be a no-op. However, it turns out that
there are some combinations of hosts and ath9k-supported cards for
which this is not a no-op (reg 0x41 has value 0x80, not 0) and this
code (or something similar) is needed. In such cases, the driver may
be next to unusable due to very frequent PCI FATAL interrupts from the
card.
Reverting the earlier commit, i.e., restoring the RETRY_TIMEOUT
disabling, seems to resolve the issue. Since the removal of this code
was not based on any known issue and was purely a cleanup change, the
safest option here is to just revert that commit. Should there be
desire to clean this up in the future, the change will need to be
tested with a more complete coverage of cards and host systems.
http://bugzilla.kernel.org/show_bug.cgi?id=13483
Cc: stable@kernel.org
Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-06-16 16:59:23 +08:00
|
|
|
/*
|
|
|
|
* Suspend/Resume resets the PCI configuration space, so we have to
|
|
|
|
* re-disable the RETRY_TIMEOUT register (0x41) to keep
|
|
|
|
* PCI Tx retries from interfering with C3 CPU state
|
|
|
|
*/
|
|
|
|
pci_read_config_dword(pdev, 0x40, &val);
|
|
|
|
if ((val & 0x0000ff00) != 0)
|
|
|
|
pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
|
2009-01-15 03:17:06 +08:00
|
|
|
|
|
|
|
/* Enable LED */
|
2009-08-14 14:00:52 +08:00
|
|
|
ath9k_hw_cfg_output(sc->sc_ah, sc->sc_ah->led_pin,
|
2009-01-15 03:17:06 +08:00
|
|
|
AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
|
2009-08-14 14:00:52 +08:00
|
|
|
ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, 1);
|
2009-01-15 03:17:06 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-10-16 06:36:17 +08:00
|
|
|
static const struct dev_pm_ops ath9k_pm_ops = {
|
|
|
|
.suspend = ath_pci_suspend,
|
|
|
|
.resume = ath_pci_resume,
|
|
|
|
.freeze = ath_pci_suspend,
|
|
|
|
.thaw = ath_pci_resume,
|
|
|
|
.poweroff = ath_pci_suspend,
|
|
|
|
.restore = ath_pci_resume,
|
|
|
|
};
|
|
|
|
|
|
|
|
#define ATH9K_PM_OPS (&ath9k_pm_ops)
|
|
|
|
|
|
|
|
#else /* !CONFIG_PM */
|
|
|
|
|
|
|
|
#define ATH9K_PM_OPS NULL
|
|
|
|
|
|
|
|
#endif /* !CONFIG_PM */
|
|
|
|
|
2009-01-15 03:17:06 +08:00
|
|
|
|
|
|
|
MODULE_DEVICE_TABLE(pci, ath_pci_id_table);
|
|
|
|
|
|
|
|
static struct pci_driver ath_pci_driver = {
|
|
|
|
.name = "ath9k",
|
|
|
|
.id_table = ath_pci_id_table,
|
|
|
|
.probe = ath_pci_probe,
|
|
|
|
.remove = ath_pci_remove,
|
2010-10-16 06:36:17 +08:00
|
|
|
.driver.pm = ATH9K_PM_OPS,
|
2009-01-15 03:17:06 +08:00
|
|
|
};
|
|
|
|
|
2009-02-20 17:43:26 +08:00
|
|
|
int ath_pci_init(void)
|
2009-01-15 03:17:06 +08:00
|
|
|
{
|
|
|
|
return pci_register_driver(&ath_pci_driver);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ath_pci_exit(void)
|
|
|
|
{
|
|
|
|
pci_unregister_driver(&ath_pci_driver);
|
|
|
|
}
|