x86: qemu: Remove call to vgabios execution
PATCH 1/7 x86: qemu: Remove call to vgabios execution
The call to pci_run_vga_bios() is not needed as this is handled in the vesa_fb driver.
---
arch/x86/cpu/qemu/pci.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)
arch/x86/cpu/qemu/pci.c +1 -18
@@ -6,7 +6,6 @@#include <common.h> #include <pci.h> -#include <pci_rom.h> #include <asm/pci.h> #include <asm/arch/device.h> #include <asm/arch/qemu.h>
@@ -51,11 +50,8 @@ void board_pci_setup_hose(struct pci_controller *hose)int board_pci_post_scan (struct pci_controller *hose) { -int ret =0 ;u16 device, xbcs;int pam, i; -pci_dev_t vga; -ulong start;/* * i440FX and Q35 chipset have different PAM register offset, but with
@@ -96,20 +92,7 @@ int board_pci_post_scan(struct pci_controller *hose) CONFIG_PCIE_ECAM_BASE | BAR_EN); } -/* -* QEMU emulated graphic card shows in the PCI configuration space with -* PCI vendor id and device id as an artificial pair 0x1234:0x1111. -* It is on PCI bus 0, function 0, but device number is not consistent -* for the two x86 targets it supports. For i440FX and PIIX chipset -* board, it shows as device 2, while for Q35 and ICH9 chipset board, -* it shows as device 1. -*/ - vga = i440fx ?I440FX_VGA :Q35_VGA ; - start =get_timer (0 ); - ret =pci_run_vga_bios (vga,NULL ,PCI_ROM_USE_NATIVE ); -debug ("BIOS ran in %lums\n" ,get_timer (start)); - -return ret; +return 0 ; }#ifdef CONFIG_GENERATE_MP_TABLE
Signature · 1 line
1.8.2.1
PATCH 2/7 x86: qemu: Move chipset-specific codes from pci.c to qemu.c
Move chipset-specific codes such as PAM init, PCIe ECAM and MP table from pci.c to qemu.c, to prepare for DM PCI conversion.
---
arch/x86/cpu/qemu/pci.c | 72 ---------------------------------------- arch/x86/cpu/qemu/qemu.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++ include/configs/qemu-x86.h | 2 ++ 3 files changed, 84 insertions(+), 72 deletions(-)
arch/x86/cpu/qemu/pci.c +0 -72
@@ -6,14 +6,9 @@#include <common.h> #include <pci.h> -#include <asm/pci.h> -#include <asm/arch/device.h> -#include <asm/arch/qemu.h> DECLARE_GLOBAL_DATA_PTR ; -static bool i440fx; -void board_pci_setup_hose (struct pci_controller *hose) { hose->first_busno =0 ;
@@ -50,72 +45,5 @@ void board_pci_setup_hose(struct pci_controller *hose)int board_pci_post_scan (struct pci_controller *hose) { -u16 device, xbcs; -int pam, i; - -/* -* i440FX and Q35 chipset have different PAM register offset, but with -* the same bitfield layout. Here we determine the offset based on its -* PCI device ID. -*/ - device =x86_pci_read_config16 (PCI_BDF (0 ,0 ,0 ),PCI_DEVICE_ID ); - i440fx = (device ==PCI_DEVICE_ID_INTEL_82441 ); - pam = i440fx ?I440FX_PAM :Q35_PAM ; - -/* -* Initialize Programmable Attribute Map (PAM) Registers -* -* Configure legacy segments C/D/E/F to system RAM -*/ -for (i =0 ; i <PAM_NUM ; i++) -x86_pci_write_config8 (PCI_BDF (0 ,0 ,0 ), pam + i,PAM_RW ); - -if (i440fx) { -/* -* Enable legacy IDE I/O ports decode -* -* Note: QEMU always decode legacy IDE I/O port on PIIX chipset. -* However Linux ata_piix driver does sanity check on these two -* registers to see whether legacy ports decode is turned on. -* This is to make Linux ata_piix driver happy. -*/ -x86_pci_write_config16 (PIIX_IDE ,IDE0_TIM ,IDE_DECODE_EN ); -x86_pci_write_config16 (PIIX_IDE ,IDE1_TIM ,IDE_DECODE_EN ); - -/* Enable I/O APIC */ - xbcs =x86_pci_read_config16 (PIIX_ISA ,XBCS ); - xbcs |=APIC_EN ; -x86_pci_write_config16 (PIIX_ISA ,XBCS , xbcs); - }else { -/* Configure PCIe ECAM base address */ -x86_pci_write_config32 (PCI_BDF (0 ,0 ,0 ),PCIEX_BAR , -CONFIG_PCIE_ECAM_BASE |BAR_EN ); - } -return 0 ; } - -#ifdef CONFIG_GENERATE_MP_TABLE -int mp_determine_pci_dstirq (int bus,int dev,int func,int pirq) -{ -u8 irq; - -if (i440fx) { -/* -* Not like most x86 platforms, the PIRQ[A-D] on PIIX3 are not -* connected to I/O APIC INTPIN#16-19. Instead they are routed -* to an irq number controled by the PIRQ routing register. -*/ - irq =x86_pci_read_config8 (PCI_BDF (bus, dev, func), -PCI_INTERRUPT_LINE ); - }else { -/* -* ICH9's PIRQ[A-H] are not consecutive numbers from 0 to 7. -* PIRQ[A-D] still maps to [0-3] but PIRQ[E-H] maps to [8-11]. -*/ - irq = pirq <8 ? pirq +16 : pirq +12 ; - } - -return irq; -} -#endif
arch/x86/cpu/qemu/qemu.c +82 -0
97 lines not on this page · raw message
include/configs/qemu-x86.h +2 -0
@@ -15,6 +15,7 @@#define CONFIG_SYS_MONITOR_LEN (1 << 20)#define CONFIG_ARCH_MISC_INIT +#define CONFIG_ARCH_EARLY_INIT_R #define CONFIG_PCI_MEM_BUS 0xc0000000#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
@@ -28,6 +29,7 @@#define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS#define CONFIG_PCI_IO_SIZE 0xe000 +#define CONFIG_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP #define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,vga\0" \
Signature · 1 line
1.8.2.1
PATCH 2/7 x86: qemu: Move chipset-specific codes from pci.c to qemu.c
Quoted 10 lines · Bin Meng
Move chipset-specific codes such as PAM init, PCIe ECAM and MP table from
pci.ctoqemu.c, to prepare for DM PCI conversion.Signed-off-by Bin Meng <[email protected]>---
arch/x86/cpu/qemu/pci.c | 72 ---------------------------------------- arch/x86/cpu/qemu/qemu.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++ include/configs/qemu-x86.h | 2 ++ 3 files changed, 84 insertions(+), 72 deletions(-)
PATCH 3/7 x86: qemu: Convert to use driver model pci
In reply to Bin MengMove to driver model for pci on QEMU.
---
arch/x86/cpu/qemu/Makefile | 1 - arch/x86/cpu/qemu/pci.c | 49 ---------------------------------------------- configs/qemu-x86_defconfig | 1 + include/configs/qemu-x86.h | 12 ------------ 4 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 arch/x86/cpu/qemu/pci.c
arch/x86/cpu/qemu/Makefile +0 -1
@@ -9,4 +9,3 @@ obj-y += car.o dram.o endif obj-y += qemu.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += acpi.o dsdt.o -obj-$(CONFIG_PCI) += pci.o
arch/x86/cpu/qemu/pci.c deleted +0 -49
49 lines not on this page · raw message
configs/qemu-x86_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_CPU=y CONFIG_SPI_FLASH=y CONFIG_NETDEVICES=y CONFIG_E1000=y +CONFIG_DM_PCI=y CONFIG_DM_RTC=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
include/configs/qemu-x86.h +0 -12
@@ -17,18 +17,6 @@#define CONFIG_ARCH_MISC_INIT #define CONFIG_ARCH_EARLY_INIT_R -#define CONFIG_PCI_MEM_BUS 0xc0000000 -#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS -#define CONFIG_PCI_MEM_SIZE 0x10000000 - -#define CONFIG_PCI_PREF_BUS 0xd0000000 -#define CONFIG_PCI_PREF_PHYS CONFIG_PCI_PREF_BUS -#define CONFIG_PCI_PREF_SIZE 0x10000000 - -#define CONFIG_PCI_IO_BUS 0x2000 -#define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS -#define CONFIG_PCI_IO_SIZE 0xe000 -#define CONFIG_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP
Signature · 1 line
1.8.2.1
PATCH 3/7 x86: qemu: Convert to use driver model pci
Quoted 11 lines · Bin Meng
Move to driver model for pci on QEMU.
Signed-off-by Bin Meng <[email protected]>---
arch/x86/cpu/qemu/Makefile | 1 - arch/x86/cpu/qemu/pci.c | 49 ---------------------------------------------- configs/qemu-x86_defconfig | 1 + include/configs/qemu-x86.h | 12 ------------ 4 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 arch/x86/cpu/qemu/pci.c
PATCH 4/7 x86: qemu: Convert to use driver model usb
In reply to Bin MengMove to driver model for USB on QEMU.
---
configs/qemu-x86_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/qemu-x86_defconfig +2 -0
@@ -19,6 +19,8 @@ CONFIG_NETDEVICES=y CONFIG_E1000=y CONFIG_DM_PCI=y CONFIG_DM_RTC=y +CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_111=y
Signature · 1 line
1.8.2.1
PATCH 4/7 x86: qemu: Convert to use driver model usb
Quoted 23 lines · Bin Meng
Move to driver model for USB on QEMU.
Signed-off-by Bin Meng <[email protected]>---
configs/qemu-x86_defconfig | 2 ++ 1 file changed, 2 insertions(+)configs/qemu-x86_defconfig +2
-1@@ -19,6 +19,8 @@ CONFIG_NETDEVICES=y CONFIG_E1000=y CONFIG_DM_PCI=y CONFIG_DM_RTC=y +CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_111=y --
Quoted 2 lines
1.8.2.1
PATCH 5/7 x86: crownbay: Remove unused PCI region address macros
In reply to Bin MengThese are leftover when converted to use driver model pci.
---
include/configs/crownbay.h | 12 ------------ 1 file changed, 12 deletions(-)
include/configs/crownbay.h +0 -12
@@ -20,18 +20,6 @@#define CONFIG_SMSC_LPC47M -#define CONFIG_PCI_MEM_BUS 0x40000000 -#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS -#define CONFIG_PCI_MEM_SIZE 0x80000000 - -#define CONFIG_PCI_PREF_BUS 0xc0000000 -#define CONFIG_PCI_PREF_PHYS CONFIG_PCI_PREF_BUS -#define CONFIG_PCI_PREF_SIZE 0x20000000 - -#define CONFIG_PCI_IO_BUS 0x2000 -#define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS -#define CONFIG_PCI_IO_SIZE 0xe000 -#define CONFIG_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP
Signature · 1 line
1.8.2.1
PATCH 5/7 x86: crownbay: Remove unused PCI region address macros
Quoted 7 lines · Bin Meng
These are leftover when converted to use driver model pci.
Signed-off-by Bin Meng <[email protected]>---
include/configs/crownbay.h | 12 ------------ 1 file changed, 12 deletions(-)
PATCH 6/7 x86: Remove legacy pci codes
In reply to Bin MengNow that we have converted all x86 boards to use driver model pci, remove these legacy pci codes.
---
arch/x86/cpu/pci.c | 45 ------------------------------------------- arch/x86/include/asm/pci.h | 21 -------------------- arch/x86/lib/fsp/fsp_common.c | 5 ----- 3 files changed, 71 deletions(-)
arch/x86/cpu/pci.c +0 -45
@@ -19,51 +19,6 @@DECLARE_GLOBAL_DATA_PTR ; -static struct pci_controller x86_hose; - -int pci_early_init_hose (struct pci_controller **hosep) -{ -struct pci_controller *hose; - - hose =calloc (1 ,sizeof (struct pci_controller )); -if (!hose) -return -ENOMEM ; - -board_pci_setup_hose (hose); -pci_setup_type1 (hose); - hose->last_busno =pci_hose_scan (hose); - gd->hose = hose; - *hosep = hose; - -return 0 ; -} - -__weak int board_pci_pre_scan (struct pci_controller *hose) -{ -return 0 ; -} - -__weak int board_pci_post_scan (struct pci_controller *hose) -{ -return 0 ; -} - -void pci_init_board (void ) -{ -struct pci_controller *hose = &x86_hose; - -/* Stop using the early hose */ - gd->hose =NULL ; - -board_pci_setup_hose (hose); -pci_setup_type1 (hose); -pci_register_hose (hose); - -board_pci_pre_scan (hose); - hose->last_busno =pci_hose_scan (hose); -board_pci_post_scan (hose); -} -static struct pci_controller *get_hose (void ) {if (gd->hose)
arch/x86/include/asm/pci.h +0 -21
@@ -25,27 +25,6 @@ struct pci_controller;void pci_setup_type1 (struct pci_controller *hose); -/** -* board_pci_setup_hose() - Set up the PCI hose -* -* This is called by the common x86 PCI code to set up the PCI controller -* hose. It may be called when no memory/BSS is available so should just -* store things in 'hose' and not in BSS variables. -*/ -void board_pci_setup_hose (struct pci_controller *hose); - -/** -* pci_early_init_hose() - Set up PCI host before relocation -* -* This allocates memory for, sets up and returns the PCI hose. It can be -* called before relocation. The hose will be stored in gd->hose for -* later use, but will become invalid one DRAM is available. -*/ -int pci_early_init_hose (struct pci_controller **hosep); - -int board_pci_pre_scan (struct pci_controller *hose); -int board_pci_post_scan (struct pci_controller *hose); -/* * Simple PCI access routines - these work from either the early PCI hose * or the 'real' one, created after U-Boot has memory available
arch/x86/lib/fsp/fsp_common.c +0 -5
@@ -35,11 +35,6 @@ int fsp_init_phase_pci(void)return status ? -EPERM :0 ; } -int board_pci_post_scan (struct pci_controller *hose) -{ -return fsp_init_phase_pci (); -} -void board_final_cleanup (void ) {u32 status;
Signature · 1 line
1.8.2.1
PATCH 6/7 x86: Remove legacy pci codes
Quoted 10 lines · Bin Meng
Now that we have converted all x86 boards to use driver model pci, remove these legacy pci codes.
Signed-off-by Bin Meng <[email protected]>---
arch/x86/cpu/pci.c | 45 ------------------------------------------- arch/x86/include/asm/pci.h | 21 -------------------- arch/x86/lib/fsp/fsp_common.c | 5 ----- 3 files changed, 71 deletions(-)
PATCH 7/7 x86: Remove CONFIG_SYS_EARLY_PCI_INIT
In reply to Bin MengCONFIG_SYS_EARLY_PCI_INIT is not needed any more since with driver model, PCI enumeration is automatically triggered.
---
include/configs/bayleybay.h | 1 - include/configs/crownbay.h | 1 - include/configs/galileo.h | 1 - include/configs/minnowmax.h | 1 - include/configs/qemu-x86.h | 1 - include/configs/som-6896.h | 1 - include/configs/x86-chromebook.h | 1 - 7 files changed, 7 deletions(-)
include/configs/bayleybay.h +0 -1
@@ -16,7 +16,6 @@#define CONFIG_SYS_MONITOR_LEN (1 << 20)#define CONFIG_ARCH_MISC_INIT -#define CONFIG_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP #define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,vga,usbkbd\0" \
include/configs/crownbay.h +0 -1
@@ -20,7 +20,6 @@#define CONFIG_SMSC_LPC47M -#define CONFIG_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP #define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,vga,usbkbd\0" \
include/configs/galileo.h +0 -1
@@ -21,7 +21,6 @@/* ns16550 UART is memory-mapped in Quark SoC */ #undef CONFIG_SYS_NS16550_PORT_MAPPED -#define CONFIG_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP #define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \
include/configs/minnowmax.h +0 -1
@@ -19,7 +19,6 @@#define CONFIG_SMSC_LPC47M -#define CONFIG_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP #define CONFIG_RTL8169 #define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,vga,serial\0" \
include/configs/qemu-x86.h +0 -1
@@ -17,7 +17,6 @@#define CONFIG_ARCH_MISC_INIT #define CONFIG_ARCH_EARLY_INIT_R -#define CONFIG_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP #define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,vga\0" \
include/configs/som-6896.h +0 -1
@@ -20,7 +20,6 @@#define CONFIG_SCSI_DEV_LIST \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WILDCATPOINT_AHCI} -#define CONFIG_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP #define VIDEO_IO_OFFSET 0
include/configs/x86-chromebook.h +0 -1
@@ -35,7 +35,6 @@#define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS#define CONFIG_PCI_IO_SIZE 0xefff -#define CONFIG_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP #define CONFIG_BIOSEMU
Signature · 1 line
1.8.2.1
PATCH 7/7 x86: Remove CONFIG_SYS_EARLY_PCI_INIT
Quoted 6 lines · Bin Meng
CONFIG_SYS_EARLY_PCI_INITis not needed any more since with driver model, PCI enumeration is automatically triggered.Signed-off-by Bin Meng <[email protected]>---
Quoted 8 lines
include/configs/bayleybay.h | 1 - include/configs/crownbay.h | 1 - include/configs/galileo.h | 1 - include/configs/minnowmax.h | 1 - include/configs/qemu-x86.h | 1 - include/configs/som-6896.h | 1 - include/configs/x86-chromebook.h | 1 - 7 files changed, 7 deletions(-)
PATCH 1/7 x86: qemu: Remove call to vgabios execution
In reply to Bin MengQuoted 8 lines · Bin Meng
The call to
pci_run_vga_bios()is not needed as this is handled in thevesa_fbdriver.Signed-off-by Bin Meng <[email protected]>---
arch/x86/cpu/qemu/pci.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)