From: John Crispin <john@phrozen.org>
To: linux-mips@linux-mips.org
Subject: Re: [PATCH V5 09/18] MIPS: Loongson: Add swiotlb to support big memory (>4GB).
Date: Sun, 12 Aug 2012 08:17:15 +0200 [thread overview]
Message-ID: <50274A6B.30807@phrozen.org> (raw)
In-Reply-To: <1344677543-22591-10-git-send-email-chenhc@lemote.com>
> diff --git a/arch/mips/include/asm/mach-loongson/dma-coherence.h b/arch/mips/include/asm/mach-loongson/dma-coherence.h
> index e143305..b1dc286 100644
> --- a/arch/mips/include/asm/mach-loongson/dma-coherence.h
> +++ b/arch/mips/include/asm/mach-loongson/dma-coherence.h
[...]
> static inline unsigned long plat_dma_addr_to_phys(struct device *dev,
> dma_addr_t dma_addr)
> {
> -#if defined(CONFIG_CPU_LOONGSON2F) && defined(CONFIG_64BIT)
> +#if defined(CONFIG_64BIT)
> +#if defined(CONFIG_CPU_LOONGSON3)
> + return (dma_addr < 0x90000000 && dma_addr >= 0x80000000) ?
> + (dma_addr & 0x0fffffff) : dma_addr;
> +#elif defined(CONFIG_CPU_LOONGSON2F)
> return (dma_addr > 0x8fffffff) ? dma_addr : (dma_addr & 0x0fffffff);
> +#endif /* CONFIG_CPU_LOONGSON3 */
> #else
> return dma_addr & 0x7fffffff;
> -#endif
> +#endif /* CONFIG_64BIT */
> }
This will break if 64bit is defined and neither LOONGSON2F/3 are not
defined.
next prev parent reply other threads:[~2012-08-12 6:18 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-11 9:32 [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
2012-08-11 9:32 ` [PATCH V5 01/18] MIPS: Loongson: Add basic Loongson-3 definition Huacai Chen
2012-08-12 5:51 ` John Crispin
2012-08-15 19:36 ` Ralf Baechle
2012-08-16 0:39 ` Huacai Chen
2012-08-11 9:32 ` [PATCH V5 02/18] MIPS: Loongson: Add basic Loongson-3 CPU support Huacai Chen
2012-08-11 9:32 ` [PATCH V5 03/18] MIPS: Loongson 3: Add Lemote-3A machtypes definition Huacai Chen
2012-08-11 9:32 ` [PATCH V5 04/18] MIPS: Loongson: Make Loongson-3 to use BCD format for RTC Huacai Chen
2012-08-12 6:06 ` John Crispin
2012-08-11 9:32 ` [PATCH V5 05/18] MIPS: Loongson: Add UEFI-like firmware interface support Huacai Chen
2012-08-11 9:32 ` [PATCH V5 06/18] MIPS: Loongson 3: Add HT-linked PCI support Huacai Chen
2012-08-11 9:32 ` [PATCH V5 07/18] MIPS: Loongson 3: Add IRQ init and dispatch support Huacai Chen
2012-08-11 9:32 ` [PATCH V5 08/18] MIPS: Loongson 3: Add serial port support Huacai Chen
2012-08-11 9:32 ` [PATCH V5 09/18] MIPS: Loongson: Add swiotlb to support big memory (>4GB) Huacai Chen
2012-08-12 6:17 ` John Crispin [this message]
2012-08-13 17:54 ` Konrad Rzeszutek Wilk
2012-08-14 2:29 ` Huacai Chen
2012-08-14 5:57 ` Huacai Chen
2012-08-14 16:26 ` David Daney
2012-08-14 16:26 ` David Daney
2012-08-15 2:18 ` Huacai Chen
2012-08-15 20:24 ` Ralf Baechle
2012-08-16 3:19 ` Huacai Chen
2012-08-11 9:32 ` [PATCH V5 10/18] MIPS: Loongson: Add Loongson-3 Kconfig options Huacai Chen
2012-08-12 6:20 ` John Crispin
2012-08-11 9:32 ` [PATCH V5 11/18] drm/radeon: Include swiotlb.h if SWIOTLB configured Huacai Chen
2012-08-11 9:32 ` [PATCH V5 12/18] drm: Handle io prot correctly for MIPS Huacai Chen
2012-08-11 9:32 ` [PATCH V5 13/18] drm: Define SAREA_MAX for Loongson (PageSize = 16KB) Huacai Chen
2012-08-15 21:31 ` Ralf Baechle
2012-08-16 0:43 ` Huacai Chen
2012-08-16 1:58 ` Matt Turner
2012-08-16 3:20 ` Huacai Chen
2012-08-11 9:32 ` [PATCH V5 14/18] ALSA: HDA: Make hda sound card usable for Loongson Huacai Chen
2012-08-13 8:00 ` [alsa-devel] " Takashi Iwai
2012-08-13 8:22 ` Huacai Chen
2012-08-11 9:32 ` [PATCH V5 15/18] MIPS: Loongson 3: Add Loongson-3 SMP support Huacai Chen
2012-08-11 9:32 ` [PATCH V5 16/18] MIPS: Loongson 3: Add CPU hotplug support Huacai Chen
2012-08-11 9:32 ` [PATCH V5 17/18] MIPS: Fix poweroff failure when HOTPLUG_CPU configured Huacai Chen
2012-08-11 9:32 ` [PATCH V5 18/18] MIPS: Loongson: Add a Loongson-3 default config file Huacai Chen
2012-08-12 6:13 ` [PATCH V5 00/16] MIPS: Add Loongson-3 based machines support John Crispin
2012-08-12 8:10 ` Huacai Chen
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=50274A6B.30807@phrozen.org \
--to=john@phrozen.org \
--cc=linux-mips@linux-mips.org \
/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