From patchwork Tue Jun 29 08:47:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Sundar S K X-Patchwork-Id: 12349537 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE1CEC11F66 for ; Tue, 29 Jun 2021 08:48:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A4A2161DC1 for ; Tue, 29 Jun 2021 08:48:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232547AbhF2Iuy (ORCPT ); Tue, 29 Jun 2021 04:50:54 -0400 Received: from mail-mw2nam12on2042.outbound.protection.outlook.com ([40.107.244.42]:42464 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232487AbhF2Iuy (ORCPT ); Tue, 29 Jun 2021 04:50:54 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L6RvryF1AHgpHYW7Z+gt1sAPj8TCd7DuqaOxQxJ82WG1Oobh7VW2S8qO/F2SqDuxaPcLl+ExD6ZjD8Zmc8x76Pd+1R8ScK5LpskM67yQTHDPy1F9lZaUxu+lR6SQl3bxidmKRqtTBCUTvz9mJanGYscwe25v/1ri76PBbkiw1s8TmIe3ymgKCK0lmqKBf7ShXD2iV/sbDlzcR1CFV/dLnp/oEk2AHbLCthARBp+T5AmPvI7sODhe3mWZ6TM2JsoTSa4uorFtPoLae84z5+yaIcs1KqOknnleweabKW57w7bjYZ8aKAqPNvujW4GU9MWmnv4s5t9Eq/y3qJbig6mEIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cNXYP/ijzWaOzLZATDyOQvTKlkdXJnsb3AbfLE/OH2I=; b=etuJ4QAK79tLxyCTPP61Gr11e8lPbUpz9/FZ79h2Kl8kOwbm21csWmJCnASTkTsRYx3SSP6Rck3n0TWNcCIS/W8/4C2GNg0tDz6SONvRoVD6RFH3pwAHCRGjsQ24g1wksO4Yg8CkrB94NPsRhaX1x7nvjwlefHY3t+8QXMuC6Ma8KbvMr95QMzUabX8Ls8P3MSJWUGajNrLHMam0wC57wZS/KH+aXA2DX2ykXddqflBzH28O4Vh42SAK/n3mSV40/w0A+wQ9i0SVij/NandGX2x07XEoxNQDuIXCiqf+KdNYhZ8wEtVfi8jQzgrfHqM0NyWeqy3BqimmC4tb3KvuiA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cNXYP/ijzWaOzLZATDyOQvTKlkdXJnsb3AbfLE/OH2I=; b=w78NyWl8Q2z8Y/XIN3EeVRjYvmMzrmUuLP8wXmkfINFZyoNl7XlxtrkW8CHgbg9TX1bhmF9RgKOblNC9WD3OaclRmMHpsGtJNSXBfH8jC2b7tb7APeOECB1lXyHHt1SQsQ+tDRCEf5AdwnHBlHcxEFVj6X/VKyqugrS2NlD4MhY= Received: from MW4PR03CA0017.namprd03.prod.outlook.com (2603:10b6:303:8f::22) by BN8PR12MB2963.namprd12.prod.outlook.com (2603:10b6:408:61::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.20; Tue, 29 Jun 2021 08:48:26 +0000 Received: from CO1NAM11FT041.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8f:cafe::12) by MW4PR03CA0017.outlook.office365.com (2603:10b6:303:8f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.20 via Frontend Transport; Tue, 29 Jun 2021 08:48:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT041.mail.protection.outlook.com (10.13.174.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4264.18 via Frontend Transport; Tue, 29 Jun 2021 08:48:25 +0000 Received: from jatayu.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Tue, 29 Jun 2021 03:48:23 -0500 From: Shyam Sundar S K To: , , CC: , Shyam Sundar S K Subject: [PATCH v5 1/7] platform/x86: amd-pmc: Fix command completion code Date: Tue, 29 Jun 2021 14:17:57 +0530 Message-ID: <20210629084803.248498-2-Shyam-sundar.S-k@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210629084803.248498-1-Shyam-sundar.S-k@amd.com> References: <20210629084803.248498-1-Shyam-sundar.S-k@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6a52e8c5-971c-48eb-df79-08d93adaa8b7 X-MS-TrafficTypeDiagnostic: BN8PR12MB2963: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: r3w1jpuyRD+3oISqur0Fdh/DdabHwEjrhCqC/0eGjRhK6KFuPyT48E4bLDoDuaqhGL/2ziEgcrsA3CbnTZpvLrZSRwA8+5mvyw6CiQTAa5/UzPqfYwd/UpZ7SC3JpBovd4VC+5/BkyTjmY3sKdUrDlNhF5exFzYQZwmOHHAOnGkEozWQa0c/vn2jktVnYgu5YQa+4Kf7BFmYYtOvlPWbKyQJgdEWXZn2cBAiOjllTk4o7cZ0N1Lsd2DVdWmRPpxI+T/MYGQjWJyj9o8Y66KRN4DQuN3pFA2Pswtz3mQEj9nwNy+FLoLwsMGaCX5cst+ZrUctLgyz41xmbgfTjj5x0atAAH+aTWq5P0SKd9PMHGxT3ESKo/DsXVLprWxegikiCxYSYb5J2M7G0t5+HsgQ+hoj+27b9yvGP/MgRxZXt6ivlog3igfQJksXit3BQw1ooQybwW+k0cgNQuriPNdzflfXaGhVsTCRWy1yiFiKcca+hWAQmWCwLfCTxmQ8DA9J1QMtcZxeSKDz0pdTKaU4nrl9eul950EtGzmqFNtFvflFCE7Y+bRSa/PZ++kEpUb37GiogyFF3a2Gd58zR3FUzbZEHYXEzmhrLQZpt9AYziEZdKXui+c5q7OGRq8SpgtTUDfqqRdRl3QS7PAKgojMdEiM2MhCKkg01rpuukiAw8NMckDGV3flhaxCYbQxr73peXQXFUNrPFm0zHym6Y7TlpxlV/JTSrRVMBBqL+Rlv3U= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(396003)(376002)(346002)(136003)(39860400002)(36840700001)(46966006)(336012)(316002)(110136005)(36756003)(2616005)(54906003)(4326008)(8676002)(1076003)(478600001)(82310400003)(5660300002)(86362001)(426003)(36860700001)(6666004)(186003)(82740400003)(2906002)(47076005)(26005)(8936002)(16526019)(83380400001)(70206006)(81166007)(356005)(7696005)(70586007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2021 08:48:25.5840 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6a52e8c5-971c-48eb-df79-08d93adaa8b7 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT041.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB2963 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org The protocol to submit a job request to SMU is to wait for AMD_PMC_REGISTER_RESPONSE to return 1,meaning SMU is ready to take requests. PMC driver has to make sure that the response code is always AMD_PMC_RESULT_OK before making any command submissions. When we submit a message to SMU, we have to wait until it processes the request. Adding a read_poll_timeout() check as this was missing in the existing code. Also, add a mutex to protect amd_pmc_send_cmd() calls to SMU. Fixes: 156ec4731cb2 ("platform/x86: amd-pmc: Add AMD platform support for S2Idle") Signed-off-by: Shyam Sundar S K Acked-by: Raul E Rangel Reviewed-by: Hans de Goede --- v2: no change v3: - use mutex to protect multiple calls to SMU - add a switch-case to handle smu responses. v4: - Handle different error codes based on smu responses. v5: - Remove redundant rc assignment as pointed by Raul drivers/platform/x86/amd-pmc.c | 38 ++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c index b9da58ee9b1e..1b5f149932c1 100644 --- a/drivers/platform/x86/amd-pmc.c +++ b/drivers/platform/x86/amd-pmc.c @@ -68,6 +68,7 @@ struct amd_pmc_dev { u32 base_addr; u32 cpu_id; struct device *dev; + struct mutex lock; /* generic mutex lock */ #if IS_ENABLED(CONFIG_DEBUG_FS) struct dentry *dbgfs_dir; #endif /* CONFIG_DEBUG_FS */ @@ -138,9 +139,10 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set) u8 msg; u32 val; + mutex_lock(&dev->lock); /* Wait until we get a valid response */ rc = readx_poll_timeout(ioread32, dev->regbase + AMD_PMC_REGISTER_RESPONSE, - val, val > 0, PMC_MSG_DELAY_MIN_US, + val, val != 0, PMC_MSG_DELAY_MIN_US, PMC_MSG_DELAY_MIN_US * RESPONSE_REGISTER_LOOP_MAX); if (rc) { dev_err(dev->dev, "failed to talk to SMU\n"); @@ -156,7 +158,37 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set) /* Write message ID to message ID register */ msg = (dev->cpu_id == AMD_CPU_ID_RN) ? MSG_OS_HINT_RN : MSG_OS_HINT_PCO; amd_pmc_reg_write(dev, AMD_PMC_REGISTER_MESSAGE, msg); - return 0; + /* Wait until we get a valid response */ + rc = readx_poll_timeout(ioread32, dev->regbase + AMD_PMC_REGISTER_RESPONSE, + val, val != 0, PMC_MSG_DELAY_MIN_US, + PMC_MSG_DELAY_MIN_US * RESPONSE_REGISTER_LOOP_MAX); + if (rc) { + dev_err(dev->dev, "SMU response timed out\n"); + goto out_unlock; + } + + switch (val) { + case AMD_PMC_RESULT_OK: + break; + case AMD_PMC_RESULT_CMD_REJECT_BUSY: + dev_err(dev->dev, "SMU not ready. err: 0x%x\n", val); + rc = -EBUSY; + goto out_unlock; + case AMD_PMC_RESULT_CMD_UNKNOWN: + dev_err(dev->dev, "SMU cmd unknown. err: 0x%x\n", val); + rc = -EINVAL; + goto out_unlock; + case AMD_PMC_RESULT_CMD_REJECT_PREREQ: + case AMD_PMC_RESULT_FAILED: + default: + dev_err(dev->dev, "SMU cmd failed. err: 0x%x\n", val); + rc = -EIO; + goto out_unlock; + } + +out_unlock: + mutex_unlock(&dev->lock); + return rc; } static int __maybe_unused amd_pmc_suspend(struct device *dev) @@ -259,6 +291,7 @@ static int amd_pmc_probe(struct platform_device *pdev) amd_pmc_dump_registers(dev); + mutex_init(&dev->lock); platform_set_drvdata(pdev, dev); amd_pmc_dbgfs_register(dev); return 0; @@ -269,6 +302,7 @@ static int amd_pmc_remove(struct platform_device *pdev) struct amd_pmc_dev *dev = platform_get_drvdata(pdev); amd_pmc_dbgfs_unregister(dev); + mutex_destroy(&dev->lock); return 0; } From patchwork Tue Jun 29 08:47:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Sundar S K X-Patchwork-Id: 12349539 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6319C11F66 for ; Tue, 29 Jun 2021 08:48:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B3DF761DC1 for ; Tue, 29 Jun 2021 08:48:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232429AbhF2IvD (ORCPT ); Tue, 29 Jun 2021 04:51:03 -0400 Received: from mail-dm3nam07on2083.outbound.protection.outlook.com ([40.107.95.83]:54635 "EHLO NAM02-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232487AbhF2Iu7 (ORCPT ); Tue, 29 Jun 2021 04:50:59 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BWAaOgVmgkBO7zU+VKI4CWrFe969ktDdJyrVHoB0mw75vELY1MTn0DIkwAmm/yPvkhUsgLKhm+j4I/QYqJe4j0j4piOU8kJGdXV5aiO8WzRG7TegUOrDGAmV+Nv9SMxOLnDrBtd4+joQABKumhFGZN0W3FaHz505KSYJdR+H2p1ReAXIvVZFZ46MDlYAUfXsZT7YEJIjWi+8XEeWlMVRQDLNUWPwalWa8ghmqLBVSV83R1I2sR4OQA9cU4nQyvP7pYOUfHMHFeKGMHBw2MR1nWcHDXIb3xjNMN79lFRBeOBGoca708OPzhE+atIrZ1XWeBrugyybGdZYFk64zPfD+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q1X99rtdJZgS6JUO0Lvd375XCUmasfaYqPYiqmZWN5s=; b=lMn2A968KDkUpaFYeDhrJt/0Wnfi/EAXFJ2bX4gDXL8e4uIWSvZjCZlGt5JGwHZDC6WA5nwQtWKpSgrBqSs7Ay+UrGiS3l8F+qIzW+PgWGTsuKQw12sJb3J15lAoNnWsFdk5/DV5X3ZlLC4fqtLIsXBjMwP1XCt5sEi+eaYJmRLZobCoQ1bMySLD1Pnl9FCmxafY+KRldL05jV8SyYAnRNBzRQ8XpWIyvDlE6HTij0oRGQ55Gn0ClUb6/IMizN1Z2RdrqN9gu1vzAnGTxG4K2vpq8tCslUR88hLPXH+Wcs/n7DfN9fXaRYe8TWVayT+p4yX/rsW692NhN39UrsWAPg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q1X99rtdJZgS6JUO0Lvd375XCUmasfaYqPYiqmZWN5s=; b=A+C36e4RKVFpQoPF4cpy60XK3AO/EgbY0YoK0+CHpxJpIRRvKc35HRqOMCjpbBcanhEHl/PkUQSrytgWIJugj36ZGjMvM6bGVQLbuCEcxvCSP9Ehau1WueIMKHNkh3sj3yZrzB2uYJlUSyqIOomDWGGHQMAnp5C0c6zDBuuZdXM= Received: from MW4PR04CA0300.namprd04.prod.outlook.com (2603:10b6:303:89::35) by BY5PR12MB3875.namprd12.prod.outlook.com (2603:10b6:a03:1ae::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.21; Tue, 29 Jun 2021 08:48:29 +0000 Received: from CO1NAM11FT058.eop-nam11.prod.protection.outlook.com (2603:10b6:303:89:cafe::93) by MW4PR04CA0300.outlook.office365.com (2603:10b6:303:89::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.19 via Frontend Transport; Tue, 29 Jun 2021 08:48:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT058.mail.protection.outlook.com (10.13.174.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4264.18 via Frontend Transport; Tue, 29 Jun 2021 08:48:29 +0000 Received: from jatayu.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Tue, 29 Jun 2021 03:48:26 -0500 From: Shyam Sundar S K To: , , CC: , Shyam Sundar S K Subject: [PATCH v5 2/7] platform/x86: amd-pmc: Fix SMU firmware reporting mechanism Date: Tue, 29 Jun 2021 14:17:58 +0530 Message-ID: <20210629084803.248498-3-Shyam-sundar.S-k@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210629084803.248498-1-Shyam-sundar.S-k@amd.com> References: <20210629084803.248498-1-Shyam-sundar.S-k@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8d83939a-e82b-4f8a-20f6-08d93adaaad9 X-MS-TrafficTypeDiagnostic: BY5PR12MB3875: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1468; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Mm4bJuLfkRuu7BOx6rhsBr/qtld4X9Raa66uGPEQ4NygXBhpbgkOXPZmUXIN8x4u6mjr/oC7Hi3ZvPe+SYOfjEieHz1UoeBuuU0chTUs4OwnmIfOlXNAR9VdH6sw2bdndAF/8T4yVQS/QUqPaTqtcFX7cNWwz9cUvSa+6SyIJWx7zssknJDRcNNDMUVxwUYcg1+4f97GCEAEYSeeIZS6RTbfdKYsFqcfzJTGHQH1mTX0QmGuyUc2syyWtg22ghazecXrmzpxFsjsEmh2zyADP35CgTgHVlrcGIPHM9vyp0fKdJYNrq85uOSAm9VM6FdWZVyfGOhqK6uTiwcBwP9VFbXd/BOU+TgdfsTAswaNh7EmgfK8lBcA/y0vYS/jfq+2jYAivKcVsROz43klPntatFzYCM7jJE9HFLWeXCSGnhfCqY3HojT/htihqbt76KDzM7g7tr3nzKGmfcKOZKoh4fkhlQeBm0BY1FTx+OIELP69PUH4drE5OQemNVe9KRfHP1XjH2V4gnhrlkn+cgS2VXpjoS0mJQmJkX1+90ZHdJSHviRAQIOTBUmqBpXDeGTqC8KcWQnflZ9ve8B4J5CaHVj8yCNLeL27k9hlnfoMUon0SMgSJOpoUs79RsvScfkq5YWqMnEFSQy3tVhqIvzPNfkJl9aHG/vF6DjWmPlnJTJ5pvQKNCMIzsjxF5JRK5HrGWjkrL67jEFklhlvzGmhAEOP48/kV8VGBIBs5U4UQXE= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(396003)(376002)(136003)(39860400002)(346002)(36840700001)(46966006)(26005)(478600001)(54906003)(426003)(186003)(2616005)(316002)(16526019)(110136005)(4326008)(2906002)(83380400001)(7696005)(82740400003)(47076005)(86362001)(336012)(81166007)(36756003)(82310400003)(36860700001)(356005)(8676002)(5660300002)(1076003)(8936002)(6666004)(70206006)(70586007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2021 08:48:29.1574 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8d83939a-e82b-4f8a-20f6-08d93adaaad9 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT058.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3875 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org It was lately understood that the current mechanism available in the driver to get SMU firmware info works only on internal SMU builds and there is a separate way to get all the SMU logging counters (addressed in the next patch). Hence remove all the smu info shown via debugfs as it is no more useful. Fixes: 156ec4731cb2 ("platform/x86: amd-pmc: Add AMD platform support for S2Idle") Signed-off-by: Shyam Sundar S K Reviewed-by: Hans de Goede --- v2: split into multiple patches as suggested by Hans v3: No change v4: No change v5: NO change drivers/platform/x86/amd-pmc.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c index 1b5f149932c1..b1d6175a13b2 100644 --- a/drivers/platform/x86/amd-pmc.c +++ b/drivers/platform/x86/amd-pmc.c @@ -52,7 +52,6 @@ #define AMD_CPU_ID_PCO AMD_CPU_ID_RV #define AMD_CPU_ID_CZN AMD_CPU_ID_RN -#define AMD_SMU_FW_VERSION 0x0 #define PMC_MSG_DELAY_MIN_US 100 #define RESPONSE_REGISTER_LOOP_MAX 200 @@ -89,11 +88,6 @@ static inline void amd_pmc_reg_write(struct amd_pmc_dev *dev, int reg_offset, u3 #ifdef CONFIG_DEBUG_FS static int smu_fw_info_show(struct seq_file *s, void *unused) { - struct amd_pmc_dev *dev = s->private; - u32 value; - - value = ioread32(dev->smu_base + AMD_SMU_FW_VERSION); - seq_printf(s, "SMU FW Info: %x\n", value); return 0; } DEFINE_SHOW_ATTRIBUTE(smu_fw_info); @@ -280,10 +274,6 @@ static int amd_pmc_probe(struct platform_device *pdev) pci_dev_put(rdev); base_addr = ((u64)base_addr_hi << 32 | base_addr_lo); - dev->smu_base = devm_ioremap(dev->dev, base_addr, AMD_PMC_MAPPING_SIZE); - if (!dev->smu_base) - return -ENOMEM; - dev->regbase = devm_ioremap(dev->dev, base_addr + AMD_PMC_BASE_ADDR_OFFSET, AMD_PMC_MAPPING_SIZE); if (!dev->regbase) From patchwork Tue Jun 29 08:47:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Sundar S K X-Patchwork-Id: 12349541 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20551C11F68 for ; Tue, 29 Jun 2021 08:48:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0617161D4D for ; Tue, 29 Jun 2021 08:48:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232487AbhF2IvE (ORCPT ); Tue, 29 Jun 2021 04:51:04 -0400 Received: from mail-dm3nam07on2066.outbound.protection.outlook.com ([40.107.95.66]:38368 "EHLO NAM02-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232601AbhF2IvD (ORCPT ); Tue, 29 Jun 2021 04:51:03 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hBEbj8Ocp0sLfa8sLhavJ+EW7tAFrrQ4kl8Sl4n8rJisLJFzTPwqWkjphxG7MvYGcgtjjZ4MywN4ZSxhnXdrZpIokqhtxhCqIBH0ijofGL1sZPnZzQbTKGkqBWNrsoXapB7UEKwP5q8ai8K/PxXLsH3RA4pfVY8/eUjrOfIePGWDDFM2RNmYxbvQxYrBnyjPytN83S6ONiTnrpEXl6wc0g6OhPATytVRMe7U/ioSnCZH6OuRS/776xn87vGA1yy9W/sGbDNxAwsGkaBRsWMgHDPO6BUkKJ2TAuymRSou9Lt6sWUS2/chLiO/lF3DiJesAU90B4y9RagLTQeKyiw0cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6Rh6MYExMeB/Dc+TZe6I+2nyKRuFeL0NRPXwnCO79IQ=; b=ZkCS4l146s6p4sPXkgS2UjrclFLDL6juiuMr/gH2RnFXKU25AEYyntVcEb5jd7WtG+Vg2yHOpC3emPSR4xzQ6pwYkOEhiuUw9zzTYEL5eW2DzrRlvgKYcO6vPCANtGnD6yhnUrJeXdTYJAKBU4xx4aHg0h52G6lqcGoV54CA9GnvVyr1w1RRC0TSrjpze45av+duG2dtM2sRjAYIlCGYRq5xJUobpxjYA/8EUQimCLAcftY2UzWywoMH94Ha4Ue7p55c/LI3kOyQg/YK3wUNOa9dirHed3If46hXLgskw4vHRvrn+PxhoBnQh7RelKI5keCeMu+OGhAgUusWLee5bg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6Rh6MYExMeB/Dc+TZe6I+2nyKRuFeL0NRPXwnCO79IQ=; b=l/CAs/GzURnYI0/7PN45Xmu9NOPXrsFvQNFkmcLQrsGuq9RwCbh7yQEvLHLhmMy1p9FLyjb02K1U04S3C3jqMOfY689jnWMDQ/oaCzQwe9m4jDMFa3unpP5IdFe3WpUpWETFh+6TzF3sz4dMFlRYw1wqglqc54/tLB5R50fVAjg= Received: from MW4PR04CA0016.namprd04.prod.outlook.com (2603:10b6:303:69::21) by CO6PR12MB5427.namprd12.prod.outlook.com (2603:10b6:5:358::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.19; Tue, 29 Jun 2021 08:48:35 +0000 Received: from CO1NAM11FT020.eop-nam11.prod.protection.outlook.com (2603:10b6:303:69:cafe::d8) by MW4PR04CA0016.outlook.office365.com (2603:10b6:303:69::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.21 via Frontend Transport; Tue, 29 Jun 2021 08:48:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT020.mail.protection.outlook.com (10.13.174.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4264.18 via Frontend Transport; Tue, 29 Jun 2021 08:48:34 +0000 Received: from jatayu.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Tue, 29 Jun 2021 03:48:32 -0500 From: Shyam Sundar S K To: , , CC: , Shyam Sundar S K Subject: [PATCH v5 3/7] platform/x86: amd-pmc: call dump registers only once Date: Tue, 29 Jun 2021 14:17:59 +0530 Message-ID: <20210629084803.248498-4-Shyam-sundar.S-k@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210629084803.248498-1-Shyam-sundar.S-k@amd.com> References: <20210629084803.248498-1-Shyam-sundar.S-k@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 274818f2-4fb1-497a-f3e1-08d93adaae48 X-MS-TrafficTypeDiagnostic: CO6PR12MB5427: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1060; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mikzdSzqp86yoxB2iBLSKWL+iIByXDMYieiTY7yYqk+o571s4Vr7Eji2UYrQ3AkZYpEAw1gDxunSz8uPXWPXDR+CQSYJex88RPvUwBjRKywRPj5PnXlhZjqjKiUco6MjPPdUstLw0PGkxJAyEsx31ocHi54qA6r0k4KU3vBGhk/2JzIl+W62V3791GwlzxP7i/ZMBCu9+BgbEUeEd9Va/H4D2431GgSVolcf3K6p5bguTr1WWqlsjb2PVYKgnSfR0gd/T0HOUNWDFt7cPZr96bH2HNEV+XYnhZfjUvStG0Vga7GeaInzaumlhgXkss/pSCKNEBN7dbtu6cwXrQSFy5quM8yIJS/MkEhZ5A0jFyNF/h/jThvGBH5QsvdYzItA7oYjuWW1JtMesns1VH7QJetrmX7nySQ5AW3IfWZ9BT6+rQeioWqLpNDc++3AnIhTNYSbgkpj17B/XtVRA4AckWJc8+vbf36FdS1O6VaVqbvi596Xf3bImyBmsX7VkbKOobVCCHFCH+YPU5DSdWm7HdoSiaQCrZvEXMe+lSj2RDACte82gk9XwHawXNmW9QpT5ydTC09R9Y4eRPLsIYcrabAPMM/Kl3tJ00/uxArPsilrxIRe6aVLaUn21os8N6AsJ5u+645Huar797lLIGelUfC2Q/GI9WUeYsw8m3rjyAP1Y14PLHHm6ea1yIQiZBGWtTdj0X4bLOZniAnu/K0BOVJJDRp8ddNu0+hDqu7bbP0= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(39860400002)(136003)(396003)(376002)(346002)(46966006)(36840700001)(478600001)(356005)(81166007)(70586007)(70206006)(54906003)(83380400001)(36860700001)(82310400003)(110136005)(26005)(8676002)(47076005)(336012)(5660300002)(426003)(86362001)(82740400003)(186003)(36756003)(2616005)(8936002)(6666004)(2906002)(316002)(16526019)(4326008)(7696005)(1076003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2021 08:48:34.9304 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 274818f2-4fb1-497a-f3e1-08d93adaae48 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT020.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR12MB5427 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Currently amd_pmc_dump_registers() routine is being called at multiple places. The best to call it is after command submission to SMU. Signed-off-by: Shyam Sundar S K Reviewed-by: Hans de Goede --- v2: split into multiple patches as suggested by Hans v3: No change v4: No change v5: No change drivers/platform/x86/amd-pmc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c index b1d6175a13b2..e5107e3b1911 100644 --- a/drivers/platform/x86/amd-pmc.c +++ b/drivers/platform/x86/amd-pmc.c @@ -182,6 +182,7 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set) out_unlock: mutex_unlock(&dev->lock); + amd_pmc_dump_registers(dev); return rc; } @@ -194,7 +195,6 @@ static int __maybe_unused amd_pmc_suspend(struct device *dev) if (rc) dev_err(pdev->dev, "suspend failed\n"); - amd_pmc_dump_registers(pdev); return 0; } @@ -207,7 +207,6 @@ static int __maybe_unused amd_pmc_resume(struct device *dev) if (rc) dev_err(pdev->dev, "resume failed\n"); - amd_pmc_dump_registers(pdev); return 0; } @@ -279,8 +278,6 @@ static int amd_pmc_probe(struct platform_device *pdev) if (!dev->regbase) return -ENOMEM; - amd_pmc_dump_registers(dev); - mutex_init(&dev->lock); platform_set_drvdata(pdev, dev); amd_pmc_dbgfs_register(dev); From patchwork Tue Jun 29 08:48:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Sundar S K X-Patchwork-Id: 12349543 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60046C11F66 for ; Tue, 29 Jun 2021 08:48:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 47F4461DC1 for ; Tue, 29 Jun 2021 08:48:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232601AbhF2IvH (ORCPT ); Tue, 29 Jun 2021 04:51:07 -0400 Received: from mail-mw2nam10on2066.outbound.protection.outlook.com ([40.107.94.66]:29153 "EHLO NAM10-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232599AbhF2IvH (ORCPT ); Tue, 29 Jun 2021 04:51:07 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K/wrJa8xvwuSeDn0IDS1MDF/DCQze9ZFlPGSxaVYqprCPZcmr7/mlvAP8X0RKGDtiG5IYrxeWg9ZP6W1VamzS56Wyjy+ILrnqVu5BIJgysr3Xzs2i0ezrWgByT9DXK2zIJQwjp2vr5C7PtCmW2RdvlppPf0FkJgTYMgq2NguLVecbxQaqL4qI2qd4Iq1JCfn3SYzgEfDwadKfsaDr0S6KPvW/FX965HkBw87wqZIEHuqc8HfQdH4I5lQV2Z8x7QEKdaoOHa+QTdsrKCm2EfFYm85GVa0vyB0YumSDwSVYWpiz0xwmqcl1An5C3SYnmfh8NESN4n+goXVTMpbogwJwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sM3A5EBNXu1VqD1FF9lrwbpj+SKi8AgwAaTV27UuA+s=; b=OLpVSv9S6Gd4bBZFIN0PNGi5OWy2BzswaThTpl1YSRjnwcKuPEPZRqZcC2BvrbqL+Sm3oSjQyQr3azhboful5bRqN8VhyxHuXD2NmF9n7HY2Xd/s/sbw5WvXhXOcwABXH7UB0xdiwuAyPmrag2sY14LIqdU8yy6R+XfQf8Vxx5iBUlZplbET66+s8ZLtytsJriWMGw1q6egU5km51Ye76ca6HuAknR59eSSSwMyXge0ljqDefqzvPAD2w6pOuRSfT/q0nt92DX7Qa8Gym/K0bZgYpB4o6Ap3iyaLPjWxIV6atzT0NVUPFFx1u+efCxL6vyJ/APQFoROa0BtPtPg9SA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sM3A5EBNXu1VqD1FF9lrwbpj+SKi8AgwAaTV27UuA+s=; b=1w/b3yKCp+8JS1O90yE/Tzn8QuEfPSwoAhvNn4rGE1CqVXr6ksMWL3N7w60CLzh4ybwTpSi7652WfwmQA5eTPDGYjIMCYHGtZplVa7ZOMKWr2lFF5Nw6Q10eBGcJGDmxDDhz2kCe7y+VezU8eaEJBjYboD00ZZHIQr5aS+x6c08= Received: from MW4PR03CA0211.namprd03.prod.outlook.com (2603:10b6:303:b9::6) by BL1PR12MB5352.namprd12.prod.outlook.com (2603:10b6:208:314::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18; Tue, 29 Jun 2021 08:48:38 +0000 Received: from CO1NAM11FT050.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b9:cafe::c0) by MW4PR03CA0211.outlook.office365.com (2603:10b6:303:b9::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18 via Frontend Transport; Tue, 29 Jun 2021 08:48:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT050.mail.protection.outlook.com (10.13.174.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4264.18 via Frontend Transport; Tue, 29 Jun 2021 08:48:38 +0000 Received: from jatayu.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Tue, 29 Jun 2021 03:48:35 -0500 From: Shyam Sundar S K To: , , CC: , Shyam Sundar S K Subject: [PATCH v5 4/7] platform/x86: amd-pmc: Add support for logging SMU metrics Date: Tue, 29 Jun 2021 14:18:00 +0530 Message-ID: <20210629084803.248498-5-Shyam-sundar.S-k@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210629084803.248498-1-Shyam-sundar.S-k@amd.com> References: <20210629084803.248498-1-Shyam-sundar.S-k@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 35d5dce8-68b9-4980-dd2b-08d93adab037 X-MS-TrafficTypeDiagnostic: BL1PR12MB5352: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:220; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sSPggDrQDl9e+mMaad5WCMCraidYF9ULAxfc4SVXmnyXdC9lkWRElAKUCgNi85lVulpn83VQt6SSDS6xXOen3zAiIWiJIV2lwmE5ff+2VgrXxP4GtvovRmzq/eFBiYNurY+muOjRb+jcGgtYsW+WkRQ28DQlDLzo1B29+IvWJU0rrHbHep9Bq4KhJTruebkv/2T7fr+x8os0aXu/AFtc0TYUCFPzZgfc0YYcwgob8D0N8Wqhp2w+3YAyzkOQ+5z/ByjpiZxsEPXymyFZRHV4wkzSBWcpo5CWb2CupGfPiDaUpNZll2/1qjtMBc0Da1dd50F5pfJ3JPPGf5xtlxiHH5KAKtepMDo62ehdj80QwhSf9d5EjPZPvvOF9ArdAIppvtwnWJNBWlrqCaljGDKMWGEHTgtlc5TJG4eVU7E+c4O1splKiukXADuwfErJ0B2bRfFh2Mo8lGLHoYAMdGeTC9ydgptdJWBHnIIcaPXu8olAUxAEhWhHGFOxQSbLuETJpllkza9MNkjTmDVInkYd3UIG1q+m3/oNF8hQ7rYN9c5VTRZMlK8ZoNLyfpbkJDWS2dKntmpL8+W0m1zSNP+AklIajLocqEVHDOuOnTsPD5HUliMy6aLTCWXD1cqjj16SbtrSmXgihqL7dhQ8jiQ9OHn2tIEXmgqwc7fXc8Iz4G8zseT5UFIyPQ9dUwbLEWIu08exuWY4E7CrSaxfxr7R57P3zIIORsUwnF/CqHauAIM= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(39860400002)(376002)(136003)(346002)(396003)(46966006)(36840700001)(86362001)(82740400003)(4326008)(8936002)(186003)(16526019)(83380400001)(2616005)(36756003)(82310400003)(36860700001)(47076005)(26005)(8676002)(1076003)(5660300002)(70206006)(2906002)(81166007)(336012)(426003)(110136005)(478600001)(54906003)(7696005)(356005)(6666004)(316002)(70586007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2021 08:48:38.1639 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 35d5dce8-68b9-4980-dd2b-08d93adab037 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT050.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5352 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org SMU provides a way to dump the s0ix debug statistics in the form of a metrics table via a of set special mailbox commands. Add support to the driver which can send these commands to SMU and expose the information received via debugfs. The information contains the s0ix entry/exit, active time of each IP block etc. As a side note, SMU subsystem logging is not supported on Picasso based SoC's. Signed-off-by: Shyam Sundar S K Reviewed-by: Hans de Goede --- v2: No change v3: No change v4: No change v5: No change drivers/platform/x86/amd-pmc.c | 147 +++++++++++++++++++++++++++++++-- 1 file changed, 139 insertions(+), 8 deletions(-) diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c index e5107e3b1911..0ebb2732c46a 100644 --- a/drivers/platform/x86/amd-pmc.c +++ b/drivers/platform/x86/amd-pmc.c @@ -46,6 +46,14 @@ #define AMD_PMC_RESULT_CMD_UNKNOWN 0xFE #define AMD_PMC_RESULT_FAILED 0xFF +/* SMU Message Definations */ +#define SMU_MSG_GETSMUVERSION 0x02 +#define SMU_MSG_LOG_GETDRAM_ADDR_HI 0x04 +#define SMU_MSG_LOG_GETDRAM_ADDR_LO 0x05 +#define SMU_MSG_LOG_START 0x06 +#define SMU_MSG_LOG_RESET 0x07 +#define SMU_MSG_LOG_DUMP_DATA 0x08 +#define SMU_MSG_GET_SUP_CONSTRAINTS 0x09 /* List of supported CPU ids */ #define AMD_CPU_ID_RV 0x15D0 #define AMD_CPU_ID_RN 0x1630 @@ -55,17 +63,42 @@ #define PMC_MSG_DELAY_MIN_US 100 #define RESPONSE_REGISTER_LOOP_MAX 200 +#define SOC_SUBSYSTEM_IP_MAX 12 +#define DELAY_MIN_US 2000 +#define DELAY_MAX_US 3000 enum amd_pmc_def { MSG_TEST = 0x01, MSG_OS_HINT_PCO, MSG_OS_HINT_RN, }; +struct amd_pmc_bit_map { + const char *name; + u32 bit_mask; +}; + +static const struct amd_pmc_bit_map soc15_ip_blk[] = { + {"DISPLAY", BIT(0)}, + {"CPU", BIT(1)}, + {"GFX", BIT(2)}, + {"VDD", BIT(3)}, + {"ACP", BIT(4)}, + {"VCN", BIT(5)}, + {"ISP", BIT(6)}, + {"NBIO", BIT(7)}, + {"DF", BIT(8)}, + {"USB0", BIT(9)}, + {"USB1", BIT(10)}, + {"LAPIC", BIT(11)}, + {} +}; + struct amd_pmc_dev { void __iomem *regbase; - void __iomem *smu_base; + void __iomem *smu_virt_addr; u32 base_addr; u32 cpu_id; + u32 active_ips; struct device *dev; struct mutex lock; /* generic mutex lock */ #if IS_ENABLED(CONFIG_DEBUG_FS) @@ -74,6 +107,7 @@ struct amd_pmc_dev { }; static struct amd_pmc_dev pmc; +static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set, u32 *data, u8 msg, bool ret); static inline u32 amd_pmc_reg_read(struct amd_pmc_dev *dev, int reg_offset) { @@ -85,9 +119,49 @@ static inline void amd_pmc_reg_write(struct amd_pmc_dev *dev, int reg_offset, u3 iowrite32(val, dev->regbase + reg_offset); } +struct smu_metrics { + u32 table_version; + u32 hint_count; + u32 s0i3_cyclecount; + u32 timein_s0i2; + u64 timeentering_s0i3_lastcapture; + u64 timeentering_s0i3_totaltime; + u64 timeto_resume_to_os_lastcapture; + u64 timeto_resume_to_os_totaltime; + u64 timein_s0i3_lastcapture; + u64 timein_s0i3_totaltime; + u64 timein_swdrips_lastcapture; + u64 timein_swdrips_totaltime; + u64 timecondition_notmet_lastcapture[SOC_SUBSYSTEM_IP_MAX]; + u64 timecondition_notmet_totaltime[SOC_SUBSYSTEM_IP_MAX]; +} __packed; + #ifdef CONFIG_DEBUG_FS static int smu_fw_info_show(struct seq_file *s, void *unused) { + struct amd_pmc_dev *dev = s->private; + struct smu_metrics table; + int idx; + + if (dev->cpu_id == AMD_CPU_ID_PCO) + return -EINVAL; + + memcpy_fromio(&table, dev->smu_virt_addr, sizeof(struct smu_metrics)); + + seq_puts(s, "\n=== SMU Statistics ===\n"); + seq_printf(s, "Table Version: %d\n", table.table_version); + seq_printf(s, "Hint Count: %d\n", table.hint_count); + seq_printf(s, "S0i3 Cycle Count: %d\n", table.s0i3_cyclecount); + seq_printf(s, "Time (in us) to S0i3: %lld\n", table.timeentering_s0i3_lastcapture); + seq_printf(s, "Time (in us) in S0i3: %lld\n", table.timein_s0i3_lastcapture); + + seq_puts(s, "\n=== Active time (in us) ===\n"); + for (idx = 0 ; idx < SOC_SUBSYSTEM_IP_MAX ; idx++) { + if (soc15_ip_blk[idx].bit_mask & dev->active_ips) + seq_printf(s, "%-8s : %lld\n", soc15_ip_blk[idx].name, + table.timecondition_notmet_lastcapture[idx]); + } + return 0; } DEFINE_SHOW_ATTRIBUTE(smu_fw_info); @@ -113,6 +187,32 @@ static inline void amd_pmc_dbgfs_unregister(struct amd_pmc_dev *dev) } #endif /* CONFIG_DEBUG_FS */ +static int amd_pmc_setup_smu_logging(struct amd_pmc_dev *dev) +{ + u32 phys_addr_low, phys_addr_hi; + u64 smu_phys_addr; + + if (dev->cpu_id == AMD_CPU_ID_PCO) + return -EINVAL; + + /* Get Active devices list from SMU */ + amd_pmc_send_cmd(dev, 0, &dev->active_ips, SMU_MSG_GET_SUP_CONSTRAINTS, 1); + + /* Get dram address */ + amd_pmc_send_cmd(dev, 0, &phys_addr_low, SMU_MSG_LOG_GETDRAM_ADDR_LO, 1); + amd_pmc_send_cmd(dev, 0, &phys_addr_hi, SMU_MSG_LOG_GETDRAM_ADDR_HI, 1); + smu_phys_addr = ((u64)phys_addr_hi << 32 | phys_addr_low); + + dev->smu_virt_addr = devm_ioremap(dev->dev, smu_phys_addr, sizeof(struct smu_metrics)); + if (!dev->smu_virt_addr) + return -ENOMEM; + + /* Start the logging */ + amd_pmc_send_cmd(dev, 0, NULL, SMU_MSG_LOG_START, 0); + + return 0; +} + static void amd_pmc_dump_registers(struct amd_pmc_dev *dev) { u32 value; @@ -127,10 +227,9 @@ static void amd_pmc_dump_registers(struct amd_pmc_dev *dev) dev_dbg(dev->dev, "AMD_PMC_REGISTER_MESSAGE:%x\n", value); } -static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set) +static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set, u32 *data, u8 msg, bool ret) { int rc; - u8 msg; u32 val; mutex_lock(&dev->lock); @@ -150,8 +249,8 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set) amd_pmc_reg_write(dev, AMD_PMC_REGISTER_ARGUMENT, set); /* Write message ID to message ID register */ - msg = (dev->cpu_id == AMD_CPU_ID_RN) ? MSG_OS_HINT_RN : MSG_OS_HINT_PCO; amd_pmc_reg_write(dev, AMD_PMC_REGISTER_MESSAGE, msg); + /* Wait until we get a valid response */ rc = readx_poll_timeout(ioread32, dev->regbase + AMD_PMC_REGISTER_RESPONSE, val, val != 0, PMC_MSG_DELAY_MIN_US, @@ -163,6 +262,11 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set) switch (val) { case AMD_PMC_RESULT_OK: + if (ret) { + /* PMFW may take longer time to return back the data */ + usleep_range(DELAY_MIN_US, 10 * DELAY_MAX_US); + *data = amd_pmc_reg_read(dev, AMD_PMC_REGISTER_ARGUMENT); + } break; case AMD_PMC_RESULT_CMD_REJECT_BUSY: dev_err(dev->dev, "SMU not ready. err: 0x%x\n", val); @@ -186,12 +290,29 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set) return rc; } +static int amd_pmc_get_os_hint(struct amd_pmc_dev *dev) +{ + switch (dev->cpu_id) { + case AMD_CPU_ID_PCO: + return MSG_OS_HINT_PCO; + case AMD_CPU_ID_RN: + return MSG_OS_HINT_RN; + } + return -EINVAL; +} + static int __maybe_unused amd_pmc_suspend(struct device *dev) { struct amd_pmc_dev *pdev = dev_get_drvdata(dev); int rc; + u8 msg; - rc = amd_pmc_send_cmd(pdev, 1); + /* Reset and Start SMU logging - to monitor the s0i3 stats */ + amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_RESET, 0); + amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_START, 0); + + msg = amd_pmc_get_os_hint(pdev); + rc = amd_pmc_send_cmd(pdev, 1, NULL, msg, 0); if (rc) dev_err(pdev->dev, "suspend failed\n"); @@ -202,8 +323,13 @@ static int __maybe_unused amd_pmc_resume(struct device *dev) { struct amd_pmc_dev *pdev = dev_get_drvdata(dev); int rc; + u8 msg; - rc = amd_pmc_send_cmd(pdev, 0); + /* Let SMU know that we are looking for stats */ + amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_DUMP_DATA, 0); + + msg = amd_pmc_get_os_hint(pdev); + rc = amd_pmc_send_cmd(pdev, 0, NULL, msg, 0); if (rc) dev_err(pdev->dev, "resume failed\n"); @@ -226,8 +352,7 @@ static int amd_pmc_probe(struct platform_device *pdev) { struct amd_pmc_dev *dev = &pmc; struct pci_dev *rdev; - u32 base_addr_lo; - u32 base_addr_hi; + u32 base_addr_lo, base_addr_hi; u64 base_addr; int err; u32 val; @@ -279,6 +404,12 @@ static int amd_pmc_probe(struct platform_device *pdev) return -ENOMEM; mutex_init(&dev->lock); + + /* Use SMU to get the s0i3 debug stats */ + err = amd_pmc_setup_smu_logging(dev); + if (err) + dev_err(dev->dev, "SMU debugging info not supported on this platform\n"); + platform_set_drvdata(pdev, dev); amd_pmc_dbgfs_register(dev); return 0; From patchwork Tue Jun 29 08:48:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Sundar S K X-Patchwork-Id: 12349545 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 967D6C11F66 for ; Tue, 29 Jun 2021 08:48:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 807E461D4D for ; Tue, 29 Jun 2021 08:48:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232603AbhF2IvL (ORCPT ); Tue, 29 Jun 2021 04:51:11 -0400 Received: from mail-bn8nam11on2050.outbound.protection.outlook.com ([40.107.236.50]:6945 "EHLO NAM11-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232599AbhF2IvL (ORCPT ); Tue, 29 Jun 2021 04:51:11 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GHypiqJbbZ5z1m4+e7SwVFy3D2GSLy/Nk8I5duR2c/c/NYb0NPL7r1DKrrikjpanodAqh8B/3S7tMGCTafpAyb8GUeDgyVqbutsd48TABqeme+1lMbYFIaLdhtHi0mCbSSdPEhIYFt7FAOhG6m3swATKOJOSIkMWxuDHkfk6mylMTK0WoN12Xe2u3Ny9GTUP0M1mAeb6ZtTAja47+NYA2QgwBSOpmNgt/4i+9gH2Aa7hvoerl1a/1Hl3rHK+5a9PCxus+KPwTMEIFS6rjBMmLQMWp7/AZcjHhfBD1izGolry8WTwlxKIkkhx4ryBdD/BJEGfJmDx/B2dJ67CmL7vAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ggNbfgBVw52v+4G3pCFXLb/Dm3DIORC8CFEfDsia5lY=; b=fHf+CuhmSCRjXN/dNTV+vENfGTTC4AMspq9boW4MHqkLMG7oE32+jMGNKq92P1laxbvTWHuW4CcnlxcGyi064kgXQn/ptV4G6REOPdsKIuESJFpHfi5Zo8wJEcfDZhh9YxPCAmYzQeq/jpm3VRIxNyzMfU0U5/V9whN+mOaOBJaxKVXn14eJWS+Yxo63oejjSfTwFhIG0m9DK9nYtPbOOTJtG7bIBlNr9rPXSJ6zGW5L0G3R6m8pY4ur7u+2V8OesStkG6uFWyonV7YFDye6H7V/v+xP9wfocO3nlftJeqmzaudYcItGPjAqOF9j2fMSAF7NN1X+boHwyCp2lph4Nw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ggNbfgBVw52v+4G3pCFXLb/Dm3DIORC8CFEfDsia5lY=; b=qA3pylQenmjQgm/ohx9Rlj4qm5NkO7PE2yCSr3CdtGKagj2shA+URVD9HKISAJkzKtjPDrsiEvUrt5NCnj/X42prDIfiNiGeexSbNv4I/Swix/IEMh2TKLtPAjiP5nKD0p05OIG/f7im7yXnhc5ON6JoLGwvbROonF2HTReOZ00= Received: from MWHPR1201CA0014.namprd12.prod.outlook.com (2603:10b6:301:4a::24) by DM6PR12MB3820.namprd12.prod.outlook.com (2603:10b6:5:1c2::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.23; Tue, 29 Jun 2021 08:48:41 +0000 Received: from CO1NAM11FT043.eop-nam11.prod.protection.outlook.com (2603:10b6:301:4a:cafe::e0) by MWHPR1201CA0014.outlook.office365.com (2603:10b6:301:4a::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.19 via Frontend Transport; Tue, 29 Jun 2021 08:48:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT043.mail.protection.outlook.com (10.13.174.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4264.18 via Frontend Transport; Tue, 29 Jun 2021 08:48:41 +0000 Received: from jatayu.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Tue, 29 Jun 2021 03:48:39 -0500 From: Shyam Sundar S K To: , , CC: , Shyam Sundar S K Subject: [PATCH v5 5/7] amd-pmc: Add support for logging s0ix counters Date: Tue, 29 Jun 2021 14:18:01 +0530 Message-ID: <20210629084803.248498-6-Shyam-sundar.S-k@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210629084803.248498-1-Shyam-sundar.S-k@amd.com> References: <20210629084803.248498-1-Shyam-sundar.S-k@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 659b0fc0-e6ff-418f-c145-08d93adab232 X-MS-TrafficTypeDiagnostic: DM6PR12MB3820: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1227; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hLgo+2tlG5Fxu67grkLs2bfUSuFURqmkwLxmFV1XlwwdlH0DS/aa1rAiH4eC73oVmnX0WXdsJbaLdVxMoTXyIXhRgGYRcS4M9T6hTgWf8IxCq3jaTznMF7R3tCZ+RdBBeGLBPxHO/ViHj8VKylaLjSl7kRLYYr6XUAZfe5XtSJY3e2yvyC1l5feEJirzJb1mkwjTLxuHzpzTb9zQMqCLGmx+OJVYTpDP1wHUQVPu55capqnjfCea2NcE6ljR0y6xEYyZRQTglVC0dSH+7+ik+Lrl4uslqIG9YSC5KC2uTtAvTQ7NBrDvFT564FWf9RgPchjUanZzXu5dKfpc9MUJfPbnVcUMYPxocdiKR89uG22P0nEAXRTx1q2shIZZgZ/sbRnTS6WrMUDkCxpaJs7m0Qx+1otK5Kf9cnNSR2VMYJwYZy2i0gGUVpVuWDVN2WMk1Xhm0v4ZL3Pr/MZyLYQsWITatJRo/+t4PXYoz4flIeZkol6PYdE2ngh11Uc62UbEPNLOF0gsG1F125VLQZANDCBn4idj5iJ4nqoUTAFqsNJeX58uKzuE/hr4Qu6Pox19moX80DhZEpmQPRaWMGrXO80wVZBpWhgf8zgXzJZ4iLI+9HX0uDfkRp77USpFCx04rgTjTnA8xxRbz+KbnCPsCBqXTYyke2NIW78c8KkZDNL9IMGDa8bW2Cbqq4MgV9kuGKFu8/Mk5WWEqbHmnmU3lNEWd5c4veRGMz5slsm9Baaf1ilW7xf5TI5N3DK8rraj/mgpHleH61QAnPlCwPEpeA== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(346002)(396003)(376002)(39860400002)(136003)(36840700001)(46966006)(1076003)(8936002)(82310400003)(54906003)(47076005)(2616005)(110136005)(4326008)(81166007)(82740400003)(478600001)(8676002)(356005)(426003)(26005)(316002)(6666004)(36860700001)(70206006)(70586007)(5660300002)(336012)(7696005)(36756003)(2906002)(186003)(86362001)(16526019)(83380400001)(32563001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2021 08:48:41.4939 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 659b0fc0-e6ff-418f-c145-08d93adab232 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT043.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3820 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Even the FCH SSC registers provides certain level of information about the s0ix entry and exit times which comes handy when the SMU fails to report the statistics via the mailbox communication. This information is captured via a new debugfs file "s0ix_stats". A non-zero entry in this counters would mean that the system entered the s0ix state. If s0ix entry time and exit time don't change during suspend to idle, the silicon has not entered the deepest state. Signed-off-by: Shyam Sundar S K Reviewed-by: Hans de Goede --- v2: No change v3: No change v4: No change v5: No change drivers/platform/x86/amd-pmc.c | 45 +++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c index 0ebb2732c46a..7f011c3f60f2 100644 --- a/drivers/platform/x86/amd-pmc.c +++ b/drivers/platform/x86/amd-pmc.c @@ -46,6 +46,15 @@ #define AMD_PMC_RESULT_CMD_UNKNOWN 0xFE #define AMD_PMC_RESULT_FAILED 0xFF +/* FCH SSC Registers */ +#define FCH_S0I3_ENTRY_TIME_L_OFFSET 0x30 +#define FCH_S0I3_ENTRY_TIME_H_OFFSET 0x34 +#define FCH_S0I3_EXIT_TIME_L_OFFSET 0x38 +#define FCH_S0I3_EXIT_TIME_H_OFFSET 0x3C +#define FCH_SSC_MAPPING_SIZE 0x800 +#define FCH_BASE_PHY_ADDR_LOW 0xFED81100 +#define FCH_BASE_PHY_ADDR_HIGH 0x00000000 + /* SMU Message Definations */ #define SMU_MSG_GETSMUVERSION 0x02 #define SMU_MSG_LOG_GETDRAM_ADDR_HI 0x04 @@ -96,6 +105,7 @@ static const struct amd_pmc_bit_map soc15_ip_blk[] = { struct amd_pmc_dev { void __iomem *regbase; void __iomem *smu_virt_addr; + void __iomem *fch_virt_addr; u32 base_addr; u32 cpu_id; u32 active_ips; @@ -166,6 +176,29 @@ static int smu_fw_info_show(struct seq_file *s, void *unused) } DEFINE_SHOW_ATTRIBUTE(smu_fw_info); +static int s0ix_stats_show(struct seq_file *s, void *unused) +{ + struct amd_pmc_dev *dev = s->private; + u64 entry_time, exit_time, residency; + + entry_time = ioread32(dev->fch_virt_addr + FCH_S0I3_ENTRY_TIME_H_OFFSET); + entry_time = entry_time << 32 | ioread32(dev->fch_virt_addr + FCH_S0I3_ENTRY_TIME_L_OFFSET); + + exit_time = ioread32(dev->fch_virt_addr + FCH_S0I3_EXIT_TIME_H_OFFSET); + exit_time = exit_time << 32 | ioread32(dev->fch_virt_addr + FCH_S0I3_EXIT_TIME_L_OFFSET); + + /* It's in 48MHz. We need to convert it */ + residency = (exit_time - entry_time) / 48; + + seq_puts(s, "=== S0ix statistics ===\n"); + seq_printf(s, "S0ix Entry Time: %lld\n", entry_time); + seq_printf(s, "S0ix Exit Time: %lld\n", exit_time); + seq_printf(s, "Residency Time: %lld\n", residency); + + return 0; +} +DEFINE_SHOW_ATTRIBUTE(s0ix_stats); + static void amd_pmc_dbgfs_unregister(struct amd_pmc_dev *dev) { debugfs_remove_recursive(dev->dbgfs_dir); @@ -176,6 +209,8 @@ static void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev) dev->dbgfs_dir = debugfs_create_dir("amd_pmc", NULL); debugfs_create_file("smu_fw_info", 0644, dev->dbgfs_dir, dev, &smu_fw_info_fops); + debugfs_create_file("s0ix_stats", 0644, dev->dbgfs_dir, dev, + &s0ix_stats_fops); } #else static inline void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev) @@ -353,7 +388,7 @@ static int amd_pmc_probe(struct platform_device *pdev) struct amd_pmc_dev *dev = &pmc; struct pci_dev *rdev; u32 base_addr_lo, base_addr_hi; - u64 base_addr; + u64 base_addr, fch_phys_addr; int err; u32 val; @@ -405,6 +440,14 @@ static int amd_pmc_probe(struct platform_device *pdev) mutex_init(&dev->lock); + /* Use FCH registers to get the S0ix stats */ + base_addr_lo = FCH_BASE_PHY_ADDR_LOW; + base_addr_hi = FCH_BASE_PHY_ADDR_HIGH; + fch_phys_addr = ((u64)base_addr_hi << 32 | base_addr_lo); + dev->fch_virt_addr = devm_ioremap(dev->dev, fch_phys_addr, FCH_SSC_MAPPING_SIZE); + if (!dev->fch_virt_addr) + return -ENOMEM; + /* Use SMU to get the s0i3 debug stats */ err = amd_pmc_setup_smu_logging(dev); if (err) From patchwork Tue Jun 29 08:48:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Sundar S K X-Patchwork-Id: 12349547 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C890C11F66 for ; Tue, 29 Jun 2021 08:48:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1AEDA61D4D for ; Tue, 29 Jun 2021 08:48:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232604AbhF2IvP (ORCPT ); Tue, 29 Jun 2021 04:51:15 -0400 Received: from mail-bn7nam10on2053.outbound.protection.outlook.com ([40.107.92.53]:56160 "EHLO NAM10-BN7-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232599AbhF2IvP (ORCPT ); Tue, 29 Jun 2021 04:51:15 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WugPqSi6aOSe3Kj75BtyeUG2RKPV8jeQhf8RIEYQEzqzmkF/IR/+MhR3tG2JaZAj6k0CfKExCTMMAacDs8cFhTLNlqBzkCIpR3GD/vX5GsLwvZMNmL4/uD/mgkJOhcVO5YY4Oq18D62uHEFSesJocUHGTNFd59Syx16EBD4efqi0SyfPYo+spbhHI13N19gn9UTaLI7LkfcRE95QHe58bej7PTH7LWhgTi6qzBNGso2hW1/bhK7UAoPi+ZW9Ip1UDA4nOq9UP2XdTjtXScqJ4J+8kUhJI5+RQ4+dCf4l58WSdeRSjOcKJC/YjFHdEvZlliozL5fcpH251SB+G70WFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HXhwKvrqvRwDRQ/cCUBW5CPa7ipzyEdRwAmmBlfCkLA=; b=ZNJ0xtdiqlDwEqgHmuCXk/Du2uuTKYTGHrZkdtIpb4V3EEJ9JNrbxPPX6izb/AQ1qvLgWij+Xjjyyb+gjDAKhPZgXaSQbZmLWor/MhsfIAZbKjRUUwppIxWdxDYeTmCz9acMw3HfDIEXNX9AmEbae4h0asntRiuZxOCDDnptcoKMfYrkdn4QB3amyojkfwk0kjs5Lqn28oZk6VNh5ijg89SntbiJ4ssagWVO7XoODDcABV4+l1tYyLbS/yxutIQnyG1CAmF7JNsnYyNaupay9wbqyREQ/J803dtOuTdNEz9M+eh2WSxXTkTGUUyzi+jy1o0agmG+CwvpsjS+5t8fkw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HXhwKvrqvRwDRQ/cCUBW5CPa7ipzyEdRwAmmBlfCkLA=; b=diI8iYLAdtizBrZY1kofVwndJ6H04tIVNNUsN1U44UzgzXjz9vRDLTMHxqv4HbMtfjrPrqBNwuv3/leGGD3R9Nrlt9xkSo2M4Qk0t/nq/vuBEpQQGvl2pC2wCTqH7OBNhlehoOff//2nuFqc/2L4DKBkDFbWVkPAoDDkhWxbNF4= Received: from MW4PR04CA0307.namprd04.prod.outlook.com (2603:10b6:303:82::12) by MN2PR12MB4143.namprd12.prod.outlook.com (2603:10b6:208:1d0::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.20; Tue, 29 Jun 2021 08:48:45 +0000 Received: from CO1NAM11FT044.eop-nam11.prod.protection.outlook.com (2603:10b6:303:82:cafe::47) by MW4PR04CA0307.outlook.office365.com (2603:10b6:303:82::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.19 via Frontend Transport; Tue, 29 Jun 2021 08:48:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT044.mail.protection.outlook.com (10.13.175.188) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4264.18 via Frontend Transport; Tue, 29 Jun 2021 08:48:45 +0000 Received: from jatayu.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Tue, 29 Jun 2021 03:48:42 -0500 From: Shyam Sundar S K To: , , CC: , Shyam Sundar S K Subject: [PATCH v5 6/7] platform/x86: amd-pmc: Add support for ACPI ID AMDI0006 Date: Tue, 29 Jun 2021 14:18:02 +0530 Message-ID: <20210629084803.248498-7-Shyam-sundar.S-k@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210629084803.248498-1-Shyam-sundar.S-k@amd.com> References: <20210629084803.248498-1-Shyam-sundar.S-k@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9c1ab666-f9c9-4203-d4b2-08d93adab46c X-MS-TrafficTypeDiagnostic: MN2PR12MB4143: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3044; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HPkUf480bUINEUks3iyYXr9ZEKFbKXYDODXh/KDcZTGW8Csc74obThYxlFH1cXayMq88HN3KgMLYarI8DUcwUi8bgC7PT2yJHEthz1FhVcqX3P6DNMetFcxB9OpOamIDc1gkBYZgTr5K/DURm4zY2FrRewDieiOiMhoaO2WE0icxCmIgvUA5H5TTuqCwukCIrYr+0Cc+Szq1SKptNP68aQ8BtlVYuEGDgNyudU/37FbD2pPiKQ0+cS+OK5pZYK+3XrJwFR6hFmlVdm4Z8TniCTF4mz6H/qL4vXSczF7Wx0B6KXb5jEkkbHPhpP9+SM7uB7SeGU05bRf4J2JExVUyghhvcwP78ugU7DPwPK0JBtF2zXsYfxVZpfPyDJUhyUmgR03g9XVCWK2psmxIhjGu3EVto/87hKkxENQsyOs7UYtMx1jqAwE3Sfe8fwNhATqqOFYbuRxwqTrSj8GvbvqzkLNV5SiDeABem0SSa0kZAVY3YG0fkLFSV++yWZUiiUEjiJb0gDbJXNosTRIFJ4iPhbm+dT5LSoxN1p7/rxjE7XF7bKthjwUD7XAg9JaU3Nrv5yaFicK4hwSeK+wlpZ6+hzbhBZsDaChSQjcolaqb5NA+V2YaLHMrrk6PBtH4qc4bAJzFL/YO6tptwd4DLbRci+8xu+5Sr9OGBhJ4q1GeYbjlpCd93PAAXI+0lzwsXJI5ZAm78uD3Plr65bYa2QOQUE4KfhqyhflsafljAupx1fk= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(346002)(136003)(39860400002)(396003)(376002)(46966006)(36840700001)(82310400003)(7696005)(8676002)(16526019)(1076003)(8936002)(81166007)(478600001)(186003)(336012)(2616005)(110136005)(6666004)(36860700001)(356005)(4326008)(86362001)(70586007)(36756003)(316002)(4744005)(5660300002)(2906002)(47076005)(70206006)(54906003)(426003)(82740400003)(26005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2021 08:48:45.2309 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9c1ab666-f9c9-4203-d4b2-08d93adab46c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT044.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4143 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Some newer BIOSes have added another ACPI ID for the uPEP device. SMU statistics behave identically on this device. Signed-off-by: Shyam Sundar S K Reviewed-by: Hans de Goede --- v2: No change v3: No change v4: No change v5: No change drivers/platform/x86/amd-pmc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c index 7f011c3f60f2..c5054fa2aed9 100644 --- a/drivers/platform/x86/amd-pmc.c +++ b/drivers/platform/x86/amd-pmc.c @@ -469,6 +469,7 @@ static int amd_pmc_remove(struct platform_device *pdev) static const struct acpi_device_id amd_pmc_acpi_ids[] = { {"AMDI0005", 0}, + {"AMDI0006", 0}, {"AMD0004", 0}, { } }; From patchwork Tue Jun 29 08:48:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Sundar S K X-Patchwork-Id: 12349549 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD9B5C11F66 for ; Tue, 29 Jun 2021 08:48:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C631D61D4D for ; Tue, 29 Jun 2021 08:48:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232599AbhF2IvV (ORCPT ); Tue, 29 Jun 2021 04:51:21 -0400 Received: from mail-dm6nam08on2084.outbound.protection.outlook.com ([40.107.102.84]:27008 "EHLO NAM04-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232518AbhF2IvV (ORCPT ); Tue, 29 Jun 2021 04:51:21 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GtXY59C5hCf8LoCyhlZsHKUNo0I7Rz6qLM8kauBgyZyQJCjZNryahPyDLP84Jp47JFjvuibabYC0aBBG18hgdM4888Buw2B9TwrdK62BJydKey87su5epkOweXkpCPhlJHI2Rvx7V9Q9gA80jrA8T3/xeR3eaBSTyjyWNMLC8V5WBEKkW+2udms+Ogwnx+ntakAVIaiIDPFPfs2wI5BBZJO/tBdfNxfKnM8KlczUW1jDV1U87tinqseapfSkWUccsXTJG3aOpFsEm2RCUUTVoxnci4YjKFlO1TTORnI+wTyAH1qTd9IrpnX4UlpkIhEkMI/0J4tkV90p6o0sH8Vqng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TsQfrUz5n1DQjKSjeMpgdYdCtiqZfRlTrnRjUenuFBo=; b=P7VG96raGb1d3YMhezlQ+IrPFacPSNTRt+y/rMC4wKlQhnoWdeZ3bV4H1GJnnO+hfpwkgKBRpYDPnJyMHl04d5fGHRE/HbMMWuWPYX9WKGM3C510Dy/pbSeEIGNbx9WabImYDGCqGZ1zKnoqFGnh4DsQmoLBeiPSBPrADDB9POUB6VPqkDjBJx0U0kUm2ZVTDlOuwNgeCH/PRQc79HkmY6tWuLR9FnCvupYQSScVYsJsq8v9sWGm33IwRdfEKpgvrdvO5JEvp301kKhomnJze7GmLPjrX4TcatJBzpvMbJ2Mp3pdm4elbTsbcuuhH9TN8STKwnATTLyWCC64ybRgIQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TsQfrUz5n1DQjKSjeMpgdYdCtiqZfRlTrnRjUenuFBo=; b=b9wsi1ExOgMIzO9+UVjV/3X/0wqVosf9w9+9axZtT4PnoIZzqfke7vDY91qZIjRBesstdVS3YoSNQ/9I3SlcXSdx24ARksfnMlExBB2Rp+Nwi/J7J3j/ZfAFAla8hCmPmEpU7vMEYclzgDvYwHHzLG56XAdQs/FYaBSdLKoy/ww= Received: from MWHPR12CA0048.namprd12.prod.outlook.com (2603:10b6:301:2::34) by MN2PR12MB4318.namprd12.prod.outlook.com (2603:10b6:208:1d8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18; Tue, 29 Jun 2021 08:48:51 +0000 Received: from CO1NAM11FT032.eop-nam11.prod.protection.outlook.com (2603:10b6:301:2:cafe::36) by MWHPR12CA0048.outlook.office365.com (2603:10b6:301:2::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.19 via Frontend Transport; Tue, 29 Jun 2021 08:48:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT032.mail.protection.outlook.com (10.13.174.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4264.18 via Frontend Transport; Tue, 29 Jun 2021 08:48:51 +0000 Received: from jatayu.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Tue, 29 Jun 2021 03:48:48 -0500 From: Shyam Sundar S K To: , , CC: , Shyam Sundar S K Subject: [PATCH v5 7/7] platform/x86: amd-pmc: Add new acpi id for future PMC controllers Date: Tue, 29 Jun 2021 14:18:03 +0530 Message-ID: <20210629084803.248498-8-Shyam-sundar.S-k@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210629084803.248498-1-Shyam-sundar.S-k@amd.com> References: <20210629084803.248498-1-Shyam-sundar.S-k@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 86e5716d-7813-4fc0-7d25-08d93adab7f6 X-MS-TrafficTypeDiagnostic: MN2PR12MB4318: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1107; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Py++Y56JLTtMTP7TrRBl1scGKu4hFi8HpZbRIvftXVs6ikJnssUdGucvhucBWSDp2RN8WFpdu2uREIGAFqQoVCsARjGFK7iH/Dw+FoClFSVB5kIsaN7hxVWpyittL7XAUk59N9Jh/KwjssKkf0L4HDQkE0VQ7Cf6zMxKzoBXCmJDLaqGx9EsnFr7EuQR/tegvFSXV22Qn9u/5/qri+5ghkeWb5FGkEI4KHBeMID64JGPbRucXIiIwWWI3qVbVFiok+n+3bzedQmS/Fqv2fFdPuSOnLTlDBThAHsRDcVdOAwvzNscv4++++OoOwWuRcniGvaj266RVxU3xxHt+Wi6BZONAHZdqcADUH3LEJFXLlJQYOInmtulUxp+/Ntx68bfgovMCr+H19KrjJE/jzJAqDt0sHtwYUYzDCYyfHEL9cQQJI5+Slq1aeOeWku8Djrkfc1X36DehRm4sNxSoL0bewzYJnQBcBgziZxTter68rGxa2yZ8wMSltD6hviyZd6DD0ET4/Prx0jAs4Vak2EEpmxcJrwxIvR9HUVM32OLpkUZLQw0xnBtBUkIToBbVOL5/qVIP7XTHCksSGs5Jhl2sYlT/BHh1X0I4w3Wcn/z57lSMBsjC4+bRy65LuHM8EK8x3nF1V2EfUf4EH5IymnLFB0LELxH2nchaTveP7370tHO2y7E4b1mxghVg4eKjeMK+xGCRiS/P3fkBr1yMDFUE9Edw5BucPpwlL1wRpKejsQ= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(346002)(136003)(376002)(396003)(39860400002)(46966006)(36840700001)(70206006)(356005)(2906002)(8676002)(81166007)(82740400003)(110136005)(2616005)(47076005)(4326008)(7696005)(478600001)(5660300002)(36860700001)(36756003)(54906003)(16526019)(82310400003)(336012)(186003)(8936002)(426003)(86362001)(26005)(6666004)(70586007)(316002)(1076003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2021 08:48:51.1602 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 86e5716d-7813-4fc0-7d25-08d93adab7f6 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT032.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4318 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org The upcoming PMC controller would have a newer acpi id, add that to the supported acpid device list. Signed-off-by: Shyam Sundar S K Reviewed-by: Hans de Goede --- v2: No change v3: No change v4: No change v5: No change drivers/platform/x86/amd-pmc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c index c5054fa2aed9..d2f9a62e1166 100644 --- a/drivers/platform/x86/amd-pmc.c +++ b/drivers/platform/x86/amd-pmc.c @@ -68,6 +68,7 @@ #define AMD_CPU_ID_RN 0x1630 #define AMD_CPU_ID_PCO AMD_CPU_ID_RV #define AMD_CPU_ID_CZN AMD_CPU_ID_RN +#define AMD_CPU_ID_YC 0x14B5 #define PMC_MSG_DELAY_MIN_US 100 #define RESPONSE_REGISTER_LOOP_MAX 200 @@ -331,6 +332,7 @@ static int amd_pmc_get_os_hint(struct amd_pmc_dev *dev) case AMD_CPU_ID_PCO: return MSG_OS_HINT_PCO; case AMD_CPU_ID_RN: + case AMD_CPU_ID_YC: return MSG_OS_HINT_RN; } return -EINVAL; @@ -376,6 +378,7 @@ static const struct dev_pm_ops amd_pmc_pm_ops = { }; static const struct pci_device_id pmc_pci_ids[] = { + { PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_YC) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_CZN) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_RN) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_PCO) }, @@ -470,6 +473,7 @@ static int amd_pmc_remove(struct platform_device *pdev) static const struct acpi_device_id amd_pmc_acpi_ids[] = { {"AMDI0005", 0}, {"AMDI0006", 0}, + {"AMDI0007", 0}, {"AMD0004", 0}, { } };