lkml.org 
[lkml]   [2009]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 6/7] x86/pci: enable pci root res read out for 32bit too

    should be good for 32bit too.

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>

    ---
    arch/x86/pci/Makefile | 3 +--
    arch/x86/pci/amd_bus.c | 17 +++--------------
    arch/x86/pci/bus_numa.h | 4 ++--
    arch/x86/pci/i386.c | 4 ----
    4 files changed, 6 insertions(+), 22 deletions(-)

    Index: linux-2.6/arch/x86/pci/Makefile
    ===================================================================
    --- linux-2.6.orig/arch/x86/pci/Makefile
    +++ linux-2.6/arch/x86/pci/Makefile
    @@ -14,8 +14,7 @@ obj-$(CONFIG_X86_VISWS) += visws.o
    obj-$(CONFIG_X86_NUMAQ) += numaq_32.o

    obj-y += common.o early.o
    -obj-y += amd_bus.o
    -obj-$(CONFIG_X86_64) += bus_numa.o intel_bus.o
    +obj-y += amd_bus.o bus_numa.o intel_bus.o

    ifeq ($(CONFIG_PCI_DEBUG),y)
    EXTRA_CFLAGS += -DDEBUG
    Index: linux-2.6/arch/x86/pci/amd_bus.c
    ===================================================================
    --- linux-2.6.orig/arch/x86/pci/amd_bus.c
    +++ linux-2.6/arch/x86/pci/amd_bus.c
    @@ -6,9 +6,7 @@

    #include <asm/pci_x86.h>

    -#ifdef CONFIG_X86_64
    #include <asm/pci-direct.h>
    -#endif

    #include "bus_numa.h"

    @@ -17,8 +15,6 @@
    * also get peer root bus resource for io,mmio
    */

    -#ifdef CONFIG_X86_64
    -
    struct pci_hostbridge_probe {
    u32 bus;
    u32 slot;
    @@ -207,7 +203,7 @@ static int __init early_fill_mp_bus_info
    address = MSR_K8_TOP_MEM1;
    rdmsrl(address, val);
    end = (val & 0xffffff800000ULL);
    - printk(KERN_INFO "TOM: %016lx aka %ldM\n", end, end>>20);
    + printk(KERN_INFO "TOM: %016llx aka %lldM\n", (u64)end, (u64)end>>20);
    if (end < (1ULL<<32))
    subtract_range(range, RANGE_NUM, 0, end - 1);

    @@ -301,7 +297,8 @@ static int __init early_fill_mp_bus_info
    address = MSR_K8_TOP_MEM2;
    rdmsrl(address, val);
    end = (val & 0xffffff800000ULL);
    - printk(KERN_INFO "TOM2: %016lx aka %ldM\n", end, end>>20);
    + printk(KERN_INFO "TOM2: %016llx aka %lldM\n", (u64)end,
    + (u64)end>>20);
    subtract_range(range, RANGE_NUM, 1ULL<<32, end - 1);
    }

    @@ -347,14 +344,6 @@ static int __init early_fill_mp_bus_info
    return 0;
    }

    -#else /* !CONFIG_X86_64 */
    -
    -static int __init early_fill_mp_bus_info(void) { return 0; }
    -
    -#endif /* !CONFIG_X86_64 */
    -
    -/* common 32/64 bit code */
    -
    #define ENABLE_CF8_EXT_CFG (1ULL << 46)

    static void enable_pci_io_ecs(void *unused)
    Index: linux-2.6/arch/x86/pci/i386.c
    ===================================================================
    --- linux-2.6.orig/arch/x86/pci/i386.c
    +++ linux-2.6/arch/x86/pci/i386.c
    @@ -257,10 +257,6 @@ void __init pcibios_resource_survey(void
    */
    fs_initcall(pcibios_assign_resources);

    -void __weak x86_pci_root_bus_res_quirks(struct pci_bus *b)
    -{
    -}
    -
    /*
    * If we set up a device for bus mastering, we need to check the latency
    * timer as certain crappy BIOSes forget to set it properly.
    Index: linux-2.6/arch/x86/pci/bus_numa.h
    ===================================================================
    --- linux-2.6.orig/arch/x86/pci/bus_numa.h
    +++ linux-2.6/arch/x86/pci/bus_numa.h
    @@ -1,5 +1,5 @@
    -#ifdef CONFIG_X86_64
    -
    +#ifndef __BUS_NUMA_H
    +#define __BUS_NUMA_H
    /*
    * sub bus (transparent) will use entres from 3 to store extra from
    * root, so need to make sure we have enough slot there, Should we



    \
     
     \ /
      Last update: 2009-12-12 00:55    [W:0.025 / U:61.184 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site