Kconfig dependencies for MIPS machines (but Malta)
v3 cover Kconfig dependencies for MIPS machines (but Malta)
Express the MIPS machine dependencies with Kconfig.
Due to its complexity, the Malta board fill follow in a different series.
v3:
- addressed review comments from Thomas and Aleksandar (noted in each patch)
v2: https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg00887.html
- Do not remove machines from the default config (Thomas)
- Corrected comment about CONFIG_PCI_BONITO (Thomas)
v1: https://www.mail-archive.com/[email protected]/msg593013.html
$ git backport-diff -u kconfig_mips-v2 Key: [----] : patches are identical [####] : number of functional differences between upstream/downstream patch The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
001/7:[----] [--] 'hw/mips: Express dependencies of the MIPSsim machine with kconfig' 002/7:[0001] [FC] 'hw/mips: Express dependencies of the Jazz machine with kconfig' 003/7:[0002] [FC] 'hw/mips: Express dependencies of the r4k platform with kconfig' 004/7:[down] 'hw/mips: Remove the redundant CONFIG_MIPS_ITU Makefile variable' 005/7:[----] [-C] 'hw/mips: Express dependencies of the Boston machine with kconfig' 006/7:[----] [-C] 'hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge' 007/7:[----] [-C] 'hw/mips: Express dependencies of the Fulong 2E machine with kconfig'
Regards,
Phil.
Philippe Mathieu-Daudé (7):
hw/mips: Express dependencies of the MIPSsim machine with Kconfig hw/mips: Express dependencies of the Jazz machine with Kconfig hw/mips: Express dependencies of the r4k platform with Kconfig hw/mips: Remove the redundant CONFIG_MIPS_ITU Makefile variable hw/mips: Express dependencies of the Boston machine with Kconfig hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge hw/mips: Express dependencies of the Fulong 2E machine with Kconfig
default-configs/mips-softmmu-common.mak | 4 --- default-configs/mips64-softmmu.mak | 5 --- default-configs/mips64el-softmmu.mak | 11 ------- hw/isa/Kconfig | 13 +++++--- hw/mips/Kconfig | 41 +++++++++++++++++++++++++ hw/misc/Kconfig | 3 -- hw/misc/Makefile.objs | 2 +- hw/pci-host/Kconfig | 4 +++ hw/pci-host/Makefile.objs | 2 +- 9 files changed, 56 insertions(+), 29 deletions(-)
Signature · 1 line
2.20.1
PATCH v3 1/7 hw/mips: Express dependencies of the MIPSsim machine with Kconfig
The MIPSsim machine only emulates an 8250 UART and a simple network controller, connected via an ISA bus.
--- default-configs/mips-softmmu-common.mak | 1 - hw/mips/Kconfig | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-)
default-configs/mips-softmmu-common.mak +0 -1
@@ -26,7 +26,6 @@ CONFIG_PIIX4=y CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y CONFIG_NE2000_ISA=y -CONFIG_MIPSNET=y CONFIG_PFLASH_CFI01=y CONFIG_I8259=y CONFIG_MC146818RTC=y
hw/mips/Kconfig +3 -0
@@ -6,6 +6,9 @@ config MALTA config MIPSSIM bool + select ISA_BUS + select SERIAL_ISA + select MIPSNET config JAZZ bool
Signature · 1 line
2.20.1
PATCH v3 2/7 hw/mips: Express dependencies of the Jazz machine with Kconfig
In reply to Philippe Mathieu-DaudéThe Jazz use the RC4030 Asic to provide an EISA bus and DMA/IRQ. The framebuffer display is managed by a G364, the network card is a Sonic DP83932. A QLogic ESP216 provides a SCSI bus.
---
v3: Keep CONFIG_JAZZ in default-configs/mips64el-softmmu.mak (Thomas)
--- default-configs/mips-softmmu-common.mak | 1 - default-configs/mips64-softmmu.mak | 5 ----- default-configs/mips64el-softmmu.mak | 5 ----- hw/mips/Kconfig | 17 +++++++++++++++++ 4 files changed, 17 insertions(+), 11 deletions(-)
default-configs/mips-softmmu-common.mak +0 -1
@@ -3,7 +3,6 @@ CONFIG_ISA_BUS=y CONFIG_PCI=y CONFIG_PCI_DEVICES=y -CONFIG_ESP=y CONFIG_VGA_ISA=y CONFIG_VGA_ISA_MM=y CONFIG_VGA_CIRRUS=y
default-configs/mips64-softmmu.mak +0 -5
@@ -1,9 +1,4 @@ # Default configuration for mips64-softmmu include mips-softmmu-common.mak -CONFIG_RC4030=y -CONFIG_DP8393X=y -CONFIG_DS1225Y=y CONFIG_JAZZ=y -CONFIG_G364FB=y -CONFIG_JAZZ_LED=y
default-configs/mips64el-softmmu.mak +0 -5
@@ -2,13 +2,8 @@ include mips-softmmu-common.mak CONFIG_IDE_VIA=y -CONFIG_RC4030=y -CONFIG_DP8393X=y -CONFIG_DS1225Y=y CONFIG_FULONG=y CONFIG_JAZZ=y -CONFIG_G364FB=y -CONFIG_JAZZ_LED=y CONFIG_VT82C686=y CONFIG_AHCI=y CONFIG_MIPS_BOSTON=y
hw/mips/Kconfig +17 -0
@@ -12,6 +12,23 @@ config MIPSSIM config JAZZ bool + select ISA_BUS + select RC4030 + select I8259 + select I8254 + select I8257 + select PCSPK + select VGA_ISA_MM + select G364FB + select DP8393X + select ESP + select FDC + select MC146818RTC + select PCKBD + select SERIAL + select PARALLEL + select DS1225Y + select JAZZ_LED config FULONG bool
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v3 2/7] hw/mips: Express dependencies of the Jazz machine with Kconfig
Quoted 65 lines · Philippe Mathieu-Daudé
The Jazz use the RC4030 Asic to provide an EISA bus and DMA/IRQ. The framebuffer display is managed by a G364, the network card is a Sonic DP83932. A QLogic ESP216 provides a SCSI bus.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v3: KeepCONFIG_JAZZin default-configs/mips64el-softmmu.mak (Thomas)--- default-configs/mips-softmmu-common.mak | 1 - default-configs/mips64-softmmu.mak | 5 ----- default-configs/mips64el-softmmu.mak | 5 ----- hw/mips/Kconfig | 17 +++++++++++++++++ 4 files changed, 17 insertions(+), 11 deletions(-)default-configs/mips-softmmu-common.mak +0
-1@@ -3,7 +3,6 @@ CONFIG_ISA_BUS=y CONFIG_PCI=y CONFIG_PCI_DEVICES=y -CONFIG_ESP=y CONFIG_VGA_ISA=y CONFIG_VGA_ISA_MM=y CONFIG_VGA_CIRRUS=ydefault-configs/mips64-softmmu.mak +0
-5@@ -1,9 +1,4 @@ # Default configuration for mips64-softmmu include mips-softmmu-common.mak -CONFIG_RC4030=y -CONFIG_DP8393X=y -CONFIG_DS1225Y=y CONFIG_JAZZ=y -CONFIG_G364FB=y -CONFIG_JAZZ_LED=ydefault-configs/mips64el-softmmu.mak +0
-5@@ -2,13 +2,8 @@ include mips-softmmu-common.mak CONFIG_IDE_VIA=y -CONFIG_RC4030=y -CONFIG_DP8393X=y -CONFIG_DS1225Y=y CONFIG_FULONG=y CONFIG_JAZZ=y -CONFIG_G364FB=y -CONFIG_JAZZ_LED=y CONFIG_VT82C686=y CONFIG_AHCI=y CONFIG_MIPS_BOSTON=yhw/mips/Kconfig +0
-0@@ -12,6 +12,23 @@ config MIPSSIM config JAZZ
hw/mips/Kconfig config MIPSSIM · line 23
Quoted 10 lines
hw/mips/Kconfig +9
-0bool + select ISA_BUS + select RC4030 + select I8259 + select I8254 + select I8257 + select PCSPK + select VGA_ISA_MM + select G364FB + select DP8393X
Looking at the code, it seems like you can also run the machine with "-net none", so I'd rather use "imply DP8393X" here instead.
Thomas
Re: [Qemu-devel] [PATCH v3 2/7] hw/mips: Express dependencies of the Jazz machine with Kconfig
Hi Thomas,
Quoted 65 lines · Thomas Huth
Quoted 64 lines · Philippe Mathieu-Daudé
The Jazz use the RC4030 Asic to provide an EISA bus and DMA/IRQ. The framebuffer display is managed by a G364, the network card is a Sonic DP83932. A QLogic ESP216 provides a SCSI bus.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v3: KeepCONFIG_JAZZin default-configs/mips64el-softmmu.mak (Thomas)--- default-configs/mips-softmmu-common.mak | 1 - default-configs/mips64-softmmu.mak | 5 ----- default-configs/mips64el-softmmu.mak | 5 ----- hw/mips/Kconfig | 17 +++++++++++++++++ 4 files changed, 17 insertions(+), 11 deletions(-)default-configs/mips-softmmu-common.mak +0
-1@@ -3,7 +3,6 @@ CONFIG_ISA_BUS=y CONFIG_PCI=y CONFIG_PCI_DEVICES=y -CONFIG_ESP=y CONFIG_VGA_ISA=y CONFIG_VGA_ISA_MM=y CONFIG_VGA_CIRRUS=ydefault-configs/mips64-softmmu.mak +0
-5@@ -1,9 +1,4 @@ # Default configuration for mips64-softmmu include mips-softmmu-common.mak -CONFIG_RC4030=y -CONFIG_DP8393X=y -CONFIG_DS1225Y=y CONFIG_JAZZ=y -CONFIG_G364FB=y -CONFIG_JAZZ_LED=ydefault-configs/mips64el-softmmu.mak +0
-5@@ -2,13 +2,8 @@ include mips-softmmu-common.mak CONFIG_IDE_VIA=y -CONFIG_RC4030=y -CONFIG_DP8393X=y -CONFIG_DS1225Y=y CONFIG_FULONG=y CONFIG_JAZZ=y -CONFIG_G364FB=y -CONFIG_JAZZ_LED=y CONFIG_VT82C686=y CONFIG_AHCI=y CONFIG_MIPS_BOSTON=yhw/mips/Kconfig +0
-0@@ -12,6 +12,23 @@ config MIPSSIM
Quoted 14 lines
hw/mips/Kconfig config MIPSSIM · line 23
Quoted 11 lines
hw/mips/Kconfig +9
-0config JAZZ bool + select ISA_BUS + select RC4030 + select I8259 + select I8254 + select I8257 + select PCSPK + select VGA_ISA_MM + select G364FB + select DP8393XLooking at the code, it seems like you can also run the machine with "-net none", so I'd rather use "imply DP8393X" here instead.
Well here I'm not sure.
For the both machine variants (PICA-61 and Magnum 4000), the chipset is soldered on the board, and is MMIO mapped (via a ChipSelect, no via a bus you can plug/unplug). So it looks the code inherited habits from boards having network card via busses.
Not sure the code can be fixed in time for soft freeze.
I might improve the commit message explaining this chipset is soldered on the board.
Regards,
Phil.
Re: [Qemu-devel] [PATCH v3 2/7] hw/mips: Express dependencies of the Jazz machine with Kconfig
Quoted 83 lines · Philippe Mathieu-Daudé
Hi Thomas,
Quoted 65 lines · Thomas Huth
Quoted 64 lines · Philippe Mathieu-Daudé
The Jazz use the RC4030 Asic to provide an EISA bus and DMA/IRQ. The framebuffer display is managed by a G364, the network card is a Sonic DP83932. A QLogic ESP216 provides a SCSI bus.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v3: KeepCONFIG_JAZZin default-configs/mips64el-softmmu.mak (Thomas)--- default-configs/mips-softmmu-common.mak | 1 - default-configs/mips64-softmmu.mak | 5 ----- default-configs/mips64el-softmmu.mak | 5 ----- hw/mips/Kconfig | 17 +++++++++++++++++ 4 files changed, 17 insertions(+), 11 deletions(-)default-configs/mips-softmmu-common.mak +0
-1@@ -3,7 +3,6 @@ CONFIG_ISA_BUS=y CONFIG_PCI=y CONFIG_PCI_DEVICES=y -CONFIG_ESP=y CONFIG_VGA_ISA=y CONFIG_VGA_ISA_MM=y CONFIG_VGA_CIRRUS=ydefault-configs/mips64-softmmu.mak +0
-5@@ -1,9 +1,4 @@ # Default configuration for mips64-softmmu include mips-softmmu-common.mak -CONFIG_RC4030=y -CONFIG_DP8393X=y -CONFIG_DS1225Y=y CONFIG_JAZZ=y -CONFIG_G364FB=y -CONFIG_JAZZ_LED=ydefault-configs/mips64el-softmmu.mak +0
-5@@ -2,13 +2,8 @@ include mips-softmmu-common.mak CONFIG_IDE_VIA=y -CONFIG_RC4030=y -CONFIG_DP8393X=y -CONFIG_DS1225Y=y CONFIG_FULONG=y CONFIG_JAZZ=y -CONFIG_G364FB=y -CONFIG_JAZZ_LED=y CONFIG_VT82C686=y CONFIG_AHCI=y CONFIG_MIPS_BOSTON=yhw/mips/Kconfig +0
-0@@ -12,6 +12,23 @@ config MIPSSIMQuoted 14 lines
hw/mips/Kconfig config MIPSSIM · line 23
Quoted 11 lines
hw/mips/Kconfig +9
-0config JAZZ bool + select ISA_BUS + select RC4030 + select I8259 + select I8254 + select I8257 + select PCSPK + select VGA_ISA_MM + select G364FB + select DP8393XLooking at the code, it seems like you can also run the machine with "-net none", so I'd rather use "imply DP8393X" here instead.
Quoted 4 lines
Well here I'm not sure.
For the both machine variants (PICA-61 and Magnum 4000), the chipset is soldered on the board, and is MMIO mapped (via a ChipSelect, no via a bus you can plug/unplug).
Ok, then please ignore my comment and keep the "select" here!
Thomas
Re: [Qemu-devel] [PATCH v3 2/7] hw/mips: Express dependencies of the Jazz machine with Kconfig
In reply to Philippe Mathieu-DaudéQuoted 9 lines
From: Philippe Mathieu-Daudé <[email protected]>
Subject: [PATCH v3 2/7] hw/mips: Express dependencies of the Jazz machine withKconfigThe Jazz use the RC4030 Asic to provide an EISA bus and DMA/IRQ. The framebuffer display is managed by a G364, the network card is a Sonic DP83932. A QLogic ESP216 provides a SCSI bus.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
PATCH v3 3/7 hw/mips: Express dependencies of the r4k platform with Kconfig
In reply to Philippe Mathieu-DaudéThis platform use standard PC devices connected to an ISA bus. Networking is provided by a ne2000 chipset.
---
v3: remove CONFIG_NE2000_ISA (Thomas)
add PFLASH_CFI01
--- default-configs/mips-softmmu-common.mak | 1 - hw/mips/Kconfig | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-)
default-configs/mips-softmmu-common.mak +0 -1
@@ -24,7 +24,6 @@ CONFIG_I8257=y CONFIG_PIIX4=y CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y -CONFIG_NE2000_ISA=y CONFIG_PFLASH_CFI01=y CONFIG_I8259=y CONFIG_MC146818RTC=y
hw/mips/Kconfig +11 -0
@@ -1,5 +1,16 @@ config R4K bool + select ISA_BUS + select SERIAL_ISA + select I8259 + select I8254 + select MC146818RTC + select VGA_ISA + select NE2000_ISA + select IDE_ISA + # I8042 + select PCKBD + select PFLASH_CFI01 config MALTA bool
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v3 3/7] hw/mips: Express dependencies of the r4k platform with Kconfig
Quoted 29 lines · Philippe Mathieu-Daudé
This platform use standard PC devices connected to an ISA bus. Networking is provided by a ne2000 chipset.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v3: removeCONFIG_NE2000_ISA(Thomas)
addPFLASH_CFI01--- default-configs/mips-softmmu-common.mak | 1 - hw/mips/Kconfig | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-)default-configs/mips-softmmu-common.mak +0
-1@@ -24,7 +24,6 @@ CONFIG_I8257=y CONFIG_PIIX4=y CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y -CONFIG_NE2000_ISA=y CONFIG_PFLASH_CFI01=y CONFIG_I8259=y CONFIG_MC146818RTC=yhw/mips/Kconfig +0
-0
hw/mips/Kconfig line 9
Quoted 9 lines
hw/mips/Kconfig +7
-0@@ -1,5 +1,16 @@ config R4K bool + select ISA_BUS + select SERIAL_ISA + select I8259 + select I8254 + select MC146818RTC + select VGA_ISA + select NE2000_ISA
Since Paolo now also introduced the "imply" keyword, I think you should use "imply" instead of "select" for both, VGA_ISA and NE2000_ISA, since the r4k machine can work without both when you specify -vga none and -net none.
Thomas
Re: [Qemu-devel] [PATCH v3 3/7] hw/mips: Express dependencies of the r4k platform with Kconfig
Quoted 36 lines · Thomas Huth
Quoted 35 lines · Philippe Mathieu-Daudé
This platform use standard PC devices connected to an ISA bus. Networking is provided by a ne2000 chipset.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v3: removeCONFIG_NE2000_ISA(Thomas)
addPFLASH_CFI01--- default-configs/mips-softmmu-common.mak | 1 - hw/mips/Kconfig | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-)default-configs/mips-softmmu-common.mak +0
-1@@ -24,7 +24,6 @@ CONFIG_I8257=y CONFIG_PIIX4=y CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y -CONFIG_NE2000_ISA=y CONFIG_PFLASH_CFI01=y CONFIG_I8259=y CONFIG_MC146818RTC=yhw/mips/Kconfig +4
-0@@ -1,5 +1,16 @@ config R4K bool + select ISA_BUS + select SERIAL_ISA + select I8259 + select I8254
Quoted 8 lines
hw/mips/Kconfig line 9
Quoted 3 lines
hw/mips/Kconfig +3
-0+ select MC146818RTC + select VGA_ISA + select NE2000_ISASince Paolo now also introduced the "imply" keyword, I think you should use "imply" instead of "select" for both,
VGA_ISAandNE2000_ISA, since the r4k machine can work without both when you specify -vga none and -net none.
OK I'll use "imply", thanks.
Quoted 3 lines
Thomas
PATCH v3 4/7 hw/mips: Remove the redundant CONFIG_MIPS_ITU Makefile variable
In reply to Philippe Mathieu-DaudéThe Inter-Thread Communication Unit (ITU, introduced in commit 34fa7e83e11) is part of the Coherent Processing System (CPS), as describe in commit 408294352ad:
Make ITU available in the system if CPU supports multithreading and is part of CPS.
Replate the CONFIG_MIPS_ITU variable by the CONFIG_MIPS_CPS one.
--- default-configs/mips-softmmu-common.mak | 1 - hw/misc/Kconfig | 3 --- hw/misc/Makefile.objs | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-)
default-configs/mips-softmmu-common.mak +0 -1
@@ -29,7 +29,6 @@ CONFIG_I8259=y CONFIG_MC146818RTC=y CONFIG_EMPTY_SLOT=y CONFIG_MIPS_CPS=y -CONFIG_MIPS_ITU=y CONFIG_R4K=y CONFIG_MALTA=y CONFIG_MIPSSIM=y
hw/misc/Kconfig +0 -3
@@ -80,9 +80,6 @@ config IMX config STM32F2XX_SYSCFG bool -config MIPS_ITU - bool - config MPS2_FPGAIO bool
hw/misc/Makefile.objs +1 -1
@@ -59,7 +59,7 @@ obj-$(CONFIG_ZYNQ) += zynq-xadc.o obj-$(CONFIG_STM32F2XX_SYSCFG) += stm32f2xx_syscfg.o obj-$(CONFIG_MIPS_CPS) += mips_cmgcr.o obj-$(CONFIG_MIPS_CPS) += mips_cpc.o -obj-$(CONFIG_MIPS_ITU) += mips_itu.o +obj-$(CONFIG_MIPS_CPS) += mips_itu.o obj-$(CONFIG_MPS2_FPGAIO) += mps2-fpgaio.o obj-$(CONFIG_MPS2_SCC) += mps2-scc.o
Signature · 1 line
2.20.1
PATCH v3 5/7 hw/mips: Express dependencies of the Boston machine with Kconfig
In reply to Philippe Mathieu-DaudéBoston is built around a Xilinx FPGA, which includes a PCIe root port and an UART. An Intel EG20T PCH connects the I/O peripherals, but only the SATA bus is emulated.
--- default-configs/mips64el-softmmu.mak | 4 ---- hw/mips/Kconfig | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-)
default-configs/mips64el-softmmu.mak +0 -4
@@ -5,8 +5,4 @@ CONFIG_IDE_VIA=y CONFIG_FULONG=y CONFIG_JAZZ=y CONFIG_VT82C686=y -CONFIG_AHCI=y CONFIG_MIPS_BOSTON=y -CONFIG_FITLOADER=y -CONFIG_PCI_EXPRESS=y -CONFIG_PCI_EXPRESS_XILINX=y
hw/mips/Kconfig +5 -0
@@ -50,3 +50,8 @@ config MIPS_CPS config MIPS_BOSTON bool + select FITLOADER + select MIPS_CPS + select PCI_EXPRESS_XILINX + select AHCI + select SERIAL
Signature · 1 line
2.20.1
PATCH v3 6/7 hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge
In reply to Philippe Mathieu-DaudéEase the kconfig selection by introducing CONFIG_PCI_BONITO to select the Bonito North Bridge.
--- default-configs/mips64el-softmmu.mak | 1 + hw/pci-host/Kconfig | 4 ++++ hw/pci-host/Makefile.objs | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-)
default-configs/mips64el-softmmu.mak +1 -0
@@ -3,6 +3,7 @@ include mips-softmmu-common.mak CONFIG_IDE_VIA=y CONFIG_FULONG=y +CONFIG_PCI_BONITO=y CONFIG_JAZZ=y CONFIG_VT82C686=y CONFIG_MIPS_BOSTON=y
hw/pci-host/Kconfig +4 -0
@@ -49,3 +49,7 @@ config PCI_EXPRESS_XILINX config PCI_EXPRESS_DESIGNWARE bool select PCI_EXPRESS + +config PCI_BONITO + select PCI + bool
hw/pci-host/Makefile.objs +1 -1
@@ -12,7 +12,7 @@ common-obj-$(CONFIG_PPCE500_PCI) += ppce500.o common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o common-obj-$(CONFIG_PCI_SABRE) += sabre.o -common-obj-$(CONFIG_FULONG) += bonito.o +common-obj-$(CONFIG_PCI_BONITO) += bonito.o common-obj-$(CONFIG_PCI_PIIX) += piix.o common-obj-$(CONFIG_PCI_EXPRESS_Q35) += q35.o common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) += gpex.o
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v3 6/7] hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge
Quoted 8 lines
From: Philippe Mathieu-Daudé <[email protected]>
Subject: [PATCH v3 6/7] hw/pci-host: UseCONFIG_PCI_BONITOto select the Bonito North BridgeEase the kconfig selection by introducing
CONFIG_PCI_BONITOto select the Bonito North Bridge.Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
PATCH v3 7/7 hw/mips: Express dependencies of the Fulong 2E machine with Kconfig
In reply to Philippe Mathieu-DaudéThe Fulong 2E machine uses a Loongson 2E as CPU, a Bonito64 system controller as North Bridge and a VT82C686 chipset as South Bridge. The network card chipset is a RTL8139D.
---
v3: Loongson 2E = CPU, Fulong 2E = machine (Aleksandar)
--- default-configs/mips64el-softmmu.mak | 3 --- hw/isa/Kconfig | 13 +++++++++---- hw/mips/Kconfig | 5 +++++ 3 files changed, 14 insertions(+), 7 deletions(-)
default-configs/mips64el-softmmu.mak +0 -3
@@ -1,9 +1,6 @@ # Default configuration for mips64el-softmmu include mips-softmmu-common.mak -CONFIG_IDE_VIA=y CONFIG_FULONG=y -CONFIG_PCI_BONITO=y CONFIG_JAZZ=y -CONFIG_VT82C686=y CONFIG_MIPS_BOSTON=y
hw/isa/Kconfig +9 -4
@@ -32,10 +32,15 @@ config PIIX4 config VT82C686 bool - select ISA_BUS - select ACPI_SMBUS - select SERIAL_ISA - select FDC + select PCI + select I8259 + select I8254 + select I8257 + select PARALLEL + select IDE_ISA + select IDE_VIA + select USB_UHCI + #select PCKBD config SMC37C669 bool
hw/mips/Kconfig +5 -0
@@ -43,6 +43,11 @@ config JAZZ config FULONG bool + select PCI_BONITO + select VT82C686 + select SMBUS_EEPROM + select RTL8139_PCI + select MC146818RTC config MIPS_CPS bool
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v3 7/7] hw/mips: Express dependencies of the Fulong 2E machine with Kconfig
Quoted 18 lines · Philippe Mathieu-Daudé
The Fulong 2E machine uses a Loongson 2E as CPU, a Bonito64 system controller as North Bridge and a VT82C686 chipset as South Bridge. The network card chipset is a RTL8139D.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v3: Loongson 2E = CPU, Fulong 2E = machine (Aleksandar)--- default-configs/mips64el-softmmu.mak | 3 --- hw/isa/Kconfig | 13 +++++++++---- hw/mips/Kconfig | 5 +++++ 3 files changed, 14 insertions(+), 7 deletions(-)default-configs/mips64el-softmmu.mak +0
-0
default-configs/mips64el-softmmu.mak line 6
Quoted 6 lines
default-configs/mips64el-softmmu.mak +0
-2@@ -1,9 +1,6 @@ # Default configuration for mips64el-softmmu include mips-softmmu-common.mak -CONFIG_IDE_VIA=y CONFIG_FULONG=y -CONFIG_PCI_BONITO=y
I think I'd rather squash the previous patch into this one here (and adjust the patch description here with some information about BONITO), so that you don't have to remove the switch again that you've just added one patch earlier.
Quoted 14 lines
default-configs/mips64el-softmmu.mak +0
-1CONFIG_JAZZ=y -CONFIG_VT82C686=y CONFIG_MIPS_BOSTON=yhw/isa/Kconfig +0
-3@@ -32,10 +32,15 @@ config PIIX4 config VT82C686 bool - select ISA_BUS - select ACPI_SMBUS - select SERIAL_ISA
hw/isa/Kconfig config PIIX4 · line 43
Quoted 10 lines
hw/isa/Kconfig +9
-1- select FDC + select PCI + select I8259 + select I8254 + select I8257 + select PARALLEL + select IDE_ISA + select IDE_VIA + select USB_UHCI + #select PCKBD
Why is this commented out? Please mention the reason either in the commit message or in an additional comment here.
Quoted 7 lines
hw/isa/Kconfig +0
-0config SMC37C669 boolhw/mips/Kconfig +0
-0
hw/mips/Kconfig config JAZZ · line 49
Quoted 7 lines
hw/mips/Kconfig +4
-0@@ -43,6 +43,11 @@ config JAZZ config FULONG bool + select PCI_BONITO + select VT82C686 + select SMBUS_EEPROM + select RTL8139_PCI
I'd suggest to use "imply RTL8139_PCI" here instead, since "-net none" should be possible for this machine, too.
Thomas
Re: [Qemu-devel] [PATCH v3 7/7] hw/mips: Express dependencies of the Fulong 2E machine with Kconfig
Quoted 21 lines · Thomas Huth
Quoted 20 lines · Philippe Mathieu-Daudé
The Fulong 2E machine uses a Loongson 2E as CPU, a Bonito64 system controller as North Bridge and a VT82C686 chipset as South Bridge. The network card chipset is a RTL8139D.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v3: Loongson 2E = CPU, Fulong 2E = machine (Aleksandar)--- default-configs/mips64el-softmmu.mak | 3 --- hw/isa/Kconfig | 13 +++++++++---- hw/mips/Kconfig | 5 +++++ 3 files changed, 14 insertions(+), 7 deletions(-)default-configs/mips64el-softmmu.mak +0
-0@@ -1,9 +1,6 @@ # Default configuration for mips64el-softmmu
Quoted 9 lines
default-configs/mips64el-softmmu.mak line 6
Quoted 4 lines
default-configs/mips64el-softmmu.mak +0
-2include mips-softmmu-common.mak -CONFIG_IDE_VIA=y CONFIG_FULONG=y -CONFIG_PCI_BONITO=yI think I'd rather squash the previous patch into this one here (and adjust the patch description here with some information about BONITO), so that you don't have to remove the switch again that you've just added one patch earlier.
I find it clearer this way... And easier for the PCI maintainers to review.
Quoted 20 lines
Quoted 20 lines
default-configs/mips64el-softmmu.mak +0
-1CONFIG_JAZZ=y -CONFIG_VT82C686=y CONFIG_MIPS_BOSTON=yhw/isa/Kconfig +4
-4@@ -32,10 +32,15 @@ config PIIX4 config VT82C686 bool - select ISA_BUS - select ACPI_SMBUS - select SERIAL_ISA - select FDC + select PCI + select I8259 + select I8254 + select I8257
Quoted 8 lines
hw/isa/Kconfig config PIIX4 · line 43
Quoted 5 lines
hw/isa/Kconfig +5
-0+ select PARALLEL + select IDE_ISA + select IDE_VIA + select USB_UHCI + #select PCKBDWhy is this commented out? Please mention the reason either in the commit message or in an additional comment here.
Oops I missed this while rebasing.
I commented this because I was not sure how to express the "USB Legacy Support", I couldn't find reference to this feature in the USB specs. It looks something the southbridge manufacturers use to emulate an i8042 controller for USB keyboard/mouse.
Gerd any idea?
Thomas, what about adding in hw/usb/Kconfig:
config USB_LEGACY_PS2_SUPPORT
# Emulated i8042
select I8042Quoted 8 lines
Quoted 8 lines
hw/isa/Kconfig +0
-0config SMC37C669 boolhw/mips/Kconfig +0
-0@@ -43,6 +43,11 @@ config JAZZ
Quoted 9 lines
hw/mips/Kconfig config JAZZ · line 49
Quoted 6 lines
hw/mips/Kconfig +4
-0config FULONG bool + select PCI_BONITO + select VT82C686 + select SMBUS_EEPROM + select RTL8139_PCII'd suggest to use "imply
RTL8139_PCI" here instead, since "-net none" should be possible for this machine, too.
This chipset is soldered onboard, so I'd rather keep it that way...
The -net option is confusing IMHO.
Thought?
Re: [Qemu-devel] [PATCH v3 7/7] hw/mips: Express dependencies of the Fulong 2E machine with Kconfig
In reply to Philippe Mathieu-DaudéQuoted 9 lines
From: Philippe Mathieu-Daudé <[email protected]>
Subject: [PATCH v3 7/7] hw/mips: Express dependencies of the Fulong 2E machine withKconfigThe Fulong 2E machine uses a Loongson 2E as CPU, a Bonito64 system controller as North Bridge and a VT82C686 chipset as South Bridge. The network card chipset is a RTL8139D.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Quoted 6 lines · Philippe Mathieu-Daudé
Express the MIPS machine dependencies with
Kconfig.Due to its complexity, the Malta board fill follow in a different series.
Philippe,
What would be the status of this series? I am willing to integrate all this, including all followups, but have hard time sorting out what happend after this submission, what is the most complete version etc. Can you enlighten me please?
Yours,
Aleksandar
Quoted 8 lines
v3:
- addressed review comments from Thomas and Aleksandar (noted in each patch)v2: https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg00887.html
- Do not remove machines from the default config (Thomas)
- Corrected comment aboutCONFIG_PCI_BONITO(Thomas)
Quoted 6 lines
v1: https://www.mail-archive.com/[email protected]/msg593013.html
$ git backport-diff -u kconfig_mips-v2 Key: [----] : patches are identical [####] : number of functional differences between upstream/downstream
patch
Quoted 1 line
The flags [FC] indicate (F)unctional and (C)ontextual differences,
respectively
Quoted 2 lines
001/7:[----] [--] 'hw/mips: Express dependencies of the MIPSsim machine
with kconfig'
Quoted 1 line
002/7:[0001] [FC] 'hw/mips: Express dependencies of the Jazz machine with
kconfig'
Quoted 1 line
003/7:[0002] [FC] 'hw/mips: Express dependencies of the r4k platform with
kconfig'
Quoted 1 line
004/7:[down] 'hw/mips: Remove the redundant
CONFIG_MIPS_ITUMakefile
variable'
Quoted 1 line
005/7:[----] [-C] 'hw/mips: Express dependencies of the Boston machine
with kconfig'
Quoted 1 line
006/7:[----] [-C] 'hw/pci-host: Use
CONFIG_PCI_BONITOto select the
Bonito North Bridge'
Quoted 1 line
007/7:[----] [-C] 'hw/mips: Express dependencies of the Fulong 2E machine
with kconfig'
Quoted 29 lines
Regards,
Phil.
Philippe Mathieu-Daudé (7):
hw/mips: Express dependencies of the MIPSsim machine withKconfighw/mips: Express dependencies of the Jazz machine withKconfighw/mips: Express dependencies of the r4k platform withKconfighw/mips: Remove the redundantCONFIG_MIPS_ITUMakefilevariable hw/mips: Express dependencies of the Boston machine withKconfighw/pci-host: UseCONFIG_PCI_BONITOto select the Bonito North Bridge hw/mips: Express dependencies of the Fulong 2E machine withKconfigdefault-configs/mips-softmmu-common.mak | 4 --- default-configs/mips64-softmmu.mak | 5 --- default-configs/mips64el-softmmu.mak | 11 ------- hw/isa/Kconfig | 13 +++++--- hw/mips/Kconfig | 41 +++++++++++++++++++++++++ hw/misc/Kconfig | 3 -- hw/misc/Makefile.objs | 2 +- hw/pci-host/Kconfig | 4 +++ hw/pci-host/Makefile.objs | 2 +- 9 files changed, 56 insertions(+), 29 deletions(-)--
2.20.1
Hi Aleksandar,
Quoted 10 lines · Aleksandar Markovic
Quoted 6 lines · On Mar 11, 2019 1:56 AM, "Philippe Mathieu-Daudé" <[email protected]…
Express the MIPS machine dependencies with
Kconfig.Due to its complexity, the Malta board fill follow in a different series.
Quoted 6 lines
Philippe,
What would be the status of this series? I am willing to integrate all this, including all followups, but have hard time sorting out what happend after this submission, what is the most complete version etc. Can you enlighten me please?
Thanks for your interest in this series :)
I was chatting with Thomas about this series earlier today! I addressed your comment about the ITU/CPS devices, then wanted to join all the Malta patches in the same series, but there are too many for a single series so I'll keep them separate.
About Malta, I can do it two ways: one quick and dirty, and one clean but long. Problem with long series is they can take too long before landing. I'm trying to figure a quick but not that dirty way to solve this, then we can improve later.
I'll resend during the week.
Regards,
Phil.
Quoted 6 lines · Aleksandar Markovic
Quoted 4 lines
What would be the status of this series? I am willing to integrate all this, including all followups, but have hard time sorting out what happend after this submission, what is the most complete version etc. Can you enlighten me please?
Quoted 6 lines
Thanks for your interest in this series :)
I was chatting with Thomas about this series earlier today! I addressed your comment about the ITU/CPS devices, then wanted to join all the Malta patches in the same series, but there are too many for a single series so I'll keep them separate.
After some sleep I could remember why I postponed this series:
1/ making the ITU selectable gives:
/usr/bin/ld: target/mips/op_helper.o: in function `helper_mtc0_saar':
./target/mips/op_helper.c:1614: undefined reference to itc_reconfigure' /usr/bin/ld: target/mips/op_helper.o: in function helper_mthc0_saar':
./target/mips/op_helper.c:1631: undefined reference to `itc_reconfigure'
collect2: error: ld returned 1 exit status
Anyway it is now selectable but has to be always selected.
2/ I thought only the Malta board was deeply mixed with the X86 ACPI code, but I later noticed the Fulong is too.
/usr/bin/ld: ../hw/isa/vt82c686.o: in function `vt82c686b_pm_realize':
./hw/isa/vt82c686.c:381: undefined reference to `acpi_pm_tmr_init' /usr/bin/ld: ./hw/isa/vt82c686.c:382: undefined reference to
`acpi_pm1_evt_init'
/usr/bin/ld: ../hw/isa/vt82c686.o: in function `pm_update_sci':
./hw/isa/vt82c686.c:195: undefined reference to `acpi_pm1_evt_get_sts'
collect2: error: ld returned 1 exit status
Both VT82C686B/PIIX4 southbridges require considerable cleanup. I think I now have something workable, but I have to sell my patches correctly to the different subsystem maintainers ;)
Regards,
Phil.
Quoted 37 lines · Philippe Mathieu-Daudé
Quoted 7 lines · Aleksandar Markovic
Quoted 4 lines
What would be the status of this series? I am willing to integrate all this, including all followups, but have hard time sorting out what happend after this submission, what is the most complete version etc. Can you enlighten me please?
Quoted 6 lines
Thanks for your interest in this series :)
I was chatting with Thomas about this series earlier today! I addressed your comment about the ITU/CPS devices, then wanted to join all the Malta patches in the same series, but there are too many for a single series so I'll keep them separate.
After some sleep I could remember why I postponed this series:
1/ making the ITU selectable gives:
/usr/bin/ld:target/mips/op_helper.o: in function `helper_mtc0_saar':
./target/mips/op_helper.c:1614: undefined reference toitc_reconfigure' /usr/bin/ld: target/mips/op_helper.o: in functionhelper_mthc0_saar':
./target/mips/op_helper.c:1631: undefined reference to `itc_reconfigure'
collect2: error: ld returned 1 exit statusAnyway it is now selectable but has to be always selected.
2/ I thought only the Malta board was deeply mixed with the X86 ACPI code, but I later noticed the Fulong is too.
/usr/bin/ld:../hw/isa/vt82c686.o: in function `vt82c686b_pm_realize':
./hw/isa/vt82c686.c:381: undefined reference to `acpi_pm_tmr_init'/usr/bin/ld:./hw/isa/vt82c686.c:382: undefined reference to
`acpi_pm1_evt_init'
/usr/bin/ld:../hw/isa/vt82c686.o: in function `pm_update_sci':
./hw/isa/vt82c686.c:195: undefined reference to `acpi_pm1_evt_get_sts'
collect2: error: ld returned 1 exit status
Quoted 4 lines
Both VT82C686B/PIIX4 southbridges require considerable cleanup. I think I now have something workable, but I have to sell my patches correctly to the different subsystem maintainers ;)
I appreciate all this very much!
I don't want to rush you in any way, but just want to tell you that the next MIPS pull request is planned for mid or end of the next week - so if you judge some parts can be independently wrapped up by that time, by no means send such set of patches. But again, it is up to you, no obligations and no questions asked.
Au revoir,
Aleksandar
Quoted 3 lines
Regards,
Phil.
Quoted 6 lines · Philippe Mathieu-Daudé
Express the MIPS machine dependencies with
Kconfig.Due to its complexity, the Malta board fill follow in a different series.
Philippe,
What do we do with this series for 4.1?
Yours,
Aleksandar
Quoted 8 lines
v3:
- addressed review comments from Thomas and Aleksandar (noted in each patch)v2: https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg00887.html
- Do not remove machines from the default config (Thomas)
- Corrected comment aboutCONFIG_PCI_BONITO(Thomas)
Quoted 6 lines
v1: https://www.mail-archive.com/[email protected]/msg593013.html
$ git backport-diff -u kconfig_mips-v2 Key: [----] : patches are identical [####] : number of functional differences between upstream/downstream
patch
Quoted 1 line
The flags [FC] indicate (F)unctional and (C)ontextual differences,
respectively
Quoted 2 lines
001/7:[----] [--] 'hw/mips: Express dependencies of the MIPSsim machine
with kconfig'
Quoted 1 line
002/7:[0001] [FC] 'hw/mips: Express dependencies of the Jazz machine with
kconfig'
Quoted 1 line
003/7:[0002] [FC] 'hw/mips: Express dependencies of the r4k platform with
kconfig'
Quoted 1 line
004/7:[down] 'hw/mips: Remove the redundant
CONFIG_MIPS_ITUMakefile
variable'
Quoted 1 line
005/7:[----] [-C] 'hw/mips: Express dependencies of the Boston machine
with kconfig'
Quoted 1 line
006/7:[----] [-C] 'hw/pci-host: Use
CONFIG_PCI_BONITOto select the
Bonito North Bridge'
Quoted 1 line
007/7:[----] [-C] 'hw/mips: Express dependencies of the Fulong 2E machine
with kconfig'
Quoted 29 lines
Regards,
Phil.
Philippe Mathieu-Daudé (7):
hw/mips: Express dependencies of the MIPSsim machine withKconfighw/mips: Express dependencies of the Jazz machine withKconfighw/mips: Express dependencies of the r4k platform withKconfighw/mips: Remove the redundantCONFIG_MIPS_ITUMakefilevariable hw/mips: Express dependencies of the Boston machine withKconfighw/pci-host: UseCONFIG_PCI_BONITOto select the Bonito North Bridge hw/mips: Express dependencies of the Fulong 2E machine withKconfigdefault-configs/mips-softmmu-common.mak | 4 --- default-configs/mips64-softmmu.mak | 5 --- default-configs/mips64el-softmmu.mak | 11 ------- hw/isa/Kconfig | 13 +++++--- hw/mips/Kconfig | 41 +++++++++++++++++++++++++ hw/misc/Kconfig | 3 -- hw/misc/Makefile.objs | 2 +- hw/pci-host/Kconfig | 4 +++ hw/pci-host/Makefile.objs | 2 +- 9 files changed, 56 insertions(+), 29 deletions(-)--
2.20.1
Hi Aleksandar,
Quoted 6 lines · Aleksandar Markovic
Quoted 3 lines · On Mar 11, 2019 1:56 AM, "Philippe Mathieu-Daudé" <[email protected]…
Express the MIPS machine dependencies with
Kconfig.
Quoted 7 lines
Quoted 3 lines
Due to its complexity, the Malta board fill follow in a different series.
Philippe,
What do we do with this series for 4.1?
As commented in another reply of this cover, while addressing your comment "systems with CPS that doesn't have ITU" I hit an incongruous issue:
/usr/bin/ld: target/mips/op_helper.o: in function `helper_mtc0_saar':
./target/mips/op_helper.c:1614: undefined reference to itc_reconfigure' /usr/bin/ld: target/mips/op_helper.o: in function helper_mthc0_saar':
./target/mips/op_helper.c:1631: undefined reference to `itc_reconfigure'
collect2: error: ld returned 1 exit status
Then while trying to resolve this I exhausted the time I had to work on this.
Since I doubt we can fix easily the design flow when (coproc) instructions access optional device before 4.1, I'll also take out the Boston patches, and see what's left I can respin.
Regards,
Phil.
Quoted 3 lines
Since I doubt we can fix easily the design flow when (coproc) instructions access optional device before 4.1, I'll also take out the Boston patches, and see what's left I can respin.
No problem, what can we do.
Or you can tell me just what patches I should apply from this series now.
I plan a MIPS pull request tomorrow evening.
Bon aprés midi,
Aleksandar
Quoted 2 lines
Regards,
Phil.