ASoC: Intel: catpt: Simple sysfs attributes

Add sysfs entries for displaying version of FW currently in use as well
as dumping full FW information including build and log-providers hashes.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200929141247.8058-10-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/Documentation/ABI/testing/sysfs-bus-pci-devices-catpt b/Documentation/ABI/testing/sysfs-bus-pci-devices-catpt
new file mode 100644 (file)
index 0000000..8a200f4
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-pci-devices-catpt
@@ -0,0 +1,16 @@
+What:          /sys/devices/pci0000:00/<dev>/fw_version
+Date:          September 2020
+Contact:       Cezary Rojewski <cezary.rojewski@intel.com>
+Description:
+               Version of AudioDSP firmware ASoC catpt driver is
+               communicating with.
+               Format: %d.%d.%d.%d, type:major:minor:build.
+
+What:          /sys/devices/pci0000:00/<dev>/fw_info
+Date:          September 2020
+Contact:       Cezary Rojewski <cezary.rojewski@intel.com>
+Description:
+               Detailed AudioDSP firmware build information including
+               build hash and log-providers hash. This information is
+               obtained during initial handshake with firmware.
+               Format: %s.

diff --git a/sound/soc/intel/catpt/core.h b/sound/soc/intel/catpt/core.h
index a29b4c0..88dc3fb 100644 (file)
--- a/sound/soc/intel/catpt/core.h
+++ b/sound/soc/intel/catpt/core.h
@@ -15,6 +15,8 @@
 
 struct catpt_dev;
 
+extern const struct attribute_group *catpt_attr_groups[];
+
 void catpt_sram_init(struct resource *sram, u32 start, u32 size);
 void catpt_sram_free(struct resource *sram);
 struct resource *

diff --git a/sound/soc/intel/catpt/device.c b/sound/soc/intel/catpt/device.c
index 0d2dd91..390ffb2 100644 (file)
--- a/sound/soc/intel/catpt/device.c
+++ b/sound/soc/intel/catpt/device.c
@@ -342,6 +342,7 @@ static struct platform_driver catpt_acpi_driver = {
                .name = "intel_catpt",
                .acpi_match_table = catpt_ids,
                .pm = &catpt_dev_pm,
+               .dev_groups = catpt_attr_groups,
        },
 };
 module_platform_driver(catpt_acpi_driver);

diff --git a/sound/soc/intel/catpt/sysfs.c b/sound/soc/intel/catpt/sysfs.c
new file mode 100644 (file)
index 0000000..9579e23
--- /dev/null
+++ b/sound/soc/intel/catpt/sysfs.c
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: GPL-2.0-only
+//
+// Copyright(c) 2020 Intel Corporation. All rights reserved.
+//
+// Author: Cezary Rojewski <cezary.rojewski@intel.com>
+//
+
+#include <linux/pm_runtime.h>
+#include "core.h"
+
+static ssize_t fw_version_show(struct device *dev,
+                              struct device_attribute *attr, char *buf)
+{
+       struct catpt_dev *cdev = dev_get_drvdata(dev);
+       struct catpt_fw_version version;
+       int ret;
+
+       pm_runtime_get_sync(cdev->dev);
+
+       ret = catpt_ipc_get_fw_version(cdev, &version);
+
+       pm_runtime_mark_last_busy(cdev->dev);
+       pm_runtime_put_autosuspend(cdev->dev);
+
+       if (ret)
+               return CATPT_IPC_ERROR(ret);
+
+       return sprintf(buf, "%d.%d.%d.%d\n", version.type, version.major,
+                      version.minor, version.build);
+}
+static DEVICE_ATTR_RO(fw_version);
+
+static ssize_t fw_info_show(struct device *dev,
+                           struct device_attribute *attr, char *buf)
+{
+       struct catpt_dev *cdev = dev_get_drvdata(dev);
+
+       return sprintf(buf, "%s\n", cdev->ipc.config.fw_info);
+}
+static DEVICE_ATTR_RO(fw_info);
+
+static struct attribute *catpt_attrs[] = {
+       &dev_attr_fw_version.attr,
+       &dev_attr_fw_info.attr,
+       NULL
+};
+
+static const struct attribute_group catpt_attr_group = {
+       .attrs = catpt_attrs,
+};
+
+const struct attribute_group *catpt_attr_groups[] = {
+       &catpt_attr_group,
+       NULL
+};