From patchwork Wed Apr 17 23:01:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 10906383 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 6ABE31390 for ; Wed, 17 Apr 2019 23:02:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48EFE28769 for ; Wed, 17 Apr 2019 23:02:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 362F228B06; Wed, 17 Apr 2019 23:02:08 +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 B062E28769 for ; Wed, 17 Apr 2019 23:02:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730037AbfDQXCH (ORCPT ); Wed, 17 Apr 2019 19:02:07 -0400 Received: from mail-pg1-f201.google.com ([209.85.215.201]:53393 "EHLO mail-pg1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728268AbfDQXCG (ORCPT ); Wed, 17 Apr 2019 19:02:06 -0400 Received: by mail-pg1-f201.google.com with SMTP id f7so70817pgi.20 for ; Wed, 17 Apr 2019 16:02:06 -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=AW27o0HP+cyrArj4H0V+gm1HNI3PxlU2rfA1IzSZc1g=; b=FLp7f/Mco2iTE08Gph2vFpyu0koLvmczvpGUMFYCzXId4aQzBg174KKiYZB3tPkdi+ tlaO6jOeUOxxumX8aZf3nKpDtleF+VBpezFQgDBQc6BQNiY/QCv4b8H6ZrNr1X1r1dE5 qfGwnhis51c+3reTXtSvv6nw3smE1lxi3CNNX6kINHoxWx5lQAU1DGuqJZRIVBGcvJ8a 5kM86cRjN3seCMV2KPvFYLIfV+XYnQvvM94/wVrBLiDURFj+zu7F3X9QSG+/qi/SSe3b ffnBZuhK1/ZH0U9QBxGCF9NshU2siSMfb6MKtpd8q3Yk2xRCH+mlwYmhQsP6yoUxeE3h MfOA== 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=AW27o0HP+cyrArj4H0V+gm1HNI3PxlU2rfA1IzSZc1g=; b=ms0/uuYnhrVsBH2GBk7ZB7wXJRIhLd3FzKi4OiEfxwX5SNGCS9oXL41xVJ5t6nkxY4 8ft3FzSg1wqxBS1MS+vQcjlOco2sCXZOC5Rw+5nJZDBgI7QHoia5KcY0WcxnlKfwPBLB ZVUXzUyy5xq8LrZ9MIu0+AZe4QKH42Wz9X3JebYRP2jzG7p6HprDywFuage+djzJVov3 ThAkhAjHkFicNHde/ZbbA221po8DAHaVpaBLy86/DLASwxDg5YoWtOcbAiXM7GhGoD5l ICzj56jZZm/POh8ExYuU+ajM2ixFvASaoGKU9bYBMMwlOKyu8wSHv4gX7d5y6yBaKpLi vsoA== X-Gm-Message-State: APjAAAU/azVpJ9NWadFQAN0tk2QowL1yFkRYUpUs/8w7Zz9n2VEDBWtp rQ1G5r+he4257wMQvlkZBEfrCJ9hHlMd X-Google-Smtp-Source: APXvYqyd3vVpVq7KQzD/8q62DNM0a/p7OI9U71zXPn3/OgJIS/19MAGX0EnFQ3KO1cEXtwyIJsNE9JH8QYQt X-Received: by 2002:a63:2983:: with SMTP id p125mr86811321pgp.262.1555542125849; Wed, 17 Apr 2019 16:02:05 -0700 (PDT) Date: Wed, 17 Apr 2019 16:01:53 -0700 In-Reply-To: <20190313222124.229371-1-rajatja@google.com> Message-Id: <20190417230155.5282-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 v6 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. There is no functional change to the driver, or to the way the devices are instantiated. Signed-off-by: Rajat Jain --- v6: Let the way devices are instantiated exactly the same as before this patch (so no functional change other than converting to a platform device). Use "intel_pmc_core" platform device (no ACPI instantiation) 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 | 65 +++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 8 deletions(-) diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c index 9908d233305e..153e79cc4d5b 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; @@ -886,30 +891,74 @@ static int __init pmc_core_probe(void) return -ENOMEM; mutex_init(&pmcdev->lock); + platform_set_drvdata(pdev, pmcdev); pmcdev->pmc_xram_read_bit = pmc_core_check_read_lock_bit(); + dmi_check_system(pmc_core_dmi_table); 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"); + device_initialized = true; + dev_info(&pdev->dev, " initialized\n"); + 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); pmc_core_dbgfs_unregister(pmcdev); + platform_set_drvdata(pdev, NULL); mutex_destroy(&pmcdev->lock); iounmap(pmcdev->regbase); + return 0; +} + +static struct platform_driver pmc_core_driver = { + .driver = { + .name = "intel_pmc_core", + }, + .probe = pmc_core_probe, + .remove = pmc_core_remove, +}; + +static struct platform_device pmc_core_device = { + .name = "intel_pmc_core", +}; + +static int __init pmc_core_init(void) +{ + int ret; + + if (!x86_match_cpu(intel_pmc_core_ids)) + return -ENODEV; + + ret = platform_driver_register(&pmc_core_driver); + if (ret) + return ret; + + ret = platform_device_register(&pmc_core_device); + if (ret) { + platform_driver_unregister(&pmc_core_driver); + return ret; + } + + return 0; +} + +static void __exit pmc_core_exit(void) +{ + platform_device_unregister(&pmc_core_device); + platform_driver_unregister(&pmc_core_driver); } -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 Apr 17 23:01:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 10906385 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 E08801390 for ; Wed, 17 Apr 2019 23:02:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C73DF28769 for ; Wed, 17 Apr 2019 23:02:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BA61028B06; Wed, 17 Apr 2019 23:02:12 +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 341FE28769 for ; Wed, 17 Apr 2019 23:02:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387627AbfDQXCL (ORCPT ); Wed, 17 Apr 2019 19:02:11 -0400 Received: from mail-pf1-f201.google.com ([209.85.210.201]:37977 "EHLO mail-pf1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387624AbfDQXCL (ORCPT ); Wed, 17 Apr 2019 19:02:11 -0400 Received: by mail-pf1-f201.google.com with SMTP id b12so138518pfj.5 for ; Wed, 17 Apr 2019 16:02:11 -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=tjsQeBEQRTBO6pLvpfRvcaJgX6Ohruhx+KnT38bByg4=; b=N3eguLmmuOPoZhuR6UhNG0d17UzrNgKSpnvQWbQjZGeh6JPIbXFccqGAkUPIFyuQ3E rwAYJo7/SKbsNwk2koLq4XdT0ncglPC+Lx9FRqOeORSa2+sGkki/f/wiSOMcy7oHEedL awaxFji8Ka5CzcaOELuWC4ehEKKHiMOmH56PhOYUmK1hefIr8Jr0GqSVfEOPQL4uDAeW TuwibQjaLuEYJb8pGAOB1GDrvHlNBr0m5IYz9eahvm/Y970UMfkcqG0sO1J+dmSnPodW kkFO9JqbczclIgVLMdnJFPPLFbqJBLOF0CfWHPNRB2oEtdl2Sjgh2M0WlAPy6583YoM4 qkdQ== 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=tjsQeBEQRTBO6pLvpfRvcaJgX6Ohruhx+KnT38bByg4=; b=fiP94jqXSrZx27JcGfVTMZwg1W4R9UYoirlDLL/JL3KClr1iygxrrlakVdQ59Y+VsN PIDSTLs1ar/EQmspIsAm6I96KqCVXrmpiGekdfCJ073Jj4JiNLTQVz3rZxB/DoOxwrb5 pxGmKzNr8Kac4F0sAxfi/924WQtNPowQLkPpLSX3681ZIrAHynp9lIqeitmhTV4KZboG IQVsH67EsH1fb/zBTQ2T2bn8tVes1po9Q+gFd7nNsPz9yuY+LwU3sB1nGG8+DbQcIs4F u09gRDFrQYtr99aAJxOj+k1YceCBriOm6Y/1tFeH1jIBhdG1oSYSmR2b1Eof74OxpIIh LqqQ== X-Gm-Message-State: APjAAAV5g1GaeQuYsCUouPdFS5183hKdWzhdwf/4fZIs3RTGlQsC8qce lbQm8Au9wFRxZIYyztwA5Veojw6N7VSM X-Google-Smtp-Source: APXvYqzy1inLBa6UoA49ujY0/g50v11Jzz3hxHkHUuODEnKXMOTZtvrV4TGcpHTrTegP+TAlsAyv+P8aPRBT X-Received: by 2002:a63:1064:: with SMTP id 36mr85232648pgq.155.1555542130393; Wed, 17 Apr 2019 16:02:10 -0700 (PDT) Date: Wed, 17 Apr 2019 16:01:54 -0700 In-Reply-To: <20190417230155.5282-1-rajatja@google.com> Message-Id: <20190417230155.5282-2-rajatja@google.com> Mime-Version: 1.0 References: <20190313222124.229371-1-rajatja@google.com> <20190417230155.5282-1-rajatja@google.com> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog Subject: [PATCH v6 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 --- v6: Some code restructuring, single conditional per if stmt. Change from dev_warn to dev_dbg. 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 | 105 ++++++++++++++++++++++++++ drivers/platform/x86/intel_pmc_core.h | 7 ++ 2 files changed, 112 insertions(+) diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c index 153e79cc4d5b..1d902230ba61 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 @@ -919,9 +920,113 @@ 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 residency for checking later */ + if (rdmsrl_safe(MSR_PKG_C10_RESIDENCY, &pmcdev->pc10_counter)) + return -EIO; + + /* Save S0ix residency for checking later */ + if (pmc_core_dev_state_get(pmcdev, &pmcdev->s0ix_counter)) + return -EIO; + + 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)) + return false; + + if (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)) + return false; + + if (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); + const struct pmc_bit_map **maps = pmcdev->map->slps0_dbg_maps; + int offset = pmcdev->map->slps0_dbg_offset; + const struct pmc_bit_map *map; + u32 data; + + if (!pmcdev->check_counters) + return 0; + + if (!pmc_core_is_s0ix_failed(pmcdev)) + return 0; + + if (pmc_core_is_pc10_failed(pmcdev)) { + /* S0ix failed because of PC10 entry failure */ + dev_info(dev, "CPU did not enter PC10!!! (PC10 cnt=0x%llx)\n", + pmcdev->pc10_counter); + return 0; + } + + /* The real interesting case - S0ix failed - lets ask PMC why. */ + dev_warn(dev, "CPU did not enter SLP_S0!!! (S0ix cnt=%llu)\n", + pmcdev->s0ix_counter); + while (*maps) { + map = *maps; + data = pmc_core_reg_read(pmcdev, offset); + offset += 4; + while (map->name) { + dev_dbg(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 struct platform_driver pmc_core_driver = { .driver = { .name = "intel_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 */ From patchwork Wed Apr 17 23:01:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 10906387 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 C5F0E1390 for ; Wed, 17 Apr 2019 23:02:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B177028769 for ; Wed, 17 Apr 2019 23:02:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A298028B06; Wed, 17 Apr 2019 23:02:20 +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 1297528769 for ; Wed, 17 Apr 2019 23:02:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387652AbfDQXCP (ORCPT ); Wed, 17 Apr 2019 19:02:15 -0400 Received: from mail-pg1-f202.google.com ([209.85.215.202]:39586 "EHLO mail-pg1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387651AbfDQXCO (ORCPT ); Wed, 17 Apr 2019 19:02:14 -0400 Received: by mail-pg1-f202.google.com with SMTP id m35so94648pgl.6 for ; Wed, 17 Apr 2019 16:02:14 -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=6boVZoHFi8CqfTk8kAtjefSBF8UemwCKpOBEIchoJQ8=; b=SrwuDJ3Ac8e5GTrnlBjwR8NO+Fj76UGcn2RCFYsvPyQSxyjLn1DAIpc81cB/ddaZNg O8+ngY88MWtcBTdLQvR0RQKKaUBmitxVtaN9KTiG1MFdr9nfzWrs+cIq/F4u6fraD5xX Yk81GpW4LELtU6q4AZJ/v9k6gtWFPma8qfRD6+YPHCs1DtyQ1AH0r4FHANY1T0FwGYJV vj7/YEijWhfY2YQZFn8/8w2PIP6JyXbWSbYPIuMPf0qH7NiLCkTv1dkIqcUi1aHFDb5d vuEJ5GAH9rIH3Ah00Jd96gG9QqaNvDGfzzVuo7U8v6b2TA+X+HfDwXfXwH9WGrVLiSvN k3lQ== 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=6boVZoHFi8CqfTk8kAtjefSBF8UemwCKpOBEIchoJQ8=; b=CjmzhdRwDb5D0Jy5asOj5k6t4FviJstRnKhQe1zzOkYrmRy3JAQMcOu8gOAHolnBdg ccElfL1fFp/09F9Hx4SYxhunIhWTFCPgFotF0hJlFEiRTgu8K1LgIjlMpHyChM5ooZU9 za124d8FexaRENadvpaHqmZ3WVPnx0DT/Wl3Uz7sXM97XZIV+9GEzjnRds6hhqxOBZ2j D2uY+ypNxi1GjOgLioXLjv8UPSIt2xJVXVp5MbkXV/7Cg4bGLnzAIXAS/yFBebxGyx71 NSp0+seMfnB40vG5aT3MLQzHoaduHk0yHudNs3UmwobfdeCCz0w9egXOOtwIbrbbaK7l LPgw== X-Gm-Message-State: APjAAAVwYqEHdZgEOzY6n5piMQYy1VyiNG9Xep0JqgYAs2EQkOc2Zp0f muql+jZZ59DcP+DsnWX0PKB9Rfh5COgz X-Google-Smtp-Source: APXvYqwarpx4DtRJAtV8u5l6h7ufOGANGAmvtDd6pYJh+gRTR2oeOx2btYZNitmV73NYwIkvC6fiCIPEZdet X-Received: by 2002:a65:4341:: with SMTP id k1mr86280746pgq.88.1555542133894; Wed, 17 Apr 2019 16:02:13 -0700 (PDT) Date: Wed, 17 Apr 2019 16:01:55 -0700 In-Reply-To: <20190417230155.5282-1-rajatja@google.com> Message-Id: <20190417230155.5282-3-rajatja@google.com> Mime-Version: 1.0 References: <20190313222124.229371-1-rajatja@google.com> <20190417230155.5282-1-rajatja@google.com> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog Subject: [PATCH v6 3/3] platform/x86: intel_pmc_core: Attach using APCI HID "INT33A1" 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 Most modern platforms already have the ACPI device "INT33A1" that could be used to attach to the driver. Switch the driver to using that and thus make the intel_pmc_core.c a pure platform_driver. Some of the legacy platforms though, may still not have this ACPI device in their ACPI tables. Thus for such platforms, move the code to manually instantiate a platform_device into a new file of its own. This would instantiate the intel_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 --- v6: Squash some of the changes of first patch into this patch to work around the bisectability issue. 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 +- drivers/platform/x86/intel_pmc_core.c | 40 +++---------- .../platform/x86/intel_pmc_core_plat_drv.c | 60 +++++++++++++++++++ 3 files changed, 69 insertions(+), 33 deletions(-) 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.c b/drivers/platform/x86/intel_pmc_core.c index 1d902230ba61..f20d08ad39ea 100644 --- a/drivers/platform/x86/intel_pmc_core.c +++ b/drivers/platform/x86/intel_pmc_core.c @@ -1023,47 +1023,23 @@ 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*/ + { } +}; +MODULE_DEVICE_TABLE(acpi, pmc_core_acpi_ids); + static struct platform_driver pmc_core_driver = { .driver = { .name = "intel_pmc_core", + .acpi_match_table = ACPI_PTR(pmc_core_acpi_ids), .pm = &pmc_core_pm_ops, }, .probe = pmc_core_probe, .remove = pmc_core_remove, }; -static struct platform_device pmc_core_device = { - .name = "intel_pmc_core", -}; - -static int __init pmc_core_init(void) -{ - int ret; - - if (!x86_match_cpu(intel_pmc_core_ids)) - return -ENODEV; - - ret = platform_driver_register(&pmc_core_driver); - if (ret) - return ret; - - ret = platform_device_register(&pmc_core_device); - if (ret) { - platform_driver_unregister(&pmc_core_driver); - return ret; - } - - return 0; -} - -static void __exit pmc_core_exit(void) -{ - platform_device_unregister(&pmc_core_device); - platform_driver_unregister(&pmc_core_driver); -} - -module_init(pmc_core_init) -module_exit(pmc_core_exit) +module_platform_driver(pmc_core_driver); MODULE_LICENSE("GPL v2"); MODULE_DESCRIPTION("Intel PMC Core Driver"); 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..20be3eaeb722 --- /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 = "intel_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);