lkml.org 
[lkml]   [2012]   [Jan]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[21/90] x86/PCI: Ignore CPU non-addressable _CRS reserved memory resources
    3.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Gary Hade <garyhade@us.ibm.com>

    commit ae5cd86455381282ece162966183d3f208c6fad7 upstream.

    This assures that a _CRS reserved host bridge window or window region is
    not used if it is not addressable by the CPU. The new code either trims
    the window to exclude the non-addressable portion or totally ignores the
    window if the entire window is non-addressable.

    The current code has been shown to be problematic with 32-bit non-PAE
    kernels on systems where _CRS reserves resources above 4GB.

    Signed-off-by: Gary Hade <garyhade@us.ibm.com>
    Reviewed-by: Bjorn Helgaas <bhelgaas@google.com>
    Cc: Thomas Renninger <trenn@novell.com>
    Cc: linux-kernel@vger.kernel.org
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/x86/pci/acpi.c | 18 ++++++++++++++++--
    1 file changed, 16 insertions(+), 2 deletions(-)

    --- a/arch/x86/pci/acpi.c
    +++ b/arch/x86/pci/acpi.c
    @@ -149,7 +149,7 @@ setup_resource(struct acpi_resource *acp
    struct acpi_resource_address64 addr;
    acpi_status status;
    unsigned long flags;
    - u64 start, end;
    + u64 start, orig_end, end;

    status = resource_to_addr(acpi_res, &addr);
    if (!ACPI_SUCCESS(status))
    @@ -165,7 +165,21 @@ setup_resource(struct acpi_resource *acp
    return AE_OK;

    start = addr.minimum + addr.translation_offset;
    - end = addr.maximum + addr.translation_offset;
    + orig_end = end = addr.maximum + addr.translation_offset;
    +
    + /* Exclude non-addressable range or non-addressable portion of range */
    + end = min(end, (u64)iomem_resource.end);
    + if (end <= start) {
    + dev_info(&info->bridge->dev,
    + "host bridge window [%#llx-%#llx] "
    + "(ignored, not CPU addressable)\n", start, orig_end);
    + return AE_OK;
    + } else if (orig_end != end) {
    + dev_info(&info->bridge->dev,
    + "host bridge window [%#llx-%#llx] "
    + "([%#llx-%#llx] ignored, not CPU addressable)\n",
    + start, orig_end, end + 1, orig_end);
    + }

    res = &info->res[info->res_num];
    res->name = info->name;



    \
     
     \ /
      Last update: 2012-01-24 01:09    [W:4.157 / U:0.412 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site