From nobody Mon Feb 9 00:00:55 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (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 ECFA030AAD0; Wed, 31 Dec 2025 22:49:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767221383; cv=none; b=huS+4AuaqCVJX1vWSWO619T2049YSRvSdEkpwQAtuZ4JcDKwUJ0ys09Kir/5GsrCJGZi3gT085WCGCOVFNbdBkDX4xev21fBavoZc62NyS5580T3vkxAmV2kBPBXp2EPhxKhVtkE4GKdgxNUnZiV2hivI+BpXGt3LgHRpBCMcNg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767221383; c=relaxed/simple; bh=KJF1vRQDE8zP+o1i8Ro1cmoCPzm4HkDZnytK7qXe1eo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u0xCrUkTa9SPn8193GUdvF6GO81Gd5VF0E3XSzm2rnKouQ7D+2cA3vw3OgFCYyW7+2GhTu8xXdaoS+yU3BpDvQXYWQLdD2WGg2bYBbxKExdRXJIuftOh+EzKS+ODW3KYguxR4C8fxswFuSiDcLQ5Dqna1eqG29VsF0/u3GE65KA= 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=eci/jZjS; arc=none smtp.client-ip=192.198.163.14 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="eci/jZjS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1767221382; x=1798757382; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KJF1vRQDE8zP+o1i8Ro1cmoCPzm4HkDZnytK7qXe1eo=; b=eci/jZjSAB0BrRB1JhaRjR6UTLKIEb5HcFblVe0/MV/xp8cpxMrtW3qN FpGGdcxmUvpKZKoa/xEWQQn0xP3ZozVhfPw0TcA+AGgCLkUvZuJolKG2U H1m9ShwOEe6T8P9T1tZp/lexx0H6MOT/WRx6L8kACzAKKODg3zxOukXEM oHsJFA3e9gd96PPdCTFgyfMAlIGWGnfbYEpFOKb0KXRVEWg91lJpcb56i ndqQrt0o3XOz35DciYk4T/zVULnYOeJvTt6jvE7JLtpRSBX+W2T54ZUdq 9vK51iO3L3LOuBcqleCAVcvHkBM5EG0nRPGZ/k1W9H/lu8aRQI73A6OYv A==; X-CSE-ConnectionGUID: sCrhpDNNRiSsq1jUOt1R3Q== X-CSE-MsgGUID: CxlX50w1Sz+rEDe/IeOFlQ== X-IronPort-AV: E=McAfee;i="6800,10657,11658"; a="68816613" X-IronPort-AV: E=Sophos;i="6.21,193,1763452800"; d="scan'208";a="68816613" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Dec 2025 14:49:40 -0800 X-CSE-ConnectionGUID: B2SNRGcJTuy7CmFrNOMjwQ== X-CSE-MsgGUID: NhxRp2JgRXSbj68C3i8LfQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,193,1763452800"; d="scan'208";a="232611010" Received: from 9cc2c43eec6b.jf.intel.com ([10.54.77.43]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Dec 2025 14:49:40 -0800 From: Zide Chen To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Ian Rogers , Adrian Hunter , Alexander Shishkin , Andi Kleen , Eranian Stephane Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Dapeng Mi , Zide Chen , Xudong Hao , Falcon Thomas Subject: [PATCH V2 03/13] perf/x86/intel/uncore: Remove has_generic_discovery_table() Date: Wed, 31 Dec 2025 14:42:20 -0800 Message-ID: <20251231224233.113839-4-zide.chen@intel.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251231224233.113839-1-zide.chen@intel.com> References: <20251231224233.113839-1-zide.chen@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" In the !x86_match_cpu() fallback path, has_generic_discovery_table() is removed because it does not handle multiple PCI devices. Instead, use PCI_ANY_ID in generic_uncore_init[] to probe all PCI devices. For MSR portals, only probe MSR 0x201e to keep the fallback simple, as this path is best-effort only. Signed-off-by: Zide Chen Reviewed-by: Dapeng Mi --- V2: Separate patch from [PATCH V1 1/7] - Move has_generic_discovery_table() related code to its own patch for easier review. arch/x86/events/intel/uncore.c | 3 ++ arch/x86/events/intel/uncore_discovery.c | 42 +++++------------------- 2 files changed, 12 insertions(+), 33 deletions(-) diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index 844030ef87c4..2a1c6dce8a35 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -1835,6 +1835,9 @@ static const struct uncore_plat_init generic_uncore_i= nit __initconst =3D { .cpu_init =3D intel_uncore_generic_uncore_cpu_init, .pci_init =3D intel_uncore_generic_uncore_pci_init, .mmio_init =3D intel_uncore_generic_uncore_mmio_init, + .domain[0].base_is_pci =3D true, + .domain[0].discovery_base =3D PCI_ANY_ID, + .domain[1].discovery_base =3D UNCORE_DISCOVERY_MSR, }; =20 static const struct x86_cpu_id intel_uncore_match[] __initconst =3D { diff --git a/arch/x86/events/intel/uncore_discovery.c b/arch/x86/events/int= el/uncore_discovery.c index 3bcbf974d3a8..6f409e0b4722 100644 --- a/arch/x86/events/intel/uncore_discovery.c +++ b/arch/x86/events/intel/uncore_discovery.c @@ -12,24 +12,6 @@ static struct rb_root discovery_tables =3D RB_ROOT; static int num_discovered_types[UNCORE_ACCESS_MAX]; =20 -static bool has_generic_discovery_table(void) -{ - struct pci_dev *dev; - int dvsec; - - dev =3D pci_get_device(PCI_VENDOR_ID_INTEL, UNCORE_DISCOVERY_TABLE_DEVICE= , NULL); - if (!dev) - return false; - - /* A discovery table device has the unique capability ID. */ - dvsec =3D pci_find_next_ext_capability(dev, 0, UNCORE_EXT_CAP_ID_DISCOVER= Y); - pci_dev_put(dev); - if (dvsec) - return true; - - return false; -} - static int logical_die_id; =20 static int get_device_die_id(struct pci_dev *dev) @@ -358,12 +340,7 @@ static bool uncore_discovery_pci(struct uncore_discove= ry_domain *domain) struct pci_dev *dev =3D NULL; bool parsed =3D false; =20 - if (domain->discovery_base) - device =3D domain->discovery_base; - else if (has_generic_discovery_table()) - device =3D UNCORE_DISCOVERY_TABLE_DEVICE; - else - device =3D PCI_ANY_ID; + device =3D domain->discovery_base; =20 /* * Start a new search and iterates through the list of @@ -406,7 +383,7 @@ static bool uncore_discovery_msr(struct uncore_discover= y_domain *domain) { unsigned long *die_mask; bool parsed =3D false; - int cpu, die, msr; + int cpu, die; u64 base; =20 die_mask =3D kcalloc(BITS_TO_LONGS(uncore_max_dies()), @@ -414,16 +391,13 @@ static bool uncore_discovery_msr(struct uncore_discov= ery_domain *domain) if (!die_mask) return false; =20 - msr =3D domain->discovery_base ? - domain->discovery_base : UNCORE_DISCOVERY_MSR; - cpus_read_lock(); for_each_online_cpu(cpu) { die =3D topology_logical_die_id(cpu); if (__test_and_set_bit(die, die_mask)) continue; =20 - if (rdmsrq_safe_on_cpu(cpu, msr, &base)) + if (rdmsrq_safe_on_cpu(cpu, domain->discovery_base, &base)) continue; =20 if (!base) @@ -446,10 +420,12 @@ bool uncore_discovery(struct uncore_plat_init *init) =20 for (i =3D 0; i < UNCORE_DISCOVERY_DOMAINS; i++) { domain =3D &init->domain[i]; - if (!domain->base_is_pci) - ret |=3D uncore_discovery_msr(domain); - else - ret |=3D uncore_discovery_pci(domain); + if (domain->discovery_base) { + if (!domain->base_is_pci) + ret |=3D uncore_discovery_msr(domain); + else + ret |=3D uncore_discovery_pci(domain); + } } =20 return ret; --=20 2.52.0