From: khalasa@piap.pl (Krzysztof Hałasa)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] CNS3xxx: Fix PCIe early iotable_init().
Date: Fri, 28 Feb 2014 12:12:45 +0100 [thread overview]
Message-ID: <m3sir3pk2a.fsf@t19.piap.pl> (raw)
In-Reply-To: <m3eh2nqz7n.fsf@t19.piap.pl> ("Krzysztof Hałasa"'s message of "Fri, 28 Feb 2014 12:00:12 +0100")
Signed-off-by: Krzysztof Ha?asa <khalasa@piap.pl>
--- a/arch/arm/mach-cns3xxx/cns3420vb.c
+++ b/arch/arm/mach-cns3xxx/cns3420vb.c
@@ -240,7 +240,7 @@ static void __init cns3420_map_io(void)
{
cns3xxx_map_io();
iotable_init(cns3420_io_desc, ARRAY_SIZE(cns3420_io_desc));
-
+ cns3xxx_pcie_iotable_init();
cns3420_early_serial_setup();
}
--- a/arch/arm/mach-cns3xxx/core.h
+++ b/arch/arm/mach-cns3xxx/core.h
@@ -14,6 +14,7 @@
#include <linux/reboot.h>
extern void cns3xxx_timer_init(void);
+extern void cns3xxx_pcie_iotable_init(void);
#ifdef CONFIG_CACHE_L2X0
void __init cns3xxx_l2x0_init(void);
--- a/arch/arm/mach-cns3xxx/pcie.c
+++ b/arch/arm/mach-cns3xxx/pcie.c
@@ -357,6 +357,15 @@ static int cns3xxx_pcie_abort_handler(unsigned long addr, unsigned int fsr,
return 0;
}
+void __init cns3xxx_pcie_iotable_init()
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(cns3xxx_pcie); i++)
+ iotable_init(cns3xxx_pcie[i].cfg_bases,
+ ARRAY_SIZE(cns3xxx_pcie[i].cfg_bases));
+}
+
static int __init cns3xxx_pcie_init(void)
{
int i;
@@ -368,8 +377,6 @@ static int __init cns3xxx_pcie_init(void)
"imprecise external abort");
for (i = 0; i < ARRAY_SIZE(cns3xxx_pcie); i++) {
- iotable_init(cns3xxx_pcie[i].cfg_bases,
- ARRAY_SIZE(cns3xxx_pcie[i].cfg_bases));
cns3xxx_pwr_clk_en(0x1 << PM_CLK_GATE_REG_OFFSET_PCIE(i));
cns3xxx_pwr_soft_rst(0x1 << PM_SOFT_RST_REG_OFFST_PCIE(i));
cns3xxx_pcie_check_link(&cns3xxx_pcie[i]);
WARNING: multiple messages have this Message-ID (diff)
From: khalasa@piap.pl (Krzysztof Hałasa)
To: linux-arm-kernel@lists.infradead.org
Cc: lkml <linux-kernel@vger.kernel.org>,
Anton Vorontsov <anton@enomsg.org>,
Yinghai Lu <yinghai@kernel.org>,
Russell King <linux@arm.linux.org.uk>
Subject: [PATCH] CNS3xxx: Fix PCIe early iotable_init().
Date: Fri, 28 Feb 2014 12:12:45 +0100 [thread overview]
Message-ID: <m3sir3pk2a.fsf@t19.piap.pl> (raw)
In-Reply-To: <m3eh2nqz7n.fsf@t19.piap.pl> ("Krzysztof Hałasa"'s message of "Fri, 28 Feb 2014 12:00:12 +0100")
Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
--- a/arch/arm/mach-cns3xxx/cns3420vb.c
+++ b/arch/arm/mach-cns3xxx/cns3420vb.c
@@ -240,7 +240,7 @@ static void __init cns3420_map_io(void)
{
cns3xxx_map_io();
iotable_init(cns3420_io_desc, ARRAY_SIZE(cns3420_io_desc));
-
+ cns3xxx_pcie_iotable_init();
cns3420_early_serial_setup();
}
--- a/arch/arm/mach-cns3xxx/core.h
+++ b/arch/arm/mach-cns3xxx/core.h
@@ -14,6 +14,7 @@
#include <linux/reboot.h>
extern void cns3xxx_timer_init(void);
+extern void cns3xxx_pcie_iotable_init(void);
#ifdef CONFIG_CACHE_L2X0
void __init cns3xxx_l2x0_init(void);
--- a/arch/arm/mach-cns3xxx/pcie.c
+++ b/arch/arm/mach-cns3xxx/pcie.c
@@ -357,6 +357,15 @@ static int cns3xxx_pcie_abort_handler(unsigned long addr, unsigned int fsr,
return 0;
}
+void __init cns3xxx_pcie_iotable_init()
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(cns3xxx_pcie); i++)
+ iotable_init(cns3xxx_pcie[i].cfg_bases,
+ ARRAY_SIZE(cns3xxx_pcie[i].cfg_bases));
+}
+
static int __init cns3xxx_pcie_init(void)
{
int i;
@@ -368,8 +377,6 @@ static int __init cns3xxx_pcie_init(void)
"imprecise external abort");
for (i = 0; i < ARRAY_SIZE(cns3xxx_pcie); i++) {
- iotable_init(cns3xxx_pcie[i].cfg_bases,
- ARRAY_SIZE(cns3xxx_pcie[i].cfg_bases));
cns3xxx_pwr_clk_en(0x1 << PM_CLK_GATE_REG_OFFSET_PCIE(i));
cns3xxx_pwr_soft_rst(0x1 << PM_SOFT_RST_REG_OFFST_PCIE(i));
cns3xxx_pcie_check_link(&cns3xxx_pcie[i]);
next prev parent reply other threads:[~2014-02-28 11:12 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-28 11:00 [ARM] CNS3xxx: 3 regressions identified in v3.14-rc4+ Krzysztof Hałasa
2014-02-28 11:00 ` Krzysztof Hałasa
2014-02-28 11:12 ` Krzysztof Hałasa [this message]
2014-02-28 11:12 ` [PATCH] CNS3xxx: Fix PCIe early iotable_init() Krzysztof Hałasa
2014-02-28 11:15 ` Arnd Bergmann
2014-02-28 11:15 ` Arnd Bergmann
2014-03-04 6:46 ` Krzysztof Hałasa
2014-03-04 6:46 ` Krzysztof Hałasa
2014-02-28 11:31 ` [ARM] CNS3xxx: 3 regressions identified in v3.14-rc4+ Arnd Bergmann
2014-02-28 11:31 ` Arnd Bergmann
2014-03-04 7:37 ` [PATCH v2] CNS3xxx: Fix PCIe early iotable_init() Krzysztof Hałasa
2014-03-04 7:37 ` Krzysztof Hałasa
2014-03-04 9:08 ` Krzysztof Hałasa
2014-03-04 9:08 ` Krzysztof Hałasa
2014-03-17 14:37 ` Arnd Bergmann
2014-03-17 14:37 ` Arnd Bergmann
2014-03-18 9:36 ` Krzysztof Hałasa
2014-03-18 9:36 ` Krzysztof Hałasa
2014-03-04 10:37 ` [PATCH2] CNS3xxx: Fix a WARN() related to IRQ allocation Krzysztof Hałasa
2014-03-04 10:37 ` Krzysztof Hałasa
2014-03-04 10:50 ` Krzysztof Hałasa
2014-03-04 10:50 ` Krzysztof Hałasa
2014-03-17 14:33 ` Arnd Bergmann
2014-03-17 14:33 ` 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=m3sir3pk2a.fsf@t19.piap.pl \
--to=khalasa@piap.pl \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.