From nobody Sat Mar 7 15:21:32 2026 X-Original-To: dev-commits-src-main@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 4fSn70705Fz6Tdbm for ; Sat, 07 Mar 2026 15:21:32 +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 4fSn706V5Mz3TSX 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=1772896892; 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=lZHnHGSWC0jvHcZvGj0njFhAUngT7HVU7X3M+KXAsLUy8sE8+KncOFXtP8DzhOXh0rYf66 4Mww71dqrRmQbqFeWcOjK9ApvdHdTx2pphLaUYBxULvlZrSaYFyIdBYXoxOMN0330z31NA ogOahkxEwda/3NJl2CaLA31rH9UZwKa1tKti6dvdEYL+BpL2mmnxCzyaNn3r/A8bt7OYSx +SovXbOD20WUxm0ZuWnWQ8/hhaO+oo5OnzCfuRgvDxK16VrQvzHCBP0HsWqN+TwiVvcqIv 8JzuQYq+cE+W5j4+ZRk8jVnhIIwz+3qNi7jrxDnSifza7S3eXUEEfqbfMY84+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772896892; a=rsa-sha256; cv=none; b=a2o19UHGH/cr7Z3LFitmo3+baDXSrq1C63ryqmosl5kgfXwoktnibf1kbf0s54mPVOsoxH T3/+7/4REL4W90Z4Get7v7e5FBGtTDTrrh3LKK1NkwltD5zFy65nRspOTmDIdmS5ZYPw36 PEu/a9cRia0OJ0tUTcnXNEENyUC+EKzA5WXSQOlqqYnUJ/t+CKMjT06AR5Fo/W0MAlIBES gk8G0SWPnIX4Bj9aWGjkSBU2ZVEwrCCtStmfbYtMR3AKc+0ajdheD0q5ZMS22v8KCJeejJ ex2i+W5iXzrCNlLQMjPSVP0xCKEJ0hxxhJ64JaCKrOizL7+Q5ta1/4JxPjkjFQ== 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=1772896892; 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=rpb6X2JI55GkRqeTbUDh5u6EP/xCLPnkxdbG5e2/RLCyI/PjCgNJsbzQ4ZzzV5LiVJzsW+ 6aSdRDYsIL4/V9xLqIThB/iu563z4et9SL+jJY4y46IN6HDyPB12U8P58iUIrQat7tIXFk jUnLCWO1h1IrBzrYh4Rzzqq7dLLVJTJOZLtaKsNQmaJvBHpICjCvBMX9dvzvjLev9W6LiG WXwDD7mRKkQjiW44CrXZCwopLXYo/lpzfzOqWittBYNMgf5p3zUyxrnuDZhsI7ybVx45hB yjC0J7t5rxMtsIuw6R0O3i+X7hT1ltXIa6m5tbI39ChbWUpQiOBZObOrQvrdAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fSn705mBNzKG 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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") \