acpi: Use U-Boot version for OEM_REVISION
PATCH 1/1 acpi: Use U-Boot version for OEM_REVISION
OEM_REVISION is 32-bit unsigned number. It should be increased only when changing software version. Therefore it should not depend on build time.
Change calculation to use U-Boot version numbers and set this revision to date number.
Prior this change OEM_REVISION was calculated from build date and stored in the same format.
After this change macro U_BOOT_BUILD_DATE is not used in other files so remove it from global autogenerated files and also from Makefile.
---
This patch depends on similar patch for BIOS Release Date which is here:
http://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
--- Makefile | 2 -- doc/develop/version.rst | 1 - lib/acpi/acpi_table.c | 18 +++++++++++++++++- test/dm/acpi.c | 20 ++++++++++++++------ 4 files changed, 31 insertions(+), 10 deletions(-)
Makefile +0 -2
@@ -1903,7 +1903,6 @@ define filechk_timestamp.h LC_ALL=C $${DATE} -u -d "$${SOURCE_DATE}" +'#define U_BOOT_DATE "%b %d %C%y"'; \ LC_ALL=C $${DATE} -u -d "$${SOURCE_DATE}" +'#define U_BOOT_TIME "%T"'; \ LC_ALL=C $${DATE} -u -d "$${SOURCE_DATE}" +'#define U_BOOT_TZ "%z"'; \ - LC_ALL=C $${DATE} -u -d "$${SOURCE_DATE}" +'#define U_BOOT_BUILD_DATE 0x%Y%m%d'; \ LC_ALL=C $${DATE} -u -d "$${SOURCE_DATE}" +'#define U_BOOT_EPOCH %s'; \ else \ return 42; \
@@ -1912,7 +1911,6 @@ define filechk_timestamp.h LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"'; \ LC_ALL=C date +'#define U_BOOT_TIME "%T"'; \ LC_ALL=C date +'#define U_BOOT_TZ "%z"'; \ - LC_ALL=C date +'#define U_BOOT_BUILD_DATE 0x%Y%m%d'; \ LC_ALL=C date +'#define U_BOOT_EPOCH %s'; \ fi) endef
doc/develop/version.rst +0 -1
@@ -84,7 +84,6 @@ fields. For example:: #define U_BOOT_DATE "Jan 06 2021" (US format only) #define U_BOOT_TIME "08:50:36" (24-hour clock) #define U_BOOT_TZ "-0700" (Time zone in hours) - #define U_BOOT_BUILD_DATE 0x20210106 (hex yyyymmdd format) #define U_BOOT_EPOCH 1609948236 The Epoch is the number of seconds since midnight on 1/1/70. You can convert
lib/acpi/acpi_table.c +17 -1
@@ -16,6 +16,22 @@#include <asm/global_data.h> #include <dm/acpi.h> +/* +* OEM_REVISION is 32-bit unsigned number. It should be increased only when +* changing software version. Therefore it should not depend on build time. +* U-Boot calculates it from U-Boot version and represent it in hexadecimal +* notation. As U-Boot version is in form year.month set low 8 bits to 0x01 +* to have valid date. So for U-Boot version 2021.04 OEM_REVISION is set to +* value 0x20210401. +*/ +#define OEM_REVISION ((((U_BOOT_VERSION_NUM / 1000) % 10) << 28) | \ + (((U_BOOT_VERSION_NUM / 100) % 10) << 24) | \ + (((U_BOOT_VERSION_NUM / 10) % 10) << 20) | \ + ((U_BOOT_VERSION_NUM % 10) << 16) | \ + (((U_BOOT_VERSION_NUM_PATCH / 10) % 10) << 12) | \ + ((U_BOOT_VERSION_NUM_PATCH % 10) << 8) | \ + 0x01) +int acpi_create_dmar (struct acpi_dmar *dmar,enum dmar_flags flags) {struct acpi_table_header *header = &dmar->header;
@@ -100,7 +116,7 @@ void acpi_fill_header(struct acpi_table_header *header, char *signature)memcpy (header->signature, signature,4 );memcpy (header->oem_id,OEM_ID ,6 );memcpy (header->oem_table_id,OEM_TABLE_ID ,8 ); - header->oem_revision =U_BOOT_BUILD_DATE ; + header->oem_revision =OEM_REVISION ;memcpy (header->aslc_id,ASLC_ID ,4 ); }
test/dm/acpi.c +14 -6
@@ -25,6 +25,14 @@#define BUF_SIZE 4096 +#define OEM_REVISION ((((U_BOOT_VERSION_NUM / 1000) % 10) << 28) | \ + (((U_BOOT_VERSION_NUM / 100) % 10) << 24) | \ + (((U_BOOT_VERSION_NUM / 10) % 10) << 20) | \ + ((U_BOOT_VERSION_NUM % 10) << 16) | \ + (((U_BOOT_VERSION_NUM_PATCH / 10) % 10) << 12) | \ + ((U_BOOT_VERSION_NUM_PATCH % 10) << 8) | \ + 0x01) +/** * struct testacpi_plat - Platform data for the test ACPI device *
@@ -218,7 +226,7 @@ static int dm_test_acpi_fill_header(struct unit_test_state *uts)ut_asserteq_mem (OEM_ID , hdr.oem_id,sizeof (hdr.oem_id));ut_asserteq_mem (OEM_TABLE_ID , hdr.oem_table_id,sizeof (hdr.oem_table_id)); -ut_asserteq (U_BOOT_BUILD_DATE , hdr.oem_revision); +ut_asserteq (OEM_REVISION , hdr.oem_revision);ut_asserteq_mem (ASLC_ID , hdr.aslc_id,sizeof (hdr.aslc_id));ut_asserteq (0x44 , hdr.aslc_revision);
@@ -365,20 +373,20 @@ static int dm_test_acpi_cmd_list(struct unit_test_state *uts) addr =ALIGN (addr +sizeof (struct acpi_rsdp ),16 );ut_assert_nextline ("RSDT %08lx %06zx (v01 U-BOOT U-BOOTBL %x INTL 0)" , addr,sizeof (struct acpi_table_header ) + -3 *sizeof (u32),U_BOOT_BUILD_DATE ); +3 *sizeof (u32),OEM_REVISION ); addr =ALIGN (addr +sizeof (struct acpi_rsdt ),16 );ut_assert_nextline ("XSDT %08lx %06zx (v01 U-BOOT U-BOOTBL %x INTL 0)" , addr,sizeof (struct acpi_table_header ) + -3 *sizeof (u64),U_BOOT_BUILD_DATE ); +3 *sizeof (u64),OEM_REVISION ); addr =ALIGN (addr +sizeof (struct acpi_xsdt ),64 );ut_assert_nextline ("DMAR %08lx %06zx (v01 U-BOOT U-BOOTBL %x INTL 0)" , - addr,sizeof (struct acpi_dmar ),U_BOOT_BUILD_DATE ); + addr,sizeof (struct acpi_dmar ),OEM_REVISION ); addr =ALIGN (addr +sizeof (struct acpi_dmar ),16 );ut_assert_nextline ("DMAR %08lx %06zx (v01 U-BOOT U-BOOTBL %x INTL 0)" , - addr,sizeof (struct acpi_dmar ),U_BOOT_BUILD_DATE ); + addr,sizeof (struct acpi_dmar ),OEM_REVISION ); addr =ALIGN (addr +sizeof (struct acpi_dmar ),16 );ut_assert_nextline ("DMAR %08lx %06zx (v01 U-BOOT U-BOOTBL %x INTL 0)" , - addr,sizeof (struct acpi_dmar ),U_BOOT_BUILD_DATE ); + addr,sizeof (struct acpi_dmar ),OEM_REVISION );ut_assert_console_end ();return 0 ;
Signature · 1 line
2.20.1
Quoted 17 lines · Pali Rohár
OEM_REVISIONis 32-bit unsigned number. It should be increased only when changing software version. Therefore it should not depend on build time.Change calculation to use U-Boot version numbers and set this revision to date number.
Prior this change
OEM_REVISIONwas calculated from build date and stored in the same format.After this change macro
U_BOOT_BUILD_DATEis not used in other files so remove it from global autogenerated files and also fromMakefile.Signed-off-by Pali Rohár <[email protected]>---
This patch depends on similar patch for BIOS Release Date which is here:
http://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
Quoted 6 lines
--- Makefile | 2 -- doc/develop/version.rst | 1 - lib/acpi/acpi_table.c | 18 +++++++++++++++++- test/dm/acpi.c | 20 ++++++++++++++------ 4 files changed, 31 insertions(+), 10 deletions(-)
Quoted 25 lines · On Tuesday 20 July 2021 12:32:46 Simon Glass wrote:
Quoted 17 lines · Pali Rohár
OEM_REVISIONis 32-bit unsigned number. It should be increased only when changing software version. Therefore it should not depend on build time.Change calculation to use U-Boot version numbers and set this revision to date number.
Prior this change
OEM_REVISIONwas calculated from build date and stored in the same format.After this change macro
U_BOOT_BUILD_DATEis not used in other files so remove it from global autogenerated files and also fromMakefile.Signed-off-by Pali Rohár <[email protected]>---
This patch depends on similar patch for BIOS Release Date which is here:
http://patchwork.ozlabs.org/project/uboot/patch/[email protected]/Quoted 6 lines
--- Makefile | 2 -- doc/develop/version.rst | 1 - lib/acpi/acpi_table.c | 18 +++++++++++++++++- test/dm/acpi.c | 20 ++++++++++++++------ 4 files changed, 31 insertions(+), 10 deletions(-)
Quoted 1 line
Reviewed-by Simon Glass <[email protected]>
Hello! Could you process this patch? Or are there any issues?
Hi Pali,
Quoted 27 lines · Pali Rohár
Quoted 25 lines · On Tuesday 20 July 2021 12:32:46 Simon Glass wrote:
Quoted 23 lines · Pali Rohár
OEM_REVISIONis 32-bit unsigned number. It should be increased only when changing software version. Therefore it should not depend on build time.Change calculation to use U-Boot version numbers and set this revision to date number.
Prior this change
OEM_REVISIONwas calculated from build date and stored in the same format.After this change macro
U_BOOT_BUILD_DATEis not used in other files so remove it from global autogenerated files and also fromMakefile.Signed-off-by Pali Rohár <[email protected]>---
This patch depends on similar patch for BIOS Release Date which is here:
http://patchwork.ozlabs.org/project/uboot/patch/[email protected]/--- Makefile | 2 -- doc/develop/version.rst | 1 - lib/acpi/acpi_table.c | 18 +++++++++++++++++- test/dm/acpi.c | 20 ++++++++++++++------ 4 files changed, 31 insertions(+), 10 deletions(-)
Quoted 3 lines
Quoted 1 line
Reviewed-by Simon Glass <[email protected]>Hello! Could you process this patch? Or are there any issues?
+Tom Rini
It isn't in my queue. Perhaps Tom has it?
Regards,
Simon
Quoted 30 lines · Simon Glass
Hi Pali,
Quoted 27 lines · Pali Rohár
Quoted 25 lines · On Tuesday 20 July 2021 12:32:46 Simon Glass wrote:
Quoted 23 lines · Pali Rohár
OEM_REVISIONis 32-bit unsigned number. It should be increased only when changing software version. Therefore it should not depend on build time.Change calculation to use U-Boot version numbers and set this revision to date number.
Prior this change
OEM_REVISIONwas calculated from build date and stored in the same format.After this change macro
U_BOOT_BUILD_DATEis not used in other files so remove it from global autogenerated files and also fromMakefile.Signed-off-by Pali Rohár <[email protected]>---
This patch depends on similar patch for BIOS Release Date which is here:
http://patchwork.ozlabs.org/project/uboot/patch/[email protected]/--- Makefile | 2 -- doc/develop/version.rst | 1 - lib/acpi/acpi_table.c | 18 +++++++++++++++++- test/dm/acpi.c | 20 ++++++++++++++------ 4 files changed, 31 insertions(+), 10 deletions(-)
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Reviewed-by Simon Glass <[email protected]>Hello! Could you process this patch? Or are there any issues?
+Tom Rini
It isn't in my queue. Perhaps Tom has it?
Well, hunh. I don't know when I moved it to Accepted, but it clearly wasn't. Sorry about that.
Signature · 1 line
Tom
Quoted 33 lines · On Thursday 30 September 2021 13:46:31 Tom Rini wrote:
Quoted 32 lines · Simon Glass
Hi Pali,
Quoted 29 lines · Pali Rohár
Quoted 26 lines · On Tuesday 20 July 2021 12:32:46 Simon Glass wrote:
Quoted 17 lines · Pali Rohár
OEM_REVISIONis 32-bit unsigned number. It should be increased only when changing software version. Therefore it should not depend on build time.Change calculation to use U-Boot version numbers and set this revision to date number.
Prior this change
OEM_REVISIONwas calculated from build date and stored in the same format.After this change macro
U_BOOT_BUILD_DATEis not used in other files so remove it from global autogenerated files and also fromMakefile.Signed-off-by Pali Rohár <[email protected]>---
This patch depends on similar patch for BIOS Release Date which is here:
http://patchwork.ozlabs.org/project/uboot/patch/[email protected]/Quoted 6 lines
--- Makefile | 2 -- doc/develop/version.rst | 1 - lib/acpi/acpi_table.c | 18 +++++++++++++++++- test/dm/acpi.c | 20 ++++++++++++++------ 4 files changed, 31 insertions(+), 10 deletions(-)Reviewed-by Simon Glass <[email protected]>
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Hello! Could you process this patch? Or are there any issues?
+Tom Rini
It isn't in my queue. Perhaps Tom has it?
Well, hunh. I don't know when I moved it to Accepted, but it clearly wasn't. Sorry about that.
Ok, so could be this patch accepted?
Quoted 6 lines · Pali Rohár
OEM_REVISIONis 32-bit unsigned number. It should be increased only when changing software version. Therefore it should not depend on build time.Change calculation to use U-Boot version numbers and set this revision to date number.
Quoted 8 lines
Prior this change
OEM_REVISIONwas calculated from build date and stored in the same format.After this change macro
U_BOOT_BUILD_DATEis not used in other files so remove it from global autogenerated files and also fromMakefile.Signed-off-by Pali Rohár <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom