mirror of
https://github.com/torvalds/linux.git
synced 2024-11-01 09:41:44 +00:00
d3ec4844d4
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
fs: Merge split strings
treewide: fix potentially dangerous trailing ';' in #defined values/expressions
uwb: Fix misspelling of neighbourhood in comment
net, netfilter: Remove redundant goto in ebt_ulog_packet
trivial: don't touch files that are removed in the staging tree
lib/vsprintf: replace link to Draft by final RFC number
doc: Kconfig: `to be' -> `be'
doc: Kconfig: Typo: square -> squared
doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
drivers/net: static should be at beginning of declaration
drivers/media: static should be at beginning of declaration
drivers/i2c: static should be at beginning of declaration
XTENSA: static should be at beginning of declaration
SH: static should be at beginning of declaration
MIPS: static should be at beginning of declaration
ARM: static should be at beginning of declaration
rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
Update my e-mail address
PCIe ASPM: forcedly -> forcibly
gma500: push through device driver tree
...
Fix up trivial conflicts:
- arch/arm/mach-ep93xx/dma-m2p.c (deleted)
- drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
- drivers/net/r8169.c (just context changes)
123 lines
2.7 KiB
C
123 lines
2.7 KiB
C
/*
|
|
* Sonics Silicon Backplane
|
|
* PCI Hostdevice wrapper
|
|
*
|
|
* Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>
|
|
* Copyright (c) 2005 Stefano Brivio <st3@riseup.net>
|
|
* Copyright (c) 2005 Danny van Dyk <kugelfang@gentoo.org>
|
|
* Copyright (c) 2005 Andreas Jaggi <andreas.jaggi@waterwave.ch>
|
|
* Copyright (c) 2005-2007 Michael Buesch <m@bues.ch>
|
|
*
|
|
* Licensed under the GNU/GPL. See COPYING for details.
|
|
*/
|
|
|
|
#include <linux/pci.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/ssb/ssb.h>
|
|
|
|
|
|
#ifdef CONFIG_PM
|
|
static int ssb_pcihost_suspend(struct pci_dev *dev, pm_message_t state)
|
|
{
|
|
struct ssb_bus *ssb = pci_get_drvdata(dev);
|
|
int err;
|
|
|
|
err = ssb_bus_suspend(ssb);
|
|
if (err)
|
|
return err;
|
|
pci_save_state(dev);
|
|
pci_disable_device(dev);
|
|
pci_set_power_state(dev, pci_choose_state(dev, state));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ssb_pcihost_resume(struct pci_dev *dev)
|
|
{
|
|
struct ssb_bus *ssb = pci_get_drvdata(dev);
|
|
int err;
|
|
|
|
pci_set_power_state(dev, 0);
|
|
err = pci_enable_device(dev);
|
|
if (err)
|
|
return err;
|
|
pci_restore_state(dev);
|
|
err = ssb_bus_resume(ssb);
|
|
if (err)
|
|
return err;
|
|
|
|
return 0;
|
|
}
|
|
#else /* CONFIG_PM */
|
|
# define ssb_pcihost_suspend NULL
|
|
# define ssb_pcihost_resume NULL
|
|
#endif /* CONFIG_PM */
|
|
|
|
static int __devinit ssb_pcihost_probe(struct pci_dev *dev,
|
|
const struct pci_device_id *id)
|
|
{
|
|
struct ssb_bus *ssb;
|
|
int err = -ENOMEM;
|
|
const char *name;
|
|
u32 val;
|
|
|
|
ssb = kzalloc(sizeof(*ssb), GFP_KERNEL);
|
|
if (!ssb)
|
|
goto out;
|
|
err = pci_enable_device(dev);
|
|
if (err)
|
|
goto err_kfree_ssb;
|
|
name = dev_name(&dev->dev);
|
|
if (dev->driver && dev->driver->name)
|
|
name = dev->driver->name;
|
|
err = pci_request_regions(dev, name);
|
|
if (err)
|
|
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;
|
|
|
|
pci_set_drvdata(dev, ssb);
|
|
|
|
out:
|
|
return err;
|
|
|
|
err_pci_release_regions:
|
|
pci_release_regions(dev);
|
|
err_pci_disable:
|
|
pci_disable_device(dev);
|
|
err_kfree_ssb:
|
|
kfree(ssb);
|
|
return err;
|
|
}
|
|
|
|
static void ssb_pcihost_remove(struct pci_dev *dev)
|
|
{
|
|
struct ssb_bus *ssb = pci_get_drvdata(dev);
|
|
|
|
ssb_bus_unregister(ssb);
|
|
pci_release_regions(dev);
|
|
pci_disable_device(dev);
|
|
kfree(ssb);
|
|
pci_set_drvdata(dev, NULL);
|
|
}
|
|
|
|
int __devinit ssb_pcihost_register(struct pci_driver *driver)
|
|
{
|
|
driver->probe = ssb_pcihost_probe;
|
|
driver->remove = ssb_pcihost_remove;
|
|
driver->suspend = ssb_pcihost_suspend;
|
|
driver->resume = ssb_pcihost_resume;
|
|
|
|
return pci_register_driver(driver);
|
|
}
|
|
EXPORT_SYMBOL(ssb_pcihost_register);
|