Recently pending ARM fixes

PATCH New Russell King - ARM Linux 7 participants 24 messages Jan 19, 2012 – Feb 28, 2012

Subsystems (5)

Arm (32-bit) Arm sub-architectures Real time clock (RTC) PXA2xx/PXA3xx support +1 more subsystems

lore

Share & tools

lore

Russell King - ARM Linux

author

2012-01-19 15:31 UTC #0 lore raw

cover Recently pending ARM fixes

Below is a summary of a new set of ARM fixes which I've queued up today (so far). The big one is the revert of the changes to rtc-sa1100.c, which completely broke the driver. Of the remainder, the bulk are sorting out a few section mismatch warnings.

The two remaining patches fix a build error with collie and some RCU problems seen on SMP platforms, and two other minor patches.

Most people won't have much interest in this set of fixes, except for the rcu patch, so I probably won't push this to Linus for a few days (which means the number could grow.)

 arch/arm/Kconfig                  |    2 +-
 arch/arm/kernel/setup.c           |    3 +-
 arch/arm/kernel/smp.c             |   10 +-
 arch/arm/mach-pxa/devices.c       |   20 ---
 arch/arm/mach-pxa/pxa25x.c        |    2 -
 arch/arm/mach-pxa/pxa27x.c        |    2 -
 arch/arm/mach-pxa/pxa300.c        |    1 -
 arch/arm/mach-pxa/pxa320.c        |    1 -
 arch/arm/mach-pxa/pxa3xx.c        |    1 -
 arch/arm/mach-pxa/pxa95x.c        |    1 -
 arch/arm/mach-sa1100/clock.c      |   91 +++--------
 arch/arm/mach-sa1100/collie.c     |    5 +-
 arch/arm/mach-sa1100/cpu-sa1100.c |    2 +-
 arch/arm/mach-sa1100/generic.c    |   20 ---
 arch/arm/mach-vexpress/ct-ca9x4.c |    4 +-
 arch/arm/mm/init.c                |    2 +-
 drivers/rtc/Kconfig               |    2 +-
 drivers/rtc/rtc-sa1100.c          |  295 ++++++++++++++-----------------------
 18 files changed, 155 insertions(+), 309 deletions(-)

Fabio Estevam (1):
ARM: 7277/1: setup.c: Fix build warning by removing unneeded header file

Kees Cook (1):
ARM: 7279/1: standardize /proc/iomem "Kernel code" name

Russell King (9):
Revert "ARM: sa1100: clean up of the clock support" Revert "ARM: pxa: add dummy clock for sa1100-rtc" Revert "RTC: sa1100: support sa1100, pxa and mmp soc families" Revert "RTC: sa1100: remove redundant code of setting alarm"
ARM: sa11x0: fix collie build error
ARM: sa11x0: fix section mismatch in cpu-sa1100.c
ARM: fix a section mismatch warning with our use of memblock
ARM: vexpress: fix two section mismatch warnings
ARM: fix rcu stalls on SMP platforms

Russell King - ARM Linux

author

2012-01-19 15:32 UTC #1 lore raw

PATCH 1/11 Revert "ARM: sa1100: clean up of the clock support"

This reverts commit edf3ff5bac2582b57de4e7c6569fee5d7c1c0a42.

This revert is necessary to revert the broken "RTC: sa1100:
support sa1100, pxa and mmp soc families" change.

---
 arch/arm/Kconfig             |    2 +-
 arch/arm/mach-sa1100/clock.c |   91 +++++++++++------------------------------
 2 files changed, 26 insertions(+), 67 deletions(-)

arch/arm/Kconfig +1 -1

index 24626b0..bb68e65 100644
@@ -754,7 +754,7 @@ config ARCH_SA1100
 	select ARCH_HAS_CPUFREQ
 	select CPU_FREQ
 	select GENERIC_CLOCKEVENTS
-	select CLKDEV_LOOKUP
+	select HAVE_CLK
 	select HAVE_SCHED_CLOCK
 	select TICK_ONESHOT
 	select ARCH_REQUIRE_GPIOLIB

arch/arm/mach-sa1100/clock.c +25 ~~-66~~

134 lines not on this page · raw message

Signature · 1 line

1.7.4.4

Russell King - ARM Linux

author

2012-01-19 15:33 UTC #2 lore raw

PATCH 2/11 Revert "ARM: pxa: add dummy clock for sa1100-rtc"

In reply to Russell King - ARM Linux

This reverts commit 7557c175f60d8d40baf16b22caf79beadef8f081.

This revert is necessary to revert the broken "RTC: sa1100:
support sa1100, pxa and mmp soc families" change.

---
 arch/arm/mach-pxa/pxa25x.c |    2 --
 arch/arm/mach-pxa/pxa27x.c |    2 --
 arch/arm/mach-pxa/pxa300.c |    1 -
 arch/arm/mach-pxa/pxa320.c |    1 -
 arch/arm/mach-pxa/pxa3xx.c |    1 -
 arch/arm/mach-pxa/pxa95x.c |    1 -
 6 files changed, 0 insertions(+), 8 deletions(-)

arch/arm/mach-pxa/pxa25x.c +0 -2

index adf058f..91e4f6c 100644
@@ -209,8 +209,6 @@ static struct clk_lookup pxa25x_clkregs[] = {
 	INIT_CLKREG(&clk_pxa25x_gpio11, NULL, "GPIO11_CLK"),
 	INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"),
 	INIT_CLKREG(&clk_pxa25x_mem, "pxa2xx-pcmcia", NULL),
-	INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL),
-	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
 static struct clk_lookup pxa25x_hwuart_clkreg =

arch/arm/mach-pxa/pxa27x.c +0 -2

index 180bd86..aed6cbc 100644
@@ -230,8 +230,6 @@ static struct clk_lookup pxa27x_clkregs[] = {
 	INIT_CLKREG(&clk_pxa27x_im, NULL, "IMCLK"),
 	INIT_CLKREG(&clk_pxa27x_memc, NULL, "MEMCLK"),
 	INIT_CLKREG(&clk_pxa27x_mem, "pxa2xx-pcmcia", NULL),
-	INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL),
-	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
 #ifdef CONFIG_PM

arch/arm/mach-pxa/pxa300.c +0 -1

index 0388eda..40bb165 100644
@@ -89,7 +89,6 @@ static DEFINE_PXA3_CKEN(gcu, PXA300_GCU, 0, 0);
 static struct clk_lookup common_clkregs[] = {
 	INIT_CLKREG(&clk_common_nand, "pxa3xx-nand", NULL),
 	INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),
-	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
 static DEFINE_PXA3_CKEN(pxa310_mmc3, MMC3, 19500000, 0);

arch/arm/mach-pxa/pxa320.c +0 -1

index d487e1f..8d614ec 100644
@@ -83,7 +83,6 @@ static DEFINE_PXA3_CKEN(gcu, PXA320_GCU, 0, 0);
 static struct clk_lookup pxa320_clkregs[] = {
 	INIT_CLKREG(&clk_pxa320_nand, "pxa3xx-nand", NULL),
 	INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),
-	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
 static int __init pxa320_init(void)

arch/arm/mach-pxa/pxa3xx.c +0 -1

index f107c71..4f402af 100644
@@ -67,7 +67,6 @@ static struct clk_lookup pxa3xx_clkregs[] = {
 	INIT_CLKREG(&clk_pxa3xx_pout, NULL, "CLK_POUT"),
 	/* Power I2C clock is always on */
 	INIT_CLKREG(&clk_dummy, "pxa3xx-pwri2c.1", NULL),
-	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 	INIT_CLKREG(&clk_pxa3xx_lcd, "pxa2xx-fb", NULL),
 	INIT_CLKREG(&clk_pxa3xx_camera, NULL, "CAMCLK"),
 	INIT_CLKREG(&clk_pxa3xx_ac97, NULL, "AC97CLK"),

arch/arm/mach-pxa/pxa95x.c +0 -1

index fccc644..d082a58 100644
@@ -217,7 +217,6 @@ static struct clk_lookup pxa95x_clkregs[] = {
 	INIT_CLKREG(&clk_pxa95x_pout, NULL, "CLK_POUT"),
 	/* Power I2C clock is always on */
 	INIT_CLKREG(&clk_dummy, "pxa3xx-pwri2c.1", NULL),
-	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 	INIT_CLKREG(&clk_pxa95x_lcd, "pxa2xx-fb", NULL),
 	INIT_CLKREG(&clk_pxa95x_ffuart, "pxa2xx-uart.0", NULL),
 	INIT_CLKREG(&clk_pxa95x_btuart, "pxa2xx-uart.1", NULL),

Signature · 1 line

1.7.4.4

Jonathan Cameron

2012-02-11 19:07 UTC #3 lore raw

PATCH 2/11 Revert "ARM: pxa: add dummy clock for sa1100-rtc"

Quoted 4 lines · Russell King - ARM Linux

This reverts commit 7557c175f60d8d40baf16b22caf79beadef8f081.
This revert is necessary to revert the broken "RTC: sa1100:
support sa1100, pxa and mmp soc families" change.

Taking out the lines concerning the dummy clk for pxa-gpio is causing stargate2's smc91x driver to fail to find the part.

So reverting the regression cause caused a different regression.

Something 'unusual' occured with the commit you reference above. The gpio line was added in 389eda15e0f41112d7c44213b3c4f8bd1c9398bc
ARM: pxa: add clk support in gpio driver

Support clk in gpio driver. There's no gpio clock in PXA25x and PXA27x. So use dummy clk instead. And move the gpio edge initialization into gpio driver for arch-mmp.

Signed-off-by Haojian Zhuang <[email protected]>

and git is telling me it was then readded in the patch you reverted.

Reapplying the above patch fixes the issue for me.

Note the regression Paul Parson's reported in

mfp/gpio regression: pxa_last_gpio used before initialized

is still there and is related to this same series of patches. Annoyingly it took me two bisections of the merge window (via some nasty breakage along the way) to track these down given one was caused by the introduction of this series and the other by the reversion of part of it. Ah well, sometimes life is against you.

Quoted 229 lines

---
 arch/arm/mach-pxa/pxa25x.c |    2 --
 arch/arm/mach-pxa/pxa27x.c |    2 --
 arch/arm/mach-pxa/pxa300.c |    1 -
 arch/arm/mach-pxa/pxa320.c |    1 -
 arch/arm/mach-pxa/pxa3xx.c |    1 -
 arch/arm/mach-pxa/pxa95x.c |    1 -
 6 files changed, 0 insertions(+), 8 deletions(-)
arch/arm/mach-pxa/pxa25x.c +0 -2
index adf058f..91e4f6c 100644
@@ -209,8 +209,6 @@ static struct clk_lookup pxa25x_clkregs[] = {
 	INIT_CLKREG(&clk_pxa25x_gpio11, NULL, "GPIO11_CLK"),
 	INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"),
 	INIT_CLKREG(&clk_pxa25x_mem, "pxa2xx-pcmcia", NULL),
-	INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL),
-	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
 static struct clk_lookup pxa25x_hwuart_clkreg =
arch/arm/mach-pxa/pxa27x.c +0 -2
index 180bd86..aed6cbc 100644
@@ -230,8 +230,6 @@ static struct clk_lookup pxa27x_clkregs[] = {
 	INIT_CLKREG(&clk_pxa27x_im, NULL, "IMCLK"),
 	INIT_CLKREG(&clk_pxa27x_memc, NULL, "MEMCLK"),
 	INIT_CLKREG(&clk_pxa27x_mem, "pxa2xx-pcmcia", NULL),
-	INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL),
-	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
 #ifdef CONFIG_PM
arch/arm/mach-pxa/pxa300.c +0 -1
index 0388eda..40bb165 100644
@@ -89,7 +89,6 @@ static DEFINE_PXA3_CKEN(gcu, PXA300_GCU, 0, 0);
 static struct clk_lookup common_clkregs[] = {
 	INIT_CLKREG(&clk_common_nand, "pxa3xx-nand", NULL),
 	INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),
-	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
 static DEFINE_PXA3_CKEN(pxa310_mmc3, MMC3, 19500000, 0);
arch/arm/mach-pxa/pxa320.c +0 -1
index d487e1f..8d614ec 100644
@@ -83,7 +83,6 @@ static DEFINE_PXA3_CKEN(gcu, PXA320_GCU, 0, 0);
 static struct clk_lookup pxa320_clkregs[] = {
 	INIT_CLKREG(&clk_pxa320_nand, "pxa3xx-nand", NULL),
 	INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),
-	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
 static int __init pxa320_init(void)
arch/arm/mach-pxa/pxa3xx.c +0 -0
index f107c71..4f402af 100644
Path: news.gmane.org!not-for-mail
From: Russell King - ARM Linux <[email protected]>
Newsgroups: gmane.linux.ports.arm.kernel
Subject: [PATCH 02/11] Revert "ARM: pxa: add dummy clock for sa1100-rtc"
Date: Thu, 19 Jan 2012 15:33:04 +0000
Lines: 89
Approved: news at gmane.org
Message-ID: <[email protected]>
References: <[email protected]>
NNTP-Posting-Host: lo.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
X-Trace: dough.gmane.org 1326987256 17293 80.91.229.12 (19 Jan 2012 15:34:16 GMT)
X-Complaints-To: usenet at dough.gmane.org
NNTP-Posting-Date: Thu, 19 Jan 2012 15:34:16 +0000 (UTC)
Cc: linux-arm-kernel at lists.infradead.org
To: Alessandro Zummo <[email protected]>, Eric Miao <[email protected]>,
Haojian Zhuang <[email protected]>
Original-X-From: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org at lists.infradead.org Thu Jan 19 16:34:12 2012
Return-path: <linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org>
Envelope-to: linux-arm-kernel at m.gmane.org
Original-Received: from merlin.infradead.org ([205.233.59.134])
	by lo.gmane.org with esmtp (Exim 4.69)
	(envelope-from <linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org>)
	id 1Rnu0B-0003BT-Rl
	for linux-arm-kernel at m.gmane.org; Thu, 19 Jan 2012 16:34:12 +0100
Original-Received: from localhost ([::1] helo=merlin.infradead.org)
	by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux))
	id 1Rntzr-0004U8-1D; Thu, 19 Jan 2012 15:33:51 +0000
Original-Received: from [2002:4e20:1eda::1] (helo=caramon.arm.linux.org.uk)
by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux))
id 1Rntzn-0004TB-NX
for linux-arm-kernel at lists.infradead.org; Thu, 19 Jan 2012 15:33:48 +0000
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
d=arm.linux.org.uk; s=caramon;
h=Date:Sender:Message-Id:Content-Type:MIME-Version:Subject:Cc:To:From:References:In-Reply-To;
bh=CRJy9I8VrueLAFVV1dQT8z59MD8ZXLM7qL7ZxqDZXb8=; b=oA0dWgc3PfX8EdGWIz4FtN+Jrhf83oMzzKwJ8OHC+ak8c43bY7lP3XneWB+0YoVhhb9dpKyM//+CWYbaxtXDPVPeR5DaXUCwhsMvrioz8CFqUQUa/tPhiDEa9uMhVhXNhxrIOCDZgUPhcT3Hua0QgoarAIAGOYlHhFXlg6Zh2Nc=;
Original-Received: from e0022681537dd.dyn.arm.linux.org.uk
([2002:4e20:1eda:1:222:68ff:fe15:37dd]:47744 helo=rmk-PC.arm.linux.org.uk)
by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256)
(Exim 4.76) (envelope-from <[email protected]>)
id 1RntzA-0003vg-I1; Thu, 19 Jan 2012 15:33:08 +0000
Original-Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76)
(envelope-from <[email protected]>)
id 1Rntz6-0002pN-UE; Thu, 19 Jan 2012 15:33:05 +0000
In-Reply-To: <[email protected]>
Content-Disposition: inline
X-Spam-Note: CRM114 invocation failed
X-Spam-Score: -1.2 (-)
X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary:
Content analysis details: (-1.2 points)
pts rule name description
---- ---------------------- --------------------------------------------------
-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%
[score: 0.0000]
-0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's
domain
0.1 DKIM_SIGNED Message has a DKIM or DK signature,
not necessarily valid
-0.1 DKIM_VALID Message has at least one valid DKIM or DK signature
0.8 RDNS_NONE Delivered to internal network by a host with no rDNS
X-BeenThere: linux-arm-kernel at lists.infradead.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: <linux-arm-kernel.lists.infradead.org>
List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>,
<mailto:[email protected]?subject=unsubscribe>
List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
List-Post: <mailto:[email protected]>
List-Help: <mailto:[email protected]?subject=help>
List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
<mailto:[email protected]?subject=subscribe>
Original-Sender: linux-arm-kernel-bounces at lists.infradead.org
Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org at lists.infradead.org
Xref: news.gmane.org gmane.linux.ports.arm.kernel:148605
Archived-At: <http://permalink.gmane.org/gmane.linux.ports.arm.kernel/148605>
This reverts commit 7557c175f60d8d40baf16b22caf79beadef8f081.
This revert is necessary to revert the broken "RTC: sa1100:
support sa1100, pxa and mmp soc families" change.
---
 arch/arm/mach-pxa/pxa25x.c |    2 --
 arch/arm/mach-pxa/pxa27x.c |    2 --
 arch/arm/mach-pxa/pxa300.c |    1 -
 arch/arm/mach-pxa/pxa320.c |    1 -
 arch/arm/mach-pxa/pxa3xx.c |    1 -
 arch/arm/mach-pxa/pxa95x.c |    1 -
 6 files changed, 0 insertions(+), 8 deletions(-)
arch/arm/mach-pxa/pxa25x.c +0 -2
index adf058f..91e4f6c 100644
@@ -209,8 +209,6 @@ static struct clk_lookup pxa25x_clkregs[] = {
 	INIT_CLKREG(&clk_pxa25x_gpio11, NULL, "GPIO11_CLK"),
 	INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"),
 	INIT_CLKREG(&clk_pxa25x_mem, "pxa2xx-pcmcia", NULL),
-	INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL),
-	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
 static struct clk_lookup pxa25x_hwuart_clkreg =
arch/arm/mach-pxa/pxa27x.c +0 -2
index 180bd86..aed6cbc 100644
@@ -230,8 +230,6 @@ static struct clk_lookup pxa27x_clkregs[] = {
 	INIT_CLKREG(&clk_pxa27x_im, NULL, "IMCLK"),
 	INIT_CLKREG(&clk_pxa27x_memc, NULL, "MEMCLK"),
 	INIT_CLKREG(&clk_pxa27x_mem, "pxa2xx-pcmcia", NULL),
-	INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL),
-	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
 #ifdef CONFIG_PM
arch/arm/mach-pxa/pxa300.c +0 -1
index 0388eda..40bb165 100644
@@ -89,7 +89,6 @@ static DEFINE_PXA3_CKEN(gcu, PXA300_GCU, 0, 0);
 static struct clk_lookup common_clkregs[] = {
 	INIT_CLKREG(&clk_common_nand, "pxa3xx-nand", NULL),
 	INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),
-	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
 static DEFINE_PXA3_CKEN(pxa310_mmc3, MMC3, 19500000, 0);
arch/arm/mach-pxa/pxa320.c +0 -1
index d487e1f..8d614ec 100644
@@ -83,7 +83,6 @@ static DEFINE_PXA3_CKEN(gcu, PXA320_GCU, 0, 0);
 static struct clk_lookup pxa320_clkregs[] = {
 	INIT_CLKREG(&clk_pxa320_nand, "pxa3xx-nand", NULL),
 	INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),
-	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
 static int __init pxa320_init(void)
arch/arm/mach-pxa/pxa3xx.c +0 -1
index f107c71..4f402af 100644
@@ -67,7 +67,6 @@ static struct clk_lookup pxa3xx_clkregs[] = {
 	INIT_CLKREG(&clk_pxa3xx_pout, NULL, "CLK_POUT"),
 	/* Power I2C clock is always on */
 	INIT_CLKREG(&clk_dummy, "pxa3xx-pwri2c.1", NULL),
-	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 	INIT_CLKREG(&clk_pxa3xx_lcd, "pxa2xx-fb", NULL),
 	INIT_CLKREG(&clk_pxa3xx_camera, NULL, "CAMCLK"),
 	INIT_CLKREG(&clk_pxa3xx_ac97, NULL, "AC97CLK"),
arch/arm/mach-pxa/pxa95x.c +0 -1
index fccc644..d082a58 100644
@@ -217,7 +217,6 @@ static struct clk_lookup pxa95x_clkregs[] = {
 	INIT_CLKREG(&clk_pxa95x_pout, NULL, "CLK_POUT"),
 	/* Power I2C clock is always on */
 	INIT_CLKREG(&clk_dummy, "pxa3xx-pwri2c.1", NULL),
-	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 	INIT_CLKREG(&clk_pxa95x_lcd, "pxa2xx-fb", NULL),
 	INIT_CLKREG(&clk_pxa95x_ffuart, "pxa2xx-uart.0", NULL),
 	INIT_CLKREG(&clk_pxa95x_btuart, "pxa2xx-uart.1", NULL),

Russell King - ARM Linux

author

2012-02-11 19:42 UTC #4 lore raw

PATCH 2/11 Revert "ARM: pxa: add dummy clock for sa1100-rtc"

Quoted 6 lines · Jonathan Cameron

Quoted 4 lines · Russell King - ARM Linux
This reverts commit 7557c175f60d8d40baf16b22caf79beadef8f081.
This revert is necessary to revert the broken "RTC: sa1100:
support sa1100, pxa and mmp soc families" change.

Quoted 7 lines

Taking out the lines concerning the dummy clk for pxa-gpio is causing stargate2's smc91x driver to fail to find the part.
So reverting the regression cause caused a different regression.
Something 'unusual' occured with the commit you reference above. The gpio line was added in 389eda15e0f41112d7c44213b3c4f8bd1c9398bc

Sigh. I give up with this issue, people are obviously useless at properly separating their changes. Someone else can sort out this bloody mess.

Haojian Zhuang

maintainer

2012-02-13 13:01 UTC #5 lore raw

PATCH 2/11 Revert "ARM: pxa: add dummy clock for sa1100-rtc"

Quoted 10 lines · Russell King - ARM Linux

Quoted 9 lines · Jonathan Cameron
Quoted 4 lines · Russell King - ARM Linux
This reverts commit 7557c175f60d8d40baf16b22caf79beadef8f081.
This revert is necessary to revert the broken "RTC: sa1100:
support sa1100, pxa and mmp soc families" change.
Taking out the lines concerning the dummy clk for pxa-gpio is causing stargate2's smc91x driver to fail to find the part.

Quoted 9 lines

Quoted 4 lines
So reverting the regression cause caused a different regression.
Something 'unusual' occured with the commit you reference above. The gpio line was added in 389eda15e0f41112d7c44213b3c4f8bd1c9398bc
Sigh. ?I give up with this issue, people are obviously useless at properly separating their changes. ?Someone else can sort out this bloody mess.

Sure. I'll try to fix this issue in this week.

Paul Parsons

2012-02-27 18:24 UTC #6 lore raw

PATCH 2/11 Revert "ARM: pxa: add dummy clock for sa1100-rtc"

Quoted 21 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
This reverts commit
7557c175f60d8d40baf16b22caf79beadef8f081.
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
This revert is necessary to revert the broken
"RTC: sa1100:
Quoted 1 line
Quoted 1 line
Quoted 1 line
support sa1100, pxa and mmp soc families"
change.
Quoted 2 lines
Quoted 2 lines
Taking out the lines concerning the dummy clk for
pxa-gpio is
Quoted 1 line
Quoted 1 line
causing stargate2's smc91x driver to fail to find
the part.
Quoted 2 lines
Quoted 2 lines
So reverting the regression cause caused a
different regression.
Quoted 2 lines
Quoted 2 lines
Something 'unusual' occured with the commit you
reference above.
Quoted 1 line
Quoted 1 line
The gpio line was added in
389eda15e0f41112d7c44213b3c4f8bd1c9398bc
Quoted 1 line

Quoted 7 lines

Quoted 1 line
Sigh. ?I give up with this issue, people are obviously
useless at
Quoted 1 line
properly separating their changes. ?Someone else can
sort out this
Quoted 2 lines
bloody mess.
Sure. I'll try to fix this issue in this week.

Removing the pxa-gpio dummy clk also broke the hx4700.

Haojian Zhuang

maintainer

2012-02-28 01:56 UTC #7 lore raw

PATCH 2/11 Revert "ARM: pxa: add dummy clock for sa1100-rtc"

Quoted 22 lines · Paul Parsons

Quoted 22 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
This reverts commit
7557c175f60d8d40baf16b22caf79beadef8f081.
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
This revert is necessary to revert the broken
"RTC: sa1100:
Quoted 1 line
Quoted 1 line
Quoted 1 line
support sa1100, pxa and mmp soc families"
change.
Quoted 2 lines
Quoted 2 lines
Taking out the lines concerning the dummy clk for
pxa-gpio is
Quoted 1 line
Quoted 1 line
causing stargate2's smc91x driver to fail to find
the part.
Quoted 2 lines
Quoted 2 lines
So reverting the regression cause caused a
different regression.
Quoted 2 lines
Quoted 2 lines
Something 'unusual' occured with the commit you
reference above.
Quoted 1 line
Quoted 1 line
The gpio line was added in
389eda15e0f41112d7c44213b3c4f8bd1c9398bc
Quoted 2 lines
Sigh. ?I give up with this issue, people are obviously

Quoted 8 lines

Quoted 6 lines
useless at
Quoted 1 line
properly separating their changes. ?Someone else can
sort out this
Quoted 2 lines
bloody mess.
Sure. I'll try to fix this issue in this week.
Removing the pxa-gpio dummy clk also broke the hx4700.

Thanks. I'll append it for pxa27x again.

Russell King - ARM Linux

author

2012-01-19 15:33 UTC #8 lore raw

PATCH 3/11 Revert "RTC: sa1100: support sa1100, pxa and mmp soc families"

In reply to Russell King - ARM Linux

This reverts commit 7cea00657dd4daef66ad95e976d5d67ed94cb97e.

The sa1100 cleanups fatally broke the SA1100 RTC driver - the first hint that something is wrong are these compiler warnings:

drivers/rtc/rtc-sa1100.c:42:1: warning: "RCNR" redefined
In file included from arch/arm/mach-sa1100/include/mach/hardware.h:73,

                 from drivers/rtc/rtc-sa1100.c:35:

arch/arm/mach-sa1100/include/mach/SA-1100.h:877:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:43:1: warning: "RTAR" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:876:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:44:1: warning: "RTSR" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:879:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:45:1: warning: "RTTR" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:878:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:47:1: warning: "RTSR_HZE" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:891:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:48:1: warning: "RTSR_ALE" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:890:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:49:1: warning: "RTSR_HZ" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:889:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:50:1: warning: "RTSR_AL" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:888:1: warning: this is the location of the previous definition

and the second problem, which is far more severe, are the different register layouts, resulting in the wrong registers being read on SA11x0 platforms. This patch adds:

but the SA11x0 registers are:

---
 arch/arm/mach-pxa/devices.c    |   20 ---
 arch/arm/mach-sa1100/generic.c |   20 ---
 drivers/rtc/Kconfig            |    2 +-
 drivers/rtc/rtc-sa1100.c       |  256 ++++++++++++---------------------------
 4 files changed, 80 insertions(+), 218 deletions(-)

arch/arm/mach-pxa/devices.c +0 ~~-20~~

index 18fd177..5bc1312 100644
@@ -415,29 +415,9 @@ static struct resource pxa_rtc_resources[] = {
 	},
 };
 
-static struct resource sa1100_rtc_resources[] = {
-	[0] = {
-		.start  = 0x40900000,
-		.end	= 0x409000ff,
-		.flags  = IORESOURCE_MEM,
-	},
-	[1] = {
-		.start  = IRQ_RTC1Hz,
-		.end    = IRQ_RTC1Hz,
-		.flags  = IORESOURCE_IRQ,
-	},
-	[2] = {
-		.start  = IRQ_RTCAlrm,
-		.end    = IRQ_RTCAlrm,
-		.flags  = IORESOURCE_IRQ,
-	},
-};
-
 struct platform_device sa1100_device_rtc = {
 	.name		= "sa1100-rtc",
 	.id		= -1,
-	.num_resources  = ARRAY_SIZE(sa1100_rtc_resources),
-	.resource       = sa1100_rtc_resources,
 };
 
 struct platform_device pxa_device_rtc = {

arch/arm/mach-sa1100/generic.c +0 ~~-20~~

index e3a28ca..a7c0df6 100644
@@ -350,29 +350,9 @@ void sa11x0_register_irda(struct irda_platform_data *irda)
 	sa11x0_register_device(&sa11x0ir_device, irda);
 }
 
-static struct resource sa11x0rtc_resources[] = {
-	[0] = {
-		.start	= 0x90010000,
-		.end	= 0x900100ff,
-		.flags	= IORESOURCE_MEM,
-	},
-	[1] = {
-		.start	= IRQ_RTC1Hz,
-		.end	= IRQ_RTC1Hz,
-		.flags	= IORESOURCE_IRQ,
-	},
-	[2] = {
-		.start	= IRQ_RTCAlrm,
-		.end	= IRQ_RTCAlrm,
-		.flags	= IORESOURCE_IRQ,
-	},
-};
-
 static struct platform_device sa11x0rtc_device = {
 	.name		= "sa1100-rtc",
 	.id		= -1,
-	.resource	= sa11x0rtc_resources,
-	.num_resources	= ARRAY_SIZE(sa11x0rtc_resources),
 };
 
 static struct platform_device *sa11x0_devices[] __initdata = {

drivers/rtc/Kconfig +1 -1

index e19a403..3a125b8 100644
@@ -774,7 +774,7 @@ config RTC_DRV_EP93XX
 
 config RTC_DRV_SA1100
 	tristate "SA11x0/PXA2xx"
-	depends on ARCH_SA1100 || ARCH_PXA || ARCH_MMP
+	depends on ARCH_SA1100 || ARCH_PXA
 	help
 	  If you say Y here you will get access to the real time clock
 	  built into your SA11x0 or PXA2xx CPU.

drivers/rtc/rtc-sa1100.c +79 ~~-177~~

417 lines not on this page · raw message

Signature · 1 line

1.7.4.4

Nicolas Pitre

2012-01-19 17:11 UTC #9 lore raw

PATCH 3/11 Revert "RTC: sa1100: support sa1100, pxa and mmp soc families"

Quoted 28 lines · Russell King - ARM Linux

This reverts commit 7cea00657dd4daef66ad95e976d5d67ed94cb97e.
The sa1100 cleanups fatally broke the SA1100 RTC driver - the first hint that something is wrong are these compiler warnings:
drivers/rtc/rtc-sa1100.c:42:1: warning: "RCNR" redefined
In file included from arch/arm/mach-sa1100/include/mach/hardware.h:73,
                 from drivers/rtc/rtc-sa1100.c:35:
arch/arm/mach-sa1100/include/mach/SA-1100.h:877:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:43:1: warning: "RTAR" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:876:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:44:1: warning: "RTSR" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:879:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:45:1: warning: "RTTR" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:878:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:47:1: warning: "RTSR_HZE" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:891:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:48:1: warning: "RTSR_ALE" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:890:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:49:1: warning: "RTSR_HZ" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:889:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:50:1: warning: "RTSR_AL" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:888:1: warning: this is the location of the previous definition
and the second problem, which is far more severe, are the different register layouts, resulting in the wrong registers being read on SA11x0 platforms. This patch adds:

Quoted 7 lines

but the SA11x0 registers are:

---
 arch/arm/mach-pxa/devices.c    |   20 ---
 arch/arm/mach-sa1100/generic.c |   20 ---
 drivers/rtc/Kconfig            |    2 +-
 drivers/rtc/rtc-sa1100.c       |  256 ++++++++++++---------------------------
 4 files changed, 80 insertions(+), 218 deletions(-)

[...]

Truncated log?

Nicolas

Russell King - ARM Linux

author

2012-01-19 17:17 UTC #10 lore raw

PATCH 3/11 Revert "RTC: sa1100: support sa1100, pxa and mmp soc families"

Quoted 37 lines · Nicolas Pitre

Quoted 28 lines · Russell King - ARM Linux
This reverts commit 7cea00657dd4daef66ad95e976d5d67ed94cb97e.
The sa1100 cleanups fatally broke the SA1100 RTC driver - the first hint that something is wrong are these compiler warnings:
drivers/rtc/rtc-sa1100.c:42:1: warning: "RCNR" redefined
In file included from arch/arm/mach-sa1100/include/mach/hardware.h:73,
                 from drivers/rtc/rtc-sa1100.c:35:
arch/arm/mach-sa1100/include/mach/SA-1100.h:877:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:43:1: warning: "RTAR" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:876:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:44:1: warning: "RTSR" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:879:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:45:1: warning: "RTTR" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:878:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:47:1: warning: "RTSR_HZE" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:891:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:48:1: warning: "RTSR_ALE" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:890:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:49:1: warning: "RTSR_HZ" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:889:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:50:1: warning: "RTSR_AL" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:888:1: warning: this is the location of the previous definition
and the second problem, which is far more severe, are the different register layouts, resulting in the wrong registers being read on SA11x0 platforms. This patch adds:
Quoted 7 lines
but the SA11x0 registers are:
---
 arch/arm/mach-pxa/devices.c    |   20 ---
 arch/arm/mach-sa1100/generic.c |   20 ---
 drivers/rtc/Kconfig            |    2 +-
 drivers/rtc/rtc-sa1100.c       |  256 ++++++++++++---------------------------
 4 files changed, 80 insertions(+), 218 deletions(-)

Quoted 3 lines

[...]
Truncated log?

No, it appears that something decided to delete several lines from the log file, particularly those between "This patch adds:" and the "but the SA11x0 registers are".

I'll add them back, and hope git doesn't lose them again.

Russell King - ARM Linux

author

2012-01-19 17:21 UTC #11 lore raw

PATCH 3/11 Revert "RTC: sa1100: support sa1100, pxa and mmp soc families"

Quoted 40 lines · Russell King - ARM Linux

Quoted 39 lines · Nicolas Pitre
Quoted 35 lines · Russell King - ARM Linux
This reverts commit 7cea00657dd4daef66ad95e976d5d67ed94cb97e.
The sa1100 cleanups fatally broke the SA1100 RTC driver - the first hint that something is wrong are these compiler warnings:
drivers/rtc/rtc-sa1100.c:42:1: warning: "RCNR" redefined
In file included from arch/arm/mach-sa1100/include/mach/hardware.h:73,
                 from drivers/rtc/rtc-sa1100.c:35:
arch/arm/mach-sa1100/include/mach/SA-1100.h:877:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:43:1: warning: "RTAR" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:876:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:44:1: warning: "RTSR" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:879:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:45:1: warning: "RTTR" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:878:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:47:1: warning: "RTSR_HZE" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:891:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:48:1: warning: "RTSR_ALE" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:890:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:49:1: warning: "RTSR_HZ" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:889:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:50:1: warning: "RTSR_AL" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:888:1: warning: this is the location of the previous definition
and the second problem, which is far more severe, are the different register layouts, resulting in the wrong registers being read on SA11x0 platforms. This patch adds:
but the SA11x0 registers are:
---
 arch/arm/mach-pxa/devices.c    |   20 ---
 arch/arm/mach-sa1100/generic.c |   20 ---
 drivers/rtc/Kconfig            |    2 +-
 drivers/rtc/rtc-sa1100.c       |  256 ++++++++++++---------------------------
 4 files changed, 80 insertions(+), 218 deletions(-)
[...]

Quoted 7 lines

Quoted 1 line
Truncated log?
No, it appears that something decided to delete several lines from the log file, particularly those between "This patch adds:" and the "but the SA11x0 registers are".
I'll add them back, and hope git doesn't lose them again.

Ah. No I can't add them. They start with '#', and of course, git in its wonderful self decides that any line starting with such a character, even in the middle of a commit log, must be deleted. Wonderful.

So, I'm afraid, that's all you get in the log, unless I can figure out a way around that.

Russell King - ARM Linux

author

2012-01-19 17:27 UTC #12 lore raw

PATCH 3/11 Revert "RTC: sa1100: support sa1100, pxa and mmp soc families"

Quoted 6 lines · Russell King - ARM Linux

Ah. No I can't add them. They start with '#', and of course, git in its wonderful self decides that any line starting with such a character, even in the middle of a commit log, must be deleted. Wonderful.
So, I'm afraid, that's all you get in the log, unless I can figure out a way around that.

Right, I've changed it to (pasted from git log):

    Revert "RTC: sa1100: support sa1100, pxa and mmp soc families"
    
    This reverts commit 7cea00657dd4daef66ad95e976d5d67ed94cb97e.
    
    The sa1100 cleanups fatally broke the SA1100 RTC driver - the first
    hint that something is wrong are these compiler warnings:
    
    drivers/rtc/rtc-sa1100.c:42:1: warning: "RCNR" redefined
    In file included from arch/arm/mach-sa1100/include/mach/hardware.h:73,
                     from drivers/rtc/rtc-sa1100.c:35:
    arch/arm/mach-sa1100/include/mach/SA-1100.h:877:1: warning: this is the location of the previous definition
    drivers/rtc/rtc-sa1100.c:43:1: warning: "RTAR" redefined
    arch/arm/mach-sa1100/include/mach/SA-1100.h:876:1: warning: this is the location of the previous definition
    drivers/rtc/rtc-sa1100.c:44:1: warning: "RTSR" redefined
    arch/arm/mach-sa1100/include/mach/SA-1100.h:879:1: warning: this is the location of the previous definition
    drivers/rtc/rtc-sa1100.c:45:1: warning: "RTTR" redefined
    arch/arm/mach-sa1100/include/mach/SA-1100.h:878:1: warning: this is the location of the previous definition
    drivers/rtc/rtc-sa1100.c:47:1: warning: "RTSR_HZE" redefined
    arch/arm/mach-sa1100/include/mach/SA-1100.h:891:1: warning: this is the location of the previous definition
    drivers/rtc/rtc-sa1100.c:48:1: warning: "RTSR_ALE" redefined
    arch/arm/mach-sa1100/include/mach/SA-1100.h:890:1: warning: this is the location of the previous definition
    drivers/rtc/rtc-sa1100.c:49:1: warning: "RTSR_HZ" redefined
    arch/arm/mach-sa1100/include/mach/SA-1100.h:889:1: warning: this is the location of the previous definition
    drivers/rtc/rtc-sa1100.c:50:1: warning: "RTSR_AL" redefined
    arch/arm/mach-sa1100/include/mach/SA-1100.h:888:1: warning: this is the location of the previous definition
    
    and the second problem, which is far more severe, are the different
    register layouts, resulting in the wrong registers being read on
    SA11x0 platforms.  This patch adds:
    
        #define RCNR           0x00    /* RTC Count Register */
        #define RTAR           0x04    /* RTC Alarm Register */
        #define RTSR           0x08    /* RTC Status Register */
        #define RTTR           0x0c    /* RTC Timer Trim Register */
    
    but the SA11x0 registers are:
    
        #define RTAR            __REG(0x90010000)  /* RTC Alarm Reg. */
        #define RCNR            __REG(0x90010004)  /* RTC CouNt Reg. */
        #define RTTR            __REG(0x90010008)  /* RTC Trim Reg. */
        #define RTSR            __REG(0x90010010)  /* RTC Status Reg. */

Nicolas Pitre

2012-01-19 17:28 UTC #13 lore raw

PATCH 3/11 Revert "RTC: sa1100: support sa1100, pxa and mmp soc families"

In reply to Russell King - ARM Linux

Quoted 47 lines · Russell King - ARM Linux

Quoted 46 lines · Russell King - ARM Linux
Quoted 37 lines · Nicolas Pitre
Quoted 28 lines · Russell King - ARM Linux
This reverts commit 7cea00657dd4daef66ad95e976d5d67ed94cb97e.
The sa1100 cleanups fatally broke the SA1100 RTC driver - the first hint that something is wrong are these compiler warnings:
drivers/rtc/rtc-sa1100.c:42:1: warning: "RCNR" redefined
In file included from arch/arm/mach-sa1100/include/mach/hardware.h:73,
                 from drivers/rtc/rtc-sa1100.c:35:
arch/arm/mach-sa1100/include/mach/SA-1100.h:877:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:43:1: warning: "RTAR" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:876:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:44:1: warning: "RTSR" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:879:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:45:1: warning: "RTTR" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:878:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:47:1: warning: "RTSR_HZE" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:891:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:48:1: warning: "RTSR_ALE" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:890:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:49:1: warning: "RTSR_HZ" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:889:1: warning: this is the location of the previous definition drivers/rtc/rtc-sa1100.c:50:1: warning: "RTSR_AL" redefined arch/arm/mach-sa1100/include/mach/SA-1100.h:888:1: warning: this is the location of the previous definition
and the second problem, which is far more severe, are the different register layouts, resulting in the wrong registers being read on SA11x0 platforms. This patch adds:
Quoted 7 lines
but the SA11x0 registers are:
---
 arch/arm/mach-pxa/devices.c    |   20 ---
 arch/arm/mach-sa1100/generic.c |   20 ---
 drivers/rtc/Kconfig            |    2 +-
 drivers/rtc/rtc-sa1100.c       |  256 ++++++++++++---------------------------
 4 files changed, 80 insertions(+), 218 deletions(-)
Quoted 3 lines
[...]
Truncated log?
No, it appears that something decided to delete several lines from the log file, particularly those between "This patch adds:" and the "but the SA11x0 registers are".

Quoted 8 lines

Quoted 1 line
I'll add them back, and hope git doesn't lose them again.
Ah. No I can't add them. They start with '#', and of course, git in its wonderful self decides that any line starting with such a character, even in the middle of a commit log, must be deleted. Wonderful.
So, I'm afraid, that's all you get in the log, unless I can figure out a way around that.

Just add a space or a tab before the #.

Alternatively you can use git commit with -F to provide the log message from a specified file (using - for stdin works).

Nicolas

Russell King - ARM Linux

author

2012-01-19 15:34 UTC #14 lore raw

PATCH 5/11 ARM: sa11x0: fix collie build error

In reply to Russell King - ARM Linux

f408c985cefc (GPIO: sa1100: implement proper gpiolib gpio_to_irq conversion) made gpio_to_irq() a function. This breaks collie where it's used to initialize some static data. Fix that by moving the initialization to the init code.

arch/arm/mach-sa1100/collie.c:139: error: initializer element is not constant arch/arm/mach-sa1100/collie.c:139: error: (near initialization for 'collie_power_resource[0].start') arch/arm/mach-sa1100/collie.c:140: error: initializer element is not constant arch/arm/mach-sa1100/collie.c:140: error: (near initialization for 'collie_power_resource[0].end')

Signed-off-by Russell King <[email protected]>

---
 arch/arm/mach-sa1100/collie.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

arch/arm/mach-sa1100/collie.c +2 -3

index c483912..cce8763 100644
@@ -144,8 +144,6 @@ static struct pda_power_pdata collie_power_data = {
 static struct resource collie_power_resource[] = {
 	{
 		.name		= "ac",
-		.start		= gpio_to_irq(COLLIE_GPIO_AC_IN),
-		.end		= gpio_to_irq(COLLIE_GPIO_AC_IN),
 		.flags		= IORESOURCE_IRQ |
 				  IORESOURCE_IRQ_HIGHEDGE |
 				  IORESOURCE_IRQ_LOWEDGE,

@@ -347,7 +345,8 @@ static void __init collie_init(void)
 
 	GPSR |= _COLLIE_GPIO_UCB1x00_RESET;
 
-
+	collie_power_resource[0].start = gpio_to_irq(COLLIE_GPIO_AC_IN);
+	collie_power_resource[0].end = gpio_to_irq(COLLIE_GPIO_AC_IN);
 	platform_scoop_config = &collie_pcmcia_config;
 
 	ret = platform_add_devices(devices, ARRAY_SIZE(devices));

Signature · 1 line

1.7.4.4

Russell King - ARM Linux

author

2012-01-19 15:34 UTC #15 lore raw

PATCH 6/11 ARM: sa11x0: fix section mismatch in cpu-sa1100.c

In reply to Russell King - ARM Linux

WARNING: arch/arm/mach-sa1100/built-in.o(.data+0x11b8): Section mismatch in reference from the variable sa1100_driver to the function .init.text:sa1100_cpu_init() The variable sa1100_driver references
the function __init sa1100_cpu_init()
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console

Signed-off-by Russell King <[email protected]>

---
 arch/arm/mach-sa1100/cpu-sa1100.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/mach-sa1100/cpu-sa1100.c +1 -1

index aaa8acf..19b2053 100644
@@ -228,7 +228,7 @@ static int __init sa1100_cpu_init(struct cpufreq_policy *policy)
 	return 0;
 }
 
-static struct cpufreq_driver sa1100_driver = {
+static struct cpufreq_driver sa1100_driver __refdata = {
 	.flags		= CPUFREQ_STICKY,
 	.verify		= sa11x0_verify_speed,
 	.target		= sa1100_target,

Signature · 1 line

1.7.4.4

Russell King - ARM Linux

author

2012-01-19 15:34 UTC #16 lore raw

PATCH 7/11 ARM: fix a section mismatch warning with our use of memblock

In reply to Russell King - ARM Linux

Commit 716a3dc2008 (ARM: Add arm_memblock_steal() to allocate memory away from the kernel) added a function which calls memblock_alloc(). This causes a section conflict:

WARNING: vmlinux.o(.text+0xc614): Section mismatch in reference from the function arm_memblock_steal() to the function .init.text:memblock_alloc() The function arm_memblock_steal() references
the function __init memblock_alloc().

Signed-off-by Russell King <[email protected]>

---
 arch/arm/mm/init.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/mm/init.c +1 -1

index 6ec1226..5dc7d12 100644
@@ -310,7 +310,7 @@ static void arm_memory_present(void)
 
 static bool arm_memblock_steal_permitted = true;
 
-phys_addr_t arm_memblock_steal(phys_addr_t size, phys_addr_t align)
+phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align)
 {
 	phys_addr_t phys;

Signature · 1 line

1.7.4.4

Russell King - ARM Linux

author

2012-01-19 15:35 UTC #17 lore raw

PATCH 8/11 ARM: vexpress: fix two section mismatch warnings

In reply to Russell King - ARM Linux

WARNING: vmlinux.o(.text+0x1bc9c): Section mismatch in reference from the function ct_ca9x4_init_cpu_map() to the function .init.text:scu_get_core_count() The function ct_ca9x4_init_cpu_map() references
the function __init scu_get_core_count().

WARNING: vmlinux.o(.text+0x1bce8): Section mismatch in reference from the function ct_ca9x4_init_cpu_map() to the function .init.text:set_smp_cross_call() The function ct_ca9x4_init_cpu_map() references
the function __init set_smp_cross_call().

Signed-off-by Russell King <[email protected]>

---
 arch/arm/mach-vexpress/ct-ca9x4.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

arch/arm/mach-vexpress/ct-ca9x4.c +2 -2

index 2b1e836..b1e87c1 100644
@@ -217,7 +217,7 @@ static void __init ct_ca9x4_init(void)
 }
 
 #ifdef CONFIG_SMP
-static void ct_ca9x4_init_cpu_map(void)
+static void __init ct_ca9x4_init_cpu_map(void)
 {
 	int i, ncores = scu_get_core_count(MMIO_P2V(A9_MPCORE_SCU));

@@ -233,7 +233,7 @@ static void ct_ca9x4_init_cpu_map(void)
 	set_smp_cross_call(gic_raise_softirq);
 }
 
-static void ct_ca9x4_smp_enable(unsigned int max_cpus)
+static void __init ct_ca9x4_smp_enable(unsigned int max_cpus)
 {
 	scu_enable(MMIO_P2V(A9_MPCORE_SCU));
 }

Signature · 1 line

1.7.4.4

Russell King - ARM Linux

author

2012-01-19 15:35 UTC #18 lore raw

PATCH 9/11 ARM: fix rcu stalls on SMP platforms

In reply to Russell King - ARM Linux

We can stall RCU processing on SMP platforms if a CPU sits in its idle loop for a long time. This happens because we don't call irq_enter() and irq_exit() around generic_smp_call_function_interrupt() and friends. Add the necessary calls, and remove the one from within ipi_timer(), so that they're all in a common place.

Signed-off-by Russell King <[email protected]>

---
 arch/arm/kernel/smp.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

arch/arm/kernel/smp.c +8 -2

index 57db122..26cdc49 100644
@@ -443,9 +443,7 @@ static DEFINE_PER_CPU(struct clock_event_device, percpu_clockevent);
 static void ipi_timer(void)
 {
 	struct clock_event_device *evt = &__get_cpu_var(percpu_clockevent);
-	irq_enter();
 	evt->event_handler(evt);
-	irq_exit();
 }
 
 #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST

@@ -548,7 +546,9 @@ void handle_IPI(int ipinr, struct pt_regs *regs)
 
 	switch (ipinr) {
 	case IPI_TIMER:
+		irq_enter();
 		ipi_timer();
+		irq_exit();
 		break;
 
 	case IPI_RESCHEDULE:

@@ -556,15 +556,21 @@ void handle_IPI(int ipinr, struct pt_regs *regs)
 		break;
 
 	case IPI_CALL_FUNC:
+		irq_enter();
 		generic_smp_call_function_interrupt();
+		irq_exit();
 		break;
 
 	case IPI_CALL_FUNC_SINGLE:
+		irq_enter();
 		generic_smp_call_function_single_interrupt();
+		irq_exit();
 		break;
 
 	case IPI_CPU_STOP:
+		irq_enter();
 		ipi_cpu_stop(cpu);
+		irq_exit();
 		break;
 
 	default:

Signature · 1 line

1.7.4.4

Russell King - ARM Linux

author

2012-01-19 15:35 UTC #19 lore raw

PATCH 10/11 ARM: 7279/1: standardize /proc/iomem "Kernel code" name

In reply to Russell King - ARM Linux

All other ports use "Kernel code" to identify the Kernel text segment in /proc/iomem. Change the ARM resources to do the same.

Signed-off-by Kees Cook <[email protected]>

Acked-by Nicolas Pitre <[email protected]>

Signed-off-by Russell King <[email protected]>

---
 arch/arm/kernel/setup.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/kernel/setup.c +1 -1

index 129fbd5..95653d0 100644
@@ -160,7 +160,7 @@ static struct resource mem_res[] = {
 		.flags = IORESOURCE_MEM
 	},
 	{
-		.name = "Kernel text",
+		.name = "Kernel code",
 		.start = 0,
 		.end = 0,
 		.flags = IORESOURCE_MEM

Signature · 1 line

1.7.4.4

Uwe Kleine-König

2012-01-19 16:11 UTC #20 lore raw

PATCH 10/11 ARM: 7279/1: standardize /proc/iomem "Kernel code" name

Hi Russell,

your summary mail suggests the author of this patch is Kees Cook. I assume you didn't add the From: pseudo header by mistake?

Ditto for Fabio and patch 11/11.

Best regards
Uwe

Quoted 32 lines · Russell King - ARM Linux

All other ports use "Kernel code" to identify the Kernel text segment in /proc/iomem. Change the ARM resources to do the same.
Signed-off-by Kees Cook <[email protected]>
Acked-by Nicolas Pitre <[email protected]>
Signed-off-by Russell King <[email protected]>
---
 arch/arm/kernel/setup.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/kernel/setup.c +1 -1
index 129fbd5..95653d0 100644
@@ -160,7 +160,7 @@ static struct resource mem_res[] = {
 		.flags = IORESOURCE_MEM
 	},
 	{
-		.name = "Kernel text",
+		.name = "Kernel code",
 		.start = 0,
 		.end = 0,
 		.flags = IORESOURCE_MEM
Signature · 7 lines
1.7.4.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Signature · 2 lines

Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

Russell King - ARM Linux

author

2012-01-19 16:20 UTC #21 lore raw

PATCH 10/11 ARM: 7279/1: standardize /proc/iomem "Kernel code" name

Quoted 4 lines · Uwe Kleine-K?nig

Hi Russell,
your summary mail suggests the author of this patch is Kees Cook. I assume you didn't add the From: pseudo header by mistake?

Yes they are, and it's something my scripts don't do at the moment. It's the first time they've sent stuff out authored by someone other than me.

Russell King - ARM Linux

author

2012-01-19 15:36 UTC #22 lore raw

PATCH 11/11 ARM: 7277/1: setup.c: Fix build warning by removing unneeded header file

In reply to Russell King - ARM Linux

Fix the following build warning:

CC arch/arm/kernel/setup.o
In file included from arch/arm/kernel/setup.c:39:
arch/arm/include/asm/elf.h:102:1: warning: "vmcore_elf64_check_arch" redefined In file included from arch/arm/kernel/setup.c:24:
include/linux/crash_dump.h:30:1: warning: this is the location of the previous definition

Since commit 93a72052 (crash_dump: export is_kdump_kernel to modules, consolidate elfcorehdr_addr, setup_elfcorehdr and saved_max_pfn) the inclusion of <linux/crash_dump.h> is no longer needed.

Remove the inclusion of <linux/crash_dump.h> and the build warning is fixed.

Signed-off-by Fabio Estevam <[email protected]>

Signed-off-by Russell King <[email protected]>

---
 arch/arm/kernel/setup.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

arch/arm/kernel/setup.c +0 -1

index 95653d0..ab70c91 100644
@@ -21,7 +21,6 @@
 #include <linux/init.h>
 #include <linux/kexec.h>
 #include <linux/of_fdt.h>
-#include <linux/crash_dump.h>
 #include <linux/root_dev.h>
 #include <linux/cpu.h>
 #include <linux/interrupt.h>

Signature · 1 line

1.7.4.4

Will Deacon

2012-01-19 17:00 UTC #23 lore raw

cover Recently pending ARM fixes

In reply to Russell King - ARM Linux

Hi Russell,

Quoted 11 lines · Russell King - ARM Linux

Below is a summary of a new set of ARM fixes which I've queued up today (so far). The big one is the revert of the changes to rtc-sa1100.c, which completely broke the driver. Of the remainder, the bulk are sorting out a few section mismatch warnings.
The two remaining patches fix a build error with collie and some RCU problems seen on SMP platforms, and two other minor patches.
Most people won't have much interest in this set of fixes, except for the rcu patch, so I probably won't push this to Linus for a few days (which means the number could grow.)

I have a few pending fixes that I plan to stick into the patch system tomorrow:

ARM: proc-v7.S: remove HARVARD_CACHE preprocessor guards
ARM: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block
ARM: vectors: use gate_vma for vectors user mapping
ARM: logical_cpu_map: decouple CPU mapping from SMP
ARM: hotplug: ensure that we copy the affinity mask when migrating IRQs
ARM: cache: assume 64-byte L1 cachelines for ARMv7 CPUs
ARM: vmlinux.lds.S: align the exception fixup table to a 4-byte boundary
ARM: vmlinux.lds.S: do not hardcode cacheline size as 32 bytes

the other bits and pieces I've been hacking on can wait until 3.4.

Cheers,

Will