lkml.org 
[lkml]   [2012]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/3]: x86-64: Handle SRAT v1 and v2 consistently
    Hi,

    x86-64 was rather inconsistent prior to this patch; it used 8 bits
    for the pxm field in cpu_affinity, but 32 bits in mem_affinity.
    This patch makes it consistent: Either use 8 bits consistently (SRAT
    rev 1 or lower) or 32 bits (SRAT rev 2 or higher).

    This is patch 2/3.
    --
    Kurt Garloff <kurt@garloff.de> [Koeln/Greven]

    From: Kurt Garloff <kurt@garloff.de>
    Subject: Use SRAT table rev to use 8bit or 32bit PXM fields (x86/x86-64)
    References: bnc#503038

    In SRAT v1, we had 8bit proximity domain (PXM) fields; SRAT v2 provides
    32bits for these. The new fields were reserved before.
    According to the ACPI spec, the OS must disregrard reserved fields.

    x86/x86-64 was rather inconsistent prior to this patch; it used 8 bits
    for the pxm field in cpu_affinity, but 32 bits in mem_affinity.
    This patch makes it consistent: Either use 8 bits consistently (SRAT
    rev 1 or lower) or 32 bits (SRAT rev 2 or higher).

    This is patch 2/3.

    Signed-off-by: Kurt Garloff <kurt@garloff.de>

    ---
    arch/x86/mm/srat.c | 4 ++++
    1 file changed, 4 insertions(+)

    Index: linux-2.6.git/arch/x86/mm/srat.c
    ===================================================================
    --- linux-2.6.git.orig/arch/x86/mm/srat.c
    +++ linux-2.6.git/arch/x86/mm/srat.c
    @@ -108,8 +108,10 @@ acpi_numa_processor_affinity_init(struct
    }
    if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
    return;
    pxm = pa->proximity_domain_lo;
    + if (acpi_srat_revision >= 2)
    + pxm |= *((unsigned int*)pa->proximity_domain_hi) << 8;
    node = setup_node(pxm);
    if (node < 0) {
    printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
    bad_srat();
    @@ -159,8 +161,10 @@ acpi_numa_memory_affinity_init(struct ac
    return;
    start = ma->base_address;
    end = start + ma->length;
    pxm = ma->proximity_domain;
    + if (acpi_srat_revision <= 1)
    + pxm &= 0xff;
    node = setup_node(pxm);
    if (node < 0) {
    printk(KERN_ERR "SRAT: Too many proximity domains.\n");
    bad_srat();[unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-01-15 22:39    [W:0.025 / U:0.032 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site