lkml.org 
[lkml]   [2010]   [Jan]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 06/38] x86/pci: add cap_resource
    prepare for 32bit pci root bus

    -v2: hpa said we should compare with (resource_size_t)~0
    -v3: according to Linus to use MAX_RESOURCE instead.
    also need need to put related patches together

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    ---
    arch/x86/pci/amd_bus.c | 8 +++++---
    arch/x86/pci/bus_numa.c | 3 +++
    arch/x86/pci/intel_bus.c | 5 ++++-
    include/linux/range.h | 8 ++++++++
    4 files changed, 20 insertions(+), 4 deletions(-)

    diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
    index e8bb553..9bcb6fe 100644
    --- a/arch/x86/pci/amd_bus.c
    +++ b/arch/x86/pci/amd_bus.c
    @@ -201,7 +201,7 @@ static int __init early_fill_mp_bus_info(void)

    memset(range, 0, sizeof(range));
    /* 0xfd00000000-0xffffffffff for HT */
    - range[0].end = (0xfdULL<<32) - 1;
    + range[0].end = cap_resource((0xfdULL<<32) - 1);

    /* need to take out [0, TOM) for RAM*/
    address = MSR_K8_TOP_MEM1;
    @@ -286,7 +286,8 @@ static int __init early_fill_mp_bus_info(void)
    }
    }

    - update_res(info, start, end, IORESOURCE_MEM, 1);
    + update_res(info, cap_resource(start), cap_resource(end),
    + IORESOURCE_MEM, 1);
    subtract_range(range, RANGE_NUM, start, end);
    printk(KERN_CONT "\n");
    }
    @@ -321,7 +322,8 @@ static int __init early_fill_mp_bus_info(void)
    if (!range[i].end)
    continue;

    - update_res(info, range[i].start, range[i].end,
    + update_res(info, cap_resource(range[i].start),
    + cap_resource(range[i].end),
    IORESOURCE_MEM, 1);
    }
    }
    diff --git a/arch/x86/pci/bus_numa.c b/arch/x86/pci/bus_numa.c
    index 3411687..1515a9b 100644
    --- a/arch/x86/pci/bus_numa.c
    +++ b/arch/x86/pci/bus_numa.c
    @@ -55,6 +55,9 @@ void __devinit update_res(struct pci_root_info *info, resource_size_t start,
    if (start > end)
    return;

    + if (start == MAX_RESOURCE)
    + return;
    +
    if (!merge)
    goto addit;

    diff --git a/arch/x86/pci/intel_bus.c b/arch/x86/pci/intel_bus.c
    index f81a2fa..145e0dd 100644
    --- a/arch/x86/pci/intel_bus.c
    +++ b/arch/x86/pci/intel_bus.c
    @@ -6,6 +6,8 @@
    #include <linux/dmi.h>
    #include <linux/pci.h>
    #include <linux/init.h>
    +#include <linux/range.h>
    +
    #include <asm/pci_x86.h>

    #include "bus_numa.h"
    @@ -85,7 +87,8 @@ static void __devinit pci_root_bus_res(struct pci_dev *dev)
    mmioh_base |= ((u64)(dword & 0x7ffff)) << 32;
    pci_read_config_dword(dev, IOH_LMMIOH_LIMITU, &dword);
    mmioh_end |= ((u64)(dword & 0x7ffff)) << 32;
    - update_res(info, mmioh_base, mmioh_end, IORESOURCE_MEM, 0);
    + update_res(info, cap_resource(mmioh_base), cap_resource(mmioh_end),
    + IORESOURCE_MEM, 0);

    print_ioh_resources(info);
    }
    diff --git a/include/linux/range.h b/include/linux/range.h
    index 0789f14..44c623e 100644
    --- a/include/linux/range.h
    +++ b/include/linux/range.h
    @@ -19,4 +19,12 @@ int clean_sort_range(struct range *range, int az);

    void sort_range(struct range *range, int nr_range);

    +#define MAX_RESOURCE ((resource_size_t)~0)
    +static inline resource_size_t cap_resource(u64 val)
    +{
    + if (val > MAX_RESOURCE)
    + return MAX_RESOURCE;
    + else
    + return val;
    +}
    #endif
    --
    1.6.4.2


    \
     
     \ /
      Last update: 2010-01-22 10:39    [W:0.044 / U:125.720 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site