From nobody Sat May 06 17:49:41 2023 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 4QDFS53Swtz49skb; Sat, 6 May 2023 17:49:41 +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 4QDFS52gZdz3FSJ; Sat, 6 May 2023 17:49:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683395381; 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=rxKiRcdVVL0AlDxbaYAL5sqLR5CEIojhL8CNEr4QA/4=; b=uZk6mSPvC9+y1aSo1ZpAxXUgO3DrKnxAj2fTzRn57/dN4DA1aJdz2d8lzmaVY81dGIyGFn 0czOuTdGowlUXnoTXNoc8q4BEXbonf6IdD7ROcavnqJyBhjYBSXEqjANlL+IjJ5R5cbhRR H3d36/Ox6Kr/B0VYKG+lR/cPLQts4ez2ak6PSzl+RkgVAIRa/BMXYBjzz07DSO0TZGJBpl wbME9nRMiG3D5CqfebFPx0prh3UgWjMHWiOvLuyFwJ+TKpnxpwCkfSnT/1EXB0+T+EKIpV iLu0NcdwZRAw4VnVq9fATmdjITsyA+ilig2nUpu01JGeRcPrsMiyyfUgzblnGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683395381; 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=rxKiRcdVVL0AlDxbaYAL5sqLR5CEIojhL8CNEr4QA/4=; b=tqUkC/dkdmZmr+9vuX13I0k1nGUz6/uEwkWIu8gDgnL9hIR1H4XkEyXC320jRsa4vi58cn wI9NFwN++ZztOdsW0mSysOYe6NHKMPRRM4vmjfdYTCgv6OE4dTG0cAXfTO1EkGVzOGPbef jfKwI+9zbYcQLkupuYPLOFmbeP2y+uiLeekXC1SwwyqXId+U2lgRE787dLG9BBtM7Jnz4U 3/ZNq1jMLKM6pNCCKaQ7BFd1K3TBDaPiqXn8Fcc/0avgYxijfS09TLFA+5QiqGcrMaNbIt BxdutKO0eL3IaijT4YsYDL+wrj4mFJhuIEHJSMvSAAv4+cmx6oJ8mOBTUvcKzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683395381; a=rsa-sha256; cv=none; b=KJrTRSN9uh4lJd4eePUcrQf1x6flGEGb0AaMVhs8crARgjYSvncjAhqAPPi1DLH4B8SajU DDkLeV48Z1kmBvWMN0UhaciAkLVGc8gLSaScZWXIEcj3GOb9oGO7M5Zb3h1x0V0RlVmj1q nB1/ldZihMRVAqt6tLuLxQ6ot0dlWJcfcU3ESBKkm+/ua37wuqiIU8wDh0PqxNOE5CgxG7 tTr6Czc7f6kZekcPbk+ivhwlLo9ZfcmoeYOJ+63ooGhYPDRzGCjT6h2IiwMKra7m+xAlaO LB5S/RljIYbi9cg7RTSE7ieQKdgnmLhwbEXCkoPDpPNO/vp0R8oHEjiHv9V02g== 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 4QDFS51l5gzm6Y; Sat, 6 May 2023 17:49:41 +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 346HnfVC017871; Sat, 6 May 2023 17:49:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 346Hnfn1017870; Sat, 6 May 2023 17:49:41 GMT (envelope-from git) Date: Sat, 6 May 2023 17:49:41 GMT Message-Id: <202305061749.346Hnfn1017870@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: ca43b2ae3ef2 - main - hwpmc: trim obsolete Intel CPU and class defs 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ca43b2ae3ef2ed86b0df36296464d7830b61b944 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=ca43b2ae3ef2ed86b0df36296464d7830b61b944 commit ca43b2ae3ef2ed86b0df36296464d7830b61b944 Author: Mitchell Horne AuthorDate: 2023-05-05 21:57:38 +0000 Commit: Mitchell Horne CommitDate: 2023-05-06 17:49:18 +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 --- 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 8d25ecad721d..fb99e22ff232 100644 --- a/sys/sys/pmc.h +++ b/sys/sys/pmc.h @@ -86,13 +86,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") \ @@ -155,9 +148,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") \