From: "Michał Mirosław" <mirq-linux-CoA6ZxLDdyEEUmgCuDUIdw@public.gmane.org> To: linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org Subject: [PATCH 2/9] arm: cache-l2x0: remove duplicate warning Date: Thu, 20 Jul 2017 02:29:23 +0200 [thread overview] Message-ID: <bc96e94b884f06bdd29f2c8c607c3e65a302ca62.1500510157.git.mirq-linux@rere.qmqm.pl> (raw) In-Reply-To: <cover.1500510157.git.mirq-linux-CoA6ZxLDdyEEUmgCuDUIdw@public.gmane.org> Warning abound changing of AUX register in l2x0_of_init() is later repeated in __l2c_init(). Move whole thing over to __l2c_init(). Signed-off-by: Michał Mirosław <mirq-linux-CoA6ZxLDdyEEUmgCuDUIdw@public.gmane.org> --- arch/arm/mm/cache-l2x0.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index 808efbb89b88..ea1e70ff4568 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c @@ -819,6 +819,8 @@ static int __init __l2c_init(const struct l2c_init_data *data, if (old_aux != aux) pr_warn("L2C: DT/platform modifies aux control register: 0x%08x -> 0x%08x\n", old_aux, aux); + else if (aux_mask != ~0U && aux_val != 0) + pr_alert("L2C: platform provided aux values match the hardware, so have no effect. Please remove them.\n"); /* Determine the number of ways */ switch (cache_id & L2X0_CACHE_ID_PART_MASK) { @@ -1755,7 +1757,7 @@ int __init l2x0_of_init(u32 aux_val, u32 aux_mask) const struct l2c_init_data *data; struct device_node *np; struct resource res; - u32 cache_id, old_aux; + u32 cache_id; u32 cache_level = 2; bool nosync = false; @@ -1778,14 +1780,6 @@ int __init l2x0_of_init(u32 aux_val, u32 aux_mask) of_property_read_bool(np, "arm,io-coherent")) data = &of_l2c310_coherent_data; - old_aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); - if (old_aux != ((old_aux & aux_mask) | aux_val)) { - pr_warn("L2C: platform modifies aux control register: 0x%08x -> 0x%08x\n", - old_aux, (old_aux & aux_mask) | aux_val); - } else if (aux_mask != ~0U && aux_val != 0) { - pr_alert("L2C: platform provided aux values match the hardware, so have no effect. Please remove them.\n"); - } - /* All L2 caches are unified, so this property should be specified */ if (!of_property_read_bool(np, "cache-unified")) pr_err("L2C: device tree omits to specify unified cache\n"); -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: mirq-linux@rere.qmqm.pl (Michał Mirosław) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/9] arm: cache-l2x0: remove duplicate warning Date: Thu, 20 Jul 2017 02:29:23 +0200 [thread overview] Message-ID: <bc96e94b884f06bdd29f2c8c607c3e65a302ca62.1500510157.git.mirq-linux@rere.qmqm.pl> (raw) In-Reply-To: <cover.1500510157.git.mirq-linux@rere.qmqm.pl> Warning abound changing of AUX register in l2x0_of_init() is later repeated in __l2c_init(). Move whole thing over to __l2c_init(). Signed-off-by: Micha? Miros?aw <mirq-linux@rere.qmqm.pl> --- arch/arm/mm/cache-l2x0.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index 808efbb89b88..ea1e70ff4568 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c @@ -819,6 +819,8 @@ static int __init __l2c_init(const struct l2c_init_data *data, if (old_aux != aux) pr_warn("L2C: DT/platform modifies aux control register: 0x%08x -> 0x%08x\n", old_aux, aux); + else if (aux_mask != ~0U && aux_val != 0) + pr_alert("L2C: platform provided aux values match the hardware, so have no effect. Please remove them.\n"); /* Determine the number of ways */ switch (cache_id & L2X0_CACHE_ID_PART_MASK) { @@ -1755,7 +1757,7 @@ int __init l2x0_of_init(u32 aux_val, u32 aux_mask) const struct l2c_init_data *data; struct device_node *np; struct resource res; - u32 cache_id, old_aux; + u32 cache_id; u32 cache_level = 2; bool nosync = false; @@ -1778,14 +1780,6 @@ int __init l2x0_of_init(u32 aux_val, u32 aux_mask) of_property_read_bool(np, "arm,io-coherent")) data = &of_l2c310_coherent_data; - old_aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); - if (old_aux != ((old_aux & aux_mask) | aux_val)) { - pr_warn("L2C: platform modifies aux control register: 0x%08x -> 0x%08x\n", - old_aux, (old_aux & aux_mask) | aux_val); - } else if (aux_mask != ~0U && aux_val != 0) { - pr_alert("L2C: platform provided aux values match the hardware, so have no effect. Please remove them.\n"); - } - /* All L2 caches are unified, so this property should be specified */ if (!of_property_read_bool(np, "cache-unified")) pr_err("L2C: device tree omits to specify unified cache\n"); -- 2.11.0
next prev parent reply other threads:[~2017-07-20 0:29 UTC|newest] Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-07-20 0:29 [PATCH 0/9] Bringing Asus TF300T support to mainline Michał Mirosław 2017-07-20 0:29 ` Michał Mirosław [not found] ` <cover.1500510157.git.mirq-linux-CoA6ZxLDdyEEUmgCuDUIdw@public.gmane.org> 2017-07-20 0:29 ` Michał Mirosław [this message] 2017-07-20 0:29 ` [PATCH 2/9] arm: cache-l2x0: remove duplicate warning Michał Mirosław 2017-07-20 0:29 ` [PATCH 3/9] arm: cache-l2x0: share l2x0_base Michał Mirosław 2017-07-20 0:29 ` Michał Mirosław [not found] ` <eb104cfdf44ef9bf7b4f271555e1496d2bf781bf.1500510157.git.mirq-linux-CoA6ZxLDdyEEUmgCuDUIdw@public.gmane.org> 2017-10-05 16:48 ` Mark Rutland 2017-10-05 16:48 ` Mark Rutland 2017-12-19 23:10 ` Russell King - ARM Linux 2017-12-19 23:10 ` Russell King - ARM Linux 2017-07-20 0:29 ` [PATCH 1/9] ARM: enable secure platform-only erratas Michał Mirosław 2017-07-20 0:29 ` Michał Mirosław [not found] ` <77ce738c15b992a92bee3a18e5468342fb2dc5ab.1500510157.git.mirq-linux-CoA6ZxLDdyEEUmgCuDUIdw@public.gmane.org> 2017-10-05 15:53 ` Dmitry Osipenko 2017-10-05 15:53 ` Dmitry Osipenko 2017-10-05 18:16 ` Dmitry Osipenko 2017-10-05 18:16 ` Dmitry Osipenko [not found] ` <bdff72b9-8ebd-a426-b27b-fe055d45cfb1-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2017-12-19 23:28 ` Russell King - ARM Linux 2017-12-19 23:28 ` Russell King - ARM Linux [not found] ` <20171219232810.GI10595-l+eeeJia6m9URfEZ8mYm6t73F7V6hmMc@public.gmane.org> 2017-12-20 12:49 ` Dmitry Osipenko 2017-12-20 12:49 ` Dmitry Osipenko 2017-07-20 0:29 ` [PATCH 5/9] ARM: trusted_foundations: announce firmware version Michał Mirosław 2017-07-20 0:29 ` Michał Mirosław 2017-07-20 0:29 ` [PATCH 4/9] ARM: trusted_foundations: enable L2x0 cache via firmware_ops Michał Mirosław 2017-07-20 0:29 ` Michał Mirosław [not found] ` <1d12ea86cca40749731a594afc165830c0b2463d.1500510157.git.mirq-linux-CoA6ZxLDdyEEUmgCuDUIdw@public.gmane.org> 2017-10-05 16:24 ` Dmitry Osipenko 2017-10-05 16:24 ` Dmitry Osipenko 2017-12-19 18:56 ` Dmitry Osipenko 2017-12-19 18:56 ` Dmitry Osipenko 2017-07-20 0:29 ` [PATCH 8/9] ARM: tegra: avoid touching Secure registers in reset handler Michał Mirosław 2017-07-20 0:29 ` Michał Mirosław 2017-07-20 0:29 ` [PATCH 6/9] ARM: init: update secondary_data register documentation Michał Mirosław 2017-07-20 0:29 ` Michał Mirosław [not found] ` <a6e5e735ebae32a433e501188a86082efc8b0b52.1500510157.git.mirq-linux-CoA6ZxLDdyEEUmgCuDUIdw@public.gmane.org> 2017-12-19 23:16 ` Russell King - ARM Linux 2017-12-19 23:16 ` Russell King - ARM Linux 2017-07-20 0:29 ` [PATCH 7/9] ARM: tegra: enable cache via TF Michał Mirosław 2017-07-20 0:29 ` Michał Mirosław [not found] ` <6a164b2270a3e996c083e94bf5b1e27028c1135e.1500510157.git.mirq-linux-CoA6ZxLDdyEEUmgCuDUIdw@public.gmane.org> 2017-12-19 19:07 ` Dmitry Osipenko 2017-12-19 19:07 ` Dmitry Osipenko 2017-12-19 23:21 ` Russell King - ARM Linux 2017-12-19 23:21 ` Russell King - ARM Linux 2017-07-20 0:29 ` [PATCH 9/9] ARM: tegra: fix sleeping while atomic in CPU idle Michał Mirosław 2017-07-20 0:29 ` Michał Mirosław [not found] ` <0a0600cdbcc9a71134105043c3e2ace84bab7c5a.1500510157.git.mirq-linux-CoA6ZxLDdyEEUmgCuDUIdw@public.gmane.org> 2017-07-20 12:45 ` Jon Hunter 2017-07-20 12:45 ` Jon Hunter [not found] ` <378bf911-147e-f800-2de4-591e160528f0-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2017-07-20 16:28 ` Michał Mirosław 2017-07-20 16:28 ` Michał Mirosław [not found] ` <20170720162852.rh565t5as2tbe6np-cHozx32mtrEEUmgCuDUIdw@public.gmane.org> 2017-07-21 8:15 ` Jon Hunter 2017-07-21 8:15 ` Jon Hunter 2017-07-20 7:48 ` [PATCH 0/9] Bringing Asus TF300T support to mainline Mikko Perttunen 2017-07-20 7:48 ` Mikko Perttunen [not found] ` <a4149270-561a-4190-4c4e-c164bd91446e-/1wQRMveznE@public.gmane.org> 2017-07-20 15:07 ` Michał Mirosław 2017-07-20 15:07 ` Michał Mirosław 2017-10-04 21:25 ` Michał Mirosław 2017-10-04 21:25 ` Michał Mirosław [not found] ` <20171004212534.uosfz6757bbds2c5-cHozx32mtrEEUmgCuDUIdw@public.gmane.org> 2017-10-05 15:52 ` Dmitry Osipenko 2017-10-05 15:52 ` Dmitry Osipenko [not found] ` <dcbbc541-60c1-8af5-25ea-927629447a55-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2017-10-05 16:07 ` Dmitry Osipenko 2017-10-05 16:07 ` Dmitry Osipenko -- strict thread matches above, loose matches on Subject: below -- 2017-07-20 0:14 Michał Mirosław [not found] ` <cover.1500509346.git.mirq-linux-CoA6ZxLDdyEEUmgCuDUIdw@public.gmane.org> 2017-07-20 0:14 ` [PATCH 2/9] arm: cache-l2x0: remove duplicate warning Michał Mirosław
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=bc96e94b884f06bdd29f2c8c607c3e65a302ca62.1500510157.git.mirq-linux@rere.qmqm.pl \ --to=mirq-linux-coa6zxlddyeeumgcuduidw@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.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: linkBe 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.