From patchwork Thu Apr 11 00:37:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 10894929 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 674D01390 for ; Thu, 11 Apr 2019 00:37:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5574F28A52 for ; Thu, 11 Apr 2019 00:37:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4953928B8E; Thu, 11 Apr 2019 00:37:49 +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 D971428A52 for ; Thu, 11 Apr 2019 00:37:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726664AbfDKAhs (ORCPT ); Wed, 10 Apr 2019 20:37:48 -0400 Received: from mail-pg1-f202.google.com ([209.85.215.202]:37351 "EHLO mail-pg1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726023AbfDKAhs (ORCPT ); Wed, 10 Apr 2019 20:37:48 -0400 Received: by mail-pg1-f202.google.com with SMTP id z12so3201042pgs.4 for ; Wed, 10 Apr 2019 17:37:48 -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=WuCLO1xjYGpgkgYX+R5A6aWXWpQcgwwbzIbNqQedb3g=; b=IcJskFP59nqQ5mMXNq/5o//icwqeVqId2wqPiIY3EhJX2irh1kELAK854GGCOjV/bZ 6HBSJZJF0IYJtNS0SuFmbIf/NTXRo72PCy8hrI65ij3MND33zs969MAU7QFpeaxRzDmJ npgDP39/zC8UvwE/68CJRJ/Y+TCSqBBiyJn95MuznFkAeLBQSKJBOR3KZKKdMAJlaqnl XC06ww6anU8YSYlDonGUu/g1RS/N5b7Zs1IKqheSZRuBObzsFAefwSheZgFVD2Q5Ks6T /aG99s/Z/qQ6ki9llMl4P+mv6G4n82wvrx3ISYjmvFvWbEw3J0/o4UYBb3WBXJWqGHph Yd5A== 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=WuCLO1xjYGpgkgYX+R5A6aWXWpQcgwwbzIbNqQedb3g=; b=f/PiGFYfjWGt4WtAgmjKhp7Jtt0LWPlebaiOW4VjVNSloNEYdQ4geq61KmWaySmukj grhUsSpmeOoBpi4YS96OcqMqeVCQ94oBA8mZORcfIyodv55e0WpTJRhei6GDmwxk9L7T ysfKsi45GBujkxE9OmzpPfLshUHcyywFu1qQEiN+zsv8Nk31cUiKT2InSNP4zpCSBHuu p4LQu7oRn8f+WxY9IqUQDc8GHJE4kwtgaJx6QdFHOGqYGykglCXsBTo5IroPU0Mh1e3N 0/GOKZ1bQ0v4qxSD40FJ+N8/NuYaT6TQHY1R5wDEhcPAiapoXid63Dv3Q6oZlcXCymVn 5dPA== X-Gm-Message-State: APjAAAWRQjNRMJwx9JvXQPZLXjY2E7ljdO7fy+5x2WPIrWdp2v4BHQYW Sde0tFnQJ7YrK7VfnmZXSzM7MhIuQT+O X-Google-Smtp-Source: APXvYqwgi72xgqf2PdPoZjm4GHT4sI2kpVQJuaB+WmgSWW0GWdmHUx5f9z0ItapkZmReasKEYRt/41ll6M4G X-Received: by 2002:a17:902:8f90:: with SMTP id z16mr1946536plo.6.1554943067362; Wed, 10 Apr 2019 17:37:47 -0700 (PDT) Date: Wed, 10 Apr 2019 17:37:36 -0700 In-Reply-To: <20190313222124.229371-1-rajatja@google.com> Message-Id: <20190411003738.55073-1-rajatja@google.com> Mime-Version: 1.0 References: <20190313222124.229371-1-rajatja@google.com> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog Subject: [PATCH v5 1/3] 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, Rafael J Wysocki , Srinivas Pandruvada 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, and attach using the ACPI enumeration method (via the ACPI device "INT33A1"). Signed-off-by: Rajat Jain --- v5: Remove the gerrit ID from commit log v4: put back the x86_match_cpu() method. v3: Don't instantiate the platform_device. Use ACPI enumeration. v2: Rephrase the commit log. No code changes. drivers/platform/x86/intel_pmc_core.c | 42 ++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c index 9908d233305e..8da886e17681 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,13 +855,17 @@ 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) { + static bool device_initialized; struct pmc_dev *pmcdev = &pmc; const struct x86_cpu_id *cpu_id; u64 slp_s0_addr; int err; + if (device_initialized) + return -ENODEV; + cpu_id = x86_match_cpu(intel_pmc_core_ids); if (!cpu_id) return -ENODEV; @@ -888,28 +893,49 @@ static int __init pmc_core_probe(void) mutex_init(&pmcdev->lock); pmcdev->pmc_xram_read_bit = pmc_core_check_read_lock_bit(); + dmi_check_system(pmc_core_dmi_table); + platform_set_drvdata(pdev, pmcdev); + err = pmc_core_dbgfs_register(pmcdev); if (err < 0) { - pr_warn(" debugfs register failed.\n"); + dev_warn(&pdev->dev, "debugfs register failed.\n"); iounmap(pmcdev->regbase); return err; } - dmi_check_system(pmc_core_dmi_table); - pr_info(" initialized\n"); + dev_info(&pdev->dev, " initialized\n"); + device_initialized = true; + return 0; } -module_init(pmc_core_probe) -static void __exit pmc_core_remove(void) +static int pmc_core_remove(struct platform_device *pdev) { - struct pmc_dev *pmcdev = &pmc; + struct pmc_dev *pmcdev = platform_get_drvdata(pdev); + platform_set_drvdata(pdev, NULL); pmc_core_dbgfs_unregister(pmcdev); mutex_destroy(&pmcdev->lock); iounmap(pmcdev->regbase); + return 0; } -module_exit(pmc_core_remove) + +static const struct acpi_device_id pmc_core_acpi_ids[] = { + {"INT33A1", 0}, /* _HID for Intel Power Engine, _CID PNP0D80*/ + { } +}; +MODULE_DEVICE_TABLE(acpi, pmc_core_acpi_ids); + +static struct platform_driver pmc_core_driver = { + .driver = { + .name = "pmc_core", + .acpi_match_table = ACPI_PTR(pmc_core_acpi_ids), + }, + .probe = pmc_core_probe, + .remove = pmc_core_remove, +}; + +module_platform_driver(pmc_core_driver); MODULE_LICENSE("GPL v2"); MODULE_DESCRIPTION("Intel PMC Core Driver"); From patchwork Thu Apr 11 00:37:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 10894933 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 58C9E17E0 for ; Thu, 11 Apr 2019 00:38:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 468F428A52 for ; Thu, 11 Apr 2019 00:38:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3AEAB28B8E; Thu, 11 Apr 2019 00:38:03 +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 A6ED428A52 for ; Thu, 11 Apr 2019 00:38:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726813AbfDKAhx (ORCPT ); Wed, 10 Apr 2019 20:37:53 -0400 Received: from mail-pg1-f202.google.com ([209.85.215.202]:54774 "EHLO mail-pg1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725982AbfDKAhw (ORCPT ); Wed, 10 Apr 2019 20:37:52 -0400 Received: by mail-pg1-f202.google.com with SMTP id d1so3167025pgk.21 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=T/yYBDCZ7HtUqGkqdQePFb1WWyGZQDUebha4Yad7/Vv63n8qWrXEEtViWuHrN1e0iJ +CsVX/99WDkxdKRqvYGqyqCHSDBVP3wb/YmFfMMRVByeUG9/Av0rEmwGiXAG7IdPeorX JwarKVjdz6SgpDA1dPc9h1r4l5fJGis5zESCY2smJbr6omzSxnMm4mR93JiVP/dlv05n wEASKEuCVE+3BQU/xcmPDJhVdbtjKfT3I3r/2KJLXCksz2psSsoJFo5kNrFhMu4eG+OD 2Xo80IVMd3LYJ9EU9fwZVCtPSRz+M5v2BLAwhQMP7idfVEOthPMguAAgHdzFI/Mn4TKZ UWcA== X-Gm-Message-State: APjAAAVZnoH+sx7HRXNgWYR8l/L31TIFKlYaO3aTEDfWLniBpKXYeUM0 l7KC9J1zRt8t1QGEmsVzn2ZH3I2uRRzr X-Google-Smtp-Source: APXvYqwvjgloPKcxsL0dvH9X1D10OuR44FqgdnKpSKYIciLLjbjrqPyiM6HKDhaNdE0But0XwSxZg2yPWp29 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 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 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 */ From patchwork Thu Apr 11 00:37:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 10894931 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 5FDEB1390 for ; Thu, 11 Apr 2019 00:38:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C35D28A52 for ; Thu, 11 Apr 2019 00:38:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F5A728B8E; Thu, 11 Apr 2019 00:38:01 +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 AAC5B28A52 for ; Thu, 11 Apr 2019 00:38:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726861AbfDKAh4 (ORCPT ); Wed, 10 Apr 2019 20:37:56 -0400 Received: from mail-pg1-f202.google.com ([209.85.215.202]:35555 "EHLO mail-pg1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726808AbfDKAhz (ORCPT ); Wed, 10 Apr 2019 20:37:55 -0400 Received: by mail-pg1-f202.google.com with SMTP id e12so3207732pgh.2 for ; Wed, 10 Apr 2019 17:37:55 -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=oLvu2mT5i1BpEbySl7Fp8s1jOl3qOBFGY/Az2WC0VvQ=; b=l+RfuE2psMafhnwq8brXACkbqChBSMMzAXtaDK29pQho4kjn9v5FIm3FBvblZSG23d lKcPVA2PNIxyBDbHfShCghdoAH7I8tnV3ev4cFODFGPYW3pUh0FQ507Wg3X2tBhizVXT KdaM46XRfvHYR0wVKwkgW0eQPjxXyf1KUbP5LlbyZpcP7GYnus0iOkj9wKdctadWGsuw 6YgYL1WV3R0xsJbzMbde/eFXC3/1CVa4kzSsfjtaw5EW/MYN+UfQuqnKO8vdg976ojPM mPl5oKmcKLila5wMzcwxva6Fh1Qdj8cPmRXcmWB9rwbS7pZPkHVoZzo6L9Ly12F0FRVm t70Q== 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=oLvu2mT5i1BpEbySl7Fp8s1jOl3qOBFGY/Az2WC0VvQ=; b=gDuu3BzbjYnfcyKYPEVmI4I01Ob9Upw1zhdALvrYGK9NB6c6cqkmHIjIghE/vLQxVG uoosJwbyG+E34WDoxFcSzNdBDn/Fcgl22YK5MwbcDIR2RUPs+lhsmqea+zEifyEXMCzi pcsPJ3a6as84Hf0Dhj4fYxnMjraAfwGeiy1ZECf0NBRPYyNMi/ZSGYhKmoGf6QQCx8Pr NnFJTJp3sY8Lh++/0WGJ3vVYZwTQofESKJLkW0GUkPZF3+Jj9b3u3XWxjVM3HaOAZPrz kcYwbg8D13YMdbhAX3sUNJ/sEHpvir7Oui0WIe5659IGYEIlEQFu6pfR75vK1A2YGnRC WGTg== X-Gm-Message-State: APjAAAWDfh+kCGoecZm8/Oj+Wg+zz6nOI8Y4Eu0rV25RRkL7/HFHHOFa H0fn5h5BCprxQ0Y0rjt99lCFBRCys7SK X-Google-Smtp-Source: APXvYqyQ8rsdf/VmcDTluedaSx/wBKHduVhQpZemB/a9JmcVcgP1FWFY0dLRkwqH3GNy8nQb5BVvSL6lOgCb X-Received: by 2002:a17:902:6b8c:: with SMTP id p12mr181045plk.37.1554943074511; Wed, 10 Apr 2019 17:37:54 -0700 (PDT) Date: Wed, 10 Apr 2019 17:37:38 -0700 In-Reply-To: <20190411003738.55073-1-rajatja@google.com> Message-Id: <20190411003738.55073-3-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 3/3] platform/x86: intel_pmc_core: Instantiate pmc_core device on legacy platforms 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 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 code to instantiate the pmc_core platform device and thus attach to the driver, if the ACPI device for the same ("INT33A1") is not present in a system where it should be. This was discussed here: https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1966991.html Signed-off-by: Rajat Jain --- v5: Remove the gerrit id from commit log v4: Rename file, remove dummy arg, 1 conditional per if statement, simplify init / exit calls.. v3: (first version of *this* patch -to go with rest of v3 patchset) v2: (does not exist) v1: (does not exist) drivers/platform/x86/Makefile | 2 +- .../platform/x86/intel_pmc_core_plat_drv.c | 60 +++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 drivers/platform/x86/intel_pmc_core_plat_drv.c diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 86cb76677bc8..7041a88c34c7 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -89,7 +89,7 @@ obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += intel_bxtwc_tmu.o obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_core.o \ intel_telemetry_pltdrv.o \ intel_telemetry_debugfs.o -obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core.o +obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core.o intel_pmc_core_plat_drv.o obj-$(CONFIG_PMC_ATOM) += pmc_atom.o obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o obj-$(CONFIG_INTEL_TURBO_MAX_3) += intel_turbo_max_3.o diff --git a/drivers/platform/x86/intel_pmc_core_plat_drv.c b/drivers/platform/x86/intel_pmc_core_plat_drv.c new file mode 100644 index 000000000000..7f5af5bd7f1f --- /dev/null +++ b/drivers/platform/x86/intel_pmc_core_plat_drv.c @@ -0,0 +1,60 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* + * Intel PMC Core platform init + * Copyright (c) 2019, Google Inc. + * Author - Rajat Jain + * + * This code instantiates platform devices for intel_pmc_core driver, only + * on supported platforms that may not have the ACPI devices in the ACPI tables. + * No new platforms should be added here, because we expect that new platforms + * should all have the ACPI device, which is the preferred way of enumeration. + */ + +#include +#include + +#include +#include + +static struct platform_device pmc_core_device = { + .name = "pmc_core", +}; + +/* + * intel_pmc_core_platform_ids is the list of platforms where we want to + * instantiate the platform_device if not already instantiated. This is + * different than intel_pmc_core_ids in intel_pmc_core.c which is the + * list of platforms that the driver supports for pmc_core device. The + * other list may grow, but this list should not. + */ +static const struct x86_cpu_id intel_pmc_core_platform_ids[] = { + INTEL_CPU_FAM6(SKYLAKE_MOBILE, pmc_core_device), + INTEL_CPU_FAM6(SKYLAKE_DESKTOP, pmc_core_device), + INTEL_CPU_FAM6(KABYLAKE_MOBILE, pmc_core_device), + INTEL_CPU_FAM6(KABYLAKE_DESKTOP, pmc_core_device), + INTEL_CPU_FAM6(CANNONLAKE_MOBILE, pmc_core_device), + INTEL_CPU_FAM6(ICELAKE_MOBILE, pmc_core_device), + {} +}; +MODULE_DEVICE_TABLE(x86cpu, intel_pmc_core_platform_ids); + +static int __init pmc_core_platform_init(void) +{ + /* Skip creating the platform device if ACPI already has a device */ + if (acpi_dev_present("INT33A1", NULL, -1)) + return -ENODEV; + + if (!x86_match_cpu(intel_pmc_core_platform_ids)) + return -ENODEV; + + return platform_device_register(&pmc_core_device); +} + +static void __exit pmc_core_platform_exit(void) +{ + platform_device_unregister(&pmc_core_device); +} + +module_init(pmc_core_platform_init); +module_exit(pmc_core_platform_exit);