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.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/Makefile b/Makefile
index d8241aa79c88c0bbd75d96e2f7f71a69fee95e96..f911f70344305cc2565b856bb5e156f74a9957e0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1890,7 +1890,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; \
@@ -1899,7 +1898,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

diff --git a/doc/develop/version.rst b/doc/develop/version.rst
index 8f3231b7611b6f976a76a9b5533e9c0decb47060..5c9046aa17aa01490eedfe124dda89ca5b871f61 100644 (file)
--- a/doc/develop/version.rst
+++ b/doc/develop/version.rst
@@ -87,7 +87,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

diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c
index 7ea4b2e87eea0b0c7fd84f7d9fe2ecde5b886517..d1685404c219ba18be2f6c6b756684a5d678d7cd 100644 (file)
--- a/lib/acpi/acpi_table.c
+++ b/lib/acpi/acpi_table.c
@@ -17,6 +17,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;
@@ -101,7 +117,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);
 }
 

diff --git a/test/dm/acpi.c b/test/dm/acpi.c
index 6f0025814ed139881cbec273a31ba25ac01ac882..c51073c9a6c27bc4f5f004e70d7de8150264dca4 100644 (file)
--- a/test/dm/acpi.c
+++ b/test/dm/acpi.c
@@ -26,6 +26,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
  *
@@ -219,7 +227,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);
 
@@ -366,20 +374,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;