• Borislav Petkov's avatar
    x86, k8 nb: Fix boot crash: enable k8_northbridges unconditionally on AMD systems · 0e152cd7
    Borislav Petkov authored
    de957628 changed setting of the
    x86_init.iommu.iommu_init function ptr only when GART IOMMU is
    found.
    
    One side effect of it is that num_k8_northbridges
    is not initialized anymore if not explicitly
    called. This resulted in uninitialized pointers in
    <arch/x86/kernel/cpu/intel_cacheinfo.c:amd_calc_l3_indices()>,
    for example, which uses the num_k8_northbridges thing through
    node_to_k8_nb_misc().
    
    Fix that through an initcall that runs right after the PCI
    subsystem and does all the scanning. Then, remove initialization
    in gart_iommu_init() which is a rootfs_initcall and we're
    running before that.
    
    What is more, since num_k8_northbridges is being used in other
    places beside GART IOMMU, include it whenever we add AMD CPU
    support. The previous dependency chain in kconfig contained
    
    K8_NB depends on AGP_AMD64|GART_IOMMU
    
    which was clearly incorrect. The more natural way in terms of
    hardware dependency should be
    
    AGP_AMD64|GART_IOMMU depends on K8_NB depends on CPU_SUP_AMD &&
    PCI. Make it so Number One!
    Signed-off-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
    Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Cc: Joerg Roedel <joerg.roedel@amd.com>
    LKML-Reference: <20100312144303.GA29262@aftab>
    Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
    Tested-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
    0e152cd7
Kconfig 5.12 KB