ASoC: cs-amp-lib: Add HP-specific EFI variable for calibration data

Search for an HP-specific EFI variable for calibration before falling
back to the normal Cirrus Logic EFI variable.

Future HP models will use an HP-defined EFI variable for storage of
amp calibration data. The content is the same as the normal Cirrus
Logic EFI variable.

The first step in cs_amp_get_cal_efi_buffer() is to get the size of
the EFI variable, so this has been made a loop that walks through an
array of possible variables.

A small change is needed to the KUnit test, which is included in this
patch. Originally the cs_amp_lib_test_get_efi_variable() hook function
asserted that the passed name and GUID matched the Cirrus Logic EFI
variable. Obviously this will fail because the code now tries the HP
definition first. The function has been changed to return EFI_NOT_FOUND
instead, which emulates the normal behaviour of trying to get the HP
variable on a system that has the Cirrus variable.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Message-ID: <20250909113039.922065-6-rf@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs-amp-lib-test.c b/sound/soc/codecs/cs-amp-lib-test.c
index e7492afa041e929c8052dbaea64de00aa779dcc1..c090498cbf78206e28310cf3321096f7f3d791b2 100644 (file)
--- a/sound/soc/codecs/cs-amp-lib-test.c
+++ b/sound/soc/codecs/cs-amp-lib-test.c
@@ -204,8 +204,9 @@ static efi_status_t cs_amp_lib_test_get_efi_variable(efi_char16_t *name,
        KUNIT_EXPECT_NOT_ERR_OR_NULL(test, guid);
        KUNIT_EXPECT_NOT_ERR_OR_NULL(test, size);
 
-       KUNIT_EXPECT_MEMEQ(test, name, expected_name, sizeof(expected_name));
-       KUNIT_EXPECT_MEMEQ(test, guid, &expected_guid, sizeof(expected_guid));
+       if (memcmp(name, expected_name, sizeof(expected_name)) ||
+           efi_guidcmp(*guid, expected_guid))
+               return -EFI_NOT_FOUND;
 
        if (!buf) {
                *size = priv->cal_blob->size;

diff --git a/sound/soc/codecs/cs-amp-lib.c b/sound/soc/codecs/cs-amp-lib.c
index 9b51d056d863b7073d0e20be5c3f39ffab0182be..8434d5196107e934bfcd3aa778381285f402e8a9 100644 (file)
--- a/sound/soc/codecs/cs-amp-lib.c
+++ b/sound/soc/codecs/cs-amp-lib.c
@@ -28,6 +28,24 @@
 #define HP_SPEAKER_ID_EFI_GUID \
        EFI_GUID(0xc49593a4, 0xd099, 0x419b, 0xa2, 0xc3, 0x67, 0xe9, 0x80, 0xe6, 0x1d, 0x1e)
 
+#define HP_CALIBRATION_EFI_NAME L"SmartAmpCalibrationData"
+#define HP_CALIBRATION_EFI_GUID \
+       EFI_GUID(0x53559579, 0x8753, 0x4f5c, 0x91, 0x30, 0xe8, 0x2a, 0xcf, 0xb8, 0xd8, 0x93)
+
+static const struct cs_amp_lib_cal_efivar {
+       efi_char16_t *name;
+       efi_guid_t *guid;
+} cs_amp_lib_cal_efivars[] = {
+       {
+               .name = HP_CALIBRATION_EFI_NAME,
+               .guid = &HP_CALIBRATION_EFI_GUID,
+       },
+       {
+               .name = CIRRUS_LOGIC_CALIBRATION_EFI_NAME,
+               .guid = &CIRRUS_LOGIC_CALIBRATION_EFI_GUID,
+       },
+};
+
 static int cs_amp_write_cal_coeff(struct cs_dsp *dsp,
                                  const struct cirrus_amp_cal_controls *controls,
                                  const char *ctl_name, u32 val)
@@ -146,12 +164,17 @@ static struct cirrus_amp_efi_data *cs_amp_get_cal_efi_buffer(struct device *dev)
        unsigned long data_size = 0;
        u8 *data;
        efi_status_t status;
-       int ret;
+       int i, ret;
+
+       /* Find EFI variable and get size */
+       for (i = 0; i < ARRAY_SIZE(cs_amp_lib_cal_efivars); i++) {
+               status = cs_amp_get_efi_variable(cs_amp_lib_cal_efivars[i].name,
+                                                cs_amp_lib_cal_efivars[i].guid,
+                                                &data_size, NULL);
+               if (status == EFI_BUFFER_TOO_SMALL)
+                       break;
+       }
 
-       /* Get real size of UEFI variable */
-       status = cs_amp_get_efi_variable(CIRRUS_LOGIC_CALIBRATION_EFI_NAME,
-                                        &CIRRUS_LOGIC_CALIBRATION_EFI_GUID,
-                                        &data_size, NULL);
        if (status != EFI_BUFFER_TOO_SMALL)
                return ERR_PTR(-ENOENT);
 
@@ -165,8 +188,8 @@ static struct cirrus_amp_efi_data *cs_amp_get_cal_efi_buffer(struct device *dev)
        if (!data)
                return ERR_PTR(-ENOMEM);
 
-       status = cs_amp_get_efi_variable(CIRRUS_LOGIC_CALIBRATION_EFI_NAME,
-                                        &CIRRUS_LOGIC_CALIBRATION_EFI_GUID,
+       status = cs_amp_get_efi_variable(cs_amp_lib_cal_efivars[i].name,
+                                        cs_amp_lib_cal_efivars[i].guid,
                                         &data_size, data);
        if (status != EFI_SUCCESS) {
                ret = -EINVAL;