Skip to contentSkip to conversation

Remove duplication of table_compute_checksum function

PATCH In review Tom Rini 1 participant 2 messages Apr 4, 2022 – Apr 15, 2022

Subsystems (2)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 Remove duplication of table_compute_checksum function

It seems like there was some merge error when first cleaning up and sharing this function. We have both an inline version of the function in include/tables_csum.h and a non-inline version in lib/tables_csum.c. Rework things so that we only have the non-inline version (due to number of calls, we should not inline this).

Fixes 1befb38b8682 ("x86: Move table csum into separate file")
Fixes 2b445e4d3194 ("x86: Move table csum into separate header")
Cc Alexander Graf <[email protected]>
---
 arch/sandbox/include/asm/tables.h |  0
 arch/x86/include/asm/tables.h     | 13 -------------
 drivers/misc/qfw.c                |  3 ---
 include/tables_csum.h             | 23 ++++++++++++-----------
 4 files changed, 12 insertions(+), 27 deletions(-)
 delete mode 100644 arch/sandbox/include/asm/tables.h
arch/sandbox/include/asm/tables.h deleted +0 -0
deleted file mode 100644
index e69de29bb2d1..000000000000
arch/x86/include/asm/tables.h +0 -13
index aa938837b65a..37be01240db5 100644
@@ -16,19 +16,6 @@
 /* SeaBIOS expects coreboot tables at address range 0x0000-0x1000 */
 #define CB_TABLE_ADDR	0x800
 
-/**
- * table_compute_checksum() - Compute a table checksum
- *
- * This computes an 8-bit checksum for the configuration table.
- * All bytes in the configuration table, including checksum itself and
- * reserved bytes must add up to zero.
- *
- * @v:		configuration table base address
- * @len:	configuration table size
- * @return:	the 8-bit checksum
- */
-u8 table_compute_checksum(void *v, int len);
-
 /**
  * table_fill_string() - Fill a string with pad in the configuration table
  *
drivers/misc/qfw.c +0 -3
index 677841aac5ef..1d54b7542b8a 100644
@@ -15,9 +15,6 @@
 #include <dm.h>
 #include <misc.h>
 #include <tables_csum.h>
-#ifdef CONFIG_GENERATE_ACPI_TABLE
-#include <asm/tables.h>
-#endif
 
 #if defined(CONFIG_GENERATE_ACPI_TABLE) && !defined(CONFIG_SANDBOX)
 /*
include/tables_csum.h +12 -11
index 5f7edc419ba2..4812333093a1 100644
@@ -6,16 +6,17 @@
 #ifndef _TABLES_CSUM_H_
 #define _TABLES_CSUM_H_
 
-static inline u8 table_compute_checksum(void *v, int len)
-{
-	u8 *bytes = v;
-	u8 checksum = 0;
-	int i;
-
-	for (i = 0; i < len; i++)
-		checksum -= bytes[i];
-
-	return checksum;
-}
+/**
+ * table_compute_checksum() - Compute a table checksum
+ *
+ * This computes an 8-bit checksum for the configuration table.
+ * All bytes in the configuration table, including checksum itself and
+ * reserved bytes must add up to zero.
+ *
+ * @v:		configuration table base address
+ * @len:	configuration table size
+ * @return:	the 8-bit checksum
+ */
+u8 table_compute_checksum(void *v, int len);
 
 #endif
Signature · 1 line
2.25.1
author
#1 lore raw
Quoted 10 lines · Tom Rini

It seems like there was some merge error when first cleaning up and sharing this function. We have both an inline version of the function in include/tables_csum.h and a non-inline version in lib/tables_csum.c. Rework things so that we only have the non-inline version (due to number of calls, we should not inline this).

Fixes 1befb38b8682 ("x86: Move table csum into separate file")
Fixes 2b445e4d3194 ("x86: Move table csum into separate header")
Cc Alexander Graf <[email protected]>

Applied to u-boot/master, thanks!

Signature · 1 line
Tom