From nobody Sat Mar 7 15:21:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fSn712zyHz6Tddb for ; Sat, 07 Mar 2026 15:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fSn706rzZz3TSY for ; Sat, 07 Mar 2026 15:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772896893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F6hEvXVmDFrZaUUFYLmBxy8DDY0zGMjEhuopqtjAEhU=; b=KcF8zxw4qqp6Gi4Jj10DT1xpytKIq3sa05I2C4Q9yQTYRHly99IAerHYgbpySsSFnwrCbm D3PXFu/007xNOaPDg7bCCQ1IrR6eie9a+9DSpz23sNmfICMGO+LAJtRkK85PriZAq3KRNK RWsjO8VKwQqTvY8gRY5/5ELOqR4sjZO85TLYyF91g4tlq+CPDbSzGEe3n3Htldz+MY7iGZ 3HexttX3KYXp4lEjQzKMSsZ2BqXCCOi/HhrCPba/GM8gfsmqmFvSXSUeVtgOraBpVF7w/W 6+yJyZRewFX/juJWFjR5b0ueXXd8/IMMjBBLC/5hfPEypVNo0FNI9F9xEhxv9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772896893; a=rsa-sha256; cv=none; b=SsLgYpJ3B3Byg10sww+LOrtBZxhDSVgV0W7GUuxfbp2yU6VdMn/Q8kharT7qiURKluLJGO wVtXu807TW3SMrfwbKo/5jubsAvkEosY+hGDgIOdP8sH+1vCBb87U/uDfBUpTj09+j9TJV mg/T2sCVH/1ndLeVJ8I5uJhyeNI7nZuVRtBuQ0oO8F3Fm4W++6N5TeGG/Z2Q0H10e/8RBD 59VGFgoj/eLsoSI+N3VIZHMlvtwVe31oNxqjAS4QfqA4CZRcLe4rwPWg8d6/e78nlcmS7d Xq9bO2prVjY2JRSiWEeLy1YSCtQWiE2dhgimWVJXvJgbhbdocIZeQfyecKtboA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772896893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F6hEvXVmDFrZaUUFYLmBxy8DDY0zGMjEhuopqtjAEhU=; b=UNPkqYZNbA8r6NjebwcvG0xeAGF6lT3iazmcSJVejUMjaxg5cy+qNLTWS2R2j6i3wjBfD4 5+lciBNU3c0B4XBxQxdvv+jiw5NXI2SWgy+texF+Uu+4YwS9XI702oDb0ovQD0W1N26Ym9 sSoE4asJaAfipRjNchkgLSeG93GwCjFuP4jLEWSHG0BknfrWyUKhQsH8Cdt6RbIxIuU3/b 2byNSOCp2DMZy274RKqArzoumYpVgKJQ4jE6ZMltNXr0CqDmPLkVk8jS5DKWcC61BSFmZ3 3FuaxPWotD2acuI3W41kvALYxSm/mTSfNK58XqNPrfx+ZPf2hfylbRuI76pJ8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fSn7061wnz1CMv for ; Sat, 07 Mar 2026 15:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b88b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Mar 2026 15:21:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ali Mashtizadeh From: Warner Losh Subject: git: e409e51f8396 - main - hwpmc: Remove left over k7, xscale and p4 references pmc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e409e51f83963beaeb95eec82c5f43e44545d6b9 Auto-Submitted: auto-generated Date: Sat, 07 Mar 2026 15:21:32 +0000 Message-Id: <69ac427c.3b88b.511cc8b5@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e409e51f83963beaeb95eec82c5f43e44545d6b9 commit e409e51f83963beaeb95eec82c5f43e44545d6b9 Author: Ali Mashtizadeh AuthorDate: 2026-02-20 21:05:41 +0000 Commit: Warner Losh CommitDate: 2026-03-07 15:17:43 +0000 hwpmc: Remove left over k7, xscale and p4 references pmc Support for these processors was removed a few years ago, but a few references remain that should be removed. Sponsored by: Netflix Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/2039 --- sys/amd64/include/pmc_mdep.h | 1 - sys/i386/include/pmc_mdep.h | 4 +--- sys/sys/pmc.h | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/amd64/include/pmc_mdep.h b/sys/amd64/include/pmc_mdep.h index 24b785312a16..c44dd066f827 100644 --- a/sys/amd64/include/pmc_mdep.h +++ b/sys/amd64/include/pmc_mdep.h @@ -65,7 +65,6 @@ struct pmc_mdep; * TSC The timestamp counter * K8 AMD Athlon64 and Opteron PMCs in 64 bit mode. * IBS AMD IBS - * PIV Intel P4/HTT and P4/EMT64 * IAP Intel Core/Core2/Atom CPUs in 64 bits mode. * IAF Intel fixed-function PMCs in Core2 and later CPUs. * UCP Intel Uncore programmable PMCs. diff --git a/sys/i386/include/pmc_mdep.h b/sys/i386/include/pmc_mdep.h index 31eded611a1e..618df8daebef 100644 --- a/sys/i386/include/pmc_mdep.h +++ b/sys/i386/include/pmc_mdep.h @@ -41,7 +41,6 @@ struct pmc_mdep; * On the i386 platform we support the following PMCs. * * TSC The timestamp counter - * K7 AMD Athlon XP/MP and other 32 bit processors. * K8 AMD Athlon64 and Opteron PMCs in 32 bit mode. * IBS AMD IBS * IAP Intel Core/Core2/Atom programmable PMCs. @@ -50,7 +49,7 @@ struct pmc_mdep; * UCF Intel Uncore fixed-function PMCs. */ -#include /* K7 and K8 */ +#include #include #include #include @@ -62,7 +61,6 @@ struct pmc_mdep; * IAF, IAP, UCF and UCP. */ #define PMC_MDEP_CLASS_INDEX_TSC 1 -#define PMC_MDEP_CLASS_INDEX_K7 2 #define PMC_MDEP_CLASS_INDEX_K8 2 #define PMC_MDEP_CLASS_INDEX_IBS 3 #define PMC_MDEP_CLASS_INDEX_IAP 2 diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h index 28484eed187e..7640a9b96c84 100644 --- a/sys/sys/pmc.h +++ b/sys/sys/pmc.h @@ -110,7 +110,6 @@ extern char pmc_cpuid[PMC_CPUID_LEN]; __PMC_CPU(INTEL_EMERALD_RAPIDS, 0xA0, "Intel Emerald Rapids") \ __PMC_CPU(INTEL_ALDERLAKEN, 0xA1, "Intel AlderlakeN") \ __PMC_CPU(INTEL_GRANITE_RAPIDS, 0xA2, "Intel Granite Rapids") \ - __PMC_CPU(INTEL_XSCALE, 0x100, "Intel XScale") \ __PMC_CPU(PPC_7450, 0x300, "PowerPC MPC7450") \ __PMC_CPU(PPC_E500, 0x340, "PowerPC e500 Core") \ __PMC_CPU(PPC_970, 0x380, "IBM PowerPC 970") \ @@ -146,7 +145,6 @@ enum pmc_cputype { __PMC_CLASS(IAP, 0x07, "Intel Core...Atom, programmable") \ __PMC_CLASS(UCF, 0x08, "Intel Uncore fixed function") \ __PMC_CLASS(UCP, 0x09, "Intel Uncore programmable") \ - __PMC_CLASS(XSCALE, 0x0A, "Intel XScale counters") \ __PMC_CLASS(PPC7450, 0x0D, "Motorola MPC7450 class") \ __PMC_CLASS(PPC970, 0x0E, "IBM PowerPC 970 class") \ __PMC_CLASS(SOFT, 0x0F, "Software events") \