FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wcte12xp, wctdm24xxp: Add compile-time option to disable ASPM for PCIe devices.

Browse Source 
Certain BIOSes appear to enable ASPM even though it is not fully supported by
the platform. Also, since the PCIe links for TDM cards are always in use it
does not make sense to allow them to transition to the disabled state.

Just turn off power management on the PCIe links completely. For more
information see http://lwn.net/Articles/449448/.

Internal-Issue-ID: DAHLIN-283
Signed-off-by: Shaun Ruffell <sruffell@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10557 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell 2012-03-21 16:33:57 +00:00
parent da11ba2f0f
commit 2c97dd21bd
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/dahdi/voicebus/voicebus.h
View File

@ -57,6 +57,15 @@
* (and not tasklet). */ * (and not tasklet). */
#define CONFIG_VOICEBUS_INTERRUPT #define CONFIG_VOICEBUS_INTERRUPT
/*
* Enable the following definition in order to disable Active-State Power
* Management on the PCIe bridge for PCIe cards. This has been known to work
* around issues where the BIOS enables it on the cards even though the
* platform does not support it.
*
*/
#undef CONFIG_VOICEBUS_DISABLE_ASPM
/* Define this to use a FIFO for the software echocan reference. /* Define this to use a FIFO for the software echocan reference.
* (experimental) */ * (experimental) */
#undef CONFIG_VOICEBUS_ECREFERENCE #undef CONFIG_VOICEBUS_ECREFERENCE

12
drivers/dahdi/wctdm24xxp/base.c
View File

@ -191,6 +191,11 @@ static const struct wctdm_desc wcaex410 = { "Wildcard AEX410", FLAG_EXPRESS, 4 }
static const struct wctdm_desc wcha80000 = { "HA8-0000", 0, 8 }; static const struct wctdm_desc wcha80000 = { "HA8-0000", 0, 8 };
static const struct wctdm_desc wchb80000 = { "HB8-0000", FLAG_EXPRESS, 8 }; static const struct wctdm_desc wchb80000 = { "HB8-0000", FLAG_EXPRESS, 8 };
static inline bool is_pcie(const struct wctdm *wc)
{
return (wc->desc->flags & FLAG_EXPRESS) > 0;
}
/** /**
* Returns true if the card is one of the Hybrid Digital Analog Cards. * Returns true if the card is one of the Hybrid Digital Analog Cards.
*/ */
@ -5679,6 +5684,13 @@ __wctdm_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
wc->vb.pdev = pdev; wc->vb.pdev = pdev;
wc->vb.debug = &debug; wc->vb.debug = &debug;
#ifdef CONFIG_VOICEBUS_DISABLE_ASPM
if (is_pcie(wc)) {
pci_disable_link_state(pdev->bus->self, PCIE_LINK_STATE_L0S |
PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
};
#endif
if (is_hx8(wc)) { if (is_hx8(wc)) {
wc->vb.ops = &hx8_voicebus_operations; wc->vb.ops = &hx8_voicebus_operations;
ret = voicebus_boot_init(&wc->vb, wc->board_name); ret = voicebus_boot_init(&wc->vb, wc->board_name);

12
drivers/dahdi/wcte12xp/base.c
View File

@ -99,6 +99,11 @@ static const struct t1_desc te120p = {"Wildcard TE120P"};
static const struct t1_desc te122 = {"Wildcard TE122"}; static const struct t1_desc te122 = {"Wildcard TE122"};
static const struct t1_desc te121 = {"Wildcard TE121"}; static const struct t1_desc te121 = {"Wildcard TE121"};
static inline bool is_pcie(const struct t1 *t1)
{
return (0 == strcmp(t1->variety, te121.name));
}
/* names of HWEC modules */ /* names of HWEC modules */
static const char *vpmadt032_name = "VPMADT032"; static const char *vpmadt032_name = "VPMADT032";
static const char *vpmoct_name = "VPMOCT032"; static const char *vpmoct_name = "VPMOCT032";
@ -2743,6 +2748,13 @@ static int __devinit te12xp_init_one(struct pci_dev *pdev, const struct pci_devi
} }
#endif /* CONFIG_VOICEBUS_ECREFERENCE */ #endif /* CONFIG_VOICEBUS_ECREFERENCE */
#ifdef CONFIG_VOICEBUS_DISABLE_ASPM
if (is_pcie(wc)) {
pci_disable_link_state(pdev->bus->self, PCIE_LINK_STATE_L0S |
PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
};
#endif
snprintf(wc->name, sizeof(wc->name)-1, "wcte12xp%d", index); snprintf(wc->name, sizeof(wc->name)-1, "wcte12xp%d", index);
pci_set_drvdata(pdev, wc); pci_set_drvdata(pdev, wc);
wc->vb.ops = &voicebus_operations; wc->vb.ops = &voicebus_operations;