vortex86ex: Defer checking PS/2 keyboard controller system flag

Don't check keyboard controller system flag until before calling
pc_keyboard_init(). This makes waiting time shorter.

Change-Id: I2cdb533a5b25575e1717434533a60decf748f6d8
Signed-off-by: Andrew Wu <arw@dmp.com.tw>
Reviewed-on: http://review.coreboot.org/3958
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Andrew Wu 2013-10-19 01:33:08 +08:00 committed by Stefan Reinauer
parent ac16405799
commit 1ce4860405
1 changed files with 8 additions and 1 deletions

View File

@ -138,7 +138,13 @@ static void upload_dmp_keyboard_firmware(struct device *dev)
// disable firmware uploading. // disable firmware uploading.
pci_write_config32(dev, SB_REG_IPFCR, reg_sb_c0 & ~0x400L); pci_write_config32(dev, SB_REG_IPFCR, reg_sb_c0 & ~0x400L);
// wait keyboard controller ready by checking status port bit 2. }
static void kbc_wait_system_flag(void)
{
/* wait keyboard controller ready by checking system flag
* (status port bit 2).
*/
post_code(POST_KBD_CHK_READY); post_code(POST_KBD_CHK_READY);
while ((inb(0x64) & 0x4) == 0) { while ((inb(0x64) & 0x4) == 0) {
} }
@ -571,6 +577,7 @@ static void southbridge_init(struct device *dev)
fix_cmos_rtc_time(); fix_cmos_rtc_time();
rtc_init(0); rtc_init(0);
kbc_wait_system_flag();
pc_keyboard_init(0); pc_keyboard_init(0);
} }