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