From patchwork Wed Mar 13 22:21:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 10851885 X-Patchwork-Delegate: andy.shevchenko@gmail.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DC1BB13B5 for ; Wed, 13 Mar 2019 22:21:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C49222A028 for ; Wed, 13 Mar 2019 22:21:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B93352A049; Wed, 13 Mar 2019 22:21:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42E412A028 for ; Wed, 13 Mar 2019 22:21:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726717AbfCMWVa (ORCPT ); Wed, 13 Mar 2019 18:21:30 -0400 Received: from mail-pg1-f201.google.com ([209.85.215.201]:37622 "EHLO mail-pg1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726559AbfCMWVa (ORCPT ); Wed, 13 Mar 2019 18:21:30 -0400 Received: by mail-pg1-f201.google.com with SMTP id a6so3849040pgj.4 for ; Wed, 13 Mar 2019 15:21:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=b8nrt+CPzo8qCRbcc0fE+vDG4wcOoKaSz2ai/pwTDyw=; b=KmUkrLz46+zddnlPY4GUK58JTUAHHyJ33gSWetgzaJZgtB6ocdFS5wuQLO+6Q4rrJg KkM3bRHLjzLycb6tHcFRgSNotIimvzJQ+7lCZwJvc7xPOpME3rMScFg9B/Ls/2g6Rct2 94O6wFFoX/AqInU+ZZTFfJc6VUarGyyKnOPRYE3UGHvyZNH5Ujopf5Sou39soc4nUre5 rkpGtUFD11t5zpEDaTJ8juyHJ2ImWLmQoK7e7Mig7Aqb3U1VcjrH7COMpMQJ5QGfrVW9 Ra6t2GvKgm9LdbdeTLWji6XPweTAMpU0rgvvwMRBvtuRq9333FX1kzgPkS+HIeQ2rbeX HSFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=b8nrt+CPzo8qCRbcc0fE+vDG4wcOoKaSz2ai/pwTDyw=; b=W60wBFyn2r3j0EdDIZdPyrLVFXLVi/Qhb3J4Gh46uFp5kUyuf9RUFfbpnVzI/Gnjp9 eu3+EF9vS5W2DLBkgOYwQfmvA26a0gAHTWtpJrySJq0FQLn+fKgXlMZestsk/pGpOJJ2 9FNcJh/BaRLWuYd7Iy4Awxje3PMksl3dI/d9iDornlBbo/5zpi1/9MOLUH0MjC4FtwUp AjH9dMEfLF++bxHhobF+lLA+4eBh5TVFr4vL6DgqbhErenFbblmPvDvzOrDEnbKVBq4P S7Z48T6KNqQBWpVhy4Ljuz7Waa6ubOeWvpFo+63e1ocJPgfSJqVT4ak/s7YuIQRg0/5J 6LVw== X-Gm-Message-State: APjAAAXQAatGA8zWJ7/fkn9OWCnThFxM3bAe8YH+hHjGV2NUO12mYrCJ nIfgP5F1n2mtol4czaTPLgMEDTrSlUKa X-Google-Smtp-Source: APXvYqzqZw2mvTfWv08nuYxq9UFFs79u3MwVRjE9m1Tq/m+jpbNkvMrSXzIeHv974i0VZnUn/8azzwK75I8B X-Received: by 2002:a63:288:: with SMTP id 130mr17679465pgc.145.1552515689076; Wed, 13 Mar 2019 15:21:29 -0700 (PDT) Date: Wed, 13 Mar 2019 15:21:23 -0700 Message-Id: <20190313222124.229371-1-rajatja@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.360.g471c308f928-goog Subject: [PATCH 1/2] platform/x86: intel_pmc_core: Convert to a platform_driver From: Rajat Jain To: Rajneesh Bhardwaj , Vishwanath Somayaji , Darren Hart , Andy Shevchenko , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Rajat Jain , furquan@google.com, evgreen@google.com, rajatxjain@gmail.com Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Convert the intel_pmc_core driver to a platform driver. There is no functional change. Some code that tries to determine what kind of CPU this is, has been moved code is moved from pmc_core_probe() to pmc_core_init(). Signed-off-by: Rajat Jain --- This is rebased off git://git.infradead.org/linux-platform-drivers-x86.git/for-next drivers/platform/x86/intel_pmc_core.c | 93 ++++++++++++++++++++------- 1 file changed, 68 insertions(+), 25 deletions(-) diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c index f2c621b55f49..55578d07610c 100644 --- a/drivers/platform/x86/intel_pmc_core.c +++ b/drivers/platform/x86/intel_pmc_core.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -854,12 +855,59 @@ static const struct dmi_system_id pmc_core_dmi_table[] = { {} }; -static int __init pmc_core_probe(void) +static int pmc_core_probe(struct platform_device *pdev) { - struct pmc_dev *pmcdev = &pmc; + struct pmc_dev *pmcdev = platform_get_drvdata(pdev); + int err; + + pmcdev->regbase = ioremap(pmcdev->base_addr, + pmcdev->map->regmap_length); + if (!pmcdev->regbase) + return -ENOMEM; + + mutex_init(&pmcdev->lock); + pmcdev->pmc_xram_read_bit = pmc_core_check_read_lock_bit(); + + err = pmc_core_dbgfs_register(pmcdev); + if (err < 0) { + dev_warn(&pdev->dev, "debugfs register failed.\n"); + iounmap(pmcdev->regbase); + return err; + } + + dmi_check_system(pmc_core_dmi_table); + dev_info(&pdev->dev, " initialized\n"); + return 0; +} + +static int pmc_core_remove(struct platform_device *pdev) +{ + struct pmc_dev *pmcdev = platform_get_drvdata(pdev); + + pmc_core_dbgfs_unregister(pmcdev); + mutex_destroy(&pmcdev->lock); + iounmap(pmcdev->regbase); + return 0; +} + +static struct platform_driver pmc_core_driver = { + .driver = { + .name = "pmc_core", + }, + .probe = pmc_core_probe, + .remove = pmc_core_remove, +}; + +static struct platform_device pmc_core_device = { + .name = "pmc_core", +}; + +static int __init pmc_core_init(void) +{ + int ret; const struct x86_cpu_id *cpu_id; + struct pmc_dev *pmcdev = &pmc; u64 slp_s0_addr; - int err; cpu_id = x86_match_cpu(intel_pmc_core_ids); if (!cpu_id) @@ -880,36 +928,31 @@ static int __init pmc_core_probe(void) else pmcdev->base_addr = slp_s0_addr - pmcdev->map->slp_s0_offset; - pmcdev->regbase = ioremap(pmcdev->base_addr, - pmcdev->map->regmap_length); - if (!pmcdev->regbase) - return -ENOMEM; + platform_set_drvdata(&pmc_core_device, pmcdev); - mutex_init(&pmcdev->lock); - pmcdev->pmc_xram_read_bit = pmc_core_check_read_lock_bit(); + ret = platform_device_register(&pmc_core_device); + if (ret) + return ret; - err = pmc_core_dbgfs_register(pmcdev); - if (err < 0) { - pr_warn(" debugfs register failed.\n"); - iounmap(pmcdev->regbase); - return err; - } + ret = platform_driver_register(&pmc_core_driver); + if (ret) + goto out_remove_dev; - dmi_check_system(pmc_core_dmi_table); - pr_info(" initialized\n"); return 0; + +out_remove_dev: + platform_device_unregister(&pmc_core_device); + return ret; } -module_init(pmc_core_probe) -static void __exit pmc_core_remove(void) +static void __init pmc_core_exit(void) { - struct pmc_dev *pmcdev = &pmc; - - pmc_core_dbgfs_unregister(pmcdev); - mutex_destroy(&pmcdev->lock); - iounmap(pmcdev->regbase); + platform_driver_unregister(&pmc_core_driver); + platform_device_unregister(&pmc_core_device); } -module_exit(pmc_core_remove) + +module_init(pmc_core_init); +module_exit(pmc_core_exit); MODULE_LICENSE("GPL v2"); MODULE_DESCRIPTION("Intel PMC Core Driver"); From patchwork Wed Mar 13 22:21:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 10851887 X-Patchwork-Delegate: andy.shevchenko@gmail.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CB81E13B5 for ; Wed, 13 Mar 2019 22:21:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B936F29F99 for ; Wed, 13 Mar 2019 22:21:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD9552A031; Wed, 13 Mar 2019 22:21:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2DCC029F99 for ; Wed, 13 Mar 2019 22:21:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726442AbfCMWVk (ORCPT ); Wed, 13 Mar 2019 18:21:40 -0400 Received: from mail-vk1-f202.google.com ([209.85.221.202]:37931 "EHLO mail-vk1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726846AbfCMWVe (ORCPT ); Wed, 13 Mar 2019 18:21:34 -0400 Received: by mail-vk1-f202.google.com with SMTP id e13so1239970vka.5 for ; Wed, 13 Mar 2019 15:21:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=N/8bTN+wgMZray1e0uHhmLK00Ub7CbzrJhnIjb/FwiA=; b=Vxzpb3191e4PQi2AYMtPoN/HMgrcaSIhwwScfsk+zKFIN3fQpNuTicDdGOY/jDNG7+ YFcZujD7dAf0Acp40m2RWE77X46VtQczzObma4M/gBJj3mFIaF1EvCJkn6A931iBu30u yW6oFSDCnawGeNb5UWL9RMbvoao8oosxUNZ27SCZqFiUmHYXfzEqeKh8wAVUIoV4QK2U w+CRh05kbtuRpGpP1bLILORLWJID9swGib3pZvHlDjuXMkATOrN2CzQBxVVsHEmIcWrZ 2TbyTqJANJUIozahl66CeQKeuu4j9tasPVuw8L63GiISC4IPA+EwivVerCMgwc7QSK3/ Zx4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=N/8bTN+wgMZray1e0uHhmLK00Ub7CbzrJhnIjb/FwiA=; b=EzSOW3eLK7nb8p3x5T0ODCW7EwbrKAgDt+K57Buqe1tzLX75cjzxO/sa+iFQLfZGk9 dVDY6ygPQuNf2fY0aDiCdBK7yVB60ZaZv5yideWvJs/LbDo9z9cCvi0XiCX9IFX455DG cIpatZUk+9L0VoKdKRxFCzlPINAVAw4bTgtCgn3yOUzZloaDu/Em39KdRPEtXe9/bdQX aki/6F2iFIDA8aw5xqRNhCducdOVxFWm1boytL+/HMTZMiTqgxSMQ84k/YL+fZv3Dq0S 4xud+McvtolXd8z7/0f73OMJIItnbM6PCKiMfJ4kEeLbTC3vAaOqNVgmYJwvob49TEcK T4Nw== X-Gm-Message-State: APjAAAXdWh7jPgYv1LY3U26O4YUs1muoWzvuZhomRaLYT6crSFC0tS0R ADUY7T6bvGvIk37JrlOU3KlhVWjHAb5+ X-Google-Smtp-Source: APXvYqzgUFCdQGMisbk/9CVRiWYHDcanTKOtXrhc2j85eb1v3PAwS+dBvIiEi8aXTzNDKh1Q7uBEU5482FLv X-Received: by 2002:ab0:22ce:: with SMTP id z14mr29223600uam.20.1552515693312; Wed, 13 Mar 2019 15:21:33 -0700 (PDT) Date: Wed, 13 Mar 2019 15:21:24 -0700 In-Reply-To: <20190313222124.229371-1-rajatja@google.com> Message-Id: <20190313222124.229371-2-rajatja@google.com> Mime-Version: 1.0 References: <20190313222124.229371-1-rajatja@google.com> X-Mailer: git-send-email 2.21.0.360.g471c308f928-goog Subject: [PATCH 2/2] platform/x86: intel_pmc_core: Allow to dump debug registers on S0ix failure From: Rajat Jain To: Rajneesh Bhardwaj , Vishwanath Somayaji , Darren Hart , Andy Shevchenko , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Rajat Jain , furquan@google.com, evgreen@google.com, rajatxjain@gmail.com Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add a module parameter which when enabled, will check on resume, if the last S0ix attempt was successful. If not, the driver would provide helpful debug information (which gets latched during the failed suspend attempt) to debug the S0ix failure. This information is very useful to debug S0ix failures. Specially since the latched debug information will be lost (over-written) if the system attempts to go into runtime (or imminent) S0ix again after that failed suspend attempt. Signed-off-by: Rajat Jain --- drivers/platform/x86/intel_pmc_core.c | 86 +++++++++++++++++++++++++++ drivers/platform/x86/intel_pmc_core.h | 7 +++ 2 files changed, 93 insertions(+) diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c index 55578d07610c..b1f4405a27ce 100644 --- a/drivers/platform/x86/intel_pmc_core.c +++ b/drivers/platform/x86/intel_pmc_core.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -890,9 +891,94 @@ static int pmc_core_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM_SLEEP + +static bool warn_on_s0ix_failures; +module_param(warn_on_s0ix_failures, bool, 0644); +MODULE_PARM_DESC(warn_on_s0ix_failures, "Check and warn for S0ix failures"); + +static int pmc_core_suspend(struct device *dev) +{ + struct pmc_dev *pmcdev = dev_get_drvdata(dev); + + /* Save PC10 and S0ix residency for checking later */ + if (warn_on_s0ix_failures && + !rdmsrl_safe(MSR_PKG_C10_RESIDENCY, &pmcdev->pc10_counter) && + !pmc_core_dev_state_get(pmcdev, &pmcdev->s0ix_counter)) + pmcdev->check_counters = true; + else + pmcdev->check_counters = false; + + return 0; +} + +static inline bool pc10_failed(struct pmc_dev *pmcdev) +{ + u64 pc10_counter; + + if (!rdmsrl_safe(MSR_PKG_C10_RESIDENCY, &pc10_counter) && + pc10_counter == pmcdev->pc10_counter) + return true; + else + return false; +} + +static inline bool s0ix_failed(struct pmc_dev *pmcdev) +{ + u64 s0ix_counter; + + if (!pmc_core_dev_state_get(pmcdev, &s0ix_counter) && + s0ix_counter == pmcdev->s0ix_counter) + return true; + else + return false; +} + +static int pmc_core_resume(struct device *dev) +{ + struct pmc_dev *pmcdev = dev_get_drvdata(dev); + + if (!pmcdev->check_counters) + return 0; + + if (pc10_failed(pmcdev)) { + dev_info(dev, "PC10 entry had failed (PC10 cnt=0x%llx)\n", + pmcdev->pc10_counter); + } else if (s0ix_failed(pmcdev)) { + + const struct pmc_bit_map **maps = pmcdev->map->slps0_dbg_maps; + const struct pmc_bit_map *map; + int offset = pmcdev->map->slps0_dbg_offset; + u32 data; + + dev_warn(dev, "S0ix entry had failed (S0ix cnt=%llu)\n", + pmcdev->s0ix_counter); + while (*maps) { + map = *maps; + data = pmc_core_reg_read(pmcdev, offset); + offset += 4; + while (map->name) { + dev_warn(dev, "SLP_S0_DBG: %-32s\tState: %s\n", + map->name, + data & map->bit_mask ? "Yes" : "No"); + ++map; + } + ++maps; + } + } + return 0; +} + +#endif + +const struct dev_pm_ops pmc_core_pm_ops = { + SET_LATE_SYSTEM_SLEEP_PM_OPS(pmc_core_suspend, pmc_core_resume) +}; + static struct platform_driver pmc_core_driver = { .driver = { .name = "pmc_core", + .pm = &pmc_core_pm_ops }, .probe = pmc_core_probe, .remove = pmc_core_remove, diff --git a/drivers/platform/x86/intel_pmc_core.h b/drivers/platform/x86/intel_pmc_core.h index 88d9c0653a5f..fdee5772e532 100644 --- a/drivers/platform/x86/intel_pmc_core.h +++ b/drivers/platform/x86/intel_pmc_core.h @@ -241,6 +241,9 @@ struct pmc_reg_map { * @pmc_xram_read_bit: flag to indicate whether PMC XRAM shadow registers * used to read MPHY PG and PLL status are available * @mutex_lock: mutex to complete one transcation + * @check_counters: On resume, check if counters are getting incremented + * @pc10_counter: PC10 residency counter + * @s0ix_counter: S0ix residency (step adjusted) * * pmc_dev contains info about power management controller device. */ @@ -253,6 +256,10 @@ struct pmc_dev { #endif /* CONFIG_DEBUG_FS */ int pmc_xram_read_bit; struct mutex lock; /* generic mutex lock for PMC Core */ + + bool check_counters; /* Check for counter increments on resume */ + u64 pc10_counter; + u64 s0ix_counter; }; #endif /* PMC_CORE_H */