From: Rob Herring <robherring2@gmail.com>
To: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Michal Simek <monstr@monstr.eu>,
Rob Herring <rob.herring@calxeda.com>,
nico@fluxnic.net
Subject: Re: [PATCH 4/4] ARM: convert PCI defines to variables
Date: Tue, 28 Jun 2011 21:32:13 -0500 [thread overview]
Message-ID: <4E0A8EAD.40800@gmail.com> (raw)
In-Reply-To: <20110628234130.GJ21898@n2100.arm.linux.org.uk>
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
next prev parent reply other threads:[~2011-06-29 2:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-28 22:57 [RFC PATCH 0/4] ARM: make mach/hardware.h optional Rob Herring
2011-06-28 22:57 ` [PATCH 1/4] microblaze: move pci flag functions into asm-generic Rob Herring
2011-06-28 22:57 ` [PATCH 2/4] ARM: remove unnecessary mach/hardware.h includes Rob Herring
2011-06-28 23:24 ` Russell King - ARM Linux
2011-06-29 2:41 ` Rob Herring
2011-06-28 22:57 ` [PATCH 3/4] ARM: pci: make pcibios_assign_all_busses use pci_has_flag Rob Herring
2011-06-28 22:57 ` [PATCH 4/4] ARM: convert PCI defines to variables Rob Herring
2011-06-28 23:41 ` Russell King - ARM Linux
2011-06-29 2:32 ` Rob Herring [this message]
2011-06-28 23:24 ` [RFC PATCH 0/4] ARM: make mach/hardware.h optional Nicolas Pitre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E0A8EAD.40800@gmail.com \
--to=robherring2@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=monstr@monstr.eu \
--cc=nico@fluxnic.net \
--cc=rob.herring@calxeda.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox