From nobody Fri Jun 9 19:58:04 2023 X-Original-To: dev-commits-src-branches@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 4QdBhX5xjZz4cKZv; Fri, 9 Jun 2023 19:58:04 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QdBhX4bvxz4J8g; Fri, 9 Jun 2023 19:58:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686340684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hYzqJZHUjKYFBXeaoMuF7hxlACWJf7UFfzRqWYHxRdk=; b=uXhvG07UtVh7RZ3C5MlbBNmUkvHFr+/tIe4gToX0DI8VWwBeJWZStz7NKiRBiah3zsPDjv pfb2qgEWyx7iKS3vGV12WyLSp2KnJknsF69U08h5ODZ5IdkpKNTumFSTGoZiJYGVfGjdce yQMbSU3L6KFxlt03O34zJP2wlRA2Z3mjaBWKgpmQG1G0g0hHLhSsmt2kGZr47btWNdtq3d Smmppu8WhM8P7+w064iWyao+GZNttk/Oyx1KnpO4AT4FG1wDed8Sk3h2MJkxr9Okv5rsng XQaBVvKQEd8K/Ne08xMrFIJVv2Xn9lX2bXnSEwyrWE56A9yMOJG5FWaEfxhpRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686340684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hYzqJZHUjKYFBXeaoMuF7hxlACWJf7UFfzRqWYHxRdk=; b=inB7IDth0lPMr/pzPgD6qDGQPXTpCTFoH5o5YJtw9oPf7IE0NUCTCs2Ihy7TuMncrhCm/R dA5ydQAYp9zmjEv4IWrSGNwDvO0MOUCLZOeBOT1FE3Ot51v6KomjZ3QuG5nzYli14AunfU q+6Nt15BLUFpSZeBrtzEH+EXj6WlNiP903CcCU+1us0oPuFLHBljdblqNrcQAgiplFAGIE Ys6hzKRNwMMhrN4ZB8pt6XGtwtwePhxjFzPVtZptnU1GivvgIsEpY3kRMSD+loKaRncNsU sr15NZFmEt3xbV4EMhOHicpdL615s/f6sbFIpUADfalfTlYnxGm+WPA0CxWdjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686340684; a=rsa-sha256; cv=none; b=R7WGIu6UvKtXIiGMTLHNSxJZogFcCouC6cOjQZ0MMrCri7AD5UYfPsQxI7OoZiYYORx2Pt FIVVOM2n4Qo9/gjWUxMO/3H7TojXeSoN7ccyNuQiXAvXf/dUplo9/ogm1QYSvg7jwu7Pqm H+cG03C+q3+kWQlIliDi8AiMGELgjp+r86A9/v42VE9ollKycUhr9SMuXilnpiFhlhcWsN n/17NhCvITSnhA5bm1TJ/WPsGZxftjX0B4WDTVUzaXuA6N1kqeKFdKB1CXtWJsskmJIFMp Qklsr8jnMQLFSK+HKq99JVaMkNlgdeTR1OHz7ZBfoK6dqRnsFfaURjIZ92dQvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QdBhX3hTqznmq; Fri, 9 Jun 2023 19:58:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 359Jw4D0072097; Fri, 9 Jun 2023 19:58:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 359Jw4wK072096; Fri, 9 Jun 2023 19:58:04 GMT (envelope-from git) Date: Fri, 9 Jun 2023 19:58:04 GMT Message-Id: <202306091958.359Jw4wK072096@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 4f845152b19b - stable/13 - hwpmc: trim obsolete Intel CPU and class defs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4f845152b19b154f4df65886c60f23c105d0c6fd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=4f845152b19b154f4df65886c60f23c105d0c6fd commit 4f845152b19b154f4df65886c60f23c105d0c6fd Author: Mitchell Horne AuthorDate: 2023-05-05 21:57:38 +0000 Commit: Mitchell Horne CommitDate: 2023-06-09 18:14:58 +0000 hwpmc: trim obsolete Intel CPU and class defs No functional change. Reviewed by: jkoshy MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39904 (cherry picked from commit ca43b2ae3ef2ed86b0df36296464d7830b61b944) --- sys/dev/hwpmc/hwpmc_intel.c | 2 +- sys/i386/include/pmc_mdep.h | 4 ---- sys/sys/pmc.h | 10 ---------- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_intel.c b/sys/dev/hwpmc/hwpmc_intel.c index 894f9c07b622..c51e74f34516 100644 --- a/sys/dev/hwpmc/hwpmc_intel.c +++ b/sys/dev/hwpmc/hwpmc_intel.c @@ -99,7 +99,7 @@ pmc_intel_initialize(void) family, model, stepping); switch (cpu_id & 0xF00) { - case 0x600: /* Pentium Pro, Celeron, Pentium II & III */ + case 0x600: switch (model) { case 0xE: cputype = PMC_CPU_INTEL_CORE; diff --git a/sys/i386/include/pmc_mdep.h b/sys/i386/include/pmc_mdep.h index a868ce11c3ca..3d498e006a36 100644 --- a/sys/i386/include/pmc_mdep.h +++ b/sys/i386/include/pmc_mdep.h @@ -45,10 +45,6 @@ struct pmc_mdep; * TSC The timestamp counter * K7 AMD Athlon XP/MP and other 32 bit processors. * K8 AMD Athlon64 and Opteron PMCs in 32 bit mode. - * PIV Intel P4/HTT and P4/EMT64 - * PPRO Intel Pentium Pro, Pentium-II, Pentium-III, Celeron and - * Pentium-M processors - * PENTIUM Intel Pentium MMX. * IAP Intel Core/Core2/Atom programmable PMCs. * IAF Intel fixed-function PMCs. * UCP Intel Uncore programmable PMCs. diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h index 91ce5d2bd71f..4b645c771484 100644 --- a/sys/sys/pmc.h +++ b/sys/sys/pmc.h @@ -84,13 +84,6 @@ extern char pmc_cpuid[PMC_CPUID_LEN]; #define __PMC_CPUS() \ __PMC_CPU(AMD_K7, 0x00, "AMD K7") \ __PMC_CPU(AMD_K8, 0x01, "AMD K8") \ - __PMC_CPU(INTEL_P5, 0x80, "Intel Pentium") \ - __PMC_CPU(INTEL_P6, 0x81, "Intel Pentium Pro") \ - __PMC_CPU(INTEL_CL, 0x82, "Intel Celeron") \ - __PMC_CPU(INTEL_PII, 0x83, "Intel Pentium II") \ - __PMC_CPU(INTEL_PIII, 0x84, "Intel Pentium III") \ - __PMC_CPU(INTEL_PM, 0x85, "Intel Pentium M") \ - __PMC_CPU(INTEL_PIV, 0x86, "Intel Pentium IV") \ __PMC_CPU(INTEL_CORE, 0x87, "Intel Core Solo/Duo") \ __PMC_CPU(INTEL_CORE2, 0x88, "Intel Core2") \ __PMC_CPU(INTEL_CORE2EXTREME, 0x89, "Intel Core2 Extreme") \ @@ -153,9 +146,6 @@ enum pmc_cputype { __PMC_CLASS(TSC, 0x00, "CPU Timestamp counter") \ __PMC_CLASS(K7, 0x01, "AMD K7 performance counters") \ __PMC_CLASS(K8, 0x02, "AMD K8 performance counters") \ - __PMC_CLASS(P5, 0x03, "Intel Pentium counters") \ - __PMC_CLASS(P6, 0x04, "Intel Pentium Pro counters") \ - __PMC_CLASS(P4, 0x05, "Intel Pentium-IV counters") \ __PMC_CLASS(IAF, 0x06, "Intel Core2/Atom, fixed function") \ __PMC_CLASS(IAP, 0x07, "Intel Core...Atom, programmable") \ __PMC_CLASS(UCF, 0x08, "Intel Uncore fixed function") \