Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp5344912yba; Wed, 10 Apr 2019 17:38:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqwhlksQtVHGTRhijH/SGvCHoq6Uf1DjprcW4FtvsOo0som146DZk7x+6H6ZT60kSS+YicTz X-Received: by 2002:a65:44cd:: with SMTP id g13mr37518659pgs.258.1554943128881; Wed, 10 Apr 2019 17:38:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554943128; cv=none; d=google.com; s=arc-20160816; b=Yhy/kHeYQt7/DivtY4ErlE9Vb5sUUbf7xVdlgLHAHLyvA3PPKK2m+FY3/MrbD3lZlR vSkxwQeWNQUMOAsIrD41AcZIhYzq9FegphjszknONISttLioHwadfg0uPfXvqR+bdzsc AzHW/r4x69+T9llrQkTRbJKZUpx9ayB3VGrNgybOA9hppIXYKofMvbryAvybKBjDN8FG JEn1sUMXHTviuwUq26yLodGpxPmfQ/49ZsdQ6t4U2gnLfqEC1RZUsswmSjw4URv5u3n/ ZHCVRetoV5MalxOdjO/Lf/2FF0szPU3ZooLg+0Do8k1931gczj8SoU3U82Qlzmc0HO/h 1SWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=sjT6DpYQBJJsmTdMcmaumUE9gKAmThJGm77LVwpquRY=; b=c6ZoCThph0BdYkJjODReiR8OxCwQZxeuBnfP+DIlYupftKSgnPTeLjYvE3aKdG1yL0 ak2xUFQ7TXSh8adcpxIvyZcWqldZhMyLbc9+FJ02OhyCbVKeChfNIBmlLhbaCLYulxfA KmhaBFy8pBTPaWiKBQ6Bi48Ipopw9gRSY9NZteDfKtwOO4hL+ZnHEkYAjx+iz8I1ZS13 uI7BwECGyPkTz/ONBTXtAYVjxZDe95MDWG+FQWuE6LAf9ePQ72ZDReXJ5y4Nuwinz9vY on7Tz+N04nS92rxuu6HXnSUEzEHJexVJ9F5cJRYIl2f881Pr0sn9ypxA9wOtlACTOpWl 7JIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=YcOfaefS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l7si33834946plb.219.2019.04.10.17.38.33; Wed, 10 Apr 2019 17:38:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=YcOfaefS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726843AbfDKAhx (ORCPT + 99 others); Wed, 10 Apr 2019 20:37:53 -0400 Received: from mail-pf1-f201.google.com ([209.85.210.201]:40484 "EHLO mail-pf1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726808AbfDKAhw (ORCPT ); Wed, 10 Apr 2019 20:37:52 -0400 Received: by mail-pf1-f201.google.com with SMTP id f7so3018732pfd.7 for ; Wed, 10 Apr 2019 17:37:51 -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=sjT6DpYQBJJsmTdMcmaumUE9gKAmThJGm77LVwpquRY=; b=YcOfaefSzIGtjAzsICexlH/tE/Yrz0TsAy7DYC4/vds8sa5CDEUnYECL4lXluuvabv UGFKkV6i92vKW/qJxJwaQ/3c+6aTquMr2pG+nHY08dnCL3Jx33e6ZzU2wyNw3TKq72Hb eWNI9T0MJF2wzX/+ggZBTVvqww1w5RHAaHm8xl8CgxZjFh5fNpTben3u9DVlYyDTa8vK 1vWVtNwvL9TynMpQaiFEXtOfYKoimKYbrqIIkfPh7HHcopQ+Ox8iiWQU6Riuy2eZHuy7 0qxcTpo5IwsvEl9Cv/Msz1vMBfj1a0tCzmo3v/oYvC2+qtzCuqanT/2T2kgwVph3K8Cb Hu3g== 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=sjT6DpYQBJJsmTdMcmaumUE9gKAmThJGm77LVwpquRY=; b=g41Dn7pzd3y0aE6dOma76Qdj6hPRE5taLQv/P+0XLjAUZpTO4ay5ahGiDcMJRd06PP yP/MKjm+PPYVH0O3Nj4YuhSMXb8B+YDfIONCBhYPHyNCyw4neslifI+zDJSO+B8kvTYs M4n4TRowni1j44EP4hVZ8GPAB3wUmxLCAHXj7peErCGuWNZctf8nvmtdgZsfHZUWmunG qS9ReOkUHC9yXHR2q2aDTbnrHMGNXMugHQlXxiYCOnTLS/PBnWjw4lbXrQfP3EExx0jm EO1xUC4upqaY+Vw1Abf+nOZxWKxqrOMv6ZOsueM+dEkOZe+ih7rRp1MUwJugSj6NpRUT Uv9w== X-Gm-Message-State: APjAAAV8ppkXJEllQmrUN7QgMeVVm6vaVJzLwFLwGA8d5FK1GKPt4qN+ hLOnm409QgnzOrWkaCjk3x9HeVJ1vUVJ X-Received: by 2002:a63:e509:: with SMTP id r9mr1021666pgh.72.1554943071064; Wed, 10 Apr 2019 17:37:51 -0700 (PDT) Date: Wed, 10 Apr 2019 17:37:37 -0700 In-Reply-To: <20190411003738.55073-1-rajatja@google.com> Message-Id: <20190411003738.55073-2-rajatja@google.com> Mime-Version: 1.0 References: <20190313222124.229371-1-rajatja@google.com> <20190411003738.55073-1-rajatja@google.com> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog Subject: [PATCH v5 2/3] 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, Rafael J Wysocki , Srinivas Pandruvada Cc: Rajat Jain , furquan@google.com, evgreen@google.com, rajatxjain@gmail.com Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a module parameter which when enabled, will check on resume, if the last S0ix attempt was successful. If not, the driver would warn and 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 --- v5: Remove the gerrit id from commit log v4: Use 1 condition per if statement, rename some functions. v3: No changes v2: Use pm_suspend_via_firmware() to enable the check only for S0ix drivers/platform/x86/intel_pmc_core.c | 93 +++++++++++++++++++++++++++ drivers/platform/x86/intel_pmc_core.h | 7 ++ 2 files changed, 100 insertions(+) diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c index 8da886e17681..b1f099de5cb3 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 @@ -920,6 +921,97 @@ 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); + + pmcdev->check_counters = false; + + /* No warnings on S0ix failures */ + if (!warn_on_s0ix_failures) + return 0; + + /* Check if the syspend will actually use S0ix */ + if (pm_suspend_via_firmware()) + return 0; + + /* Save PC10 and S0ix residency for checking later */ + if (!rdmsrl_safe(MSR_PKG_C10_RESIDENCY, &pmcdev->pc10_counter) && + !pmc_core_dev_state_get(pmcdev, &pmcdev->s0ix_counter)) + pmcdev->check_counters = true; + + return 0; +} + +static inline bool pmc_core_is_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; + + return false; +} + +static inline bool pmc_core_is_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; + + 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 (pmc_core_is_pc10_failed(pmcdev)) { + dev_info(dev, "PC10 entry had failed (PC10 cnt=0x%llx)\n", + pmcdev->pc10_counter); + } else if (pmc_core_is_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 + +static const struct dev_pm_ops pmc_core_pm_ops = { + SET_LATE_SYSTEM_SLEEP_PM_OPS(pmc_core_suspend, pmc_core_resume) +}; + static const struct acpi_device_id pmc_core_acpi_ids[] = { {"INT33A1", 0}, /* _HID for Intel Power Engine, _CID PNP0D80*/ { } @@ -930,6 +1022,7 @@ static struct platform_driver pmc_core_driver = { .driver = { .name = "pmc_core", .acpi_match_table = ACPI_PTR(pmc_core_acpi_ids), + .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 */ -- 2.21.0.392.gf8f6787159e-goog