From patchwork Thu Apr 11 00:31:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 10894917 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 2676017E0 for ; Thu, 11 Apr 2019 00:31:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13D5F28B47 for ; Thu, 11 Apr 2019 00:31:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 078C128B79; Thu, 11 Apr 2019 00:31:24 +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 906FB28B47 for ; Thu, 11 Apr 2019 00:31:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726215AbfDKAbX (ORCPT ); Wed, 10 Apr 2019 20:31:23 -0400 Received: from mail-ua1-f73.google.com ([209.85.222.73]:46521 "EHLO mail-ua1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726026AbfDKAbX (ORCPT ); Wed, 10 Apr 2019 20:31:23 -0400 Received: by mail-ua1-f73.google.com with SMTP id j8so578050uaq.13 for ; Wed, 10 Apr 2019 17:31:22 -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=fUO4Zc9r9iRqnMXU7pmbDFyIQVT4ORoAx+PUxxOCeLo=; b=pZo8awcaLdM4ZsZS0mw7O8Cq7wGTfkcbZizy5b8WGnKrUaoDIMBYs6TRwCTX1Or/gU 39gg3z/qMcCuqYc22t4noDDTknF4lWdVbR9XXlziXba3NdxkCOttAY5oZQBnMyYWGHUy qxu+AE0XsxynevzOP0N2KXgORCfSA3RD2KbVre1k2fzOFAs1evMyHf8SO4uIDg+ET7+2 ZQnOPOnDaRxCOOgnX58olCG3RdP1pXMUtP97YZjgV5XDmSnn3lH6VzvN845i3e8qILLt 9Mg2ZHz9o9VBWEv2M+jJCNfJ46xhFUvh5GkmPbthn6n2H44muEAHtZtqhAmN97NBsAcB P1pA== 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=fUO4Zc9r9iRqnMXU7pmbDFyIQVT4ORoAx+PUxxOCeLo=; b=jQxADsqyas8KiBLayrNWEMVDDK52hp7jacn84n5ChHGgmiDfYnVRIg8FTbWQrAXHe6 r5ZJ+BKzZQxKrMLcfL2Q34v41r0zkx7C+qGZ6sN6Oun3oD89XYmJfQ6HNjeKAVWYLU8I LTMfoUmLUC1MSU+DTUH0cdEfow38TcOd1O2I86NYL87ZXyxSOl3edn/0r1IwvuiaPpXg GMUmGtDl6ZSKSAiNpduhO+ewxK5SKnhXe8BaGGkaaq1CY+dD7Hus6hL+S7/BMQ6tl+fe 2uoIjQe73WIW7bb2nDQmHGCpRknDXkBEn+EiMZ6Zoar8WvJIxgDxPOYguMoUNBPhcF6z PK4w== X-Gm-Message-State: APjAAAV6KvUa04vDqxoIIm8Bs4Yh4Jf9KsoEgM+WP7Xrxw+3VZR7B9tH VL0rbpZRx8vBkuaQ1OHObhUwVLieXrm7 X-Google-Smtp-Source: APXvYqy/2fjtHKxVyhxosPCF4p9Dx8wnwZu1j0wAj/f00fcr9hZBtZsFmWeG5PfGm5hhhc5KKtguBuo/n9TT X-Received: by 2002:a1f:6095:: with SMTP id u143mr5418278vkb.13.1554942681882; Wed, 10 Apr 2019 17:31:21 -0700 (PDT) Date: Wed, 10 Apr 2019 17:31:05 -0700 In-Reply-To: <20190313222124.229371-1-rajatja@google.com> Message-Id: <20190411003107.52044-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 v4 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 , 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"). Change-Id: I2c2c9bbff48a6548f5c96e18d766ffc4633762c0 Signed-off-by: Rajat Jain --- 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:31:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 10894919 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 13E0A17E0 for ; Thu, 11 Apr 2019 00:31:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 00FE328B47 for ; Thu, 11 Apr 2019 00:31:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E8DD128B79; Thu, 11 Apr 2019 00:31:28 +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 64C0428B47 for ; Thu, 11 Apr 2019 00:31:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726805AbfDKAb1 (ORCPT ); Wed, 10 Apr 2019 20:31:27 -0400 Received: from mail-oi1-f201.google.com ([209.85.167.201]:33798 "EHLO mail-oi1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726796AbfDKAb1 (ORCPT ); Wed, 10 Apr 2019 20:31:27 -0400 Received: by mail-oi1-f201.google.com with SMTP id w10so2049629oie.1 for ; Wed, 10 Apr 2019 17:31:26 -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=tsOWk2cVWqbBlMNxvPpaOSii7DDKlJ5eds47veVZ5KM=; b=Gc1AGrfHtVEdt/uHs01OPStQPQCYN6qaHN1oY/cjLV2bKFFqZQf4e1t7977JwYfRSM rFdmT2qevcipgUzD0EXxYNOhT5Qcpm5D6qS/YYMxe4FFzwsxa42Vbm1oTgMNw43qTt72 a809VWZJ3wS5mN5p69tH9w4cetJ40amBjI8N2HBK4OEzWLhp+LPsCK60uWlgo1NkmsHi cXF376uoGHbkvoGDJOQ97GMkmyueVks6nQLRYJr+Bfi3Ed0LbREaMgiQL8VbGPl7a0AG h2JpKVXfD+NxYHd1GXpBYSptR5QuZQSJDurdpRoXLWqeAvrI0YCAhSwNKdOdYKtQdQ9a 370A== 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=tsOWk2cVWqbBlMNxvPpaOSii7DDKlJ5eds47veVZ5KM=; b=Pdqs2l9Seq0TX5boPp6sbcILsBbVgGbhWrwYc+6Z3bI9YI/8Qo1XLBO8lKPHgGEdEf Z0FRYqOkN38qWu0JMwLeEC/9YRi+FNEDdvm56RuM3m0K8AGMHfDCLVEUCG2qQKkbFwy8 scE4I5nUmjUdD6jsmLbRL7mNTQnyBPHbaiYPdoYsBcVF5jaVDytd2TRDeTDiH+iunzcq xpk4IVBsm0t18CnUGUBDUn0sZlXY0fk+p+kQ7ACskPIuti8fURzzBhFo3EPVz1JF2Bga Uz/vrDu6SV6oE6JMGrPo4aPpiTDJnaHYgpmrEp8YPNFgrROI/3XK8FwdCTmGWFePl9ma cvxQ== X-Gm-Message-State: APjAAAUAZfSHq9Tia96ZOgNd+V3klNiicY0/sE+xVFZ2EyxK8F4S4EjZ eucaXKYr/pvC9HvZQRB37+T0cMIaAdVN X-Google-Smtp-Source: APXvYqzmMg7Oj5HAnFeSq3QEee5yz2a4QbQE22m9EdcM6pl13RQJT3871YbnYo0/akIegvlijeqx0wjQLplZ X-Received: by 2002:aca:abd7:: with SMTP id u206mr3966902oie.36.1554942686486; Wed, 10 Apr 2019 17:31:26 -0700 (PDT) Date: Wed, 10 Apr 2019 17:31:06 -0700 In-Reply-To: <20190411003107.52044-1-rajatja@google.com> Message-Id: <20190411003107.52044-2-rajatja@google.com> Mime-Version: 1.0 References: <20190313222124.229371-1-rajatja@google.com> <20190411003107.52044-1-rajatja@google.com> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog Subject: [PATCH v4 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 , 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 --- 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:31:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 10894921 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 90EEC1708 for ; Thu, 11 Apr 2019 00:31:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D83028B47 for ; Thu, 11 Apr 2019 00:31:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7085C28B79; Thu, 11 Apr 2019 00:31:38 +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 0140528B47 for ; Thu, 11 Apr 2019 00:31:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726854AbfDKAbd (ORCPT ); Wed, 10 Apr 2019 20:31:33 -0400 Received: from mail-qt1-f201.google.com ([209.85.160.201]:55082 "EHLO mail-qt1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726812AbfDKAbd (ORCPT ); Wed, 10 Apr 2019 20:31:33 -0400 Received: by mail-qt1-f201.google.com with SMTP id p26so3955170qtq.21 for ; Wed, 10 Apr 2019 17:31:32 -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=xjs1svdJGaWis4ufgIMZP5hXjuYMKhCw0cBzYAGLyMA=; b=agUBoBwBj4xqdTmLQHczdAFX/old7ot4YrWZUAHLbg8eEgmC+7vsSCHkc6jx+SmcFp U4+U0MKTAeZkSbCHMiW07/VaaqRIUsgfnojKN2TaLVcT+8pK+tGqpOKm3tt3xbkCd4Xp av5eep0mJjx85gltV3QaDlSQ5SMrwzywohDzPfZVIiy+eqApQp8nC53z0p+CAUcRzhs5 IoUl7eyw1pno1LNK6z6wUpMN6kkMfmqk3z6uqoIPTu/cxYVixZFComsUKS6l2/bXrI8K GL7pJCxckG4fcNFys26FdmqEOHXcn7uDl6C0Ec+wjF7VYEU4hYQt6DkIDGHRP79OSbhx L/zw== 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=xjs1svdJGaWis4ufgIMZP5hXjuYMKhCw0cBzYAGLyMA=; b=co2LAxoGL05clyz97saXNaQ53ar7Q1SKr4Tbghbi/FMkz5Z6RkFJPsaDu6mZjgV05Y 8Vw7tbEJBwpyBtOomP+JKIuyNNPZgLHwXjAcyGiSt7yMY337eWdh+WCnxU8HlfuiY3nD pBb8rYWtRsPPcDixz+mLjM+DiUlog3q6XZWxpcAMO3TCtvXTZk2jOwJMnh+0g2glPFmC PKVKseypTcRRn8SoG7TP+TQ5an0hqSNAeC0fG1jBQ05ooRtdkYc1mRpUZA0z1LNnCPFQ xtbbPAAJqmi2PVmc7NziZFvfhXhJMUWwl7n1Hjt4nUDrit1Pcfc33GB5ybeuztF1xeXV SIxg== X-Gm-Message-State: APjAAAXhZ6oDKUiIYO6CTEi3pJNEw+VfzNOkfJUcxeM0ss8r05j8CYOk MjYwuv12XCA2udmZCTOMjQBy04FuXAqR X-Google-Smtp-Source: APXvYqzwWKR48+ul3nTqlDPsoRiLt2SL+DD/vCMf9CWovKHCsFVWD7qZp9WBHS01DVP65LeQnTjHo69GKFhh X-Received: by 2002:ac8:3623:: with SMTP id m32mr5819876qtb.6.1554942692263; Wed, 10 Apr 2019 17:31:32 -0700 (PDT) Date: Wed, 10 Apr 2019 17:31:07 -0700 In-Reply-To: <20190411003107.52044-1-rajatja@google.com> Message-Id: <20190411003107.52044-3-rajatja@google.com> Mime-Version: 1.0 References: <20190313222124.229371-1-rajatja@google.com> <20190411003107.52044-1-rajatja@google.com> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog Subject: [PATCH v4 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 , 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 Change-Id: I62e0909b010c13614feec36e2c72aed984b61734 Signed-off-by: Rajat Jain --- 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);