ASoC: Intel: avs: Expose FW version with sysfs

Add functionality to read version of loaded FW from sysfs.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20240209085256.121261-1-amadeuszx.slawinski@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/Documentation/ABI/testing/sysfs-bus-pci-devices-avs b/Documentation/ABI/testing/sysfs-bus-pci-devices-avs
new file mode 100644 (file)
index 0000000..ebff3fa
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-pci-devices-avs
@@ -0,0 +1,8 @@
+What:          /sys/devices/pci0000:00/<dev>/avs/fw_version
+Date:          February 2024
+Contact:       Cezary Rojewski <cezary.rojewski@intel.com>
+Description:
+               Version of AudioDSP firmware ASoC avs driver is communicating
+               with.
+
+               Format: %d.%d.%d.%d, type:major:minor:build.

diff --git a/sound/soc/intel/avs/Makefile b/sound/soc/intel/avs/Makefile
index 460ee6599daf035baf03013be668a35c4e7cb5b4..a3fad926d0fb098d5d7ef58563b1a6623ab7c804 100644 (file)
--- a/sound/soc/intel/avs/Makefile
+++ b/sound/soc/intel/avs/Makefile
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
 snd-soc-avs-objs := dsp.o ipc.o messages.o utils.o core.o loader.o \
-                   topology.o path.o pcm.o board_selection.o control.o
+                   topology.o path.o pcm.o board_selection.o control.o \
+                   sysfs.o
 snd-soc-avs-objs += cldma.o
 snd-soc-avs-objs += skl.o apl.o
 

diff --git a/sound/soc/intel/avs/avs.h b/sound/soc/intel/avs/avs.h
index d694e08e44e1851fafb69352eeadafbb70d0def8..69c912feb8a7e038c15c4429989d16dfbb4e98d1 100644 (file)
--- a/sound/soc/intel/avs/avs.h
+++ b/sound/soc/intel/avs/avs.h
@@ -392,4 +392,8 @@ static inline void avs_debugfs_init(struct avs_dev *adev) { }
 static inline void avs_debugfs_exit(struct avs_dev *adev) { }
 #endif
 
+/* Filesystems integration */
+
+extern const struct attribute_group *avs_attr_groups[];
+
 #endif /* __SOUND_SOC_INTEL_AVS_H */

diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c
index 59c3793f65df0c5573ec6e7f873ef33d31f46371..aa98768a7c562d1f133ad2ff4df177bfd6bdbc9b 100644 (file)
--- a/sound/soc/intel/avs/core.c
+++ b/sound/soc/intel/avs/core.c
@@ -773,6 +773,7 @@ static struct pci_driver avs_pci_driver = {
        .probe = avs_pci_probe,
        .remove = avs_pci_remove,
        .shutdown = avs_pci_shutdown,
+       .dev_groups = avs_attr_groups,
        .driver = {
                .pm = &avs_dev_pm,
        },

diff --git a/sound/soc/intel/avs/sysfs.c b/sound/soc/intel/avs/sysfs.c
new file mode 100644 (file)
index 0000000..cce2163
--- /dev/null
+++ b/sound/soc/intel/avs/sysfs.c
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0-only
+//
+// Copyright(c) 2021-2024 Intel Corporation. All rights reserved.
+//
+// Authors: Cezary Rojewski <cezary.rojewski@intel.com>
+//          Amadeusz Slawinski <amadeuszx.slawinski@linux.intel.com>
+//
+
+#include <linux/sysfs.h>
+#include "avs.h"
+
+static ssize_t fw_version_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+       struct avs_dev *adev = to_avs_dev(dev);
+       struct avs_fw_version *fw_version = &adev->fw_cfg.fw_version;
+
+       return sysfs_emit(buf, "%d.%d.%d.%d\n", fw_version->major, fw_version->minor,
+                         fw_version->hotfix, fw_version->build);
+}
+static DEVICE_ATTR_RO(fw_version);
+
+static struct attribute *avs_fw_attrs[] = {
+       &dev_attr_fw_version.attr,
+       NULL
+};
+
+static const struct attribute_group avs_attr_group = {
+       .name = "avs",
+       .attrs = avs_fw_attrs,
+};
+
+const struct attribute_group *avs_attr_groups[] = {
+       &avs_attr_group,
+       NULL
+};