From nobody Sat Feb 7 18:52:02 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (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 D873730DEAC; Fri, 23 Jan 2026 02:51:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769136710; cv=none; b=KzjrJHRzzwQKASDL+iS8SA0Q2oSDdElThRyHWVpYFZMSapb2DPZeQHnTke3EYwzV4mnZFS/jL6EpDGSnbwXxrscPfgiQmtMUSHU1ItypXeE7C3UFfrlrnqZWXgUxlTtZ+YCq1t7FuZj4xuEQWhBo3/4LP1G2T3f5tpkyMglxC9c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769136710; c=relaxed/simple; bh=AifcgV3JTwiDsvThtOIe2tG8qxmjqvBSKFl97zzi22I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uArwogGqOv1oAcHLWieRCSBs5bDKr5PCS+F/dC+blJ99K0muY0TBtUZwS50hNmpIbTjs1iQU+G4nrD2/Q1uAWEfNdmTyKznaxAZ05trgxJv/cpBQANKwTi2kcqND4svAhOIHOcJX1JsEMt6BHx3pyQUpnS9WV2pvTnvacihydEk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=nbWqroRg; arc=none smtp.client-ip=192.198.163.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass 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="nbWqroRg" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1769136691; x=1800672691; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AifcgV3JTwiDsvThtOIe2tG8qxmjqvBSKFl97zzi22I=; b=nbWqroRgK46imzEuJFwwCJl0LRs/RP5+zbcaU8gR1Yi00T3zHJuPifgy ApzfTlpDByeIh/Zbw7KIHrHH+YHC8Lll5N1ShdoPn0KEXT48bIbIMqsMZ LmXV4pQ4W8zgzNYJZvxq6GYWqyA25RBuweFBsiqr66I0CovHZbJmmJzP7 Nk8LAnUKH182UDqySDpdJQQhufgyxW9IXscgz0Tz6+ad/YyYQ6VoGkC4T 0PWMevj+5jznK2vnfhLrrqt4sju3VK9nS2FQ+/eUpKMB08ZFj2qabyhGs /FK8lX/tWmZ9GdrFVDlcxUAw26IXEPxl4bxxWHn0K6JFxXZkmRJ4DHRue g==; X-CSE-ConnectionGUID: wE0prGFFTna9fFtxhdJBbQ== X-CSE-MsgGUID: Wpp+Qj3oSK6V4xqpguh6DA== X-IronPort-AV: E=McAfee;i="6800,10657,11679"; a="81016459" X-IronPort-AV: E=Sophos;i="6.21,247,1763452800"; d="scan'208";a="81016459" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jan 2026 18:51:18 -0800 X-CSE-ConnectionGUID: eqo0nlTRRPqZ/5Yx0fXyag== X-CSE-MsgGUID: SsxPKxNnRmeqwXVlcYx0yw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,247,1763452800"; d="scan'208";a="211773095" Received: from debox1-desk4.jf.intel.com ([10.88.27.138]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jan 2026 18:51:17 -0800 From: "David E. Box" To: thomas.hellstrom@linux.intel.com, rodrigo.vivi@intel.com, irenic.rajneesh@gmail.com, ilpo.jarvinen@linux.intel.com, srinivas.pandruvada@linux.intel.com, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, xi.pardee@linux.intel.com Cc: "David E. Box" , hansg@kernel.org, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Subject: [PATCH v4 3/6] platform/x86/intel/vsec: Decouple add/link helpers from PCI Date: Thu, 22 Jan 2026 18:51:04 -0800 Message-ID: <20260123025108.3772255-4-david.e.box@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260123025108.3772255-1-david.e.box@linux.intel.com> References: <20260123025108.3772255-1-david.e.box@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This refactor is prepares for adding ACPI-enumerated PMT endpoints. While intel_vsec is bound to PCI today, some helpers are used by code that will also register PMT endpoints from non-PCI (ACPI) paths. Clean up PCI-specific plumbing where it isn=E2=80=99t strictly required and rely on generic struct device where possible. Signed-off-by: David E. Box Reviewed-by: Ilpo J=C3=A4rvinen --- v4: - No change v3: - No change v2: - No changes (previous patch 1) drivers/platform/x86/intel/vsec.c | 13 +++++++++---- drivers/platform/x86/intel/vsec_tpmi.c | 2 +- include/linux/intel_vsec.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel= /vsec.c index 61b32ae7f064..f850343491fc 100644 --- a/drivers/platform/x86/intel/vsec.c +++ b/drivers/platform/x86/intel/vsec.c @@ -158,18 +158,23 @@ static bool vsec_driver_present(int cap_id) */ static const struct pci_device_id intel_vsec_pci_ids[]; =20 -static int intel_vsec_link_devices(struct pci_dev *pdev, struct device *de= v, +static int intel_vsec_link_devices(struct device *parent, struct device *d= ev, int consumer_id) { const struct vsec_feature_dependency *deps; enum vsec_device_state *state; struct device **suppliers; struct vsec_priv *priv; + struct pci_dev *pdev; int supplier_id; =20 if (!consumer_id) return 0; =20 + if (!dev_is_pci(parent)) + return 0; + + pdev =3D to_pci_dev(parent); if (!pci_match_id(intel_vsec_pci_ids, pdev)) return 0; =20 @@ -204,7 +209,7 @@ static int intel_vsec_link_devices(struct pci_dev *pdev= , struct device *dev, return 0; } =20 -int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent, +int intel_vsec_add_aux(struct device *parent, struct intel_vsec_device *intel_vsec_dev, const char *name) { @@ -252,7 +257,7 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct dev= ice *parent, if (ret) goto cleanup_aux; =20 - ret =3D intel_vsec_link_devices(pdev, &auxdev->dev, intel_vsec_dev->cap_i= d); + ret =3D intel_vsec_link_devices(parent, &auxdev->dev, intel_vsec_dev->cap= _id); if (ret) goto cleanup_aux; =20 @@ -343,7 +348,7 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, str= uct intel_vsec_header *he * Pass the ownership of intel_vsec_dev and resource within it to * intel_vsec_add_aux() */ - return intel_vsec_add_aux(pdev, parent, no_free_ptr(intel_vsec_dev), + return intel_vsec_add_aux(parent, no_free_ptr(intel_vsec_dev), intel_vsec_name(header->id)); } =20 diff --git a/drivers/platform/x86/intel/vsec_tpmi.c b/drivers/platform/x86/= intel/vsec_tpmi.c index 7748b5557a18..180bc5e18e06 100644 --- a/drivers/platform/x86/intel/vsec_tpmi.c +++ b/drivers/platform/x86/intel/vsec_tpmi.c @@ -655,7 +655,7 @@ static int tpmi_create_device(struct intel_tpmi_info *t= pmi_info, * feature_vsec_dev and res memory are also freed as part of * device deletion. */ - return intel_vsec_add_aux(vsec_dev->pcidev, &vsec_dev->auxdev.dev, + return intel_vsec_add_aux(&vsec_dev->pcidev->dev, feature_vsec_dev, feature_id_name); } =20 diff --git a/include/linux/intel_vsec.h b/include/linux/intel_vsec.h index d551174b0049..49a746ec0128 100644 --- a/include/linux/intel_vsec.h +++ b/include/linux/intel_vsec.h @@ -184,7 +184,7 @@ struct pmt_feature_group { struct telemetry_region regions[]; }; =20 -int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent, +int intel_vsec_add_aux(struct device *parent, struct intel_vsec_device *intel_vsec_dev, const char *name); =20 --=20 2.43.0