Skip to content

Commit

Permalink
ssb: Clear RETRY_TIMEOUT in PCI Configuration for normal devices
Browse files Browse the repository at this point in the history
MMIO log traces obtained using the Broadcom wl hybrid driver show that
the RETRY_TIMEOUT register (0x41) in PCI configuration space is cleared
if non-zero. Similar code found in other drivers such as ipw2100 show
this operation is needed to keep PCI Tx retries from interfering with
C3 CPU state. There are no known cases where omission of this code has
caused a problem, but this patch is offered just in case such a situation
occurs.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Larry Finger authored and John W. Linville committed Nov 15, 2010
1 parent 14fb7c1 commit e081685
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions drivers/ssb/pcihost_wrapper.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ static int ssb_pcihost_probe(struct pci_dev *dev,
struct ssb_bus *ssb;
int err = -ENOMEM;
const char *name;
u32 val;

ssb = kzalloc(sizeof(*ssb), GFP_KERNEL);
if (!ssb)
Expand All @@ -74,6 +75,12 @@ static int ssb_pcihost_probe(struct pci_dev *dev,
goto err_pci_disable;
pci_set_master(dev);

/* Disable the RETRY_TIMEOUT register (0x41) to keep
* PCI Tx retries from interfering with C3 CPU state */
pci_read_config_dword(dev, 0x40, &val);
if ((val & 0x0000ff00) != 0)
pci_write_config_dword(dev, 0x40, val & 0xffff00ff);

err = ssb_bus_pcibus_register(ssb, dev);
if (err)
goto err_pci_release_regions;
Expand Down

0 comments on commit e081685

Please sign in to comment.