lkml.org 
[lkml]   [2011]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 4/4] ARM: convert PCI defines to variables
    On 06/28/2011 06:41 PM, Russell King - ARM Linux wrote:
    > On Tue, Jun 28, 2011 at 05:57:39PM -0500, Rob Herring wrote:
    >> From: Rob Herring <rob.herring@calxeda.com>
    >>
    >> Convert PCIBIOS_MIN_IO, PCIBIOS_MIN_MEM, and PCIMEM_BASE to variables to allow
    >> multi-platform builds. This also removes the requirement for a platform to
    >> have a mach/hardware.h.
    >
    > Please don't include PCIMEM_BASE in that - move that into asm/vga.h and
    > call it VGA_BASE because that's really what it is. There's also the
    > matter of a definition of a HAS_ symbol...
    >
    Okay. I'm still setting vga_base (no point in this case for a define) in
    the platforms' pci code as in all cases vga_base is set to PCI memory
    space.

    I don't follow your comment about HAS_ symbol.

    >> diff --git a/arch/arm/include/asm/vga.h b/arch/arm/include/asm/vga.h
    >> index 250a4dd..86290df 100644
    >> --- a/arch/arm/include/asm/vga.h
    >> +++ b/arch/arm/include/asm/vga.h
    >> @@ -2,7 +2,7 @@
    >> #define ASMARM_VGA_H
    >>
    >> #include <linux/io.h>
    >> -#include <mach/hardware.h>
    >> +#include <asm/pci.h>
    >>
    >> #define VGA_MAP_MEM(x,s) (PCIMEM_BASE + (x))
    >>
    >
    > VGA is not dependent on having PCI - there have been ARM platforms which
    > have VGA without PCI.
    >
    >> diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h
    >> index b4ea392..de63ca3 100644
    >> --- a/arch/arm/mach-pxa/include/mach/hardware.h
    >> +++ b/arch/arm/mach-pxa/include/mach/hardware.h
    >> @@ -337,8 +337,6 @@ extern unsigned long get_clock_tick_rate(void);
    >> #endif
    >>
    >> #if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI)
    >> -#define PCIBIOS_MIN_IO 0
    >> -#define PCIBIOS_MIN_MEM 0
    >> #define ARCH_HAS_DMA_SET_COHERENT_MASK
    >> #endif
    >>
    >
    > This definitely breaks because ARCH_HAS_DMA_SET_COHERENT_MASK needs to
    > be picked up by linux/dma-mapping.h. However, this may already be
    > broken as there's no clear path where this reliably happens.

    Looks like moving it to mach/memory.h would be the right header. This is
    also something to make run-time. Hopefully, the dma mapping work will
    address that.

    Rob



    \
     
     \ /
      Last update: 2011-06-29 04:35    [W:0.034 / U:31.040 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site