From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 15CFBE67A6C for ; Tue, 3 Mar 2026 05:20:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0521D10E62E; Tue, 3 Mar 2026 05:20:03 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="cStgnyTg"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) by gabe.freedesktop.org (Postfix) with ESMTPS id AE33310E0DA; Tue, 3 Mar 2026 05:20:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1772515202; x=1804051202; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JCgyo/lo7cviGPalqsOJMLdOx0W+zsxVyd5GeUpVA6k=; b=cStgnyTglIjk/BTn2Z0HKgmN1BogNwTRdTwe5XvfBvP4rM7D8+t7BYut r/Zael8aMFj37bQybBoDSWEdggyveVGRcxSkAiN8/SWtX0Ic8UHvIq+cS 5+yELALD9KmBZmBzvK/fCdeq2LCqLqQ8WaUXCJEbj0SfacPRhPz2OhUj4 n3iYMlUDQkGEYZcvwfA09vmTSp7DkyhTYVWpuLbRCbpumZhoqVHTrA5YI Vov9tvIjdt3wgZncxtZYcuCe+PFRDtApYN3v2xZoOcYwTzmeMk5WBTbzJ dsDHT9H3YAunh1qbywJKrNB3W9xjU66aLA5H0wKP1LketJpj65C1rhupD w==; X-CSE-ConnectionGUID: T37RPtzLRBilPnRBoRCVWw== X-CSE-MsgGUID: tP5oW4IRTtSjB0VEczrpwA== X-IronPort-AV: E=McAfee;i="6800,10657,11717"; a="73445417" X-IronPort-AV: E=Sophos;i="6.21,321,1763452800"; d="scan'208";a="73445417" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Mar 2026 21:20:01 -0800 X-CSE-ConnectionGUID: EP8rVgwKRXyksktBJYkFfA== X-CSE-MsgGUID: oBpQYIQeTqi6XnxtxN8OUw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,321,1763452800"; d="scan'208";a="217110173" Received: from debox1-desk4.jf.intel.com ([10.88.27.138]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Mar 2026 21:20:01 -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@linux.intel.com, hansg@kernel.org, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Subject: [PATCH v7 3/6] platform/x86/intel/vsec: Decouple add/link helpers from PCI Date: Mon, 2 Mar 2026 21:19:50 -0800 Message-ID: <20260303051953.1453372-4-david.e.box@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260303051953.1453372-1-david.e.box@linux.intel.com> References: <20260303051953.1453372-1-david.e.box@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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. Reviewed-by: Ilpo J=C3=A4rvinen Signed-off-by: David E. Box --- Changes in v7: - Correct the remaining struct device * argument to intel_vsec_add_aux(). When dropping the unused first argument in v6, the device parameter was inadvertently changed from &vsec_dev->auxdev.dev to the PCI device. Restore the aux device. Changes in v6: - No change Changes in v5: - No change Changes in v4: - No change Changes in v3: - No change Changes in v2: - No change (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 e0096be605d9..938648b9ef09 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 98846e88d3d0..2298b6361094 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->auxdev.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