Commit 0f6dd8e1 authored by Marcel Apfelbaum's avatar Marcel Apfelbaum Committed by Michael S. Tsirkin
Browse files

apci: fix PXB behaviour if used with unsupported BIOS 



PXB does not work with unsupported bioses, but should
not interfere with normal OS operation.
We don't ship them anymore, but it's reasonable
to keep the work-around until we update the bios in qemu.

Fix this by not adding PXB mem/IO chunks to _CRS
if they weren't configured by BIOS.

Signed-off-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarLaszlo Ersek <lersek@redhat.com>
parent 0e79e51a

hw/i386/acpi-build.c

+58 −29
Original line number Diff line number Diff line
@@ -786,6 +786,14 @@ static Aml *build_crs(PCIHostState *host, 
            range_base = r->addr;

            range_limit = r->addr + r->size - 1;



            /*

             * Work-around for old bioses

             * that do not support multiple root buses

             */

            if (!range_base || range_base > range_limit) {

                continue;

            }



            if (r->type & PCI_BASE_ADDRESS_SPACE_IO) {

                aml_append(crs,

                    aml_word_io(AML_MIN_FIXED, AML_MAX_FIXED,
@@ -819,6 +827,12 @@ static Aml *build_crs(PCIHostState *host, 


            range_base = pci_bridge_get_base(dev, PCI_BASE_ADDRESS_SPACE_IO);

            range_limit = pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_SPACE_IO);



            /*

             * Work-around for old bioses

             * that do not support multiple root buses

             */

            if (range_base || range_base > range_limit) {

                aml_append(crs,

                           aml_word_io(AML_MIN_FIXED, AML_MAX_FIXED,

                                       AML_POS_DECODE, AML_ENTIRE_RANGE,
@@ -828,11 +842,18 @@ static Aml *build_crs(PCIHostState *host, 
                                       0,

                                       range_limit - range_base + 1));

                crs_range_insert(io_ranges, range_base, range_limit);

            }



            range_base =

                pci_bridge_get_base(dev, PCI_BASE_ADDRESS_SPACE_MEMORY);

            range_limit =

                pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_SPACE_MEMORY);



            /*

             * Work-around for old bioses

             * that do not support multiple root buses

             */

            if (range_base || range_base > range_limit) {

                aml_append(crs,

                           aml_dword_memory(AML_POS_DECODE, AML_MIN_FIXED,

                                            AML_MAX_FIXED, AML_NON_CACHEABLE,
@@ -843,11 +864,18 @@ static Aml *build_crs(PCIHostState *host, 
                                            0,

                                            range_limit - range_base + 1));

                crs_range_insert(mem_ranges, range_base, range_limit);

          }



            range_base =

                pci_bridge_get_base(dev, PCI_BASE_ADDRESS_MEM_PREFETCH);

            range_limit =

                pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_MEM_PREFETCH);



            /*

             * Work-around for old bioses

             * that do not support multiple root buses

             */

            if (range_base || range_base > range_limit) {

                aml_append(crs,

                           aml_dword_memory(AML_POS_DECODE, AML_MIN_FIXED,

                                            AML_MAX_FIXED, AML_NON_CACHEABLE,
@@ -860,6 +888,7 @@ static Aml *build_crs(PCIHostState *host, 
                crs_range_insert(mem_ranges, range_base, range_limit);

            }

        }

    }



    aml_append(crs,

        aml_word_bus_number(AML_MIN_FIXED, AML_MAX_FIXED, AML_POS_DECODE,