Skip to contentSkip to conversation

add support for hisilicon common section decoder

PATCH In review Xiaofei Tan 2 participants 5 messages Jul 27, 2020 – Sep 1, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover add support for hisilicon common section decoder

1.Delete some duplicate/useless code.
2.Add support of hisilicon common section decoder for Kunpeng series.

Xiaofei Tan (3):
rasdaemon: delete the duplicate code about the definition of hip08 DB
fields
rasdaemon: delete the code of non-standard error decoder for hip07
rasdaemon: add support for hisilicon common section decoder

 Makefile.am               |   2 +-
 non-standard-hisi_hip07.c | 151 -----------------------
 non-standard-hisi_hip08.c | 102 +--------------
 non-standard-hisilicon.c  | 307 ++++++++++++++++++++++++++++++++++++++++++++++
 non-standard-hisilicon.h  |  49 ++++++++
 5 files changed, 363 insertions(+), 248 deletions(-)
 delete mode 100644 non-standard-hisi_hip07.c
 create mode 100644 non-standard-hisilicon.c
 create mode 100644 non-standard-hisilicon.h
Signature · 1 line
2.8.1
#1 lore raw

PATCH 1/3 rasdaemon: delete the duplicate code about the definition of hip08 DB fields

Delete the duplicate code about the definition of DB fields for hip08 OEM event format1 and format2. Because the two OEM event format is the same.

---
 non-standard-hisi_hip08.c | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)
non-standard-hisi_hip08.c +5 -18
index 8bf10c1..7fc6939 100644
@@ -504,7 +504,7 @@ static char *pcie_local_sub_module_name(uint8_t id)
 }
 
 #ifdef HAVE_SQLITE3
-static const struct db_fields hip08_oem_type1_event_fields[] = {
+static const struct db_fields hip08_oem_event_fields[] = {
 	{ .name = "id",			.type = "INTEGER PRIMARY KEY" },
 	{ .name = "timestamp",          .type = "TEXT" },
 	{ .name = "version",		.type = "INTEGER" },
@@ -519,27 +519,14 @@ static const struct db_fields hip08_oem_type1_event_fields[] = {
 
 static const struct db_table_descriptor hip08_oem_type1_event_tab = {
 	.name = "hip08_oem_type1_event_v2",
-	.fields = hip08_oem_type1_event_fields,
-	.num_fields = ARRAY_SIZE(hip08_oem_type1_event_fields),
-};
-
-static const struct db_fields hip08_oem_type2_event_fields[] = {
-	{ .name = "id",                 .type = "INTEGER PRIMARY KEY" },
-	{ .name = "timestamp",          .type = "TEXT" },
-	{ .name = "version",            .type = "INTEGER" },
-	{ .name = "soc_id",             .type = "INTEGER" },
-	{ .name = "socket_id",          .type = "INTEGER" },
-	{ .name = "nimbus_id",          .type = "INTEGER" },
-	{ .name = "module_id",          .type = "TEXT" },
-	{ .name = "sub_module_id",      .type = "TEXT" },
-	{ .name = "err_severity",       .type = "TEXT" },
-	{ .name = "regs_dump",		.type = "TEXT" },
+	.fields = hip08_oem_event_fields,
+	.num_fields = ARRAY_SIZE(hip08_oem_event_fields),
 };
 
 static const struct db_table_descriptor hip08_oem_type2_event_tab = {
 	.name = "hip08_oem_type2_event_v2",
-	.fields = hip08_oem_type2_event_fields,
-	.num_fields = ARRAY_SIZE(hip08_oem_type2_event_fields),
+	.fields = hip08_oem_event_fields,
+	.num_fields = ARRAY_SIZE(hip08_oem_event_fields),
 };
 
 static const struct db_fields hip08_pcie_local_event_fields[] = {
Signature · 1 line
2.8.1
#2 lore raw

PATCH 2/3 rasdaemon: delete the code of non-standard error decoder for hip07

In reply to Xiaofei Tan

Delete the code of non-standard error decoder for hip07 that was never used. Because the corresponding code in Linux kernel wasn't accepted.

---
 Makefile.am               |   2 +-
 non-standard-hisi_hip07.c | 151 ----------------------------------------------
 2 files changed, 1 insertion(+), 152 deletions(-)
 delete mode 100644 non-standard-hisi_hip07.c
Makefile.am +1 -1
index f4822b9..2b38e4b 100644
@@ -52,7 +52,7 @@ if WITH_ABRT_REPORT
    rasdaemon_SOURCES += ras-report.c
 endif
 if WITH_HISI_NS_DECODE
-   rasdaemon_SOURCES += non-standard-hisi_hip07.c non-standard-hisi_hip08.c
+   rasdaemon_SOURCES += non-standard-hisi_hip08.c
 endif
 if WITH_MEMORY_CE_PFA
    rasdaemon_SOURCES += rbtree.c ras-page-isolation.c
non-standard-hisi_hip07.c deleted +0 -151

151 lines not on this page · raw message

Signature · 1 line
2.8.1
#3 lore raw

PATCH 3/3 rasdaemon: add support for hisilicon common section decoder

In reply to Xiaofei Tan

Add a new non-standard error section, Hisilicon common section. It is defined for the next generation SoC Kunpeng930. It also supports Kunpeng920 and some modules of Kunpeng920 could be changed to use this section.

We put the code to an new source file, as it supports multiple Hardware platform. Some code of hip08 could be shared. Move them to this new file.

---
 Makefile.am               |   2 +-
 non-standard-hisi_hip08.c |  79 +-----------
 non-standard-hisilicon.c  | 307 ++++++++++++++++++++++++++++++++++++++++++++++
 non-standard-hisilicon.h  |  49 ++++++++
 4 files changed, 358 insertions(+), 79 deletions(-)
 create mode 100644 non-standard-hisilicon.c
 create mode 100644 non-standard-hisilicon.h
Makefile.am +1 -1
index 2b38e4b..c956d35 100644
@@ -52,7 +52,7 @@ if WITH_ABRT_REPORT
    rasdaemon_SOURCES += ras-report.c
 endif
 if WITH_HISI_NS_DECODE
-   rasdaemon_SOURCES += non-standard-hisi_hip08.c
+   rasdaemon_SOURCES += non-standard-hisi_hip08.c non-standard-hisilicon.c
 endif
 if WITH_MEMORY_CE_PFA
    rasdaemon_SOURCES += rbtree.c ras-page-isolation.c
non-standard-hisi_hip08.c +1 -78

109 lines not on this page · raw message

non-standard-hisilicon.c new file +307 -0

307 lines not on this page · raw message

non-standard-hisilicon.h new file +49 -0

49 lines not on this page · raw message

Signature · 1 line
2.8.1
#4 lore raw
In reply to Xiaofei Tan

Em Mon, 27 Jul 2020 15:38:36 +0800
Xiaofei Tan <[email protected]> escreveu:

Quoted 8 lines

1.Delete some duplicate/useless code.
2.Add support of hisilicon common section decoder for Kunpeng series.

Xiaofei Tan (3):
rasdaemon: delete the duplicate code about the definition of hip08 DB
fields
rasdaemon: delete the code of non-standard error decoder for hip07
rasdaemon: add support for hisilicon common section decoder

Patches merged, thanks!

Thanks,
Mauro