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");