Commit 479b46b5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



This reverts commit b7d5b439.
It conflicts with commit baab93af "USB:
EHCI: ASPM quirk of ISOC on AMD Hudson" and merging the two just doesn't
work properly.

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

drivers/usb/host/ehci-hcd.c

+7 −3
Original line number Diff line number Diff line
@@ -114,11 +114,13 @@ MODULE_PARM_DESC(hird, "host initiated resume duration, +1 for each 75us\n"); 


#define	INTR_MASK (STS_IAA | STS_FATAL | STS_PCD | STS_ERR | STS_INT)



/* for ASPM quirk of ISOC on AMD SB800 */

static struct pci_dev *amd_nb_dev;



/*-------------------------------------------------------------------------*/



#include "ehci.h"

#include "ehci-dbg.c"

#include "pci-quirks.h"



/*-------------------------------------------------------------------------*/
@@ -530,8 +532,10 @@ static void ehci_stop (struct usb_hcd *hcd) 
	spin_unlock_irq (&ehci->lock);

	ehci_mem_cleanup (ehci);



	if (ehci->amd_pll_fix == 1)

		usb_amd_dev_put();

	if (amd_nb_dev) {

		pci_dev_put(amd_nb_dev);

		amd_nb_dev = NULL;

	}



#ifdef	EHCI_STATS

	ehci_dbg (ehci, "irq normal %ld err %ld reclaim %ld (lost %ld)\n",

drivers/usb/host/ehci-pci.c

+32 −6
Original line number Diff line number Diff line
@@ -44,6 +44,35 @@ static int ehci_pci_reinit(struct ehci_hcd *ehci, struct pci_dev *pdev) 
	return 0;

}



static int ehci_quirk_amd_SB800(struct ehci_hcd *ehci)

{

	struct pci_dev *amd_smbus_dev;

	u8 rev = 0;



	amd_smbus_dev = pci_get_device(PCI_VENDOR_ID_ATI, 0x4385, NULL);

	if (!amd_smbus_dev)

		return 0;



	pci_read_config_byte(amd_smbus_dev, PCI_REVISION_ID, &rev);

	if (rev < 0x40) {

		pci_dev_put(amd_smbus_dev);

		amd_smbus_dev = NULL;

		return 0;

	}



	if (!amd_nb_dev)

		amd_nb_dev = pci_get_device(PCI_VENDOR_ID_AMD, 0x1510, NULL);

	if (!amd_nb_dev)

		ehci_err(ehci, "QUIRK: unable to get AMD NB device\n");



	ehci_info(ehci, "QUIRK: Enable AMD SB800 L1 fix\n");



	pci_dev_put(amd_smbus_dev);

	amd_smbus_dev = NULL;



	return 1;

}



/* called during probe() after chip reset completes */

static int ehci_pci_setup(struct usb_hcd *hcd)

{
@@ -102,6 +131,9 @@ static int ehci_pci_setup(struct usb_hcd *hcd) 
	/* cache this readonly data; minimize chip reads */

	ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);



	if (ehci_quirk_amd_SB800(ehci))

		ehci->amd_l1_fix = 1;



	retval = ehci_halt(ehci);

	if (retval)

		return retval;
@@ -152,9 +184,6 @@ static int ehci_pci_setup(struct usb_hcd *hcd) 
		}

		break;

	case PCI_VENDOR_ID_AMD:

		/* AMD PLL quirk */

		if (usb_amd_find_chipset_info())

			ehci->amd_pll_fix = 1;

		/* AMD8111 EHCI doesn't work, according to AMD errata */

		if (pdev->device == 0x7463) {

			ehci_info(ehci, "ignoring AMD8111 (errata)\n");
@@ -200,9 +229,6 @@ static int ehci_pci_setup(struct usb_hcd *hcd) 
		}

		break;

	case PCI_VENDOR_ID_ATI:

		/* AMD PLL quirk */

		if (usb_amd_find_chipset_info())

			ehci->amd_pll_fix = 1;

		/* SB600 and old version of SB700 have a bug in EHCI controller,

		 * which causes usb devices lose response in some cases.

		 */

drivers/usb/host/ehci-sched.c

+65 −8
Original line number Diff line number Diff line
@@ -1587,6 +1587,63 @@ 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 (
@@ -1615,8 +1672,8 @@ itd_link_urb ( 
	}



	if (ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs == 0) {

		if (ehci->amd_pll_fix == 1)

			usb_amd_quirk_pll_disable();

		if (ehci->amd_l1_fix == 1)

			ehci_quirk_amd_L1(ehci, 1);

	}



	ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs++;
@@ -1744,8 +1801,8 @@ itd_complete ( 
	ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--;



	if (ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs == 0) {

		if (ehci->amd_pll_fix == 1)

			usb_amd_quirk_pll_enable();

		if (ehci->amd_l1_fix == 1)

			ehci_quirk_amd_L1(ehci, 0);

	}



	if (unlikely(list_is_singular(&stream->td_list))) {
@@ -2035,8 +2092,8 @@ sitd_link_urb ( 
	}



	if (ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs == 0) {

		if (ehci->amd_pll_fix == 1)

			usb_amd_quirk_pll_disable();

		if (ehci->amd_l1_fix == 1)

			ehci_quirk_amd_L1(ehci, 1);

	}



	ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs++;
@@ -2140,8 +2197,8 @@ sitd_complete ( 
	ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--;



	if (ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs == 0) {

		if (ehci->amd_pll_fix == 1)

			usb_amd_quirk_pll_enable();

		if (ehci->amd_l1_fix == 1)

			ehci_quirk_amd_L1(ehci, 0);

	}



	if (list_is_singular(&stream->td_list)) {

drivers/usb/host/ehci.h

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ struct ehci_hcd { /* one per controller */ 
	unsigned		has_amcc_usb23:1;

	unsigned		need_io_watchdog:1;

	unsigned		broken_periodic:1;

	unsigned		amd_pll_fix:1;

	unsigned		amd_l1_fix:1;

	unsigned		fs_i_thresh:1;	/* Intel iso scheduling */

	unsigned		use_dummy_qh:1;	/* AMD Frame List table quirk*/

drivers/usb/host/ohci-hcd.c

+11 −2
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ static const char hcd_name [] = "ohci_hcd"; 
#define	STATECHANGE_DELAY	msecs_to_jiffies(300)



#include "ohci.h"

#include "pci-quirks.h"



static void ohci_dump (struct ohci_hcd *ohci, int verbose);

static int ohci_init (struct ohci_hcd *ohci);
@@ -86,8 +85,18 @@ static int ohci_restart (struct ohci_hcd *ohci); 
#endif



#ifdef CONFIG_PCI

static void quirk_amd_pll(int state);

static void amd_iso_dev_put(void);

static void sb800_prefetch(struct ohci_hcd *ohci, int on);

#else

static inline void quirk_amd_pll(int state)

{

	return;

}

static inline void amd_iso_dev_put(void)

{

	return;

}

static inline void sb800_prefetch(struct ohci_hcd *ohci, int on)

{

	return;
@@ -903,7 +912,7 @@ static void ohci_stop (struct usb_hcd *hcd) 
	if (quirk_zfmicro(ohci))

		del_timer(&ohci->unlink_watchdog);

	if (quirk_amdiso(ohci))

		usb_amd_dev_put();

		amd_iso_dev_put();



	remove_debug_files (ohci);

	ohci_mem_cleanup (ohci);

CRA Git | Maintained and supported by SUSTech CRA and CCSE