From owner-svn-src-all@freebsd.org Sat Feb 1 19:45:28 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6268F2298FD; Sat, 1 Feb 2020 19:45:28 +0000 (UTC) (envelope-from cem@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4894Lw1zz2z3xvS; Sat, 1 Feb 2020 19:45:28 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3F95E4113; Sat, 1 Feb 2020 19:45:28 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 011JjSAh021399; Sat, 1 Feb 2020 19:45:28 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 011JjSBY021398; Sat, 1 Feb 2020 19:45:28 GMT (envelope-from cem@FreeBSD.org) Message-Id: <202002011945.011JjSBY021398@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Sat, 1 Feb 2020 19:45:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357376 - head/sys/x86/cpufreq X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: head/sys/x86/cpufreq X-SVN-Commit-Revision: 357376 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Feb 2020 19:45:28 -0000 Author: cem Date: Sat Feb 1 19:45:27 2020 New Revision: 357376 URL: https://svnweb.freebsd.org/changeset/base/357376 Log: hwpstate_intel(4): Error check epp sysctl & bail if HW does not support feature Modified: head/sys/x86/cpufreq/hwpstate_intel.c Modified: head/sys/x86/cpufreq/hwpstate_intel.c ============================================================================== --- head/sys/x86/cpufreq/hwpstate_intel.c Sat Feb 1 19:40:11 2020 (r357375) +++ head/sys/x86/cpufreq/hwpstate_intel.c Sat Feb 1 19:45:27 2020 (r357376) @@ -218,6 +218,7 @@ raw_to_percent(int x) static int sysctl_epp_select(SYSCTL_HANDLER_ARGS) { + struct hwp_softc *sc; device_t dev; struct pcpu *pc; uint64_t requested; @@ -225,6 +226,10 @@ sysctl_epp_select(SYSCTL_HANDLER_ARGS) int ret; dev = oidp->oid_arg1; + sc = device_get_softc(dev); + if (!sc->hwp_pref_ctrl) + return (ENODEV); + pc = cpu_get_pcpu(dev); if (pc == NULL) return (ENXIO); @@ -233,7 +238,9 @@ sysctl_epp_select(SYSCTL_HANDLER_ARGS) sched_bind(curthread, pc->pc_cpuid); thread_unlock(curthread); - rdmsr_safe(MSR_IA32_HWP_REQUEST, &requested); + ret = rdmsr_safe(MSR_IA32_HWP_REQUEST, &requested); + if (ret) + goto out; val = (requested & IA32_HWP_REQUEST_ENERGY_PERFORMANCE_PREFERENCE) >> 24; val = raw_to_percent(val); @@ -253,7 +260,7 @@ sysctl_epp_select(SYSCTL_HANDLER_ARGS) requested &= ~IA32_HWP_REQUEST_ENERGY_PERFORMANCE_PREFERENCE; requested |= val << 24; - wrmsr_safe(MSR_IA32_HWP_REQUEST, requested); + ret = wrmsr_safe(MSR_IA32_HWP_REQUEST, requested); out: thread_lock(curthread);