From patchwork Fri Feb 9 08:52:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 13550969 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 22A88664A4 for ; Fri, 9 Feb 2024 08:52:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707468756; cv=none; b=J2XX7prilUhU1kKD8N98fNi1sCV6K4Rly9hfuw52zKs6Ih6KpzQFkKtcYemQdOGQ1bPcp94PbuSIjYRnFTlpA6wMNShkCArSGlSHkp6KWG2FsJ/vJvO3y+T1DV1tYPX/dAu+H4S8MJfWWCs7FUL7jPZVwI/1ntrMikXDHfO15FM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707468756; c=relaxed/simple; bh=nBOwufcJKX3rOqeiUYDP5rWcbiNGvqPqiRENy/6jTDM=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=b2XyJ9bdM7sJFITRh1KmX8xVRhLyD/grDB2uGs0x1QTTjdVcLXtXBiGbc5RZWKXhb+6MmuPowT/PcyEiDqYd1xiOUFgXThPmr4+mP5IZ5glOGEmQTs4x6d9Ly0MAX5qk8yi6pzS2uwj2WAKMh84pjal8wZwrI9OWVOs9veIGt2c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Y6t+UDkk; arc=none smtp.client-ip=198.175.65.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Y6t+UDkk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707468755; x=1739004755; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=nBOwufcJKX3rOqeiUYDP5rWcbiNGvqPqiRENy/6jTDM=; b=Y6t+UDkkVgBj2a03sMjTBbGmtfaQTzEVkloux7zIQip3+Lmw36w/Cgtq SpW0SFfiigvB9aaz5Xii4+kxC0Pv76ERC65Hb8IAZDfnqVLDOHME8RnWu RoivOVPi4A1syhBtPnjvtA75op3gCnttcW2AXo7Ngcgm13jJzx6RDtY9J P3zAcIvOtvybdxy+XtjL5qHR9oX/9dPQN3Ua7iPf9sYi2cniRX9CqgA07 yu4ThENRSfmX0CadF11iVjs2hnJa7rKp3bZ18DkI4XxIOE6RClRW3ZdTB myWDYADhU6splMw3ae70R+mZZTuJ1zXl8nNE+XTu9hG5OB6e/A9x/qJCL w==; X-IronPort-AV: E=McAfee;i="6600,9927,10978"; a="18808769" X-IronPort-AV: E=Sophos;i="6.05,256,1701158400"; d="scan'208";a="18808769" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2024 00:52:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,256,1701158400"; d="scan'208";a="2196047" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by fmviesa006.fm.intel.com with ESMTP; 09 Feb 2024 00:52:32 -0800 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Mark Brown Cc: Cezary Rojewski , Takashi Iwai , Jaroslav Kysela , alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, =?utf-8?q?=C5=81u?= =?utf-8?q?kasz_Majczak?= , Stephen Rothwell , =?utf-8?q?Amadeusz_S=C5=82awi?= =?utf-8?q?=C5=84ski?= Subject: [PATCH v2] ASoC: Intel: avs: Expose FW version with sysfs Date: Fri, 9 Feb 2024 09:52:56 +0100 Message-Id: <20240209085256.121261-1-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Cezary Rojewski Add functionality to read version of loaded FW from sysfs. Signed-off-by: Cezary Rojewski Signed-off-by: Amadeusz Sławiński --- Changes in v2: - Adjust path in Documentation to correct one --- .../ABI/testing/sysfs-bus-pci-devices-avs | 8 +++++ sound/soc/intel/avs/Makefile | 3 +- sound/soc/intel/avs/avs.h | 4 +++ sound/soc/intel/avs/core.c | 1 + sound/soc/intel/avs/sysfs.c | 35 +++++++++++++++++++ 5 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-devices-avs create mode 100644 sound/soc/intel/avs/sysfs.c diff --git a/Documentation/ABI/testing/sysfs-bus-pci-devices-avs b/Documentation/ABI/testing/sysfs-bus-pci-devices-avs new file mode 100644 index 0000000000000..ebff3fa12055d --- /dev/null +++ b/Documentation/ABI/testing/sysfs-bus-pci-devices-avs @@ -0,0 +1,8 @@ +What: /sys/devices/pci0000:00//avs/fw_version +Date: February 2024 +Contact: Cezary Rojewski +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 460ee6599daf0..a3fad926d0fb0 100644 --- 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 d694e08e44e18..69c912feb8a7e 100644 --- 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 db78eb2f01080..273a902168562 100644 --- a/sound/soc/intel/avs/core.c +++ b/sound/soc/intel/avs/core.c @@ -776,6 +776,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 index 0000000000000..cce21636fbc02 --- /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 +// Amadeusz Slawinski +// + +#include +#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 +};