sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usbdebug AMD: Add choice of EHCI controller

Browse Source 
Chipsets sb700 and sb800/hudson have more than one USB EHCI controller,
implement the selection logic using already existing Kconfig option.

Change-Id: I9e0df1669d73863c95c36a3a7fee40d58f6f097e
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/3928
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Kyösti Mälkki
2013-09-17 00:12:05 +03:00
parent dd6c4ec1ed
commit a1179cafdb
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/southbridge/amd/agesa/hudson/enable_usbdebug.c
View File

@ -26,15 +26,16 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include "hudson.h" #include "hudson.h"
#ifndef HUDSON_DEVN_BASE
#define HUDSON_DEVN_BASE 0
#endif
#define DEBUGPORT_MISC_CONTROL 0x80 #define DEBUGPORT_MISC_CONTROL 0x80
pci_devfn_t pci_ehci_dbg_dev(unsigned int hcd_idx) pci_devfn_t pci_ehci_dbg_dev(unsigned int hcd_idx)
{ {
return PCI_DEV(0, HUDSON_DEVN_BASE + 0x12, 2); if (hcd_idx==3)
return PCI_DEV(0, 0x16, 2);
else if (hcd_idx==2)
return PCI_DEV(0, 0x13, 2);
else
return PCI_DEV(0, 0x12, 2);
} }
void pci_ehci_dbg_set_port(pci_devfn_t dev, unsigned int port) void pci_ehci_dbg_set_port(pci_devfn_t dev, unsigned int port)

10
src/southbridge/amd/sb700/enable_usbdebug.c
View File

@ -29,14 +29,12 @@
#define DEBUGPORT_MISC_CONTROL 0x80 #define DEBUGPORT_MISC_CONTROL 0x80
/*
* Note: The SB700 has two EHCI devices, D18:F2 and D19:F2.
* This code currently only supports the first one, i.e., USB Debug devices
* attached to physical USB ports belonging to the first EHCI device.
*/
pci_devfn_t pci_ehci_dbg_dev(unsigned int hcd_idx) pci_devfn_t pci_ehci_dbg_dev(unsigned int hcd_idx)
{ {
return PCI_DEV(0, 0x12, 2); if (hcd_idx==2)
return PCI_DEV(0, 0x13, 2);
else
return PCI_DEV(0, 0x12, 2);
} }
void pci_ehci_dbg_set_port(pci_devfn_t dev, unsigned int port) void pci_ehci_dbg_set_port(pci_devfn_t dev, unsigned int port)

11
src/southbridge/amd/sb800/enable_usbdebug.c
View File

@ -26,15 +26,16 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include "sb800.h" #include "sb800.h"
#ifndef SB800_DEVN_BASE
#define SB800_DEVN_BASE 0
#endif
#define DEBUGPORT_MISC_CONTROL 0x80 #define DEBUGPORT_MISC_CONTROL 0x80
pci_devfn_t pci_ehci_dbg_dev(unsigned int hcd_idx) pci_devfn_t pci_ehci_dbg_dev(unsigned int hcd_idx)
{ {
return PCI_DEV(0, SB800_DEVN_BASE + 0x12, 2); if (hcd_idx==3)
return PCI_DEV(0, 0x16, 2);
else if (hcd_idx==2)
return PCI_DEV(0, 0x13, 2);
else
return PCI_DEV(0, 0x12, 2);
} }
void pci_ehci_dbg_set_port(pci_devfn_t dev, unsigned int port) void pci_ehci_dbg_set_port(pci_devfn_t dev, unsigned int port)