From patchwork Tue Nov 16 07:39:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Goswami, Sanket" X-Patchwork-Id: 12621681 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80F62C433EF for ; Tue, 16 Nov 2021 07:41:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E34A619EC for ; Tue, 16 Nov 2021 07:41:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231355AbhKPHoO (ORCPT ); Tue, 16 Nov 2021 02:44:14 -0500 Received: from mail-bn7nam10on2061.outbound.protection.outlook.com ([40.107.92.61]:41728 "EHLO NAM10-BN7-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S231401AbhKPHn7 (ORCPT ); Tue, 16 Nov 2021 02:43:59 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BsiKDEBlsE7goP7ezJBle0S2+cLOXM06m/TgFkE69nqRTRx2ys+fFrOzL/CGOT8ca/mTE7Bm/BoEYU5NAoNTh6eudLRpBzxYlhr/HKF9uSyW0PQXNfvlafu6UJRDRwtyz1Vms8HfRegVZQt6eep9jtIM9romW+5dbI0RG//f2sEJwLn3ahnsVwjGobwrRG+HMu0caC9yfudIbeTuXNiWbVir2qSk+U0RFvpsqtHUCuXT4wYecWdTzHoEAxToRcZ9Zp29Dep+6url71p3wOfbtFeb3FvpgQLmMXeEi1b34S3/79kRpMkZYGcGGtwKRcp+MLyWg952YgHB1+Kdjeh5DQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vTavOjBIXZ91wkmShFKozvoYqwKxsnTofa2HKyIDTrs=; b=CZ8KBjr0qwNrmWzMJ6QQb202zNXHWlSu8aIOE8UxmN3XaYR1v1IDEqnkmW0WnjmrApC6Kc6A3v2lq13UOuTRab6GSQ+itDSPKwIAiKHfyIWoKMFcII0hgXSDcf8zxhMkeRKlksHIdjgAuun17j11f7REbcsrHxS+Dg9ZitrbQ3OdNceiHzKTy9jWz6eo2Py8Xd0f1LmMVsq/Y6utvHzjB2TWbC5XAX5RTWADzhzgEO8v+/TDleU4JzLmu39+lUv7uNGDPTMDq9pJdhFLlnAlhBKpykNbB4PBLJ9OUn1fdNgsLb4P8b/eLl6bPZszEuYLbGv/OEHiXcezgJWii28ptA== 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=vTavOjBIXZ91wkmShFKozvoYqwKxsnTofa2HKyIDTrs=; b=St1GYOK28OSr1TTO5bbtVlCyRRJgQpAbH3UwD3pvo7bQKiei/ewaJzzmCSLH+wUpxE+ra0QVXJjTRbUpfB5pS57U8wmpH1zIhURvlrOgPmMZNgpPe2PUtGU0OxK8DTcLdbixXoww3qLAb2oULUY1C8sJry3AlAPHDad8k6PInvo= Received: from DM6PR02CA0108.namprd02.prod.outlook.com (2603:10b6:5:1f4::49) by DM4PR12MB5199.namprd12.prod.outlook.com (2603:10b6:5:396::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.26; Tue, 16 Nov 2021 07:41:00 +0000 Received: from DM6NAM11FT021.eop-nam11.prod.protection.outlook.com (2603:10b6:5:1f4:cafe::d8) by DM6PR02CA0108.outlook.office365.com (2603:10b6:5:1f4::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.19 via Frontend Transport; Tue, 16 Nov 2021 07:41:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;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 DM6NAM11FT021.mail.protection.outlook.com (10.13.173.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4690.15 via Frontend Transport; Tue, 16 Nov 2021 07:40:59 +0000 Received: from Mayan-RMB.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.2375.17; Tue, 16 Nov 2021 01:40:57 -0600 From: Sanket Goswami To: , , CC: , Sanket Goswami Subject: [PATCH 1/2] platform/x86: amd-pmc: Introduce message port argument in SMU routine Date: Tue, 16 Nov 2021 13:09:59 +0530 Message-ID: <20211116074000.28626-2-Sanket.Goswami@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211116074000.28626-1-Sanket.Goswami@amd.com> References: <20211116074000.28626-1-Sanket.Goswami@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2dfddfc6-d960-456b-8a8b-08d9a8d46f1b X-MS-TrafficTypeDiagnostic: DM4PR12MB5199: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1332; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Rw9TCCQY6OlYMf1ng4QcMLy+hDCRM47EJFwmXFHpqeT3RJ7tt4UM0+BmzgMAPh42jINbisuO+ziggqAAAyCLm5f8VkMXAsz8tai8TQICe96piDmFPa+t11bz61y3C2yQ0TKkPjO56AWRMtzuLNfFIXL5w/ObCk/0NknKZOtEQycncX0nLcNXiQiVsTrmfvtsvI4AT4eQY6BMf3VbZ89qNCvAIlztHxhULphfYsbIl9oV06TLoBLMDfxh02NTyGHY9FC2wWLvjUofErXVoUayzaFxkkbsfwc62QK9c1vJxHQRhGc8xrmBdxEvE9I6gcaCdgIgTRtvGFPugPWiO8d6Y2ZL5nwlBMUGVZanyY73YSIzLVreRZa7Avt/YF9BAIvcenjCIEV6JfrL0HCmgfnHj6klqP1eeKf9SyjuCZ6g90Ok4XisrbVs4wuManlz79eGWfgEYvIrtqOrfKSf9A6V3wnKz/1LiTjpwo965c9Y1R8Rrqngu9MunaDSLsVVsWcKqZLGWU9M+SrCKisV+1d0vy6ouUfi7bxt93RCXPsF9Pp1gkjQ6olG9REMB2EbtbZTVCutiOlv9SohEbWMx9ehj/b5/nrQdpgoWFA2BkMLiLFFsOe6A+H2/lsTGuzPDLivCf8bemEieKMUBX4uX36mqwS2s85drXtjp4COTQyMgXte1uvBHFlcaB8wtsdB07xH2uJdDI6h+xSoJgI136GBrQdNWsLLT16GE9AUrEeDp0c= 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)(46966006)(36840700001)(8676002)(54906003)(8936002)(5660300002)(2616005)(15650500001)(4326008)(2906002)(426003)(336012)(47076005)(316002)(86362001)(110136005)(508600001)(186003)(36756003)(7696005)(16526019)(82310400003)(1076003)(70206006)(70586007)(36860700001)(81166007)(83380400001)(26005)(356005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2021 07:40:59.9165 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2dfddfc6-d960-456b-8a8b-08d9a8d46f1b 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: DM6NAM11FT021.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5199 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Add a msg_port_stb argument to amd_pmc_send_cmd() function signature to distinguish between the components using the different SMU ports. Co-developed-by: Shyam Sundar S K Signed-off-by: Shyam Sundar S K Signed-off-by: Sanket Goswami --- drivers/platform/x86/amd-pmc.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c index a39354ea96c4..5769d009033a 100644 --- a/drivers/platform/x86/amd-pmc.c +++ b/drivers/platform/x86/amd-pmc.c @@ -41,6 +41,10 @@ #define AMD_PMC_STB_PMI_0 0x03E30600 #define AMD_PMC_STB_PREDEF 0xC6000001 +/* STB message port and Parameters */ +#define PMC_MSG_PORT_PEP 0 +#define PMC_MSG_PORT_STB 1 + /* Base address of SMU for mapping physical address to virtual address */ #define AMD_PMC_SMU_INDEX_ADDRESS 0xB8 #define AMD_PMC_SMU_INDEX_DATA 0xBC @@ -140,7 +144,8 @@ module_param(enable_stb, bool, 0644); MODULE_PARM_DESC(enable_stb, "Enable the STB debug mechanism"); static struct amd_pmc_dev pmc; -static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, u32 arg, u32 *data, u8 msg, bool ret); +static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, u32 arg, u32 *data, u8 msg, bool ret, + u8 msg_port_stb); static int amd_pmc_write_stb(struct amd_pmc_dev *dev, u32 data); static int amd_pmc_read_stb(struct amd_pmc_dev *dev, u32 *buf); @@ -176,7 +181,7 @@ static int amd_pmc_get_smu_version(struct amd_pmc_dev *dev) int rc; u32 val; - rc = amd_pmc_send_cmd(dev, 0, &val, SMU_MSG_GETSMUVERSION, 1); + rc = amd_pmc_send_cmd(dev, 0, &val, SMU_MSG_GETSMUVERSION, 1, PMC_MSG_PORT_PEP); if (rc) return rc; @@ -370,11 +375,12 @@ static int amd_pmc_setup_smu_logging(struct amd_pmc_dev *dev) return -EINVAL; /* Get Active devices list from SMU */ - amd_pmc_send_cmd(dev, 0, &dev->active_ips, SMU_MSG_GET_SUP_CONSTRAINTS, 1); + amd_pmc_send_cmd(dev, 0, &dev->active_ips, SMU_MSG_GET_SUP_CONSTRAINTS, 1, + PMC_MSG_PORT_PEP); /* 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); + amd_pmc_send_cmd(dev, 0, &phys_addr_low, SMU_MSG_LOG_GETDRAM_ADDR_LO, 1, PMC_MSG_PORT_PEP); + amd_pmc_send_cmd(dev, 0, &phys_addr_hi, SMU_MSG_LOG_GETDRAM_ADDR_HI, 1, PMC_MSG_PORT_PEP); 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)); @@ -382,7 +388,7 @@ static int amd_pmc_setup_smu_logging(struct amd_pmc_dev *dev) return -ENOMEM; /* Start the logging */ - amd_pmc_send_cmd(dev, 0, NULL, SMU_MSG_LOG_START, 0); + amd_pmc_send_cmd(dev, 0, NULL, SMU_MSG_LOG_START, 0, PMC_MSG_PORT_PEP); return 0; } @@ -401,7 +407,8 @@ 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, u32 arg, u32 *data, u8 msg, bool ret) +static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, u32 arg, u32 *data, u8 msg, bool ret, + u8 msg_port_stb) { int rc; u32 val; @@ -529,8 +536,8 @@ static int __maybe_unused amd_pmc_suspend(struct device *dev) u32 arg = 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); + amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_RESET, 0, PMC_MSG_PORT_PEP); + amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_START, 0, PMC_MSG_PORT_PEP); /* Activate CZN specific RTC functionality */ if (pdev->cpu_id == AMD_CPU_ID_CZN) { @@ -542,7 +549,7 @@ static int __maybe_unused amd_pmc_suspend(struct device *dev) /* Dump the IdleMask before we send hint to SMU */ amd_pmc_idlemask_read(pdev, dev, NULL); msg = amd_pmc_get_os_hint(pdev); - rc = amd_pmc_send_cmd(pdev, arg, NULL, msg, 0); + rc = amd_pmc_send_cmd(pdev, arg, NULL, msg, 0, PMC_MSG_PORT_PEP); if (rc) dev_err(pdev->dev, "suspend failed\n"); @@ -559,12 +566,12 @@ static int __maybe_unused amd_pmc_resume(struct device *dev) u8 msg; msg = amd_pmc_get_os_hint(pdev); - rc = amd_pmc_send_cmd(pdev, 0, NULL, msg, 0); + rc = amd_pmc_send_cmd(pdev, 0, NULL, msg, 0, PMC_MSG_PORT_PEP); if (rc) dev_err(pdev->dev, "resume failed\n"); /* Let SMU know that we are looking for stats */ - amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_DUMP_DATA, 0); + amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_DUMP_DATA, 0, PMC_MSG_PORT_PEP); /* Dump the IdleMask to see the blockers */ amd_pmc_idlemask_read(pdev, dev, NULL); From patchwork Tue Nov 16 07:40:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Goswami, Sanket" X-Patchwork-Id: 12621683 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1119C433F5 for ; Tue, 16 Nov 2021 07:42:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8277C619EC for ; Tue, 16 Nov 2021 07:42:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231328AbhKPHpA (ORCPT ); Tue, 16 Nov 2021 02:45:00 -0500 Received: from mail-mw2nam10on2046.outbound.protection.outlook.com ([40.107.94.46]:49536 "EHLO NAM10-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230424AbhKPHof (ORCPT ); Tue, 16 Nov 2021 02:44:35 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TX8J2+ObhEYBpk7i3+RvvYgYeNNS5CFywLzWrXCkpCbRhBod9xUqUyM7v/BsSVLO9waRHouFXJugs0OsoLFwP7TTKbdHD8Q9Z2OEEcGydxv76YSgtTNuYV6emfLzzAs1v3z86rtcnDIaGHDMY8ZjuelPk/+4hVCBICa4K7mk5ETqgWuEEq+G/u6eAkWR2V2nVAb10a6O4kkwIHMRejTcw0z9n+TwP2Wa7kXP+RPqYJaIwQum+qPVjCJHraBMoyiyyN84GKfP2nlAfs1ArBdZFwMYFhlKm/SxFxxxAmQHr5vytzU6Buq9wau49VQEft+JLjoc18qCiuUbjHqteqFqgw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=m37T6yxMLEyrQ9M3uo1K91SSsu6++mdC5xg1EvC8xk8=; b=n6iZJNtW50bZnXB2buUdM6aBAHOJV9ESWgixjD0kZDkCOybqBkwoZde2wcAptEAEHAaAZ1RYSKT2eihCdt+SDb6IByyP6nx61RfHH/yHCX3qJX4K/VkwOjk6s5TwtxsBji+zddmbKlsqXjDbqhUe4b+/WGI9hZKcSPd/7cgrtwgvgsTu9FMbE6+j72K1WwhsqdIoNhSloAZmfhkEYnxyG2MkjIYRe/k0I2FqpADqqTBLRkOdQBmeeZwdMICfVfJWjy8W6Rb8Y064y0uNMo8Tpu7nzJAEM1NVJsTkovuMnsBp5taWltcHA7CJmSEG3jiBXLf+oL7ISKUAVkWL3QvRAQ== 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=m37T6yxMLEyrQ9M3uo1K91SSsu6++mdC5xg1EvC8xk8=; b=p8i/CsWkjov8Q77xNJugmgsbcxUTbuGVwzBCmMX5fazwZWP7ACoXMFcsFYg2GwgrIlT2sE6pRFINhqJaj25k+ftoMk6bKdOUmfleC+Vp2i2XS92PNIIcmmOSffVweq/XfXSPFkM7pQjt9qLkLIS9oheRWZd4ucLXsXBINVQZvuU= Received: from DM6PR11CA0007.namprd11.prod.outlook.com (2603:10b6:5:190::20) by BY5PR12MB4885.namprd12.prod.outlook.com (2603:10b6:a03:1de::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.26; Tue, 16 Nov 2021 07:41:37 +0000 Received: from DM6NAM11FT016.eop-nam11.prod.protection.outlook.com (2603:10b6:5:190:cafe::ec) by DM6PR11CA0007.outlook.office365.com (2603:10b6:5:190::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Tue, 16 Nov 2021 07:41:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;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 DM6NAM11FT016.mail.protection.outlook.com (10.13.173.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4690.15 via Frontend Transport; Tue, 16 Nov 2021 07:41:37 +0000 Received: from Mayan-RMB.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.2375.17; Tue, 16 Nov 2021 01:41:34 -0600 From: Sanket Goswami To: , , CC: , Sanket Goswami Subject: [PATCH 2/2] platform/x86: amd-pmc: Add support for AMD Spill to DRAM STB feature Date: Tue, 16 Nov 2021 13:10:00 +0530 Message-ID: <20211116074000.28626-3-Sanket.Goswami@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211116074000.28626-1-Sanket.Goswami@amd.com> References: <20211116074000.28626-1-Sanket.Goswami@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8e2b4918-614b-4823-5b22-08d9a8d48538 X-MS-TrafficTypeDiagnostic: BY5PR12MB4885: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3Gz7GmTFwITWEGMdOhGH8hrLdmXe4f7ZSl/7Gm9QjCDI4YooNUJv+u7rQFmQtH5TrmEXWLfsPRoI6YyoZXfcc+ywtNple2r19VEyxHROKJGek8Th6og6ER3jaJjjb3p5Um8P5oD0E+quudB2+ZaQ4dChOkxKDkRSNIZOikyZ7bSKG2bXsZV8tBl7KNFRO2IF6KjDPh0TSYbuKDwMBww587UcdtGRZLqfcuLwJOc5N5C4CAV0GilrSZ/oO2O3IMNM3E7AvmEB8Op7jUoAn1T4IS7YHx167iAVODEjyVZHcyfNl1yqRPAb4C2UYNgHC5Gr3HIpq79xEK6zjKmL4uWoOWlKi5znr/Qtcav/iNpOH5Lkb7J8CJLKABJa/1/ElPpY2PstKLdrM+XODWj7Yj+PEuMtKoJBSQa4fnn498+lzOsMR6IOMzeVXkzHEialJMo5nAs0t547SAQshh4u8v8mswE1JznxRmmSxjOZBgZ/eHilDkC9xbhQEukJxcIGtitclL/fy8O65AKCTMobAlN9Nxhu2W/jXszX69YTV/eIluvsHtUgJ0I5J0N6R5GPqZGHKhi1w6OweCBBxbUrvLLF0DjMRg2RAZxxV5LolLf6uWeCQQjrEJQXrVScf5jeCDu1wchg2w8qxGOXLZA4nQqnIOrWvESaQDGP1xS75eqyuQapq+C9nSc0TBzSfWn6k8LI8IRoRNSZKOGY3spKPhPCD/X/CdOBSekN4SLQYXI8HL0= 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)(36840700001)(46966006)(70586007)(2616005)(336012)(110136005)(8676002)(86362001)(5660300002)(2906002)(1076003)(8936002)(16526019)(36756003)(186003)(6666004)(54906003)(426003)(47076005)(26005)(508600001)(4326008)(82310400003)(316002)(81166007)(356005)(83380400001)(70206006)(7696005)(36860700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2021 07:41:37.0162 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8e2b4918-614b-4823-5b22-08d9a8d48538 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: DM6NAM11FT016.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4885 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Spill to DRAM functionality is a feature that allows STB (Smart Trace Buffer) to spill data from SRAM into DRAM on some future AMD ASICs. The size allocated for STB is more than the earlier SoC's which helps to collect more tracing and telemetry data. Co-developed-by: Shyam Sundar S K Signed-off-by: Shyam Sundar S K Signed-off-by: Sanket Goswami --- drivers/platform/x86/amd-pmc.c | 128 ++++++++++++++++++++++++++++----- 1 file changed, 112 insertions(+), 16 deletions(-) diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c index 5769d009033a..5973e2d23827 100644 --- a/drivers/platform/x86/amd-pmc.c +++ b/drivers/platform/x86/amd-pmc.c @@ -40,10 +40,16 @@ #define AMD_PMC_STB_INDEX_DATA 0xFC #define AMD_PMC_STB_PMI_0 0x03E30600 #define AMD_PMC_STB_PREDEF 0xC6000001 +#define AMD_STB_REGISTER_MESSAGE 0xA20 +#define AMD_STB_REGISTER_RESPONSE 0xA80 +#define AMD_STB_REGISTER_ARGUMENT 0xA88 /* STB message port and Parameters */ #define PMC_MSG_PORT_PEP 0 #define PMC_MSG_PORT_STB 1 +#define STB_SPILL_TO_DRAM 0xBE +#define STB_TELEMETRY_BYTES_MAX 0x100000 +#define STB_TELEMETRY_DRAMBYTES_MAX 0x1000000 /* Base address of SMU for mapping physical address to virtual address */ #define AMD_PMC_SMU_INDEX_ADDRESS 0xB8 @@ -99,6 +105,13 @@ enum amd_pmc_def { MSG_OS_HINT_RN, }; +enum stb_arg { + FIX_SIZE = 0x01, + STB_ADDR_LOW, + STB_ADDR_HIGH, + STB_SAMPLES, +}; + struct amd_pmc_bit_map { const char *name; u32 bit_mask; @@ -123,6 +136,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 *stb_virt_addr; void __iomem *fch_virt_addr; u32 base_addr; u32 cpu_id; @@ -238,6 +252,61 @@ const struct file_operations amd_pmc_stb_debugfs_fops = { .release = amd_pmc_stb_debugfs_release, }; +static int amd_pmc_stb_debugfs_open_v2(struct inode *inode, struct file *filp) +{ + struct amd_pmc_dev *dev = filp->f_inode->i_private; + u32 *buf, phys_addr_low, phys_addr_hi, size, samples; + u64 stb_phys_addr; + + amd_pmc_send_cmd(dev, FIX_SIZE, &size, STB_SPILL_TO_DRAM, 1, PMC_MSG_PORT_STB); + if (size != STB_TELEMETRY_BYTES_MAX) + return -EIO; + + /* Get STB DRAM address */ + amd_pmc_send_cmd(dev, STB_ADDR_LOW, &phys_addr_low, STB_SPILL_TO_DRAM, 1, PMC_MSG_PORT_STB); + amd_pmc_send_cmd(dev, STB_ADDR_HIGH, &phys_addr_hi, STB_SPILL_TO_DRAM, 1, PMC_MSG_PORT_STB); + /* Get the number of samples present in the STB buffer */ + amd_pmc_send_cmd(dev, STB_SAMPLES, &samples, STB_SPILL_TO_DRAM, 1, PMC_MSG_PORT_STB); + stb_phys_addr = ((u64)phys_addr_hi << 32 | phys_addr_low); + + dev->stb_virt_addr = devm_ioremap(dev->dev, stb_phys_addr, STB_TELEMETRY_DRAMBYTES_MAX); + if (!dev->stb_virt_addr) + return -ENOMEM; + + buf = kzalloc(STB_TELEMETRY_BYTES_MAX, GFP_KERNEL); + if (!buf) + return -ENOMEM; + + memcpy_fromio(buf, dev->stb_virt_addr, STB_TELEMETRY_BYTES_MAX); + + filp->private_data = buf; + + return 0; +} + +static ssize_t amd_pmc_stb_debugfs_read_v2(struct file *filp, char __user *buf, size_t size, + loff_t *pos) +{ + if (!filp->private_data) + return -EINVAL; + + return simple_read_from_buffer(buf, size, pos, filp->private_data, + STB_TELEMETRY_BYTES_MAX); +} + +static int amd_pmc_stb_debugfs_release_v2(struct inode *inode, struct file *filp) +{ + kfree(filp->private_data); + return 0; +} + +const struct file_operations amd_pmc_stb_debugfs_fops_v2 = { + .owner = THIS_MODULE, + .open = amd_pmc_stb_debugfs_open_v2, + .read = amd_pmc_stb_debugfs_read_v2, + .release = amd_pmc_stb_debugfs_release_v2, +}; + static int amd_pmc_idlemask_read(struct amd_pmc_dev *pdev, struct device *dev, struct seq_file *s) { @@ -352,9 +421,15 @@ static void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev) debugfs_create_file("amd_pmc_idlemask", 0644, dev->dbgfs_dir, dev, &amd_pmc_idlemask_fops); /* Enable STB only when the module_param is set */ - if (enable_stb) - debugfs_create_file("stb_read", 0644, dev->dbgfs_dir, dev, - &amd_pmc_stb_debugfs_fops); + if (enable_stb) { + if (dev->cpu_id == AMD_CPU_ID_YC) { + debugfs_create_file("stb_read", 0644, dev->dbgfs_dir, dev, + &amd_pmc_stb_debugfs_fops_v2); + } else { + debugfs_create_file("stb_read", 0644, dev->dbgfs_dir, dev, + &amd_pmc_stb_debugfs_fops); + } + } } #else static inline void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev) @@ -393,17 +468,27 @@ static int amd_pmc_setup_smu_logging(struct amd_pmc_dev *dev) return 0; } -static void amd_pmc_dump_registers(struct amd_pmc_dev *dev) +static void amd_pmc_dump_registers(struct amd_pmc_dev *dev, u8 msg_port_stb) { - u32 value; + u32 value, message, argument, response; + + if (msg_port_stb) { + message = AMD_STB_REGISTER_MESSAGE; + argument = AMD_STB_REGISTER_ARGUMENT; + response = AMD_STB_REGISTER_RESPONSE; + } else { + message = AMD_PMC_REGISTER_MESSAGE; + argument = AMD_PMC_REGISTER_ARGUMENT; + response = AMD_PMC_REGISTER_RESPONSE; + } - value = amd_pmc_reg_read(dev, AMD_PMC_REGISTER_RESPONSE); + value = amd_pmc_reg_read(dev, response); dev_dbg(dev->dev, "AMD_PMC_REGISTER_RESPONSE:%x\n", value); - value = amd_pmc_reg_read(dev, AMD_PMC_REGISTER_ARGUMENT); + value = amd_pmc_reg_read(dev, argument); dev_dbg(dev->dev, "AMD_PMC_REGISTER_ARGUMENT:%x\n", value); - value = amd_pmc_reg_read(dev, AMD_PMC_REGISTER_MESSAGE); + value = amd_pmc_reg_read(dev, message); dev_dbg(dev->dev, "AMD_PMC_REGISTER_MESSAGE:%x\n", value); } @@ -411,11 +496,22 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, u32 arg, u32 *data, u8 msg, u8 msg_port_stb) { int rc; - u32 val; + u32 val, message, argument, response; mutex_lock(&dev->lock); + + if (msg_port_stb) { + message = AMD_STB_REGISTER_MESSAGE; + argument = AMD_STB_REGISTER_ARGUMENT; + response = AMD_STB_REGISTER_RESPONSE; + } else { + message = AMD_PMC_REGISTER_MESSAGE; + argument = AMD_PMC_REGISTER_ARGUMENT; + response = AMD_PMC_REGISTER_RESPONSE; + } + /* Wait until we get a valid response */ - rc = readx_poll_timeout(ioread32, dev->regbase + AMD_PMC_REGISTER_RESPONSE, + rc = readx_poll_timeout(ioread32, dev->regbase + response, val, val != 0, PMC_MSG_DELAY_MIN_US, PMC_MSG_DELAY_MIN_US * RESPONSE_REGISTER_LOOP_MAX); if (rc) { @@ -424,16 +520,16 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, u32 arg, u32 *data, u8 msg, } /* Write zero to response register */ - amd_pmc_reg_write(dev, AMD_PMC_REGISTER_RESPONSE, 0); + amd_pmc_reg_write(dev, response, 0); /* Write argument into response register */ - amd_pmc_reg_write(dev, AMD_PMC_REGISTER_ARGUMENT, arg); + amd_pmc_reg_write(dev, argument, arg); /* Write message ID to message ID register */ - amd_pmc_reg_write(dev, AMD_PMC_REGISTER_MESSAGE, msg); + amd_pmc_reg_write(dev, message, msg); /* Wait until we get a valid response */ - rc = readx_poll_timeout(ioread32, dev->regbase + AMD_PMC_REGISTER_RESPONSE, + rc = readx_poll_timeout(ioread32, dev->regbase + response, val, val != 0, PMC_MSG_DELAY_MIN_US, PMC_MSG_DELAY_MIN_US * RESPONSE_REGISTER_LOOP_MAX); if (rc) { @@ -446,7 +542,7 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, u32 arg, u32 *data, u8 msg, 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); + *data = amd_pmc_reg_read(dev, argument); } break; case AMD_PMC_RESULT_CMD_REJECT_BUSY: @@ -467,7 +563,7 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, u32 arg, u32 *data, u8 msg, out_unlock: mutex_unlock(&dev->lock); - amd_pmc_dump_registers(dev); + amd_pmc_dump_registers(dev, msg_port_stb); return rc; }