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