* [PATCH] ARM: dts: Add l2x0 device node for Exynos4-based boards
@ 2014-01-07 8:53 Tushar Behera
2014-01-23 18:15 ` Tomasz Figa
0 siblings, 1 reply; 6+ messages in thread
From: Tushar Behera @ 2014-01-07 8:53 UTC (permalink / raw)
To: linux-samsung-soc; +Cc: kgene.kim, arnd, tomasz.figa
For Exynos4 platform, L2 cache initialization is done only if
a device node for l2x0 device exists.
L2 cache initialization path is different when a board boots with
secure firmware. Since there are many Exynos4 based SoCs that boot
in secure mode, enabling this only for boards that don't boot with
secure firmware.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
---
Tested on Exynos4210-Origen board.
arch/arm/boot/dts/exynos4.dtsi | 8 ++++++++
arch/arm/boot/dts/exynos4210-origen.dts | 4 ++++
arch/arm/boot/dts/exynos4210-smdkv310.dts | 4 ++++
arch/arm/boot/dts/exynos4210-trats.dts | 4 ++++
arch/arm/boot/dts/exynos4210-universal_c210.dts | 4 ++++
arch/arm/boot/dts/exynos4412-odroidx.dts | 4 ++++
arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 ++++
arch/arm/boot/dts/exynos4412-tiny4412.dts | 4 ++++
8 files changed, 36 insertions(+)
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 08452e1..e0ddbd2 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -49,6 +49,14 @@
reg = <0x10000000 0x100>;
};
+ l2-cache-controller@10502000 {
+ compatible = "arm,pl310-cache";
+ reg = <0x10502000 0x1000>;
+ cache-unified;
+ cache-level = <2>;
+ status = "disabled";
+ };
+
mipi_phy: video-phy@10020710 {
compatible = "samsung,s5pv210-mipi-video-phy";
reg = <0x10020710 8>;
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index 2aa13cb..eea1286 100644
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -32,6 +32,10 @@
bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc";
};
+ l2-cache-controller@10502000 {
+ status = "okay";
+ };
+
regulators {
compatible = "simple-bus";
#address-cells = <1>;
diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index 9c01b71..5ce2869 100644
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -29,6 +29,10 @@
bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc";
};
+ l2-cache-controller@10502000 {
+ status = "okay";
+ };
+
sdhci@12530000 {
bus-width = <4>;
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts
index 63cc571..00dbc6c 100644
--- a/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/arch/arm/boot/dts/exynos4210-trats.dts
@@ -30,6 +30,10 @@
bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rootwait earlyprintk panic=5";
};
+ l2-cache-controller@10502000 {
+ status = "okay";
+ };
+
regulators {
compatible = "simple-bus";
diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index d2e3f5f..e732afe 100644
--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
@@ -28,6 +28,10 @@
bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rw rootwait earlyprintk panic=5 maxcpus=1";
};
+ l2-cache-controller@10502000 {
+ status = "okay";
+ };
+
mct@10050000 {
compatible = "none";
};
diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
index 8aad5f7..6fb9e84 100644
--- a/arch/arm/boot/dts/exynos4412-odroidx.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
@@ -22,6 +22,10 @@
reg = <0x40000000 0x40000000>;
};
+ l2-cache-controller@10502000 {
+ status = "okay";
+ };
+
leds {
compatible = "gpio-leds";
led1 {
diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts b/arch/arm/boot/dts/exynos4412-smdk4412.dts
index ad316a1..f72d425 100644
--- a/arch/arm/boot/dts/exynos4412-smdk4412.dts
+++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts
@@ -27,6 +27,10 @@
bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc";
};
+ l2-cache-controller@10502000 {
+ status = "okay";
+ };
+
g2d@10800000 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/exynos4412-tiny4412.dts b/arch/arm/boot/dts/exynos4412-tiny4412.dts
index 0a98312..33a3cb89 100644
--- a/arch/arm/boot/dts/exynos4412-tiny4412.dts
+++ b/arch/arm/boot/dts/exynos4412-tiny4412.dts
@@ -22,6 +22,10 @@
reg = <0x40000000 0x40000000>;
};
+ l2-cache-controller@10502000 {
+ status = "okay";
+ };
+
leds {
compatible = "gpio-leds";
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: Add l2x0 device node for Exynos4-based boards
2014-01-07 8:53 [PATCH] ARM: dts: Add l2x0 device node for Exynos4-based boards Tushar Behera
@ 2014-01-23 18:15 ` Tomasz Figa
2014-01-24 4:44 ` Tushar Behera
0 siblings, 1 reply; 6+ messages in thread
From: Tomasz Figa @ 2014-01-23 18:15 UTC (permalink / raw)
To: Tushar Behera, linux-samsung-soc; +Cc: kgene.kim, arnd, tomasz.figa
Hi,
On 07.01.2014 09:53, Tushar Behera wrote:
> For Exynos4 platform, L2 cache initialization is done only if
> a device node for l2x0 device exists.
>
> L2 cache initialization path is different when a board boots with
> secure firmware. Since there are many Exynos4 based SoCs that boot
> in secure mode, enabling this only for boards that don't boot with
> secure firmware.
>
> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
> ---
>
> Tested on Exynos4210-Origen board.
>
> arch/arm/boot/dts/exynos4.dtsi | 8 ++++++++
> arch/arm/boot/dts/exynos4210-origen.dts | 4 ++++
> arch/arm/boot/dts/exynos4210-smdkv310.dts | 4 ++++
> arch/arm/boot/dts/exynos4210-trats.dts | 4 ++++
> arch/arm/boot/dts/exynos4210-universal_c210.dts | 4 ++++
> arch/arm/boot/dts/exynos4412-odroidx.dts | 4 ++++
> arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 ++++
> arch/arm/boot/dts/exynos4412-tiny4412.dts | 4 ++++
> 8 files changed, 36 insertions(+)
Looks good. Unfortunately this is still going to break secure firmware
enabled boards, because l2x0_of_init() does not check if the node is
enabled.
Best regards,
Tomasz
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: Add l2x0 device node for Exynos4-based boards
2014-01-23 18:15 ` Tomasz Figa
@ 2014-01-24 4:44 ` Tushar Behera
2014-01-24 11:48 ` Tomasz Figa
0 siblings, 1 reply; 6+ messages in thread
From: Tushar Behera @ 2014-01-24 4:44 UTC (permalink / raw)
To: Tomasz Figa; +Cc: linux-samsung-soc, Kgene Kim, Arnd Bergmann, Tomasz Figa
On 23 January 2014 23:45, Tomasz Figa <t.figa@samsung.com> wrote:
> Hi,
>
>
> On 07.01.2014 09:53, Tushar Behera wrote:
>>
>> For Exynos4 platform, L2 cache initialization is done only if
>> a device node for l2x0 device exists.
>>
>> L2 cache initialization path is different when a board boots with
>> secure firmware. Since there are many Exynos4 based SoCs that boot
>> in secure mode, enabling this only for boards that don't boot with
>> secure firmware.
>>
>> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
>> ---
>>
>> Tested on Exynos4210-Origen board.
>>
>> arch/arm/boot/dts/exynos4.dtsi | 8 ++++++++
>> arch/arm/boot/dts/exynos4210-origen.dts | 4 ++++
>> arch/arm/boot/dts/exynos4210-smdkv310.dts | 4 ++++
>> arch/arm/boot/dts/exynos4210-trats.dts | 4 ++++
>> arch/arm/boot/dts/exynos4210-universal_c210.dts | 4 ++++
>> arch/arm/boot/dts/exynos4412-odroidx.dts | 4 ++++
>> arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 ++++
>> arch/arm/boot/dts/exynos4412-tiny4412.dts | 4 ++++
>> 8 files changed, 36 insertions(+)
>
>
> Looks good. Unfortunately this is still going to break secure firmware
> enabled boards, because l2x0_of_init() does not check if the node is
> enabled.
>
Is the following check in l2x0_of_init() not enough?
1002 |-------np = of_find_matching_node(NULL, l2x0_ids);
1003 |-------if (!np)
1004 |-------|-------return -ENODEV;
> Best regards,
> Tomasz
--
Tushar Behera
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: Add l2x0 device node for Exynos4-based boards
2014-01-24 4:44 ` Tushar Behera
@ 2014-01-24 11:48 ` Tomasz Figa
2014-02-12 9:33 ` Tushar Behera
0 siblings, 1 reply; 6+ messages in thread
From: Tomasz Figa @ 2014-01-24 11:48 UTC (permalink / raw)
To: Tushar Behera; +Cc: linux-samsung-soc, Kgene Kim, Arnd Bergmann, Tomasz Figa
On 24.01.2014 05:44, Tushar Behera wrote:
> On 23 January 2014 23:45, Tomasz Figa <t.figa@samsung.com> wrote:
>> Hi,
>>
>>
>> On 07.01.2014 09:53, Tushar Behera wrote:
>>>
>>> For Exynos4 platform, L2 cache initialization is done only if
>>> a device node for l2x0 device exists.
>>>
>>> L2 cache initialization path is different when a board boots with
>>> secure firmware. Since there are many Exynos4 based SoCs that boot
>>> in secure mode, enabling this only for boards that don't boot with
>>> secure firmware.
>>>
>>> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
>>> ---
>>>
>>> Tested on Exynos4210-Origen board.
>>>
>>> arch/arm/boot/dts/exynos4.dtsi | 8 ++++++++
>>> arch/arm/boot/dts/exynos4210-origen.dts | 4 ++++
>>> arch/arm/boot/dts/exynos4210-smdkv310.dts | 4 ++++
>>> arch/arm/boot/dts/exynos4210-trats.dts | 4 ++++
>>> arch/arm/boot/dts/exynos4210-universal_c210.dts | 4 ++++
>>> arch/arm/boot/dts/exynos4412-odroidx.dts | 4 ++++
>>> arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 ++++
>>> arch/arm/boot/dts/exynos4412-tiny4412.dts | 4 ++++
>>> 8 files changed, 36 insertions(+)
>>
>>
>> Looks good. Unfortunately this is still going to break secure firmware
>> enabled boards, because l2x0_of_init() does not check if the node is
>> enabled.
>>
>
> Is the following check in l2x0_of_init() not enough?
>
> 1002 |-------np = of_find_matching_node(NULL, l2x0_ids);
> 1003 |-------if (!np)
> 1004 |-------|-------return -ENODEV;
It only looks for a matching node without checking its status property.
Best regards,
Tomasz
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: Add l2x0 device node for Exynos4-based boards
2014-01-24 11:48 ` Tomasz Figa
@ 2014-02-12 9:33 ` Tushar Behera
2014-02-12 10:10 ` Tomasz Figa
0 siblings, 1 reply; 6+ messages in thread
From: Tushar Behera @ 2014-02-12 9:33 UTC (permalink / raw)
To: Tomasz Figa; +Cc: linux-samsung-soc, Kgene Kim, Arnd Bergmann, Tomasz Figa
On 24 January 2014 17:18, Tomasz Figa <t.figa@samsung.com> wrote:
>
>
> On 24.01.2014 05:44, Tushar Behera wrote:
>>
>> On 23 January 2014 23:45, Tomasz Figa <t.figa@samsung.com> wrote:
>>>
>>> Hi,
>>>
>>>
>>> On 07.01.2014 09:53, Tushar Behera wrote:
>>>>
>>>>
>>>> For Exynos4 platform, L2 cache initialization is done only if
>>>> a device node for l2x0 device exists.
>>>>
>>>> L2 cache initialization path is different when a board boots with
>>>> secure firmware. Since there are many Exynos4 based SoCs that boot
>>>> in secure mode, enabling this only for boards that don't boot with
>>>> secure firmware.
>>>>
>>>> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
>>>> ---
>>>>
>>>> Tested on Exynos4210-Origen board.
>>>>
>>>> arch/arm/boot/dts/exynos4.dtsi | 8 ++++++++
>>>> arch/arm/boot/dts/exynos4210-origen.dts | 4 ++++
>>>> arch/arm/boot/dts/exynos4210-smdkv310.dts | 4 ++++
>>>> arch/arm/boot/dts/exynos4210-trats.dts | 4 ++++
>>>> arch/arm/boot/dts/exynos4210-universal_c210.dts | 4 ++++
>>>> arch/arm/boot/dts/exynos4412-odroidx.dts | 4 ++++
>>>> arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 ++++
>>>> arch/arm/boot/dts/exynos4412-tiny4412.dts | 4 ++++
>>>> 8 files changed, 36 insertions(+)
>>>
>>>
>>>
>>> Looks good. Unfortunately this is still going to break secure firmware
>>> enabled boards, because l2x0_of_init() does not check if the node is
>>> enabled.
>>>
>>
>> Is the following check in l2x0_of_init() not enough?
>>
>> 1002 |-------np = of_find_matching_node(NULL, l2x0_ids);
>> 1003 |-------if (!np)
>> 1004 |-------|-------return -ENODEV;
>
>
> It only looks for a matching node without checking its status property.
>
Hmm ... so in that case, will this work?
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index 7abde2ce..ebcab01 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -973,11 +973,17 @@ int __init l2x0_of_init(u32 aux_val, u32 aux_mask)
struct device_node *np;
const struct l2x0_of_data *data;
struct resource res;
+ const char *status;
np = of_find_matching_node(NULL, l2x0_ids);
if (!np)
return -ENODEV;
+ status = of_get_property(np, "status", NULL);
+ if (status)
+ if (strcmp(status, "okay"))
+ return -ENODEV;
+
if (of_address_to_resource(np, 0, &res))
return -ENODEV;
--
Tushar Behera
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: Add l2x0 device node for Exynos4-based boards
2014-02-12 9:33 ` Tushar Behera
@ 2014-02-12 10:10 ` Tomasz Figa
0 siblings, 0 replies; 6+ messages in thread
From: Tomasz Figa @ 2014-02-12 10:10 UTC (permalink / raw)
To: Tushar Behera, Tomasz Figa; +Cc: linux-samsung-soc, Kgene Kim, Arnd Bergmann
On 12.02.2014 10:33, Tushar Behera wrote:
> On 24 January 2014 17:18, Tomasz Figa <t.figa@samsung.com> wrote:
>>
>>
>> On 24.01.2014 05:44, Tushar Behera wrote:
>>>
>>> On 23 January 2014 23:45, Tomasz Figa <t.figa@samsung.com> wrote:
>>>>
>>>> Hi,
>>>>
>>>>
>>>> On 07.01.2014 09:53, Tushar Behera wrote:
>>>>>
>>>>>
>>>>> For Exynos4 platform, L2 cache initialization is done only if
>>>>> a device node for l2x0 device exists.
>>>>>
>>>>> L2 cache initialization path is different when a board boots with
>>>>> secure firmware. Since there are many Exynos4 based SoCs that boot
>>>>> in secure mode, enabling this only for boards that don't boot with
>>>>> secure firmware.
>>>>>
>>>>> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
>>>>> ---
>>>>>
>>>>> Tested on Exynos4210-Origen board.
>>>>>
>>>>> arch/arm/boot/dts/exynos4.dtsi | 8 ++++++++
>>>>> arch/arm/boot/dts/exynos4210-origen.dts | 4 ++++
>>>>> arch/arm/boot/dts/exynos4210-smdkv310.dts | 4 ++++
>>>>> arch/arm/boot/dts/exynos4210-trats.dts | 4 ++++
>>>>> arch/arm/boot/dts/exynos4210-universal_c210.dts | 4 ++++
>>>>> arch/arm/boot/dts/exynos4412-odroidx.dts | 4 ++++
>>>>> arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 ++++
>>>>> arch/arm/boot/dts/exynos4412-tiny4412.dts | 4 ++++
>>>>> 8 files changed, 36 insertions(+)
>>>>
>>>>
>>>>
>>>> Looks good. Unfortunately this is still going to break secure firmware
>>>> enabled boards, because l2x0_of_init() does not check if the node is
>>>> enabled.
>>>>
>>>
>>> Is the following check in l2x0_of_init() not enough?
>>>
>>> 1002 |-------np = of_find_matching_node(NULL, l2x0_ids);
>>> 1003 |-------if (!np)
>>> 1004 |-------|-------return -ENODEV;
>>
>>
>> It only looks for a matching node without checking its status property.
>>
>
> Hmm ... so in that case, will this work?
>
> diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
> index 7abde2ce..ebcab01 100644
> --- a/arch/arm/mm/cache-l2x0.c
> +++ b/arch/arm/mm/cache-l2x0.c
> @@ -973,11 +973,17 @@ int __init l2x0_of_init(u32 aux_val, u32 aux_mask)
> struct device_node *np;
> const struct l2x0_of_data *data;
> struct resource res;
> + const char *status;
>
> np = of_find_matching_node(NULL, l2x0_ids);
> if (!np)
> return -ENODEV;
>
> + status = of_get_property(np, "status", NULL);
> + if (status)
> + if (strcmp(status, "okay"))
> + return -ENODEV;
> +
> if (of_address_to_resource(np, 0, &res))
> return -ENODEV;
Yes, this would work, but there is already
int of_device_is_available(const struct device_node *device)
which can be used instead of open coding this.
Best regards,
Tomasz
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-02-12 10:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-07 8:53 [PATCH] ARM: dts: Add l2x0 device node for Exynos4-based boards Tushar Behera
2014-01-23 18:15 ` Tomasz Figa
2014-01-24 4:44 ` Tushar Behera
2014-01-24 11:48 ` Tomasz Figa
2014-02-12 9:33 ` Tushar Behera
2014-02-12 10:10 ` Tomasz Figa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox