The commit
297b64c74385 ("ras: acpi / apei: generate trace event for unrecognized CPER section")
brought inconsistency in UUID types which are used across the RAS subsystem.
Fix this by moving to use guid_t everywhere.
Cc: Tyler Baicar <[email protected]>
Signed-off-by: Andy Shevchenko <[email protected]>
---
drivers/ras/ras.c | 2 +-
include/ras/ras_event.h | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/ras/ras.c b/drivers/ras/ras.c
index 3f38907320dc..95540ea8dd9d 100644
--- a/drivers/ras/ras.c
+++ b/drivers/ras/ras.c
@@ -14,7 +14,7 @@
#define TRACE_INCLUDE_PATH ../../include/ras
#include <ras/ras_event.h>
-void log_non_standard_event(const uuid_le *sec_type, const uuid_le *fru_id,
+void log_non_standard_event(const guid_t *sec_type, const guid_t *fru_id,
const char *fru_text, const u8 sev, const u8 *err,
const u32 len)
{
diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h
index a0794632fd01..36c5c5e38c1d 100644
--- a/include/ras/ras_event.h
+++ b/include/ras/ras_event.h
@@ -27,7 +27,7 @@
TRACE_EVENT(extlog_mem_event,
TP_PROTO(struct cper_sec_mem_err *mem,
u32 err_seq,
- const uuid_le *fru_id,
+ const guid_t *fru_id,
const char *fru_text,
u8 sev),
@@ -39,7 +39,7 @@ TRACE_EVENT(extlog_mem_event,
__field(u8, sev)
__field(u64, pa)
__field(u8, pa_mask_lsb)
- __field_struct(uuid_le, fru_id)
+ __field_struct(guid_t, fru_id)
__string(fru_text, fru_text)
__field_struct(struct cper_mem_err_compact, data)
),
@@ -218,8 +218,8 @@ TRACE_EVENT(arm_event,
*/
TRACE_EVENT(non_standard_event,
- TP_PROTO(const uuid_le *sec_type,
- const uuid_le *fru_id,
+ TP_PROTO(const guid_t *sec_type,
+ const guid_t *fru_id,
const char *fru_text,
const u8 sev,
const u8 *err,
--
2.18.0
On Fri, Jul 13, 2018 at 04:10:27PM +0300, Andy Shevchenko wrote:
> The commit
>
> 297b64c74385 ("ras: acpi / apei: generate trace event for unrecognized CPER section")
>
> brought inconsistency in UUID types which are used across the RAS subsystem.
>
> Fix this by moving to use guid_t everywhere.
Any comments on this?
>
> Cc: Tyler Baicar <[email protected]>
> Signed-off-by: Andy Shevchenko <[email protected]>
> ---
> drivers/ras/ras.c | 2 +-
> include/ras/ras_event.h | 8 ++++----
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/ras/ras.c b/drivers/ras/ras.c
> index 3f38907320dc..95540ea8dd9d 100644
> --- a/drivers/ras/ras.c
> +++ b/drivers/ras/ras.c
> @@ -14,7 +14,7 @@
> #define TRACE_INCLUDE_PATH ../../include/ras
> #include <ras/ras_event.h>
>
> -void log_non_standard_event(const uuid_le *sec_type, const uuid_le *fru_id,
> +void log_non_standard_event(const guid_t *sec_type, const guid_t *fru_id,
> const char *fru_text, const u8 sev, const u8 *err,
> const u32 len)
> {
> diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h
> index a0794632fd01..36c5c5e38c1d 100644
> --- a/include/ras/ras_event.h
> +++ b/include/ras/ras_event.h
> @@ -27,7 +27,7 @@
> TRACE_EVENT(extlog_mem_event,
> TP_PROTO(struct cper_sec_mem_err *mem,
> u32 err_seq,
> - const uuid_le *fru_id,
> + const guid_t *fru_id,
> const char *fru_text,
> u8 sev),
>
> @@ -39,7 +39,7 @@ TRACE_EVENT(extlog_mem_event,
> __field(u8, sev)
> __field(u64, pa)
> __field(u8, pa_mask_lsb)
> - __field_struct(uuid_le, fru_id)
> + __field_struct(guid_t, fru_id)
> __string(fru_text, fru_text)
> __field_struct(struct cper_mem_err_compact, data)
> ),
> @@ -218,8 +218,8 @@ TRACE_EVENT(arm_event,
> */
> TRACE_EVENT(non_standard_event,
>
> - TP_PROTO(const uuid_le *sec_type,
> - const uuid_le *fru_id,
> + TP_PROTO(const guid_t *sec_type,
> + const guid_t *fru_id,
> const char *fru_text,
> const u8 sev,
> const u8 *err,
> --
> 2.18.0
>
--
With Best Regards,
Andy Shevchenko
On Fri, Jul 13, 2018 at 04:10:27PM +0300, Andy Shevchenko wrote:
> The commit
>
> 297b64c74385 ("ras: acpi / apei: generate trace event for unrecognized CPER section")
>
> brought inconsistency in UUID types which are used across the RAS subsystem.
>
> Fix this by moving to use guid_t everywhere.
Looks good,
Reviewed-by: Christoph Hellwig <[email protected]>
On Fri, Oct 05, 2018 at 09:33:05AM +0200, Christoph Hellwig wrote:
> On Fri, Jul 13, 2018 at 04:10:27PM +0300, Andy Shevchenko wrote:
> > The commit
> >
> > 297b64c74385 ("ras: acpi / apei: generate trace event for unrecognized CPER section")
> >
> > brought inconsistency in UUID types which are used across the RAS subsystem.
> >
> > Fix this by moving to use guid_t everywhere.
>
> Looks good,
>
> Reviewed-by: Christoph Hellwig <[email protected]>
Thanks, Christoph.
Tomas, Tyler, any comments from your side?
I can push it through my tree if it looks abandon, or if Christoph is okay
through UUID one.
--
With Best Regards,
Andy Shevchenko
On Fri, Oct 05, 2018 at 09:33:05AM +0200, Christoph Hellwig wrote:
> On Fri, Jul 13, 2018 at 04:10:27PM +0300, Andy Shevchenko wrote:
> > The commit
> >
> > 297b64c74385 ("ras: acpi / apei: generate trace event for unrecognized CPER section")
> >
> > brought inconsistency in UUID types which are used across the RAS subsystem.
> >
> > Fix this by moving to use guid_t everywhere.
>
> Looks good,
>
> Reviewed-by: Christoph Hellwig <[email protected]>
Rafael, since you handled ACPI/APEI stuff for this cycle, perhaps you can take
this one as well since for half a year there is no response from maintainers?
--
With Best Regards,
Andy Shevchenko
On 1/9/19 11:07 AM, Andy Shevchenko wrote:
> On Fri, Oct 05, 2018 at 09:33:05AM +0200, Christoph Hellwig wrote:
>> On Fri, Jul 13, 2018 at 04:10:27PM +0300, Andy Shevchenko wrote:
>>> The commit
>>>
>>> 297b64c74385 ("ras: acpi / apei: generate trace event for unrecognized CPER section")
>>>
>>> brought inconsistency in UUID types which are used across the RAS subsystem.
>>>
>>> Fix this by moving to use guid_t everywhere.
>>
>> Looks good,
>>
>> Reviewed-by: Christoph Hellwig <[email protected]>
>
> Thanks, Christoph.
>
> Tomas, Tyler, any comments from your side?
Thanks for asking. I have no comments on my side.
Thanks,
Thomas
> I can push it through my tree if it looks abandon, or if Christoph is okay
> through UUID one.
>
On Thu, Jan 24, 2019 at 10:57:52PM +0200, Andy Shevchenko wrote:
> Rafael, since you handled ACPI/APEI stuff for this cycle, perhaps you can take
> this one as well since for half a year there is no response from maintainers?
Can you send me the patch again pls, ontop of tip:ras/core:
https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/log/?h=ras/core
I'll take it.
Thx.
--
Regards/Gruss,
Boris.
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
--