From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: /proc/cpuinfo: DT: Add support for Revision
Date: Mon, 26 Jan 2015 14:22:27 -0600 [thread overview]
Message-ID: <CAL_JsqKNq4mY9vwDBPGYLmSYpTnYqS4QvjkbMkD6LJpxDYoLAg@mail.gmail.com> (raw)
In-Reply-To: <201501262009.45854@pali>
On Mon, Jan 26, 2015 at 1:09 PM, Pali Roh?r <pali.rohar@gmail.com> wrote:
> Ok, here is patch which set Revision field (global variable system_rev) in /proc/cpuinfo from DT
> revision property:
>
> diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
> index 11c54de..9946c1b 100644
> --- a/arch/arm/kernel/devtree.c
> +++ b/arch/arm/kernel/devtree.c
> @@ -19,6 +19,7 @@
> #include <linux/of_irq.h>
> #include <linux/of_platform.h>
> #include <linux/smp.h>
> +#include <linux/libfdt_env.h>
>
> #include <asm/cputype.h>
> #include <asm/setup.h>
> @@ -26,6 +27,7 @@
> #include <asm/smp_plat.h>
> #include <asm/mach/arch.h>
> #include <asm/mach-types.h>
> +#include <asm/system_info.h>
>
>
> #ifdef CONFIG_SMP
> @@ -204,6 +206,8 @@ static const void * __init arch_get_next_mach(const char *const **match)
> const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
> {
> const struct machine_desc *mdesc, *mdesc_best = NULL;
> + unsigned long dt_root;
> + const u32 *prop;
>
> #ifdef CONFIG_ARCH_MULTIPLATFORM
> DT_MACHINE_START(GENERIC_DT, "Generic DT based system")
> @@ -215,17 +219,16 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
> if (!dt_phys || !early_init_dt_verify(phys_to_virt(dt_phys)))
> return NULL;
>
> + dt_root = of_get_flat_dt_root();
> mdesc = of_flat_dt_match_machine(mdesc_best, arch_get_next_mach);
>
> if (!mdesc) {
> const char *prop;
> int size;
> - unsigned long dt_root;
>
> early_print("\nError: unrecognized/unsupported "
> "device tree compatible list:\n[ ");
>
> - dt_root = of_get_flat_dt_root();
> prop = of_get_flat_dt_prop(dt_root, "compatible", &size);
> while (size > 0) {
> early_print("'%s' ", prop);
> @@ -246,5 +249,10 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
> /* Change machine number to match the mdesc we're using */
> __machine_arch_type = mdesc->nr;
>
> + /* Set system revision from DT */
> + prop = of_get_flat_dt_prop(dt_root, "revision", NULL);
> + if (prop)
> + system_rev = fdt32_to_cpu(*prop);
> +
> return mdesc;
> }
>
>
> And here is patch which convert ATAG revision into DT revision property and append it into DT in
> decompress code:
>
> diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c
> index 9448aa0..e7e1cc9 100644
> --- a/arch/arm/boot/compressed/atags_to_fdt.c
> +++ b/arch/arm/boot/compressed/atags_to_fdt.c
> @@ -171,6 +171,8 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space)
> cpu_to_fdt32(atag->u.mem.size);
> }
>
> + } else if (atag->hdr.tag == ATAG_REVISION) {
> + setprop_cell(fdt, "/", "revision", atag->u.revision.rev);
> } else if (atag->hdr.tag == ATAG_INITRD2) {
> uint32_t initrd_start, initrd_size;
> initrd_start = atag->u.initrd.start;
>
>
> I tested it on DT booted Nokia N900 and it is working, in /proc/cpuinfo is revision from ATAG.
>
> I do not know which DT property to use for storing HW Revision, so if "/revision" is not correct one,
> let me know what to use instead. Also you can add my Signed-off-by for both patches.
It is the correct property, but /revision in DT is a string.
You need to add your own sign-off.
Rob
next prev parent reply other threads:[~2015-01-26 20:22 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-18 16:54 [PATCH] ARM: /proc/cpuinfo: Use DT machine name when possible Pali Rohár
2014-06-18 19:01 ` Russell King - ARM Linux
2014-06-18 19:09 ` Pali Rohár
2014-06-18 19:59 ` Russell King - ARM Linux
2014-06-19 8:21 ` Pavel Machek
2014-07-11 19:31 ` Pavel Machek
2014-06-18 19:07 ` Rob Herring
2014-06-18 19:22 ` Pali Rohár
2014-06-18 20:00 ` Russell King - ARM Linux
2014-06-18 20:20 ` Pali Rohár
2014-06-18 21:53 ` Fabio Estevam
2014-11-24 22:16 ` Pali Rohár
2014-06-18 20:46 ` Rob Herring
2014-06-18 21:47 ` Russell King - ARM Linux
2014-06-18 22:27 ` Rob Herring
2014-06-18 23:07 ` Russell King - ARM Linux
2014-11-24 22:19 ` Pali Rohár
2014-12-04 0:33 ` Rob Herring
2014-12-04 0:48 ` Pali Rohár
2014-12-04 16:49 ` Rob Herring
2014-12-04 17:57 ` Pali Rohár
2014-12-04 18:10 ` Rob Herring
2015-01-26 19:09 ` [PATCH] ARM: /proc/cpuinfo: DT: Add support for Revision Pali Rohár
2015-01-26 20:22 ` Rob Herring [this message]
2015-01-30 14:14 ` Pali Rohár
2015-01-30 21:03 ` Rob Herring
2015-02-27 15:45 ` Pali Rohár
2015-02-27 15:55 ` [PATCH v2 0/2] " Pali Rohár
2015-02-27 15:55 ` [PATCH v2 1/2] arm: devtree: Set system_rev from DT revision Pali Rohár
2015-02-27 15:55 ` [PATCH v2 2/2] arm: boot: convert ATAG_REVISION to DT revision field Pali Rohár
2015-03-02 11:28 ` [PATCH v2 0/2] ARM: /proc/cpuinfo: DT: Add support for Revision Pavel Machek
2015-03-16 15:44 ` Tony Lindgren
2015-03-16 16:14 ` Russell King - ARM Linux
2015-03-16 16:43 ` Nicolas Pitre
2015-03-16 19:21 ` Russell King - ARM Linux
2015-03-16 18:10 ` Tony Lindgren
2015-03-16 19:59 ` Russell King - ARM Linux
2015-03-16 20:54 ` Pali Rohár
2015-03-16 20:59 ` Tony Lindgren
2015-01-26 22:34 ` [PATCH] " Andreas Färber
2015-02-27 15:56 ` Pali Rohár
2015-01-26 19:16 ` [PATCH] ARM: /proc/atags: Export also for DT Pali Rohár
2015-01-26 20:33 ` Rob Herring
2015-01-27 13:21 ` Pavel Machek
2015-01-27 14:16 ` Rob Herring
2015-01-27 14:24 ` Pavel Machek
2015-01-27 14:32 ` Pali Rohár
2015-01-27 17:48 ` Russell King - ARM Linux
2015-01-27 20:03 ` Nicolas Pitre
2015-01-27 21:09 ` Russell King - ARM Linux
2015-01-27 21:34 ` Nicolas Pitre
2015-01-27 21:58 ` Nicolas Pitre
2015-01-27 22:33 ` Russell King - ARM Linux
2015-01-28 2:07 ` Nicolas Pitre
2015-01-28 6:21 ` Jean-Christophe PLAGNIOL-VILLARD
2015-01-28 7:19 ` Pavel Machek
2015-01-28 8:06 ` Jean-Christophe PLAGNIOL-VILLARD
2015-01-28 8:25 ` Pavel Machek
2015-01-28 7:18 ` Pavel Machek
2015-01-28 13:38 ` Pali Rohár
2015-01-27 23:10 ` Pavel Machek
2015-01-28 0:50 ` Tony Lindgren
2015-01-28 13:58 ` Pali Rohár
2015-01-28 14:33 ` Nicolas Pitre
2015-01-28 15:39 ` Tony Lindgren
2015-01-28 15:47 ` Pali Rohár
2015-01-28 15:48 ` Tony Lindgren
2015-01-28 16:31 ` Jason Cooper
2015-01-28 15:57 ` Rob Herring
2015-01-28 16:13 ` Russell King - ARM Linux
2015-01-28 16:19 ` Will Deacon
2015-01-28 17:01 ` Russell King - ARM Linux
2015-01-28 17:29 ` Russell King - ARM Linux
2015-01-28 17:18 ` Pali Rohár
2015-01-28 18:00 ` Jean-Christophe PLAGNIOL-VILLARD
2015-01-28 19:33 ` Pali Rohár
2015-01-28 18:03 ` Pavel Machek
2015-01-28 19:27 ` Arnd Bergmann
2015-01-28 14:46 ` Jean-Christophe PLAGNIOL-VILLARD
2015-01-27 19:40 ` Nicolas Pitre
2015-01-26 20:37 ` Russell King - ARM Linux
2015-01-26 20:44 ` Pali Rohár
2014-12-04 19:00 ` [PATCH] ARM: /proc/cpuinfo: Use DT machine name when possible Pali Rohár
2014-12-04 10:59 ` Russell King - ARM Linux
2014-06-18 21:10 ` Aaro Koskinen
2014-07-11 19:28 ` Pavel Machek
2014-11-24 22:21 ` Pali Rohár
2014-09-05 11:38 ` Pali Rohár
2014-09-05 12:13 ` Russell King - ARM Linux
2014-09-10 12:46 ` Pavel Machek
2014-11-24 22:23 ` Pali Rohár
2014-09-05 13:45 ` Mark Rutland
2014-09-05 13:52 ` Pali Rohár
2014-09-05 13:58 ` Mark Rutland
2014-11-24 22:25 ` Pali Rohár
2014-09-05 13:58 ` Fabio Estevam
2014-11-24 22:27 ` Pali Rohár
2014-09-06 15:34 ` Andreas Färber
2014-11-24 22:29 ` Pali Rohár
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=CAL_JsqKNq4mY9vwDBPGYLmSYpTnYqS4QvjkbMkD6LJpxDYoLAg@mail.gmail.com \
--to=robherring2@gmail.com \
--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).