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 5/9] ARM: trusted_foundations: announce firmware version Date: Thu, 20 Jul 2017 02:29:24 +0200 [thread overview] Message-ID: <90ad41ff1b54695154348c0c7f9333ed9e162ce3.1500510157.git.mirq-linux@rere.qmqm.pl> (raw) In-Reply-To: <cover.1500510157.git.mirq-linux-CoA6ZxLDdyEEUmgCuDUIdw@public.gmane.org> Announce Trusted Foundations version for debugging and documentation. Signed-off-by: Michał Mirosław <mirq-linux-CoA6ZxLDdyEEUmgCuDUIdw@public.gmane.org> --- arch/arm/firmware/trusted_foundations.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/arm/firmware/trusted_foundations.c b/arch/arm/firmware/trusted_foundations.c index 81ff71b87438..105655802dfd 100644 --- a/arch/arm/firmware/trusted_foundations.c +++ b/arch/arm/firmware/trusted_foundations.c @@ -30,6 +30,8 @@ #define TF_CACHE_FLUSH 2 #define TF_CACHE_REENABLE 4 +#define TF_GET_PROTOCOL_VERSION 0xfffffffb + #define TF_CPU_PM 0xfffffffc #define TF_CPU_PM_S3 0xffffffe3 #define TF_CPU_PM_S2 0xffffffe6 @@ -39,7 +41,7 @@ static unsigned long cpu_boot_addr; -static void __naked tf_generic_smc(u32 type, u32 arg1, u32 arg2) +static u64 __naked tf_generic_smc(u32 type, u32 arg1, u32 arg2) { asm volatile( ".arch_extension sec\n\t" @@ -54,6 +56,7 @@ static void __naked tf_generic_smc(u32 type, u32 arg1, u32 arg2) : : "r" (type), "r" (arg1), "r" (arg2) : "memory"); + return 0; /* silence gcc warning */ } static int tf_set_cpu_boot_addr(int cpu, unsigned long boot_addr) @@ -106,6 +109,11 @@ static int tf_init_cache(void) } #endif /* CONFIG_CACHE_L2X0 */ +static u32 tf_get_protocol_version(void) +{ + return tf_generic_smc(TF_GET_PROTOCOL_VERSION, 0, 0) >> 48; +} + static const struct firmware_ops trusted_foundations_ops = { .set_cpu_boot_addr = tf_set_cpu_boot_addr, .prepare_idle = tf_prepare_idle, @@ -116,6 +124,12 @@ static const struct firmware_ops trusted_foundations_ops = { void register_trusted_foundations(struct trusted_foundations_platform_data *pd) { + unsigned int protocol = tf_get_protocol_version(); + + pr_info("TF: version %u.%u, protocol %u.%u\n", + pd->version_major, pd->version_minor, + protocol >> 8, protocol & 0xFF); + /* * we are not using version information for now since currently * supported SMCs are compatible with all TF releases @@ -141,5 +155,6 @@ void of_register_trusted_foundations(void) &pdata.version_minor); if (err != 0) panic("Trusted Foundation: missing version-minor property\n"); + register_trusted_foundations(&pdata); } -- 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 5/9] ARM: trusted_foundations: announce firmware version Date: Thu, 20 Jul 2017 02:29:24 +0200 [thread overview] Message-ID: <90ad41ff1b54695154348c0c7f9333ed9e162ce3.1500510157.git.mirq-linux@rere.qmqm.pl> (raw) In-Reply-To: <cover.1500510157.git.mirq-linux@rere.qmqm.pl> Announce Trusted Foundations version for debugging and documentation. Signed-off-by: Micha? Miros?aw <mirq-linux@rere.qmqm.pl> --- arch/arm/firmware/trusted_foundations.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/arm/firmware/trusted_foundations.c b/arch/arm/firmware/trusted_foundations.c index 81ff71b87438..105655802dfd 100644 --- a/arch/arm/firmware/trusted_foundations.c +++ b/arch/arm/firmware/trusted_foundations.c @@ -30,6 +30,8 @@ #define TF_CACHE_FLUSH 2 #define TF_CACHE_REENABLE 4 +#define TF_GET_PROTOCOL_VERSION 0xfffffffb + #define TF_CPU_PM 0xfffffffc #define TF_CPU_PM_S3 0xffffffe3 #define TF_CPU_PM_S2 0xffffffe6 @@ -39,7 +41,7 @@ static unsigned long cpu_boot_addr; -static void __naked tf_generic_smc(u32 type, u32 arg1, u32 arg2) +static u64 __naked tf_generic_smc(u32 type, u32 arg1, u32 arg2) { asm volatile( ".arch_extension sec\n\t" @@ -54,6 +56,7 @@ static void __naked tf_generic_smc(u32 type, u32 arg1, u32 arg2) : : "r" (type), "r" (arg1), "r" (arg2) : "memory"); + return 0; /* silence gcc warning */ } static int tf_set_cpu_boot_addr(int cpu, unsigned long boot_addr) @@ -106,6 +109,11 @@ static int tf_init_cache(void) } #endif /* CONFIG_CACHE_L2X0 */ +static u32 tf_get_protocol_version(void) +{ + return tf_generic_smc(TF_GET_PROTOCOL_VERSION, 0, 0) >> 48; +} + static const struct firmware_ops trusted_foundations_ops = { .set_cpu_boot_addr = tf_set_cpu_boot_addr, .prepare_idle = tf_prepare_idle, @@ -116,6 +124,12 @@ static const struct firmware_ops trusted_foundations_ops = { void register_trusted_foundations(struct trusted_foundations_platform_data *pd) { + unsigned int protocol = tf_get_protocol_version(); + + pr_info("TF: version %u.%u, protocol %u.%u\n", + pd->version_major, pd->version_minor, + protocol >> 8, protocol & 0xFF); + /* * we are not using version information for now since currently * supported SMCs are compatible with all TF releases @@ -141,5 +155,6 @@ void of_register_trusted_foundations(void) &pdata.version_minor); if (err != 0) panic("Trusted Foundation: missing version-minor property\n"); + register_trusted_foundations(&pdata); } -- 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 ` [PATCH 2/9] arm: cache-l2x0: remove duplicate warning Michał Mirosław 2017-07-20 0:29 ` 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 ` Michał Mirosław [this message] 2017-07-20 0:29 ` [PATCH 5/9] ARM: trusted_foundations: announce firmware version 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 5/9] ARM: trusted_foundations: announce firmware version 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=90ad41ff1b54695154348c0c7f9333ed9e162ce3.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.