hw/arm/virt-acpi-build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
This is more proper to use PCIE_MMCFG_BUS to retrieve end_bus_number.
Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
---
hw/arm/virt-acpi-build.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index d7e2e4885b..57679a89bf 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -560,8 +560,8 @@ build_mcfg(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
/* Only a single allocation so no need to play with segments */
mcfg->allocation[0].pci_segment = cpu_to_le16(0);
mcfg->allocation[0].start_bus_number = 0;
- mcfg->allocation[0].end_bus_number = (memmap[ecam_id].size
- / PCIE_MMCFG_SIZE_MIN) - 1;
+ mcfg->allocation[0].end_bus_number =
+ PCIE_MMCFG_BUS(memmap[ecam_id].size - 1);
build_header(linker, table_data, (void *)(table_data->data + mcfg_start),
"MCFG", table_data->len - mcfg_start, 1, NULL, NULL);
--
2.19.1
Hi On 3/12/19 8:49 AM, Wei Yang wrote: > This is more proper to use PCIE_MMCFG_BUS to retrieve end_bus_number. > > Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> Reviewed-by: Eric Auger <eric.auger@redhat.com> Thanks Eric > --- > hw/arm/virt-acpi-build.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index d7e2e4885b..57679a89bf 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -560,8 +560,8 @@ build_mcfg(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > /* Only a single allocation so no need to play with segments */ > mcfg->allocation[0].pci_segment = cpu_to_le16(0); > mcfg->allocation[0].start_bus_number = 0; > - mcfg->allocation[0].end_bus_number = (memmap[ecam_id].size > - / PCIE_MMCFG_SIZE_MIN) - 1; > + mcfg->allocation[0].end_bus_number = > + PCIE_MMCFG_BUS(memmap[ecam_id].size - 1); > > build_header(linker, table_data, (void *)(table_data->data + mcfg_start), > "MCFG", table_data->len - mcfg_start, 1, NULL, NULL); >
On Tue, 12 Mar 2019 15:49:53 +0800 Wei Yang <richardw.yang@linux.intel.com> wrote: > This is more proper to use PCIE_MMCFG_BUS to retrieve end_bus_number. > > Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/arm/virt-acpi-build.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index d7e2e4885b..57679a89bf 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -560,8 +560,8 @@ build_mcfg(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > /* Only a single allocation so no need to play with segments */ > mcfg->allocation[0].pci_segment = cpu_to_le16(0); > mcfg->allocation[0].start_bus_number = 0; > - mcfg->allocation[0].end_bus_number = (memmap[ecam_id].size > - / PCIE_MMCFG_SIZE_MIN) - 1; > + mcfg->allocation[0].end_bus_number = > + PCIE_MMCFG_BUS(memmap[ecam_id].size - 1); > > build_header(linker, table_data, (void *)(table_data->data + mcfg_start), > "MCFG", table_data->len - mcfg_start, 1, NULL, NULL);
On Tue, 12 Mar 2019 at 07:51, Wei Yang <richardw.yang@linux.intel.com> wrote: > > This is more proper to use PCIE_MMCFG_BUS to retrieve end_bus_number. > > Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> > --- > hw/arm/virt-acpi-build.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index d7e2e4885b..57679a89bf 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -560,8 +560,8 @@ build_mcfg(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > /* Only a single allocation so no need to play with segments */ > mcfg->allocation[0].pci_segment = cpu_to_le16(0); > mcfg->allocation[0].start_bus_number = 0; > - mcfg->allocation[0].end_bus_number = (memmap[ecam_id].size > - / PCIE_MMCFG_SIZE_MIN) - 1; > + mcfg->allocation[0].end_bus_number = > + PCIE_MMCFG_BUS(memmap[ecam_id].size - 1); > > build_header(linker, table_data, (void *)(table_data->data + mcfg_start), > "MCFG", table_data->len - mcfg_start, 1, NULL, NULL); > -- > 2.19.1 Applied to target-arm.next, thanks. -- PMM
© 2016 - 2024 Red Hat, Inc.