colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: queensbay: Really disable IGD

Browse Source 
According to Atom E6xx datasheet, setting VGA Disable (bit17)
of Graphics Controller register (offset 0x50) prevents IGD
(D2:F0) from reporting itself as a VGA display controller
class in the PCI configuration space, and should also prevent
it from responding to VGA legacy memory range and I/O addresses.

However test result shows that with just VGA Disable bit set and
a PCIe graphics card connected to one of the PCIe controllers on
the E6xx, accessing the VGA legacy space still causes system hang.
After a number of attempts, it turns out besides VGA Disable bit,
the SDVO (D3:F0) device should be disabled to make it work.

To simplify, use the Function Disable register (offset 0xc4)
to disable both IGD (D2:F0) and SDVO (D3:F0) devices. Now these
two devices will be completely disabled (invisible in the PCI
configuration space) unless a system reset is performed.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng
2015-10-22 19:13:32 -07:00
parent 1eb39a5093
commit e5ffa4bb62
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
arch/x86/cpu/queensbay/tnc.c
View File

@@ -25,12 +25,26 @@ static void unprotect_spi_flash(void)
static void __maybe_unused disable_igd(void) static void __maybe_unused disable_igd(void)
{ {
u32 gc; /*
* According to Atom E6xx datasheet, setting VGA Disable (bit17)
gc = x86_pci_read_config32(TNC_IGD, IGD_GC); * of Graphics Controller register (offset 0x50) prevents IGD
gc &= ~GMS_MASK; * (D2:F0) from reporting itself as a VGA display controller
gc |= VGA_DISABLE; * class in the PCI configuration space, and should also prevent
x86_pci_write_config32(TNC_IGD, IGD_GC, gc); * it from responding to VGA legacy memory range and I/O addresses.
*
* However test result shows that with just VGA Disable bit set and
* a PCIe graphics card connected to one of the PCIe controllers on
* the E6xx, accessing the VGA legacy space still causes system hang.
* After a number of attempts, it turns out besides VGA Disable bit,
* the SDVO (D3:F0) device should be disabled to make it work.
*
* To simplify, use the Function Disable register (offset 0xc4)
* to disable both IGD (D2:F0) and SDVO (D3:F0) devices. Now these
* two devices will be completely disabled (invisible in the PCI
* configuration space) unless a system reset is performed.
*/
x86_pci_write_config32(TNC_IGD, IGD_FD, FUNC_DISABLE);
x86_pci_write_config32(TNC_SDVO, IGD_FD, FUNC_DISABLE);
} }
int arch_cpu_init(void) int arch_cpu_init(void)

7
arch/x86/include/asm/arch-queensbay/tnc.h
View File

@@ -7,10 +7,9 @@
#ifndef _X86_ARCH_TNC_H_ #ifndef _X86_ARCH_TNC_H_
#define _X86_ARCH_TNC_H_ #define _X86_ARCH_TNC_H_
/* IGD Control Register */ /* IGD Function Disable Register */
#define IGD_GC 0x50 #define IGD_FD 0xc4
#define VGA_DISABLE 0x00020000 #define FUNC_DISABLE 0x00000001
#define GMS_MASK 0x00700000
/* Memory BAR Enable */ /* Memory BAR Enable */
#define MEM_BAR_EN 0x00000001 #define MEM_BAR_EN 0x00000001