USB host: Move AMD PLL quirk to pci-quirks.c

This patch moves the AMD PLL quirk code in OHCI/EHCI driver to pci-quirks.c,
and exports the functions to be used by xHCI driver later.

AMD PLL quirk disable the optional PM feature inside specific
SB700/SB800/Hudson-2/3 platforms under the following conditions:

1. If an isochronous device is connected to OHCI/EHCI/xHCI port and is active;
2. Optional PM feature that powers down the internal Bus PLL when the link is
   in low power state is enabled.

Without AMD PLL quirk, USB isochronous stream may stutter or have breaks
occasionally, which greatly impair the performance of audio/video streams.

Currently AMD PLL quirk is implemented in OHCI and EHCI driver, and will be
added to xHCI driver too. They are doing similar things actually, so move
the quirk code to pci-quirks.c, which has several advantages:

1. Remove duplicate defines and functions in OHCI/EHCI (and xHCI) driver and
   make them cleaner;
2. AMD chipset information will be probed only once and then stored.
   Currently they're probed during every OHCI/EHCI initialization, move
   the detect code to pci-quirks.c saves the repeat detect cost;
3. Build up synchronization among OHCI/EHCI/xHCI driver. In current
   code, every host controller enable/disable PLL only according to
   its own status, and may enable PLL while there is still isoc transfer on
   other HCs. Move the quirk to pci-quirks.c prevents this issue.

Signed-off-by: Andiry Xu <andiry.xu@amd.com>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Alex He <alex.he@amd.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 8 insertions, 65 deletions

diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index aa46f57f9ec8..b3bd1c6dc61f 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -1590,63 +1590,6 @@ itd_link (struct ehci_hcd *ehci, unsigned frame, struct ehci_itd *itd)
         *hw_p = cpu_to_hc32(ehci, itd->itd_dma | Q_TYPE_ITD);
 }
 
-#define AB_REG_BAR_LOW 0xe0
-#define AB_REG_BAR_HIGH 0xe1
-#define AB_INDX(addr) ((addr) + 0x00)
-#define AB_DATA(addr) ((addr) + 0x04)
-#define NB_PCIE_INDX_ADDR 0xe0
-#define NB_PCIE_INDX_DATA 0xe4
-#define NB_PIF0_PWRDOWN_0 0x01100012
-#define NB_PIF0_PWRDOWN_1 0x01100013
-
-static void ehci_quirk_amd_L1(struct ehci_hcd *ehci, int disable)
-{
-        u32 addr, addr_low, addr_high, val;
-
-        outb_p(AB_REG_BAR_LOW, 0xcd6);
-        addr_low = inb_p(0xcd7);
-        outb_p(AB_REG_BAR_HIGH, 0xcd6);
-        addr_high = inb_p(0xcd7);
-        addr = addr_high << 8 | addr_low;
-        outl_p(0x30, AB_INDX(addr));
-        outl_p(0x40, AB_DATA(addr));
-        outl_p(0x34, AB_INDX(addr));
-        val = inl_p(AB_DATA(addr));
-
-        if (disable) {
-                val &= ~0x8;
-                val |= (1 << 4) | (1 << 9);
-        } else {
-                val |= 0x8;
-                val &= ~((1 << 4) | (1 << 9));
-        }
-        outl_p(val, AB_DATA(addr));
-
-        if (amd_nb_dev) {
-                addr = NB_PIF0_PWRDOWN_0;
-                pci_write_config_dword(amd_nb_dev, NB_PCIE_INDX_ADDR, addr);
-                pci_read_config_dword(amd_nb_dev, NB_PCIE_INDX_DATA, &val);
-                if (disable)
-                        val &= ~(0x3f << 7);
-                else
-                        val |= 0x3f << 7;
-
-                pci_write_config_dword(amd_nb_dev, NB_PCIE_INDX_DATA, val);
-
-                addr = NB_PIF0_PWRDOWN_1;
-                pci_write_config_dword(amd_nb_dev, NB_PCIE_INDX_ADDR, addr);
-                pci_read_config_dword(amd_nb_dev, NB_PCIE_INDX_DATA, &val);
-                if (disable)
-                        val &= ~(0x3f << 7);
-                else
-                        val |= 0x3f << 7;
-
-                pci_write_config_dword(amd_nb_dev, NB_PCIE_INDX_DATA, val);
-        }
-
-        return;
-}
-
 /* fit urb's itds into the selected schedule slot; activate as needed */
 static int
 itd_link_urb (
@@ -1675,8 +1618,8 @@ itd_link_urb (
         }
 
         if (ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs == 0) {
-                if (ehci->amd_l1_fix == 1)
-                        ehci_quirk_amd_L1(ehci, 1);
+                if (ehci->amd_pll_fix == 1)
+                        usb_amd_quirk_pll_disable();
         }
 
         ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs++;
@@ -1804,8 +1747,8 @@ itd_complete (
         ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--;
 
         if (ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs == 0) {
-                if (ehci->amd_l1_fix == 1)
-                        ehci_quirk_amd_L1(ehci, 0);
+                if (ehci->amd_pll_fix == 1)
+                        usb_amd_quirk_pll_enable();
         }
 
         if (unlikely(list_is_singular(&stream->td_list))) {
@@ -2095,8 +2038,8 @@ sitd_link_urb (
         }
 
         if (ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs == 0) {
-                if (ehci->amd_l1_fix == 1)
-                        ehci_quirk_amd_L1(ehci, 1);
+                if (ehci->amd_pll_fix == 1)
+                        usb_amd_quirk_pll_disable();
         }
 
         ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs++;
@@ -2200,8 +2143,8 @@ sitd_complete (
         ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--;
 
         if (ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs == 0) {
-                if (ehci->amd_l1_fix == 1)
-                        ehci_quirk_amd_L1(ehci, 0);
+                if (ehci->amd_pll_fix == 1)
+                        usb_amd_quirk_pll_enable();
         }
 
         if (list_is_singular(&stream->td_list)) {