RE: [PATCH v6 09/14] ASoC: Intel: catpt: Simple sysfs attributes

On 2020-09-17 4:12 PM, Cezary Rojewski wrote:

Add sysfs entries for displaying version of FW currently in use as well as binary dump of entire version info, including build and log providers hashes.

Signed-off-by: Cezary Rojewski cezary.rojewski@intel.com

Changes in v6:

• functions declaration and usage now part of this patch instead of being separated from it

Changes in v2:

• fixed size provided to memcpy() in fw_build_read() as reported by Mark

+Greg KH

Greg, would you mind taking a look at these sysfs entries added for new catpt driver (Audio DSP driver for Haswell and Broadwell machines)?

Link to opening post for the series: [PATCH v6 00/14] ASoC: Intel: Catpt - Lynx and Wildcat point https://www.spinics.net/lists/alsa-devel/msg115765.html

Let me give you a quick introduction to the catpt's fs code: During power-up sequence a handshake is made between host (kernel device driver) and DSP (firmware) side. Two sysfs entries are generated which expose running DSP firmware version and its build info - information obtained during said handshake.

Much like devices (such as those of PCI-type) expose sysfs entries for their easy identification, catpt provides entries to identify DSP FW it is dealing with.

Thanks, Czarek

sound/soc/intel/catpt/core.h | 3 ++ sound/soc/intel/catpt/device.c | 6 +++ sound/soc/intel/catpt/fs.c | 79 ++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 sound/soc/intel/catpt/fs.c

diff --git a/sound/soc/intel/catpt/core.h b/sound/soc/intel/catpt/core.h index a29b4c0232cb..1f0f1ac92341 100644 --- a/sound/soc/intel/catpt/core.h +++ b/sound/soc/intel/catpt/core.h @@ -155,6 +155,9 @@ int catpt_store_module_states(struct catpt_dev *cdev, struct dma_chan *chan); int catpt_store_memdumps(struct catpt_dev *cdev, struct dma_chan *chan); int catpt_coredump(struct catpt_dev *cdev);

+int catpt_sysfs_create(struct catpt_dev *cdev); +void catpt_sysfs_remove(struct catpt_dev *cdev);

• #include <sound/memalloc.h> #include <uapi/sound/asound.h>

diff --git a/sound/soc/intel/catpt/device.c b/sound/soc/intel/catpt/device.c index 7c7ddbabaf55..e9b7c1f474e0 100644 --- a/sound/soc/intel/catpt/device.c +++ b/sound/soc/intel/catpt/device.c @@ -184,6 +184,10 @@ static int catpt_probe_components(struct catpt_dev *cdev) goto board_err; }

• ret = catpt_sysfs_create(cdev);
• if (ret)

• goto board_err;
  

• /* reflect actual ADSP state in pm_runtime */ pm_runtime_set_active(cdev->dev);

@@ -292,6 +296,8 @@ static int catpt_acpi_remove(struct platform_device *pdev) catpt_sram_free(&cdev->iram); catpt_sram_free(&cdev->dram);

• catpt_sysfs_remove(cdev);
• return 0; }

diff --git a/sound/soc/intel/catpt/fs.c b/sound/soc/intel/catpt/fs.c new file mode 100644 index 000000000000..d73493687f4a --- /dev/null +++ b/sound/soc/intel/catpt/fs.c @@ -0,0 +1,79 @@ +// SPDX-License-Identifier: GPL-2.0-pcm +// +// 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_build_read(struct file *filp, struct kobject *kobj,

• 	     struct bin_attribute *bin_attr, char *buf,
  

• 	     loff_t off, size_t count)
  

+{

• struct catpt_dev *cdev = dev_get_drvdata(kobj_to_dev(kobj));
• 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);
  

• memcpy(buf, &version, sizeof(version));
• return count;

+}

+static BIN_ATTR_RO(fw_build, sizeof(struct catpt_fw_version));

+int catpt_sysfs_create(struct catpt_dev *cdev) +{

• int ret;
• ret = sysfs_create_file(&cdev->dev->kobj, &dev_attr_fw_version.attr);
• if (ret)

• return ret;
  

• ret = sysfs_create_bin_file(&cdev->dev->kobj, &bin_attr_fw_build);
• if (ret) {

• sysfs_remove_file(&cdev->dev->kobj, &dev_attr_fw_version.attr);
  

• return ret;
  

• }
• return 0;

+}

+void catpt_sysfs_remove(struct catpt_dev *cdev) +{

• sysfs_remove_bin_file(&cdev->dev->kobj, &bin_attr_fw_build);
• sysfs_remove_file(&cdev->dev->kobj, &dev_attr_fw_version.attr);

+}