Update functional tests for AST2500/AST2600/AST103/AST1060
cover Update functional tests for AST2500/AST2600/AST103/AST1060
v1:
- Remove AST2600 PCIe root device and RC_L support
- Drop RC_H root-bus remap and bus number properties
- Expand AST2600 RC_H PCIe MMIO window to 0x60000000�V0x80000000
- Update functional tests for AST2500, AST2600, AST1060, and AST1030
- AST2500 tests are updated to use SDK v10.00, as network support is known to be broken in v11.00.
Jamin Lin (7):
tests/functional/arm/test_aspeed_ast2500: Update test ASPEED SDK
v10.00
hw/pci-host/aspeed_pcie: Drop AST2600 PCIe root device
hw/pci-host/aspeed_pcie: Drop AST2600 RC_H root-bus remap and bus-nr
property
hw/arm/aspeed_ast2600: Expand RC_H PCIe MMIO window to 0x60000000 -
0x80000000
tests/functional/arm/test_aspeed_ast2600_sdk: Update test ASPEED SDK
v11.00
tests/functional/arm/test_aspeed_ast1060: Update test
aspeed-zephyr-project v03.04
tests/functional/arm/test_aspeed_ast1030: Update test ASPEED Zephyr
SDK v03.05include/hw/pci-host/aspeed_pcie.h | 11 --- hw/arm/aspeed_ast2600.c | 8 +- hw/pci-host/aspeed_pcie.c | 76 +------------------ tests/functional/arm/test_aspeed_ast1030.py | 12 +-- tests/functional/arm/test_aspeed_ast1060.py | 14 ++-- tests/functional/arm/test_aspeed_ast2500.py | 8 +- .../functional/arm/test_aspeed_ast2600_sdk.py | 22 +++--- 7 files changed, 31 insertions(+), 120 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/7 tests/functional/arm/test_aspeed_ast2500: Update test ASPEED SDK v10.00
--- tests/functional/arm/test_aspeed_ast2500.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tests/functional/arm/test_aspeed_ast2500.py +4 -4
@@ -37,14 +37,14 @@ def test_arm_ast2500_evb_buildroot(self): self.do_test_arm_aspeed_buildroot_poweroff() - ASSET_SDK_V908_AST2500 = Asset( - 'https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.08/ast2500-default-obmc.tar.gz', - 'c0a2ba169efd19be5eb77c50ec2a6afd9d826e196a0be3432f969fc72d4b7c0e') + ASSET_SDK_V1000_AST2500 = Asset( + 'https://github.com/AspeedTech-BMC/openbmc/releases/download/v10.00/ast2500-default-obmc.tar.gz', + '7d71a3f71d5f4d9f3451f59a73bf9baf8fd9f6a24107eb504a3216151a8b2b5b') def test_arm_ast2500_evb_sdk(self): self.set_machine('ast2500-evb') - self.archive_extract(self.ASSET_SDK_V908_AST2500) + self.archive_extract(self.ASSET_SDK_V1000_AST2500) self.do_test_arm_aspeed_sdk_start( self.scratch_file("ast2500-default", "image-bmc"))
Signature · 1 line
2.43.0
PATCH 2/7 hw/pci-host/aspeed_pcie: Drop AST2600 PCIe root device
In reply to Jamin Lin viaAST2600 PCIe previously exposed a root bus at 0x80 with both a root device at 80:00.0 and a root port at 80:08.0.
Recent ASPEED SDK PCIe driver updates decided to remove the root device and keep only a single root port. This behavior has already been accepted by the upstream Linux kernel.
Update the QEMU PCIe model accordingly by dropping the root device implementation and related properties. AST2600 now matches the AST2700 PCIe topology and no longer supports the legacy RC_L layout.
--- include/hw/pci-host/aspeed_pcie.h | 9 ----- hw/pci-host/aspeed_pcie.c | 57 ------------------------------- 2 files changed, 66 deletions(-)
include/hw/pci-host/aspeed_pcie.h +0 -9
@@ -50,13 +50,6 @@ typedef struct AspeedPCIERootPortState {PCIESlot parent_obj; } AspeedPCIERootPortState; -#define TYPE_ASPEED_PCIE_ROOT_DEVICE "aspeed.pcie-root-device" -OBJECT_DECLARE_SIMPLE_TYPE (AspeedPCIERootDeviceState,ASPEED_PCIE_ROOT_DEVICE ); - -struct AspeedPCIERootDeviceState { -PCIBridge parent_obj; -}; -#define TYPE_ASPEED_PCIE_RC "aspeed.pcie-rc"OBJECT_DECLARE_SIMPLE_TYPE (AspeedPCIERcState,ASPEED_PCIE_RC );
@@ -78,10 +71,8 @@ struct AspeedPCIERcState {uint32_t rp_addr;uint32_t bus_nr;char name[16 ]; -bool has_rd;qemu_irq irq; -AspeedPCIERootDeviceState root_device;AspeedPCIERootPortState root_port; };
hw/pci-host/aspeed_pcie.c +0 -57
99 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH 3/7 hw/pci-host/aspeed_pcie: Drop AST2600 RC_H root-bus remap and bus-nr property
In reply to Jamin Lin viaThe original AST2600 PCIe design supported both RC_L and RC_H, using root bus number 0 for RC_L and 0x80 for RC_H. In that model, the root port appeared as 80:08.0 and QEMU carried a "bus-nr" property plus a config-space bus remap to translate bus 0x80 to bus 0x00 for PCI enumeration.
Linux mainline has since dropped RC_L support and updated the RC_H root bus number to start at 0. The root port is now enumerated as 00:08.0, matching the default QEMU PCIe subsystem root bus numbering.
Remove the bus number setting and the AST2600 bus remap logic, and drop the corresponding "bus-nr"/rc_bus_nr fields and property plumbing. QEMU now relies on the default root bus 0 behavior.
--- include/hw/pci-host/aspeed_pcie.h | 2 -- hw/pci-host/aspeed_pcie.c | 19 +------------------ 2 files changed, 1 insertion(+), 20 deletions(-)
include/hw/pci-host/aspeed_pcie.h +0 -2
@@ -69,7 +69,6 @@ struct AspeedPCIERcState {uint64_t dram_base;uint32_t msi_addr;uint32_t rp_addr; -uint32_t bus_nr;char name[16 ];qemu_irq irq;
@@ -102,7 +101,6 @@ struct AspeedPCIECfgClass {uint32_t rc_msi_addr;uint32_t rc_rp_addr; -uint64_t rc_bus_nr;uint64_t nr_regs;bool rc_has_rd; };
hw/pci-host/aspeed_pcie.c +1 -18
@@ -268,7 +268,7 @@ static const char *aspeed_pcie_rc_root_bus_path(PCIHostState *host_bridge,AspeedPCIECfgState *cfg =container_of (rc, AspeedPCIECfgState, rc); -snprintf (rc->name,sizeof (rc->name),"%04x:%02x" , cfg->id, rc->bus_nr); +snprintf (rc->name,sizeof (rc->name),"%04x:00" , cfg->id);return rc->name; }
@@ -283,7 +283,6 @@ static void aspeed_pcie_rc_instance_init(Object *obj) }static const Property aspeed_pcie_rc_props[] = { -DEFINE_PROP_UINT32 ("bus-nr" , AspeedPCIERcState, bus_nr,0 ),DEFINE_PROP_UINT32 ("rp-addr" , AspeedPCIERcState, rp_addr,0 ),DEFINE_PROP_UINT32 ("msi-addr" , AspeedPCIERcState, msi_addr,0 ),DEFINE_PROP_UINT64 ("dram-base" , AspeedPCIERcState, dram_base,0 ),
@@ -490,17 +489,6 @@ static void aspeed_pcie_cfg_readwrite(AspeedPCIECfgState *s, offset = cfg_addr &0xffc ; pci =PCI_HOST_BRIDGE (rc); - -/* -* On the AST2600, the RC_H bus number range from 0x80 to 0xFF, with the -* root device and root port assigned to bus 0x80 instead of the standard -* 0x00. To allow the PCI subsystem to correctly discover devices on the -* root bus, bus 0x80 is remapped to 0x00. -*/ -if (bus == rc->bus_nr) { - bus =0 ; - } - pdev =pci_find_device (pci->bus, bus, devfn);if (!pdev) { s->regs[desc->rdata_reg] = ~0 ;
@@ -650,9 +638,6 @@ static void aspeed_pcie_cfg_realize(DeviceState *dev, Error **errp) apc->nr_regs << 2);sysbus_init_mmio (sbd, &s->mmio); -object_property_set_int (OBJECT (&s->rc),"bus-nr" , - apc->rc_bus_nr, - &error_abort);object_property_set_int (OBJECT (&s->rc),"rp-addr" , apc->rc_rp_addr, &error_abort);
@@ -691,7 +676,6 @@ static void aspeed_pcie_cfg_class_init(ObjectClass *klass, const void *data) apc->reg_map = &aspeed_regmap; apc->nr_regs =0x100 >>2 ; apc->rc_msi_addr =0x1e77005C ; - apc->rc_bus_nr =0x80 ; apc->rc_rp_addr =PCI_DEVFN (8 ,0 ); }
@@ -811,7 +795,6 @@ static void aspeed_2700_pcie_cfg_class_init(ObjectClass *klass, apc->reg_map = &aspeed_2700_regmap; apc->nr_regs =0x100 >>2 ; apc->rc_msi_addr =0x000000F0 ; - apc->rc_bus_nr =0 ; apc->rc_rp_addr =PCI_DEVFN (0 ,0 ); }
Signature · 1 line
2.43.0
Re: [PATCH v1 3/7] hw/pci-host/aspeed_pcie: Drop AST2600 RC_H root-bus remap and bus-nr property
Quoted 6 lines · Jamin Lin via qemu development
The original AST2600 PCIe design supported both
RC_LandRC_H, using root bus number 0 forRC_Land0x80forRC_H. In that model, the root port appeared as 80:08.0 and QEMU carried a "bus-nr" property plus a config-space bus remap to translate bus0x80to bus0x00for PCI enumeration.Linux mainline has since dropped
RC_Lsupport and updated theRC_Hroot bus
Was PCI support for the Aspeed SoC merged in mainline ?
Thanks,
C.
Quoted 98 lines
number to start at 0. The root port is now enumerated as 00:08.0, matching the default QEMU PCIe subsystem root bus numbering.
Remove the bus number setting and the AST2600 bus remap logic, and drop the corresponding "bus-nr"/rc_bus_nr fields and property plumbing. QEMU now relies on the default root bus 0 behavior.
Signed-off-by Jamin Lin <[email protected]>--- include/hw/pci-host/aspeed_pcie.h | 2 -- hw/pci-host/aspeed_pcie.c | 19 +------------------ 2 files changed, 1 insertion(+), 20 deletions(-)include/hw/pci-host/aspeed_pcie.h +0
-2@@ -69,7 +69,6 @@ struct AspeedPCIERcState {uint64_t dram_base;uint32_t msi_addr;uint32_t rp_addr; -uint32_t bus_nr;char name[16 ];qemu_irq irq;@@ -102,7 +101,6 @@ struct AspeedPCIECfgClass {uint32_t rc_msi_addr;uint32_t rc_rp_addr; -uint64_t rc_bus_nr;uint64_t nr_regs;bool rc_has_rd; };hw/pci-host/aspeed_pcie.c +1
-18@@ -268,7 +268,7 @@ static const char *aspeed_pcie_rc_root_bus_path(PCIHostState *host_bridge,AspeedPCIECfgState *cfg =container_of (rc, AspeedPCIECfgState, rc); -snprintf (rc->name,sizeof (rc->name),"%04x:%02x" , cfg->id, rc->bus_nr); +snprintf (rc->name,sizeof (rc->name),"%04x:00" , cfg->id);return rc->name; }@@ -283,7 +283,6 @@ static void aspeed_pcie_rc_instance_init(Object *obj) }static const Property aspeed_pcie_rc_props[] = { -DEFINE_PROP_UINT32 ("bus-nr" , AspeedPCIERcState, bus_nr,0 ),DEFINE_PROP_UINT32 ("rp-addr" , AspeedPCIERcState, rp_addr,0 ),DEFINE_PROP_UINT32 ("msi-addr" , AspeedPCIERcState, msi_addr,0 ),DEFINE_PROP_UINT64 ("dram-base" , AspeedPCIERcState, dram_base,0 ),@@ -490,17 +489,6 @@ static void aspeed_pcie_cfg_readwrite(AspeedPCIECfgState *s, offset = cfg_addr &0xffc ; pci =PCI_HOST_BRIDGE (rc); - -/* -* On the AST2600, the RC_H bus number range from 0x80 to 0xFF, with the -* root device and root port assigned to bus 0x80 instead of the standard -* 0x00. To allow the PCI subsystem to correctly discover devices on the -* root bus, bus 0x80 is remapped to 0x00. -*/ -if (bus == rc->bus_nr) { - bus =0 ; - } - pdev =pci_find_device (pci->bus, bus, devfn);if (!pdev) { s->regs[desc->rdata_reg] = ~0 ;@@ -650,9 +638,6 @@ static void aspeed_pcie_cfg_realize(DeviceState *dev, Error **errp) apc->nr_regs << 2);sysbus_init_mmio (sbd, &s->mmio); -object_property_set_int (OBJECT (&s->rc),"bus-nr" , - apc->rc_bus_nr, - &error_abort);object_property_set_int (OBJECT (&s->rc),"rp-addr" , apc->rc_rp_addr, &error_abort);@@ -691,7 +676,6 @@ static void aspeed_pcie_cfg_class_init(ObjectClass *klass, const void *data) apc->reg_map = &aspeed_regmap; apc->nr_regs =0x100 >>2 ; apc->rc_msi_addr =0x1e77005C ; - apc->rc_bus_nr =0x80 ; apc->rc_rp_addr =PCI_DEVFN (8 ,0 ); }@@ -811,7 +795,6 @@ static void aspeed_2700_pcie_cfg_class_init(ObjectClass *klass, apc->reg_map = &aspeed_2700_regmap; apc->nr_regs =0x100 >>2 ; apc->rc_msi_addr =0x000000F0 ; - apc->rc_bus_nr =0 ; apc->rc_rp_addr =PCI_DEVFN (0 ,0 ); }
RE: [PATCH v1 3/7] hw/pci-host/aspeed_pcie: Drop AST2600 RC_H root-bus remap and bus-nr property
Hi Cédric
Quoted 10 lines
Subject: Re: [PATCH v1 3/7] hw/pci-host/aspeed_pcie: Drop AST2600
RC_Hroot-bus remap and bus-nr propertyQuoted 6 lines · Jamin Lin via qemu development
The original AST2600 PCIe design supported both
RC_LandRC_H, using root bus number 0 forRC_Land0x80forRC_H. In that model, the root port appeared as
80:08.0 and QEMU carried a "bus-nr" property plus a config-space bus remap to translate bus0x80to bus0x00for PCI enumeration.
Quoted 5 lines
Quoted 2 lines
Linux mainline has since dropped
RC_Lsupport and updated theRC_Hroot busWas PCI support for the Aspeed SoC merged in mainline ?
The ASPEED PCIe RC driver has been applied to the PCIe subtree in the next branch. Please refer to the following links for details.
The change will be merged into the Linux mainline soon.
https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/log/?h=next
https://lore.kernel.org/linux-pci/[email protected]/T/#eb13673b4787528d636afa40791ae43d38bd1152a
https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/commit/?h=next&id=51aa64d4c19f0f00fd50cafd37cc2328675053ab
Thanks,
Jamin
Quoted 111 lines
Thanks,
C.
hw/pci-host/aspeed_pcie.c static const char
Quoted 39 lines
number to start at 0. The root port is now enumerated as 00:08.0, matching the default QEMU PCIe subsystem root bus numbering.
Remove the bus number setting and the AST2600 bus remap logic, and drop the corresponding "bus-nr"/rc_bus_nr fields and property plumbing. QEMU now relies on the default root bus 0 behavior.
Signed-off-by Jamin Lin <[email protected]>--- include/hw/pci-host/aspeed_pcie.h | 2 -- hw/pci-host/aspeed_pcie.c | 19 +------------------ 2 files changed, 1 insertion(+), 20 deletions(-)include/hw/pci-host/aspeed_pcie.h +0
-2@@ -69,7 +69,6 @@ struct AspeedPCIERcState {uint64_t dram_base;uint32_t msi_addr;uint32_t rp_addr; -uint32_t bus_nr;char name[16 ];qemu_irq irq;@@ -102,7 +101,6 @@ struct AspeedPCIECfgClass {uint32_t rc_msi_addr;uint32_t rc_rp_addr; -uint64_t rc_bus_nr;uint64_t nr_regs;bool rc_has_rd; };hw/pci-host/aspeed_pcie.c +0
-0@@ -268,7 +268,7 @@ static const char*aspeed_pcie_rc_root_bus_path(PCIHostState
*host_bridge,hw/pci-host/aspeed_pcie.c static void aspeed_pcie_rc_instance_init(Object
Quoted 9 lines
hw/pci-host/aspeed_pcie.c +1
-1AspeedPCIECfgState *cfg =container_of (rc, AspeedPCIECfgState, rc); -snprintf (rc->name,sizeof (rc->name),"%04x:%02x" , cfg->id, rc->bus_nr); +snprintf (rc->name,sizeof (rc->name),"%04x:00" , cfg->id);return rc->name; }@@ -283,7 +283,6 @@ static void aspeed_pcie_rc_instance_init(Object*obj)
hw/pci-host/aspeed_pcie.c static void aspeed_pcie_rc_instance_init(Object *obj)
Quoted 7 lines
hw/pci-host/aspeed_pcie.c +0
-1}static const Property aspeed_pcie_rc_props[] = { -DEFINE_PROP_UINT32 ("bus-nr" , AspeedPCIERcState, bus_nr,0 ),DEFINE_PROP_UINT32 ("rp-addr" , AspeedPCIERcState, rp_addr,0 ),DEFINE_PROP_UINT32 ("msi-addr" , AspeedPCIERcState, msi_addr,0 ), DEFINE_PROP_UINT64("dram-base", AspeedPCIERcState,
dram_base,Quoted 1 line
0), @@ -490,17 +489,6 @@ static void
aspeed_pcie_cfg_readwrite(AspeedPCIECfgState *s,
hw/pci-host/aspeed_pcie.c static void aspeed_pcie_cfg_readwrite(AspeedPCIECfgState *s,
Quoted 6 lines
offset = cfg_addr & 0xffc; pci = PCI_HOST_BRIDGE(rc);hw/pci-host/aspeed_pcie.c +0
-3- -/* -* On the AST2600, the RC_H bus number range from 0x80 to 0xFF, with the
Quoted 1 line
- * root device and root port assigned to bus
0x80instead of thestandard
Quoted 1 line
- *
0x00. To allow the PCI subsystem to correctly discover devices onthe
hw/pci-host/aspeed_pcie.c static void
Quoted 28 lines
hw/pci-host/aspeed_pcie.c +0
-6-* root bus, bus 0x80 is remapped to 0x00. -*/ -if (bus == rc->bus_nr) { - bus =0 ; - } - pdev =pci_find_device (pci->bus, bus, devfn);if (!pdev) { s->regs[desc->rdata_reg] = ~0; @@ -650,9 +638,6 @@ staticvoid
aspeed_pcie_cfg_realize(DeviceState *dev, Error **errp)apc->nr_regs << 2); sysbus_init_mmio(sbd, &s->mmio);hw/pci-host/aspeed_pcie.c +0
-3-object_property_set_int (OBJECT (&s->rc),"bus-nr" , - apc->rc_bus_nr, - &error_abort);object_property_set_int (OBJECT (&s->rc),"rp-addr" , apc->rc_rp_addr, &error_abort); @@ -691,7 +676,6 @@static void
aspeed_pcie_cfg_class_init(ObjectClass *klass, const void *data)apc->reg_map = &aspeed_regmap; apc->nr_regs = 0x100 >> 2; apc->rc_msi_addr = 0x1e77005C;hw/pci-host/aspeed_pcie.c +0
-1- apc->rc_bus_nr =0x80 ; apc->rc_rp_addr =PCI_DEVFN (8 ,0 ); }@@ -811,7 +795,6 @@ static voidaspeed_2700_pcie_cfg_class_init(ObjectClass *klass,
Quoted 7 lines
hw/pci-host/aspeed_pcie.c +0
-1apc->reg_map = &aspeed_2700_regmap; apc->nr_regs =0x100 >>2 ; apc->rc_msi_addr =0x000000F0 ; - apc->rc_bus_nr =0 ; apc->rc_rp_addr =PCI_DEVFN (0 ,0 ); }
Re: [PATCH v1 3/7] hw/pci-host/aspeed_pcie: Drop AST2600 RC_H root-bus remap and bus-nr property
Quoted 18 lines · Jamin Lin
Hi Cédric
Quoted 10 lines
Subject: Re: [PATCH v1 3/7] hw/pci-host/aspeed_pcie: Drop AST2600
RC_Hroot-bus remap and bus-nr propertyQuoted 6 lines · Jamin Lin via qemu development
The original AST2600 PCIe design supported both
RC_LandRC_H, using root bus number 0 forRC_Land0x80forRC_H. In that model, the root port appeared as
80:08.0 and QEMU carried a "bus-nr" property plus a config-space bus remap to translate bus0x80to bus0x00for PCI enumeration.Quoted 5 lines
Quoted 2 lines
Linux mainline has since dropped
RC_Lsupport and updated theRC_Hroot busWas PCI support for the Aspeed SoC merged in mainline ?
Quoted 7 lines
The ASPEED PCIe RC driver has been applied to the PCIe subtree in the next branch. Please refer to the following links for details.
The change will be merged into the Linux mainline soon.https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/log/?h=next
https://lore.kernel.org/linux-pci/[email protected]/T/#eb13673b4787528d636afa40791ae43d38bd1152a
https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/commit/?h=next&id=51aa64d4c19f0f00fd50cafd37cc2328675053ab
Great ! nice work.
Thanks,
C.
PATCH 4/7 hw/arm/aspeed_ast2600: Expand RC_H PCIe MMIO window to 0x60000000 - 0x80000000
In reply to Jamin Lin viaHistorically, the ASPEED PCIe driver supported both RC_L and RC_H, with RC_L using MMIO window 0x60000000 - 0x70000000 and RC_H using 0x70000000 - 0x80000000.
Mainline Linux has dropped RC_L support and now supports RC_H only, updating RC_H to use a single combined MMIO window 0x60000000 - 0x80000000.
Update the AST2600 QEMU model accordingly by moving PCIE_MMIO1 base to 0x60000000 and increasing the aliased MMIO size to 0x20000000.
--- hw/arm/aspeed_ast2600.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
hw/arm/aspeed_ast2600.c +4 -4
@@ -81,7 +81,7 @@ static const hwaddr aspeed_soc_ast2600_memmap[] = { [ASPEED_DEV_FSI1] = 0x1E79B000, [ASPEED_DEV_FSI2] = 0x1E79B100, [ASPEED_DEV_I3C] = 0x1E7A0000, - [ASPEED_DEV_PCIE_MMIO1] = 0x70000000, + [ASPEED_DEV_PCIE_MMIO1] = 0x60000000, [ASPEED_DEV_SDRAM] = 0x80000000, };
@@ -303,14 +303,14 @@ static uint64_t aspeed_calc_affinity(int cpu)* * Model scope / limitations: * - Firmware supports RC_H only; this QEMU model does not support RC_L. -* - RC_H uses PHY1 and the MMIO window [0x70000000, 0x80000000] +* - RC_H uses PHY1 and the MMIO window [0x60000000, 0x80000000] * (aka MMIO1). * * Indexing convention (this model): * - Expose a single logical instance at index 0. * - pcie[0] -> hardware RC_H (PCIe1) * - phy[0] -> hardware PHY1 -* - mmio.0 -> guest address range MMIO1: 0x70000000-0x80000000 +* - mmio.0 -> guest address range MMIO1: 0x60000000-0x80000000 * - RC_L / PCIe0 is not created and mapped. */ static bool aspeed_soc_ast2600_pcie_realize (DeviceState *dev,Error **errp)
@@ -346,7 +346,7 @@ static bool aspeed_soc_ast2600_pcie_realize(DeviceState *dev, Error **errp)memory_region_init_alias (&s->pcie_mmio_alias[0 ],OBJECT (&s->pcie[0 ].rc),"aspeed.pcie-mmio" , mmio_mr, sc->memmap[ASPEED_DEV_PCIE_MMIO1 ], -0x10000000 ); +0x20000000 );memory_region_add_subregion (s->memory, sc->memmap[ASPEED_DEV_PCIE_MMIO1 ], &s->pcie_mmio_alias[0 ]);
Signature · 1 line
2.43.0
PATCH 5/7 tests/functional/arm/test_aspeed_ast2600_sdk: Update test ASPEED SDK v11.00
In reply to Jamin Lin viaDrop root device and set root bus number to 0.
--- .../functional/arm/test_aspeed_ast2600_sdk.py | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-)
tests/functional/arm/test_aspeed_ast2600_sdk.py +9 -13
@@ -14,22 +14,18 @@ class AST2600Machine(AspeedTest): - ASSET_SDK_V908_AST2600 = Asset( - 'https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.08/ast2600-default-obmc.tar.gz', - 'a0414f14ad696550efe083c2156dbeda855c08cc9ae7f40fe1b41bf292295f82') + ASSET_SDK_V1100_AST2600 = Asset( + 'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.00/ast2600-default-obmc.tar.gz', + '64d8926a7d01b649168be96c986603b5690f06391286c438a3a772c8c7039e93') def do_ast2600_pcie_test(self): exec_command_and_wait_for_pattern(self, - 'lspci -s 80:00.0', - '80:00.0 Host bridge: ' - 'ASPEED Technology, Inc. Device 2600') - exec_command_and_wait_for_pattern(self, - 'lspci -s 80:08.0', - '80:08.0 PCI bridge: ' + 'lspci -s 00:08.0', + '00:08.0 PCI bridge: ' 'ASPEED Technology, Inc. AST1150 PCI-to-PCI Bridge') exec_command_and_wait_for_pattern(self, - 'lspci -s 81:00.0', - '81:00.0 Ethernet controller: ' + 'lspci -s 01:00.0', + '01:00.0 Ethernet controller: ' 'Intel Corporation 82574L Gigabit Network Connection') exec_command_and_wait_for_pattern(self, 'ip addr show dev eth4',
@@ -39,7 +35,7 @@ def test_arm_ast2600_evb_sdk(self): self.set_machine('ast2600-evb') self.require_netdev('user') - self.archive_extract(self.ASSET_SDK_V908_AST2600) + self.archive_extract(self.ASSET_SDK_V1100_AST2600) self.vm.add_args('-device', 'tmp105,bus=aspeed.i2c.bus.5,address=0x4d,id=tmp-test')
@@ -77,7 +73,7 @@ def test_arm_ast2600_evb_sdk(self): def test_arm_ast2600_otp_blockdev_device(self): self.vm.set_machine("ast2600-evb") - image_path = self.archive_extract(self.ASSET_SDK_V908_AST2600) + image_path = self.archive_extract(self.ASSET_SDK_V1100_AST2600) otp_img = self.generate_otpmem_image() self.vm.set_console()
Signature · 1 line
2.43.0
PATCH 6/7 tests/functional/arm/test_aspeed_ast1060: Update test aspeed-zephyr-project v03.04
In reply to Jamin Lin via--- tests/functional/arm/test_aspeed_ast1060.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
tests/functional/arm/test_aspeed_ast1060.py +7 -7
@@ -11,18 +11,18 @@ class AST1060Machine(AspeedTest): - ASSET_ASPEED_AST1060_PROT_3_02 = Asset( + ASSET_ASPEED_AST1060_PROT_3_04 = Asset( ('https://github.com/AspeedTech-BMC' - '/aspeed-zephyr-project/releases/download/v03.02' - '/ast1060_prot_v03.02.tgz'), - 'dd5f1adc935316ddd1906506a02e15567bd7290657b52320f1a225564cc175bd') + '/aspeed-zephyr-project/releases/download/v03.04' + '/ast1060_prot_v03.04.tgz'), + 'c0319df55f5b7a547efefc5a6ba374b881223d5fe1a776bfdd36f97fd1f31d50') - def test_arm_ast1060_prot_3_02(self): + def test_arm_ast1060_prot_3_04(self): self.set_machine('ast1060-evb') kernel_name = "ast1060_prot/zephyr.bin" kernel_file = self.archive_extract( - self.ASSET_ASPEED_AST1060_PROT_3_02, member=kernel_name) + self.ASSET_ASPEED_AST1060_PROT_3_04, member=kernel_name) self.vm.set_console() self.vm.add_args('-kernel', kernel_file, '-nographic')
@@ -35,7 +35,7 @@ def test_arm_ast1060_otp_blockdev_device(self): self.vm.set_machine("ast1060-evb") kernel_name = "ast1060_prot/zephyr.bin" - kernel_file = self.archive_extract(self.ASSET_ASPEED_AST1060_PROT_3_02, + kernel_file = self.archive_extract(self.ASSET_ASPEED_AST1060_PROT_3_04, member=kernel_name) otp_img = self.generate_otpmem_image()
Signature · 1 line
2.43.0
PATCH 7/7 tests/functional/arm/test_aspeed_ast1030: Update test ASPEED Zephyr SDK v03.05
In reply to Jamin Lin via--- tests/functional/arm/test_aspeed_ast1030.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
tests/functional/arm/test_aspeed_ast1030.py +6 -6
@@ -12,17 +12,17 @@ class AST1030Machine(AspeedTest): - ASSET_ZEPHYR_3_03 = Asset( + ASSET_ZEPHYR_3_05 = Asset( ('https://github.com/AspeedTech-BMC' - '/zephyr/releases/download/v00.03.03/ast1030-evb-demo.zip'), - '27cd73cdee6374bceb4ee58b3ace87989fa3f0684f4e612510804b588b24d4e0') + '/zephyr/releases/download/v00.03.05/ast1030-evb-demo.zip'), + '057528d343490b1fbb5a721e91084b4f04fec60dc114bd65e724554f9c217f4b') - def test_arm_ast1030_zephyros_3_03(self): + def test_arm_ast1030_zephyros_3_05(self): self.set_machine('ast1030-evb') kernel_name = "ast1030-evb-demo/zephyr.elf" kernel_file = self.archive_extract( - self.ASSET_ZEPHYR_3_03, member=kernel_name) + self.ASSET_ZEPHYR_3_05, member=kernel_name) self.vm.set_console() self.vm.add_args('-kernel', kernel_file, '-nographic')
@@ -72,7 +72,7 @@ def test_arm_ast1030_otp_blockdev_device(self): self.vm.set_machine("ast1030-evb") kernel_name = "ast1030-evb-demo/zephyr.elf" - kernel_file = self.archive_extract(self.ASSET_ZEPHYR_3_03, + kernel_file = self.archive_extract(self.ASSET_ZEPHYR_3_05, member=kernel_name) otp_img = self.generate_otpmem_image()
Signature · 1 line
2.43.0
Quoted 23 lines · Jamin Lin via qemu development
v1:
- Remove AST2600 PCIe root device andRC_Lsupport
- DropRC_Hroot-bus remap and bus number properties
- Expand AST2600RC_HPCIe MMIO window to 0x60000000�V0x80000000
- Update functional tests for AST2500, AST2600, AST1060, and AST1030
- AST2500 tests are updated to use SDK v10.00, as network support is known to be broken in v11.00.Jamin Lin (7):
tests/functional/arm/test_aspeed_ast2500: Update test ASPEED SDKv10.00 hw/pci-host/aspeed_pcie: Drop AST2600 PCIe root device hw/pci-host/aspeed_pcie: Drop AST2600 RC_H root-bus remap and bus-nr property hw/arm/aspeed_ast2600: Expand RC_H PCIe MMIO window to 0x60000000 - 0x80000000 tests/functional/arm/test_aspeed_ast2600_sdk: Update test ASPEED SDK v11.00 tests/functional/arm/test_aspeed_ast1060: Update test aspeed-zephyr-project v03.04 tests/functional/arm/test_aspeed_ast1030: Update test ASPEED Zephyr SDK v03.05
Quoted 9 lines
include/hw/pci-host/aspeed_pcie.h | 11 --- hw/arm/aspeed_ast2600.c | 8 +- hw/pci-host/aspeed_pcie.c | 76 +------------------ tests/functional/arm/test_aspeed_ast1030.py | 12 +-- tests/functional/arm/test_aspeed_ast1060.py | 14 ++-- tests/functional/arm/test_aspeed_ast2500.py | 8 +- .../functional/arm/test_aspeed_ast2600_sdk.py | 22 +++--- 7 files changed, 31 insertions(+), 120 deletions(-)
For the series,
Thanks,
C.