From patchwork Wed Aug 24 21:29:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 662573 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3sKL7m6gDpz9s65; Thu, 25 Aug 2016 07:30:28 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b=0y53wAHV; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1bcfkf-0007pZ-IE; Wed, 24 Aug 2016 21:30:25 +0000 Received: from mail-it0-f43.google.com ([209.85.214.43]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1bcfkG-0007bO-I7 for kernel-team@lists.ubuntu.com; Wed, 24 Aug 2016 21:30:00 +0000 Received: by mail-it0-f43.google.com with SMTP id n128so58322890ith.1 for ; Wed, 24 Aug 2016 14:30:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=KzFXlRv94qh/ROShIY9siyQG43h/BxeoxNactnxDBPM=; b=0y53wAHVvatSS6qMOtyNAv4MT8q4C5dqYHBsKkdUw3rptNeLO7Y196WV7ILi3iT/jw Pdy+kXcTezQ50tfbhyDV8Uhb5xWshVmXuobCiiC0GuO3eOETj/xX5/QCTqE9Cjl0XlUQ jnQWjLKhxVLA13tyu3z3jnVEw/FPcUNmtAU278+SZ296JttwQsQ5HNjf3PYA4auWy6vl m4BgZORkk/vyst3N1mk2FeXhjcIV2A56d6sypGyouFhPE3kBExhDxV+iqJyKFDoCtOc9 5CNXm58HybeQpem7kTPx1zbH5K1xzfOFz85bM6WaWC79IhiOPeJ7BEN5gLj8q7fcHNdU PZZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=KzFXlRv94qh/ROShIY9siyQG43h/BxeoxNactnxDBPM=; b=a535DP7GPcMBFZ1tWN1Ss4n2Zos151G+tpyL1/6b1xkUQIMScKWtL7oSRuSLLIJtvw v5lBk1Op1KwqXmEPve0JjBs0MvpXJsfNzALzW2F1pnNX9R5CBQCLieLycbVcxBQalx1n SRUIaS1QfYgH6O7IVXx7KD2nCd9GsW9MFHd8DLTjEZ3xE+MrWvopf3sOxpI0ygsiFXhc aZKZlNWR3bO6p9VIyR0YLmlJV5mexcyPLHEyZNgFoO3w+tq4xjx2PG5201l8GRfkBOr/ OXPt4zL8pleG1mZXd8qc4YzEiW5UmVGfpFwiWmz/zmlbHGIuESGwZPiugjVWvqeALZ+e appQ== X-Gm-Message-State: AEkoousFN2Yeac7WCiV5ED0qG9F10E0xgOXi+uQl2kFZRaqsHjjYKgpfJE0Ddu2OS+gRWGXy X-Received: by 10.107.175.34 with SMTP id y34mr6581437ioe.70.1472074199327; Wed, 24 Aug 2016 14:29:59 -0700 (PDT) Received: from gbyte.rtg.local (host-174-45-44-32.hln-mt.client.bresnan.net. [174.45.44.32]) by smtp.gmail.com with ESMTPSA id o5sm12370305ith.20.2016.08.24.14.29.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Aug 2016 14:29:58 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 11/16] intel_idle: Add SKX support Date: Wed, 24 Aug 2016 15:29:41 -0600 Message-Id: <1472074186-21406-12-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1472074186-21406-1-git-send-email-tim.gardner@canonical.com> References: <1472074186-21406-1-git-send-email-tim.gardner@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Len Brown BugLink: http://bugs.launchpad.net/bugs/1591821 SKX is similar to BDX Signed-off-by: Len Brown Signed-off-by: Rafael J. Wysocki (cherry picked from commit f9e71657c2c0a8f1c50884ab45794be2854e158e) Signed-off-by: Tim Gardner --- drivers/idle/intel_idle.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index 862346b..4677c3d 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c @@ -660,6 +660,35 @@ static struct cpuidle_state skl_cstates[] = { .enter = NULL } }; +static struct cpuidle_state skx_cstates[] = { + { + .name = "C1-SKX", + .desc = "MWAIT 0x00", + .flags = MWAIT2flg(0x00), + .exit_latency = 2, + .target_residency = 2, + .enter = &intel_idle, + .enter_freeze = intel_idle_freeze, }, + { + .name = "C1E-SKX", + .desc = "MWAIT 0x01", + .flags = MWAIT2flg(0x01), + .exit_latency = 10, + .target_residency = 20, + .enter = &intel_idle, + .enter_freeze = intel_idle_freeze, }, + { + .name = "C6-SKX", + .desc = "MWAIT 0x20", + .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 133, + .target_residency = 600, + .enter = &intel_idle, + .enter_freeze = intel_idle_freeze, }, + { + .enter = NULL } +}; + static struct cpuidle_state atom_cstates[] = { { .name = "C1E-ATM", @@ -907,6 +936,10 @@ static const struct idle_cpu idle_cpu_skl = { .disable_promotion_to_c1e = true, }; +static const struct idle_cpu idle_cpu_skx = { + .state_table = skx_cstates, + .disable_promotion_to_c1e = true, +}; static const struct idle_cpu idle_cpu_avn = { .state_table = avn_cstates, @@ -948,6 +981,7 @@ static const struct x86_cpu_id intel_idle_ids[] __initconst = { ICPU(0x56, idle_cpu_bdw), ICPU(0x4e, idle_cpu_skl), ICPU(0x5e, idle_cpu_skl), + ICPU(0x55, idle_cpu_skx), ICPU(0x57, idle_cpu_knl), {} };