From: Simon Horman <horms@verge.net.au>
To: linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 08/14] ARM: shmobile: Add shared R-Car Gen2 CMA reservation code
Date: Thu, 26 Jun 2014 00:19:55 +0000 [thread overview]
Message-ID: <20140626001955.GA557@verge.net.au> (raw)
In-Reply-To: <20140625234708.GD7130@verge.net.au>
[Cc Olof]
On Thu, Jun 26, 2014 at 08:47:08AM +0900, Simon Horman wrote:
> On Wed, Jun 25, 2014 at 07:18:09PM +0400, Sergei Shtylyov wrote:
> > Hello.
> >
> > On 06/25/2014 11:35 AM, Simon Horman wrote:
> >
> > >From: Magnus Damm <damm+renesas@opensource.se>
> >
> > >Add R-Car Gen2 CMA memory reservation code that can be
> > >shared between multiple SoCs and boards. At this point
> > >r8a7790 and r8a7791 are supported.
> >
> > >The top 256MiB of the legacy 32-bit physical memory space
> > >is assigned to a separate CMA area that may be assigned
> > >to various devices later on.
> >
> > >Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> > >[horms+renesas@verge.net.au: rebased]
> > >Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> >
> > [...]
> >
> > >diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> > >index fdc714e..544b9bf 100644
> > >--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
> > >+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> > >@@ -20,8 +20,11 @@
> > >
> > > #include <linux/clk/shmobile.h>
> > > #include <linux/clocksource.h>
> > >+#include <linux/device.h>
> > >+#include <linux/dma-contiguous.h>
> > > #include <linux/io.h>
> > > #include <linux/kernel.h>
> > >+#include <linux/of_fdt.h>
> > > #include <asm/mach/arch.h>
> > > #include "common.h"
> > > #include "rcar-gen2.h"
> >
> > Hm, this part looks incomplete. I thought you were going to add CMA code here?
>
> Thanks, something does indeed seem to have gone wrong there.
I suspect that this is the result of an error on my part when I rebased
the code on top of v3.16-rc1 before making it available to next.
The missing code appears to lie in "ARM: shmobile: rcar-gen2: Update for
of_get_flat_dt_prop() update".
Olof, I'd prefer not to rebase my branches in next. But if you'd like
me to do so to clean up this problem then let me know.
next prev parent reply other threads:[~2014-06-26 0:19 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-16 6:03 [GIT PULL] Renesas ARM Based SoC Updates for v3.16 Simon Horman
2014-04-16 6:03 ` [PATCH 1/8] ARM: shmobile: Update r8a7791 CPU freq to 1500MHz in C Simon Horman
2014-04-16 6:03 ` [PATCH 2/8] ARM: shmobile: Add shared shmobile_init_delay() Simon Horman
2014-04-16 6:03 ` [PATCH 3/8] ARM: shmobile: Remove legacy EMEV2 SoC support Simon Horman
2014-04-16 6:03 ` [PATCH 4/8] ARM: shmobile: Remove EMEV2 header file Simon Horman
2014-04-16 6:03 ` [PATCH 5/8] ARM: shmobile: Make use of r8a7790_add_standard_devices() Simon Horman
2014-04-16 6:03 ` [PATCH 6/8] ARM: shmobile: rcar-gen2: Cache Mode Monitor Register Value Simon Horman
2014-04-16 6:03 ` [PATCH 7/8] ARM: shmobile: Check r8a7791 MD21 at SMP boot Simon Horman
2014-04-16 6:03 ` [PATCH 8/8] ARM: shmobile: r8a7778/bockw: Move "select RENESAS_INTC_IRQPIN" under SoC Simon Horman
2014-05-05 20:45 ` [GIT PULL] Renesas ARM Based SoC Updates for v3.16 Olof Johansson
2014-06-25 7:35 ` [GIT PULL] Renesas ARM Based SoC Updates for v3.17 Simon Horman
2014-06-25 7:35 ` [PATCH 01/14] ARM: shmobile: r8a7791 SYSC setup code Simon Horman
2014-06-25 7:35 ` [PATCH 02/14] ARM: shmobile: APMU: Add Core-Standby-state for Suspend to RAM Simon Horman
2014-06-25 7:35 ` [PATCH 03/14] ARM: shmobile: r8a7790: Support Core-Standby " Simon Horman
2014-06-25 7:35 ` [PATCH 04/14] ARM: shmobile: r8a7791: " Simon Horman
2014-06-25 7:35 ` [PATCH 05/14] ARM: shmobile: Mark all SoCs in shmobile as CPUFreq, capable Simon Horman
2014-06-25 8:56 ` Viresh Kumar
2014-06-25 9:26 ` Simon Horman
2014-06-25 9:42 ` Viresh Kumar
2014-06-25 11:38 ` Simon Horman
2014-06-25 11:51 ` Viresh Kumar
2014-06-25 12:23 ` Simon Horman
2014-06-26 1:48 ` Gaku Inami
2014-06-25 7:35 ` [PATCH 06/14] ARM: shmobile: Use shmobile_init_late() on r8a7790 DT-only Simon Horman
2014-06-25 7:35 ` [PATCH 07/14] ARM: shmobile: Use shmobile_init_late() on r8a7791 DT-only Simon Horman
2014-06-25 7:35 ` [PATCH 08/14] ARM: shmobile: Add shared R-Car Gen2 CMA reservation code Simon Horman
2014-06-25 15:18 ` Sergei Shtylyov
2014-06-25 23:47 ` Simon Horman
2014-06-26 0:19 ` Simon Horman [this message]
2014-06-25 7:35 ` [PATCH 09/14] ARM: shmobile: rcar-gen2: Update for of_get_flat_dt_prop() update Simon Horman
2014-06-25 7:35 ` [PATCH 10/14] ARM: shmobile: rcar-gen2: Use "1ULL" instead of "(u64)1" Simon Horman
2014-06-25 7:35 ` [PATCH 11/14] ARM: shmobile: rcar-gen2: Remove useless copied section for LongTrail Simon Horman
2014-06-25 7:35 ` [PATCH 12/14] ARM: shmobile: rcar-gen2: correct return value of shmobile_smp_apmu_suspend_init Simon Horman
2014-06-25 7:35 ` [PATCH 13/14] ARM: shmobile: rcar-gen2: update call to dma_contiguous_reserve_area Simon Horman
2014-06-25 7:35 ` [PATCH 14/14] ARM: shmobile: Remove ARCH_HAS_CPUFREQ config for shmobile Simon Horman
2014-07-08 5:07 ` [GIT PULL] Renesas ARM Based SoC Updates for v3.17 Olof Johansson
2014-07-11 9:40 ` Simon Horman
2014-08-23 1:44 ` [GIT PULL] Renesas ARM Based SoC Updates for v3.18 Simon Horman
2014-08-23 1:44 ` [PATCH 01/11] ARM: shmobile: r8a7778: Add missing call to shmobile_init_late() Simon Horman
2014-08-23 1:44 ` [PATCH 02/11] ARM: shmobile: sh73a0: Add shmobile_init_late() Simon Horman
2014-08-23 1:44 ` [PATCH 03/11] ARM: shmobile: r8a7779: Fix shmobile_init_late() Simon Horman
2014-08-23 1:44 ` [PATCH 04/11] ARM: shmobile: r8a7778: " Simon Horman
2014-08-23 1:44 ` [PATCH 05/11] ARM: shmobile: r8a73a4: Add shmobile_init_late() Simon Horman
2014-08-23 1:44 ` [PATCH 06/11] ARM: shmobile: r7s72100: " Simon Horman
2014-08-23 1:44 ` [PATCH 07/11] ARM: shmobile: Rework multiplatform include workaround Simon Horman
2014-08-23 1:44 ` [PATCH 08/11] ARM: shmobile: dma: Use defines instead of hardcoded numbers Simon Horman
2014-08-23 1:44 ` [PATCH 09/11] ARM: shmobile: r8a7779: Remove NR_IRQS_LEGACY Simon Horman
2014-08-23 1:44 ` [PATCH 10/11] ARM: shmobile: sh7372: Remove unneeded nr_irqs initialization Simon Horman
2014-08-23 1:44 ` [PATCH 11/11] ARM: shmobile: sh73a0: " Simon Horman
2014-08-25 0:41 ` [GIT PULL] Renesas ARM Based SoC Updates for v3.18 Simon Horman
2014-12-29 1:47 ` [GIT PULL] Renesas ARM Based SoC Updates for v3.20 Simon Horman
2014-12-29 1:47 ` [PATCH 1/4] ARM: shmobile: sh73a0 legacy/reference: Add missing INTCA0 clock for irqpin module Simon Horman
2014-12-29 1:47 ` [PATCH 2/4] ARM: shmobile: Fix is_e2 warning Simon Horman
2014-12-29 1:47 ` [PATCH 3/4] ARM: shmobile: r8a7779: No TWD setup in C for Multiplatform Simon Horman
2014-12-29 1:47 ` [PATCH 4/4] ARM: shmobile: r8a73a4: Multiplatform support Simon Horman
2015-01-12 22:37 ` [GIT PULL] Renesas ARM Based SoC Updates for v3.20 Olof Johansson
2015-02-26 6:22 ` [GIT PULL] Renesas ARM Based SoC Updates for v4.1 Simon Horman
2015-02-26 6:22 ` [PATCH 1/5] ARM: shmobile: No R-Car Gen2 CMA reservation when HIGHMEM=n Simon Horman
2015-02-26 6:22 ` [PATCH 2/5] ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set Simon Horman
2015-02-26 6:22 ` [PATCH 3/5] ARM: shmobile: Add function to get SoCs revision data for R-Car Gen2 Simon Horman
2015-02-26 6:22 ` [PATCH 4/5] ARM: shmobile: Add support SOC_BUS to " Simon Horman
2015-02-26 15:53 ` Arnd Bergmann
2015-02-27 0:52 ` Simon Horman
2015-02-27 9:00 ` Arnd Bergmann
2015-02-27 10:41 ` Geert Uytterhoeven
2015-02-27 13:44 ` Arnd Bergmann
2015-03-01 1:52 ` Simon Horman
2015-02-26 6:22 ` [PATCH 5/5] ARM: shmobile: r8a7740: Remove restart callback Simon Horman
2015-05-28 1:05 ` [GIT PULL] Renesas ARM Based SoC Updates for v4.2 Simon Horman
2015-05-28 1:05 ` [PATCH] ARM: shmobile: only select sound drivers that build Simon Horman
2015-05-29 14:24 ` [GIT PULL] Renesas ARM Based SoC Updates for v4.2 Arnd Bergmann
2015-07-24 8:41 ` [GIT PULL] Renesas ARM Based SoC Updates for v4.3 Simon Horman
2015-07-24 8:41 ` [PATCH 1/2] ARM: shmobile: Basic r8a7793 SoC support Simon Horman
2015-07-24 8:41 ` [PATCH 2/2] ARM: shmobile: gose: enable R-Car Gen2 regulator quirk Simon Horman
2015-07-27 12:35 ` [GIT PULL] Renesas ARM Based SoC Updates for v4.3 Olof Johansson
2015-09-24 5:30 ` [GIT PULL] Renesas ARM Based SoC Updates for v4.4 Simon Horman
2015-09-24 5:30 ` [PATCH] ARM: shmobile: R-Mobile: Use CPG/MSTP Clock Domain attach/detach helpers Simon Horman
2015-10-06 14:43 ` [GIT PULL] Renesas ARM Based SoC Updates for v4.4 Arnd Bergmann
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=20140626001955.GA557@verge.net.au \
--to=horms@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).