From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (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 0B7352750FB for ; Fri, 30 May 2025 20:38:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748637510; cv=none; b=gma2FuWxmh/c9xA/8hBBdoETwk709qn4fF96WRtofwo8icSrL9tGm50EaQ/GrdqlQnj3wE0QgocXr+0N34F3YkB5TT8Zqxd1DT4azMuC+3ZlaCV61DqV8pOuUdGjtmRmaOAl99VOKtBaBeOBjEeZljnUc/KC+te0lqolRw+kYF8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748637510; c=relaxed/simple; bh=V0cRuTqCcDsiblitVsaOLoYDNL8Po7arWi43KEasI2M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qGvyI/0naGlMLtq4dlsBF047TSqFzIYJ7mvgB7dcuO5ofnrFDcRuNil2+794c9VqZzoz74orqZlx2FRVXfwLGEhGPQnjaABT1LUxR4PAbW/pxa6dX/ays39g6Yo+3bW15NQYh0AciPCSDJy5q3u6lCKmHDhzXNsbVmHtKjzaqak= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ND0o4UA7; arc=none smtp.client-ip=198.175.65.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ND0o4UA7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1748637509; x=1780173509; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=V0cRuTqCcDsiblitVsaOLoYDNL8Po7arWi43KEasI2M=; b=ND0o4UA7cDVgFrp5VNCMMuh+ll7PDVAmw0DgEgSwNPMWahaiot8rBCav 21uKD4BET4QVH7QYlF3tB/Md33UP3ilX+nMe9SuKLFu1Y83Up34RTFwEh YR2EM0pZ4JMRKBPDqNXq+OIAFodbMlOQZS/gbwzP+RrPdQWvQt8/B8u5b XBlKtMTzh4C+ZRQvHbaVGs0Ik92ECMH7H2f9Gr4HDSyu18iZMaAIgTaJx zewFNAv2FexJT1EojMpcq5b6b/F9j5WWNaokzRFoRyeHPVJvN3tTmfApq 3OIMsyFcA0MMxDn0QT3jaiXbf+rg2A5OZzlXxBFxsoSQxIERuuHAF0fTc w==; X-CSE-ConnectionGUID: anaB94YoTJuyTlE/eGRLCw== X-CSE-MsgGUID: 9qRRfHUqTb+4ZZkgwjREoA== X-IronPort-AV: E=McAfee;i="6700,10204,11449"; a="54406023" X-IronPort-AV: E=Sophos;i="6.16,196,1744095600"; d="scan'208";a="54406023" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2025 13:38:28 -0700 X-CSE-ConnectionGUID: r6LibFp5RIqtT9AufxYlDw== X-CSE-MsgGUID: ilHy0kMLQSWeWnpifR0RMg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,196,1744095600"; d="scan'208";a="143824271" Received: from mjruhl-desk.amr.corp.intel.com (HELO mjruhl-desk.intel.com) ([10.124.223.23]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2025 13:38:27 -0700 From: "Michael J. Ruhl" To: platform-driver-x86@vger.kernel.org, intel-xe@lists.freedesktop.org, hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com, lucas.demarchi@intel.com, rodrigo.vivi@intel.com Cc: "Michael J. Ruhl" Subject: [PATCH v2 6/8] platform/x86/intel/pmt: decouple sysfs and namespace Date: Fri, 30 May 2025 16:37:55 -0400 Message-ID: <20250530203757.190853-7-michael.j.ruhl@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250530203757.190853-1-michael.j.ruhl@intel.com> References: <20250530203757.190853-1-michael.j.ruhl@intel.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The PMT namespace includes the crashlog sysfs attribute information. Other crashlog version/types may need different sysfs attributes. Coupling the attributes with the namespace blocks this usage. Decouple sysfs attributes from the name space and add them to the specific entry. Reviewed-by: Ilpo Järvinen Signed-off-by: Michael J. Ruhl --- drivers/platform/x86/intel/pmt/class.c | 12 ++++++------ drivers/platform/x86/intel/pmt/class.h | 2 +- drivers/platform/x86/intel/pmt/crashlog.c | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/platform/x86/intel/pmt/class.c b/drivers/platform/x86/intel/pmt/class.c index bba552131bc2..880baf02a985 100644 --- a/drivers/platform/x86/intel/pmt/class.c +++ b/drivers/platform/x86/intel/pmt/class.c @@ -329,8 +329,8 @@ static int intel_pmt_dev_register(struct intel_pmt_entry *entry, entry->kobj = &dev->kobj; - if (ns->attr_grp) { - ret = sysfs_create_group(entry->kobj, ns->attr_grp); + if (entry->attr_grp) { + ret = sysfs_create_group(entry->kobj, entry->attr_grp); if (ret) goto fail_sysfs_create_group; } @@ -371,8 +371,8 @@ static int intel_pmt_dev_register(struct intel_pmt_entry *entry, fail_add_endpoint: sysfs_remove_bin_file(entry->kobj, &entry->pmt_bin_attr); fail_ioremap: - if (ns->attr_grp) - sysfs_remove_group(entry->kobj, ns->attr_grp); + if (entry->attr_grp) + sysfs_remove_group(entry->kobj, entry->attr_grp); fail_sysfs_create_group: device_unregister(dev); fail_dev_create: @@ -414,8 +414,8 @@ void intel_pmt_dev_destroy(struct intel_pmt_entry *entry, if (entry->size) sysfs_remove_bin_file(entry->kobj, &entry->pmt_bin_attr); - if (ns->attr_grp) - sysfs_remove_group(entry->kobj, ns->attr_grp); + if (entry->attr_grp) + sysfs_remove_group(entry->kobj, entry->attr_grp); device_unregister(dev); xa_erase(ns->xa, entry->devid); diff --git a/drivers/platform/x86/intel/pmt/class.h b/drivers/platform/x86/intel/pmt/class.h index d2d8f9e31c9d..a44571c09253 100644 --- a/drivers/platform/x86/intel/pmt/class.h +++ b/drivers/platform/x86/intel/pmt/class.h @@ -47,6 +47,7 @@ struct intel_pmt_entry { struct class_endpoint *ep; struct intel_pmt_header header; struct bin_attribute pmt_bin_attr; + const struct attribute_group *attr_grp; struct kobject *kobj; void __iomem *disc_table; void __iomem *base; @@ -60,7 +61,6 @@ struct intel_pmt_entry { struct intel_pmt_namespace { const char *name; struct xarray *xa; - const struct attribute_group *attr_grp; int (*pmt_header_decode)(struct intel_pmt_entry *entry, struct device *dev); int (*pmt_add_endpoint)(struct intel_vsec_device *ivdev, diff --git a/drivers/platform/x86/intel/pmt/crashlog.c b/drivers/platform/x86/intel/pmt/crashlog.c index 94858bfb52f8..09cd0a1346f3 100644 --- a/drivers/platform/x86/intel/pmt/crashlog.c +++ b/drivers/platform/x86/intel/pmt/crashlog.c @@ -241,6 +241,8 @@ static int pmt_crashlog_header_decode(struct intel_pmt_entry *entry, /* Size is measured in DWORDS, but accessor returns bytes */ header->size = GET_SIZE(readl(disc_table + SIZE_OFFSET)); + entry->attr_grp = &pmt_crashlog_group; + return 0; } @@ -248,7 +250,6 @@ static DEFINE_XARRAY_ALLOC(crashlog_array); static struct intel_pmt_namespace pmt_crashlog_ns = { .name = "crashlog", .xa = &crashlog_array, - .attr_grp = &pmt_crashlog_group, .pmt_header_decode = pmt_crashlog_header_decode, .pmt_add_endpoint = intel_pmt_add_endpoint, }; -- 2.49.0