From patchwork Wed Dec 30 02:54:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chakravarty, Souvik K" X-Patchwork-Id: 7931741 Return-Path: X-Original-To: patchwork-platform-driver-x86@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E0E1EBEEE5 for ; Wed, 30 Dec 2015 02:54:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DC1DD20120 for ; Wed, 30 Dec 2015 02:54:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF5F12010B for ; Wed, 30 Dec 2015 02:54:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752664AbbL3Cye (ORCPT ); Tue, 29 Dec 2015 21:54:34 -0500 Received: from mga02.intel.com ([134.134.136.20]:39377 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752158AbbL3Cyd convert rfc822-to-8bit (ORCPT ); Tue, 29 Dec 2015 21:54:33 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP; 29 Dec 2015 18:54:33 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,498,1444719600"; d="scan'208";a="883221220" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga002.fm.intel.com with ESMTP; 29 Dec 2015 18:54:33 -0800 Received: from fmsmsx119.amr.corp.intel.com (10.18.124.207) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 29 Dec 2015 18:54:32 -0800 Received: from bgsmsx151.gar.corp.intel.com (10.224.48.42) by FMSMSX119.amr.corp.intel.com (10.18.124.207) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 29 Dec 2015 18:54:32 -0800 Received: from bgsmsx105.gar.corp.intel.com ([169.254.3.167]) by BGSMSX151.gar.corp.intel.com ([169.254.3.6]) with mapi id 14.03.0248.002; Wed, 30 Dec 2015 08:24:29 +0530 From: "Chakravarty, Souvik K" To: "platform-driver-x86@vger.kernel.org" CC: "dvhart@infradead.org" , "Kasagar, Srinidhi" , "Zha, Qipeng" , "Muralidhar, Rajeev D" , "Ghorai, Sukumar" , "Yu, Ong Hock" , "Li, Aubrey" , "rjw@rjwysocki.net" Subject: RE: [PATCH v4 2/5] platform:x86: Add Intel telemetry platform device Thread-Topic: [PATCH v4 2/5] platform:x86: Add Intel telemetry platform device Thread-Index: AQHRPW3zPLltRxANTEmEuwgwmy8TnZ7i3+Iw Date: Wed, 30 Dec 2015 02:54:28 +0000 Message-ID: <5F7315E704FA0841B5DFCE90329B2BB42B74AD63@BGSMSX105.gar.corp.intel.com> References: <1450867389-11291-1-git-send-email-souvik.k.chakravarty@intel.com> In-Reply-To: <1450867389-11291-1-git-send-email-souvik.k.chakravarty@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.223.10.10] MIME-Version: 1.0 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP + Rafael -----Original Message----- From: Chakravarty, Souvik K Sent: Wednesday, December 23, 2015 4:13 PM To: platform-driver-x86@vger.kernel.org Cc: dvhart@infradead.org; Kasagar, Srinidhi ; Zha, Qipeng ; Muralidhar, Rajeev D ; Ghorai, Sukumar ; Yu, Ong Hock ; Li, Aubrey ; Chakravarty, Souvik K Subject: [PATCH v4 2/5] platform:x86: Add Intel telemetry platform device Telemetry Device is created by the pmc_ipc driver. Resources are populated according SSRAM region as indicated by the BIOS tables. Signed-off-by: Souvik Kumar Chakravarty --- Changes in v4: * Patch v3 2/5 is split in 2 patches according to Device and Driver addition --- Changes in v3: * Clean code using checkpatch.pl from Kernel v4.3-rc4 --- Changes in v2: * Fix issues in code style, indentation & comments * Follow kernel-doc sytle comments * Changed Banner to include "All Rights Reserved" * Change telemetry_plt_config.telem_in_use type to bool * Introduce Default empty platform specific callbacks to remove NULL checks * Use pr_fmt in init * Change to MODULE_LICENSE to GPL --- drivers/platform/x86/intel_pmc_ipc.c | 96 ++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) return ret; } +static int ipc_create_telemetry_device(void) { + struct platform_device *pdev; + struct resource *res; + int ret; + + pdev = platform_device_alloc(TELEMETRY_DEVICE_NAME, -1); + if (!pdev) { + dev_err(ipcdev.dev, + "Failed to allocate telemetry platform device\n"); + return -ENOMEM; + } + + pdev->dev.parent = ipcdev.dev; + + res = telemetry_res + TELEMETRY_RESOURCE_PUNIT_SSRAM; + res->start = ipcdev.telem_punit_ssram_base; + res->end = res->start + ipcdev.telem_punit_ssram_size - 1; + + res = telemetry_res + TELEMETRY_RESOURCE_PMC_SSRAM; + res->start = ipcdev.telem_pmc_ssram_base; + res->end = res->start + ipcdev.telem_pmc_ssram_size - 1; + + ret = platform_device_add_resources(pdev, telemetry_res, + ARRAY_SIZE(telemetry_res)); + if (ret) { + dev_err(ipcdev.dev, + "Failed to add telemetry platform resources\n"); + goto err; + } + + ret = platform_device_add(pdev); + if (ret) { + dev_err(ipcdev.dev, + "Failed to add telemetry platform device\n"); + goto err; + } + ipcdev.telemetry_dev = pdev; + + return 0; +err: + platform_device_put(pdev); + return ret; +} + static int ipc_create_pmc_devices(void) { int ret; @@ -588,6 +658,14 @@ static int ipc_create_pmc_devices(void) dev_err(ipcdev.dev, "Failed to add punit platform device\n"); platform_device_unregister(ipcdev.tco_dev); } + + if (!ipcdev.telem_res_inval) { + ret = ipc_create_telemetry_device(); + if (ret) + dev_warn(ipcdev.dev, + "Failed to add telemetry platform device\n"); + } + return ret; } @@ -692,6 +770,22 @@ static int ipc_plat_get_res(struct platform_device *pdev) ipcdev.gcr_size = PLAT_RESOURCE_GCR_SIZE; dev_info(&pdev->dev, "ipc res: %pR\n", res); + ipcdev.telem_res_inval = 0; + res = platform_get_resource(pdev, IORESOURCE_MEM, + PLAT_RESOURCE_TELEM_SSRAM_INDEX); + if (!res) { + dev_err(&pdev->dev, "Failed to get telemetry ssram resource\n"); + ipcdev.telem_res_inval = 1; + } else { + ipcdev.telem_punit_ssram_base = res->start + + TELEM_PUNIT_SSRAM_OFFSET; + ipcdev.telem_punit_ssram_size = TELEM_SSRAM_SIZE; + ipcdev.telem_pmc_ssram_base = res->start + + TELEM_PMC_SSRAM_OFFSET; + ipcdev.telem_pmc_ssram_size = TELEM_SSRAM_SIZE; + dev_info(&pdev->dev, "telemetry ssram res: %pR\n", res); + } + return 0; } @@ -749,6 +843,7 @@ err_sys: err_irq: platform_device_unregister(ipcdev.tco_dev); platform_device_unregister(ipcdev.punit_dev); + platform_device_unregister(ipcdev.telemetry_dev); err_device: iounmap(ipcdev.ipc_base); res = platform_get_resource(pdev, IORESOURCE_MEM, @@ -766,6 +861,7 @@ static int ipc_plat_remove(struct platform_device *pdev) free_irq(ipcdev.irq, &ipcdev); platform_device_unregister(ipcdev.tco_dev); platform_device_unregister(ipcdev.punit_dev); + platform_device_unregister(ipcdev.telemetry_dev); iounmap(ipcdev.ipc_base); res = platform_get_resource(pdev, IORESOURCE_MEM, PLAT_RESOURCE_IPC_INDEX); -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/platform/x86/intel_pmc_ipc.c b/drivers/platform/x86/intel_pmc_ipc.c index ca69135..092519e 100644 --- a/drivers/platform/x86/intel_pmc_ipc.c +++ b/drivers/platform/x86/intel_pmc_ipc.c @@ -70,6 +70,7 @@ #define PLAT_RESOURCE_GCR_SIZE 0x1000 #define PLAT_RESOURCE_BIOS_DATA_INDEX 1 #define PLAT_RESOURCE_BIOS_IFACE_INDEX 2 +#define PLAT_RESOURCE_TELEM_SSRAM_INDEX 3 #define PLAT_RESOURCE_ISP_DATA_INDEX 4 #define PLAT_RESOURCE_ISP_IFACE_INDEX 5 #define PLAT_RESOURCE_GTD_DATA_INDEX 6 @@ -88,6 +89,10 @@ #define TCO_BASE_OFFSET 0x60 #define TCO_REGS_SIZE 16 #define PUNIT_DEVICE_NAME "intel_punit_ipc" +#define TELEMETRY_DEVICE_NAME "intel_telemetry" +#define TELEM_SSRAM_SIZE 240 +#define TELEM_PMC_SSRAM_OFFSET 0x1B00 +#define TELEM_PUNIT_SSRAM_OFFSET 0x1A00 static const int iTCO_version = 3; @@ -110,6 +115,14 @@ static struct intel_pmc_ipc_dev { /* punit */ struct platform_device *punit_dev; + + /* Telemetry */ + resource_size_t telem_pmc_ssram_base; + resource_size_t telem_punit_ssram_base; + int telem_pmc_ssram_size; + int telem_punit_ssram_size; + u8 telem_res_inval; + struct platform_device *telemetry_dev; } ipcdev; static char *ipc_err_sources[] = { @@ -491,6 +504,18 @@ static struct itco_wdt_platform_data tco_info = { .version = 3, }; +#define TELEMETRY_RESOURCE_PUNIT_SSRAM 0 +#define TELEMETRY_RESOURCE_PMC_SSRAM 1 +static struct resource telemetry_res[] = { + /*Telemetry*/ + { + .flags = IORESOURCE_MEM, + }, + { + .flags = IORESOURCE_MEM, + }, +}; + static int ipc_create_punit_device(void) { struct platform_device *pdev; @@ -574,6 +599,51 @@ err: