From patchwork Fri Oct 22 17:28:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Goswami, Sanket" X-Patchwork-Id: 12578295 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 04C4AC433F5 for ; Fri, 22 Oct 2021 17:29:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB8016103D for ; Fri, 22 Oct 2021 17:29:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232258AbhJVRcB (ORCPT ); Fri, 22 Oct 2021 13:32:01 -0400 Received: from mail-dm6nam10on2082.outbound.protection.outlook.com ([40.107.93.82]:57696 "EHLO NAM10-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S231453AbhJVRcB (ORCPT ); Fri, 22 Oct 2021 13:32:01 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D6XJU3kBa+RPpEp4Aj/umip7T5JnJjkq5MtvKE2m99YHj/H1vhTdQdX29WfQQSBn1kxUKGeWxzLsTONjsQdoCajJ1762+VskMGv+EvWRbeGlmEC4RvAxu0dtQgCFnE3vw2kcvZr5B7JLZI/xijLuBq+7nTtPDxJMVXez1P++/5r72j62M//2n31aQeEueYK6RIdnxL9zrvldeki0wKb+EntiLHHjqXktzPVQD41GVbXfDVRT+cslqp8okxGwg7hogyk2R1dgStD6NWCo3m+q+1z2fHL4KTdTovHozbrvNrkD1at+FPFB5kReey9cMIBT/EJSBxumMJ7Z1WtQtKOdCQ== 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=wvDBePDoYP0+HlsA9FX7q/sqm/p2DNlymjsCmEbTm1w=; b=Pk/7f2QCG+2byCqkOUSAqzTLo6k6fQ44ri5hjMVnHNgj7x4dHCNDUl85TwLSQbik/M9Mn5YbplKX17qGSa9G+KeIlCvYul5i7v4euSpc0C3RXzJVu6dzMOlLS+ZIVYRqhnEGt6Y3GPw+i0q4VOpI9Oe9fPIdUV0q39NkhdqbxFQEiy6xCBibi7FAcgTzL3j6cZf14ACqm70TZo0Q0UBDUm4i5qRh3ocrVLSIV1hTS6WyPpVMOkj6B77EkykZ+bPWsrJd/4mT7ZteHtNYhvARplWK0T70baiJ1iu8ArWNYOCcqU6llEs+BgIrSdlgARmCtkV7biUKLdoy7fDy2hVJ8w== 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=wvDBePDoYP0+HlsA9FX7q/sqm/p2DNlymjsCmEbTm1w=; b=EJux+Mmjd4ok8p5HkMl1UWShEDLuswMUyg6e4sjvb6QMy6oMI9gp+uTkLfXIIgj7u4cMKQf9vYPBymgSIxEyEjp+jXdiiYbnZ8BCOufvM/SLgy5OSDxJBPpzx7shmuM7IrgenO0uOw8tn44Jlk0dKtnWhQ1bUdhZDBLaQYV2nP0= Received: from BN9PR03CA0497.namprd03.prod.outlook.com (2603:10b6:408:130::22) by BY5PR12MB4949.namprd12.prod.outlook.com (2603:10b6:a03:1df::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.16; Fri, 22 Oct 2021 17:29:41 +0000 Received: from BN8NAM11FT056.eop-nam11.prod.protection.outlook.com (2603:10b6:408:130:cafe::dc) by BN9PR03CA0497.outlook.office365.com (2603:10b6:408:130::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18 via Frontend Transport; Fri, 22 Oct 2021 17:29: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 BN8NAM11FT056.mail.protection.outlook.com (10.13.177.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4628.16 via Frontend Transport; Fri, 22 Oct 2021 17:29:40 +0000 Received: from amd-Mandolin-PCO.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.2308.15; Fri, 22 Oct 2021 12:29:36 -0500 From: Sanket Goswami To: , , CC: , Sanket Goswami Subject: [PATCH v3 1/3] platform/x86: amd-pmc: Store the pci_dev instance inside struct amd_pmc_dev Date: Fri, 22 Oct 2021 22:58:43 +0530 Message-ID: <20211022172845.2608-2-Sanket.Goswami@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211022172845.2608-1-Sanket.Goswami@amd.com> References: <20211022172845.2608-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: 1bd4300a-5659-4bf8-87b4-08d99581878d X-MS-TrafficTypeDiagnostic: BY5PR12MB4949: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2582; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5X89ZT0MkIYnp+OPf0KLS1Tb63jlZOm4/hyvcA6KoaQorAUeCrtePOGt0POq0NqciSyf7v3rzAUfYwdTlZ4cKshWocErX6RaKbgIh4dPCFLWqMsrFuYb2XMNXvQ7kyGyP2shcNCEeunhAntF+4aYiC/eJDuu3IdMG4A2KIGObJxJtWIbOmH+2thkk0zdRZEOgTRMEj8uq4BDpgtarVJdNimQbkvHMwHxAjYH4S3E6lbxAnChXRWIrGaneJuS6IJmxS5K5bkJh5ef+9fSwIt+fb7cfDhPq5sBVJGtmvObhzqH39tsILwhFWwfTlek5MV9qgdd7zsteINVG2nP0cOACaOlLBkbRk9omkWpSNj26ZslGfpnqcD4jdy6K37JRHYaJ3GcOOXfkRzAuXgYUvaLVXCoofRko6URTmYStOmgrs8ptY74ilYMMHbHgcyHnlaWidD4V11X36UxvONS9Ziwlp6ya3BSouzXVjEeA3K4jJDp+fbsxt1pHbZdZpJepMIJ87phnNjjHT5otfJEMR+6C54mQxpFa5ztbkJv447Hk7N8Sq/lQRPnCgIQd1W2EQFwtutbs1zZzkCXqsrzmPzmbOX4FYLw6lqmx802Jq2wnItNur/WpBspsOmNkWGdiEyFH5gYajJyXsyAbJ76HaiMsgaHBLmYRvW9TvSTVfYnjCrZL+tGTxyz5pXBid5Hrn13ugYfEKp9RLsP8bXuC01g+2E1bxAJ29tiRgdnmyK83qA= 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)(81166007)(4326008)(86362001)(110136005)(36756003)(54906003)(83380400001)(26005)(6666004)(47076005)(356005)(16526019)(36860700001)(2906002)(336012)(8676002)(70586007)(7696005)(186003)(82310400003)(70206006)(2616005)(1076003)(316002)(508600001)(8936002)(5660300002)(426003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2021 17:29:40.6275 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1bd4300a-5659-4bf8-87b4-08d99581878d 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: BN8NAM11FT056.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4949 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Store the root port information in amd_pmc_probe() so that the information can be used across multiple routines. Signed-off-by: Sanket Goswami --- Changes in v3: - Address review comments from Hans. Changes in v2: - Store the rdev info in amd_pmc_probe() as suggested by Hans. drivers/platform/x86/amd-pmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c index 678bf6874c63..5d88e55e1ce7 100644 --- a/drivers/platform/x86/amd-pmc.c +++ b/drivers/platform/x86/amd-pmc.c @@ -121,6 +121,7 @@ struct amd_pmc_dev { u16 minor; u16 rev; struct device *dev; + struct pci_dev *rdev; struct mutex lock; /* generic mutex lock */ #if IS_ENABLED(CONFIG_DEBUG_FS) struct dentry *dbgfs_dir; @@ -541,6 +542,7 @@ static int amd_pmc_probe(struct platform_device *pdev) } dev->cpu_id = rdev->device; + dev->rdev = rdev; err = pci_write_config_dword(rdev, AMD_PMC_SMU_INDEX_ADDRESS, AMD_PMC_BASE_ADDR_LO); if (err) { dev_err(dev->dev, "error writing to 0x%x\n", AMD_PMC_SMU_INDEX_ADDRESS); @@ -570,7 +572,6 @@ static int amd_pmc_probe(struct platform_device *pdev) } base_addr_hi = val & AMD_PMC_BASE_ADDR_LO_MASK; - pci_dev_put(rdev); base_addr = ((u64)base_addr_hi << 32 | base_addr_lo); dev->regbase = devm_ioremap(dev->dev, base_addr + AMD_PMC_BASE_ADDR_OFFSET, @@ -604,6 +605,7 @@ static int amd_pmc_remove(struct platform_device *pdev) struct amd_pmc_dev *dev = platform_get_drvdata(pdev); amd_pmc_dbgfs_unregister(dev); + pci_dev_put(dev->rdev); mutex_destroy(&dev->lock); return 0; } From patchwork Fri Oct 22 17:28:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Goswami, Sanket" X-Patchwork-Id: 12578299 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 04836C433FE for ; Fri, 22 Oct 2021 17:29:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E2C3B61248 for ; Fri, 22 Oct 2021 17:29:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233653AbhJVRcO (ORCPT ); Fri, 22 Oct 2021 13:32:14 -0400 Received: from mail-bn7nam10on2054.outbound.protection.outlook.com ([40.107.92.54]:50113 "EHLO NAM10-BN7-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S231453AbhJVRcM (ORCPT ); Fri, 22 Oct 2021 13:32:12 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TJ42KbwJqBW3sMeZ48X/HmxPWZ3CM545F3ZJNjyRkQ3gtPyIcLtPf+vrrbwXtBb2OzMlINqjVMjdw8LWvq+HPOfSEoIGsNmo8qisPsOMqD/KyUjB8FHpm7k3i6/z9sOFMRu1s9ZpgQoxMXEgKTMPrRz+Fcj8g08lfRyx2qAR0/UOHBhCp8T1iybkzKyrDjF5PS3kRmD6PtS8VaRG9Qq8WAckU25XSLjsKKNu5WXx0JBggf2b3hZpfttL9SncRt0e1ySZrmiiQJT0t+QNfpom5mnkwwlJkyK9VLirRydWLURmhA27Oob2+gzWEN8CL3y7HrBhirisEvLjfl0lFP94ow== 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=cXjqLFnzvKFy2ZWqUJydwAfXWXLOW7t7XPQa9aCVTKk=; b=FiOo6zLV//DgY93Ap+ftbS3Oceu3ml7b7iOhpVRPqTX0HwojIcIHNiUsawxO15jXvMtSyq5xtlJL1SMQOMBqgqZA80eqMU5y+FCFCheM5wY2keF458tDYlijyEL+fJyG0/WKzABvIeGhpxjgTv/ksaT8SWvIagM772f3yu9fE0Ruka9wj5doFp2d3cyUuYiN6Qx6XFyQvH0NU+gnPeN538JJnTwGJQ2bD5T7eG3qkby0uBVd+HSz56xOOtvNarwv/fLkNKW7xQATVfe8asmkQVGTf6lOCeXrzDn9z9n+qBjT+NxnmPz9nkGfnl15uLk5E3OaNW4DAUp2EgqtXTRttQ== 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=cXjqLFnzvKFy2ZWqUJydwAfXWXLOW7t7XPQa9aCVTKk=; b=JlHctk5FBu5M7ghlJ1ZKKYhR91Np5ADHxq8Vu0twARKI9t6gQZolYK8HO7TYA+ft6KYSOVGXiWDN6txZnSoIcv6LujQrWl9w+4LfdgczQxlMJlRP/Su4AXPF2LxO6t2ViMCva20YgFUtmNDKt4JMog30LOVBbZGMe4v0ZZTIP3E= Received: from BN0PR02CA0060.namprd02.prod.outlook.com (2603:10b6:408:e5::35) by MW2PR12MB2426.namprd12.prod.outlook.com (2603:10b6:907:10::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Fri, 22 Oct 2021 17:29:49 +0000 Received: from BN8NAM11FT012.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e5:cafe::f4) by BN0PR02CA0060.outlook.office365.com (2603:10b6:408:e5::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.15 via Frontend Transport; Fri, 22 Oct 2021 17:29:48 +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 BN8NAM11FT012.mail.protection.outlook.com (10.13.177.55) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4628.16 via Frontend Transport; Fri, 22 Oct 2021 17:29:48 +0000 Received: from amd-Mandolin-PCO.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.2308.15; Fri, 22 Oct 2021 12:29:45 -0500 From: Sanket Goswami To: , , CC: , Sanket Goswami Subject: [PATCH v3 2/3] platform/x86: amd-pmc: Simplify error handling path Date: Fri, 22 Oct 2021 22:58:44 +0530 Message-ID: <20211022172845.2608-3-Sanket.Goswami@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211022172845.2608-1-Sanket.Goswami@amd.com> References: <20211022172845.2608-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: 387264b2-b20b-4141-e8b9-08d995818c23 X-MS-TrafficTypeDiagnostic: MW2PR12MB2426: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 46k0Tn67jUBGB8PUM00Ih/V3Qlt24EhpR4TKRUDXTtpnNosMAJ967L1GP9WyRLQtZ/c77JDAKN4WVOHSJi9UtLTn5UeQW4PPSZ0t0mooCZ03XeK+YEaWXHG4Lm2FH8j/jLALKR7TjuIV1Kxbrp2fqsxg2FrEnTqKVG0N3JULOTuagb/RRuEsp1X5xZPmEjeLDQxTjF8oNiWR6s/I7snWPW8MYpWsWiQLwsmcpzh1bIqLNwWP7K8Xd+2nNb9LKf2F6FgRoFgCJ5DaABeayMJUJhFJSgY8BxDpa4YdL/0EPWYAy6ACDR1fXAJ1yvbioWS2tMvpKU4C8GjZdk756EIgPNIDfUe4ZiGbeXl3tcPWAo6IVmhS+MpIOK1qbj8n0x1yqgrUqaE4GuhKXS9XCAwZl+IWiN4czNUYiWtuMkSiDgql75rkw0Ul9/pGYOu/nfUr35u5V7n0hReEd/tXqHHj4wNbA7zjjREjwblyzG7Fg4dow55VHFC25AdwscvKPSsWv02eH3hWqGYFUtBt6p0WOCuPouUiFEvrv2Ph6UPToAoUK7cjH5CpFlA16CUjif0pW86Q030mTogZKV7kdgnrqZdJsFwQjEOC1CuqfUUt/RM2KXWXCGp5HJCK7y6Y634++D7aUXEdZmw03y+/YXoiPPqbWxpFqfMNffpMMG90C5+91mUmswfTjmVqXR5aE2snSIClbPY64ADT+c5545P935NOITx/LmeuPcrtVpAVuOw= 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)(508600001)(26005)(81166007)(70206006)(47076005)(5660300002)(186003)(2616005)(110136005)(36756003)(336012)(8936002)(316002)(54906003)(82310400003)(83380400001)(36860700001)(2906002)(86362001)(4326008)(426003)(8676002)(356005)(70586007)(7696005)(1076003)(16526019)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2021 17:29:48.3679 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 387264b2-b20b-4141-e8b9-08d995818c23 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: BN8NAM11FT012.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR12MB2426 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Handle error-exits in the amd_pmc_probe() so that the code duplication is reduced. Suggested-by: Hans de Goede Signed-off-by: Sanket Goswami --- drivers/platform/x86/amd-pmc.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c index 5d88e55e1ce7..50cb65e38d11 100644 --- a/drivers/platform/x86/amd-pmc.c +++ b/drivers/platform/x86/amd-pmc.c @@ -546,30 +546,24 @@ static int amd_pmc_probe(struct platform_device *pdev) err = pci_write_config_dword(rdev, AMD_PMC_SMU_INDEX_ADDRESS, AMD_PMC_BASE_ADDR_LO); if (err) { dev_err(dev->dev, "error writing to 0x%x\n", AMD_PMC_SMU_INDEX_ADDRESS); - pci_dev_put(rdev); - return pcibios_err_to_errno(err); + goto err_pci_dev_put; } err = pci_read_config_dword(rdev, AMD_PMC_SMU_INDEX_DATA, &val); - if (err) { - pci_dev_put(rdev); - return pcibios_err_to_errno(err); - } + if (err) + goto err_pci_dev_put; base_addr_lo = val & AMD_PMC_BASE_ADDR_HI_MASK; err = pci_write_config_dword(rdev, AMD_PMC_SMU_INDEX_ADDRESS, AMD_PMC_BASE_ADDR_HI); if (err) { dev_err(dev->dev, "error writing to 0x%x\n", AMD_PMC_SMU_INDEX_ADDRESS); - pci_dev_put(rdev); - return pcibios_err_to_errno(err); + goto err_pci_dev_put; } err = pci_read_config_dword(rdev, AMD_PMC_SMU_INDEX_DATA, &val); - if (err) { - pci_dev_put(rdev); - return pcibios_err_to_errno(err); - } + if (err) + goto err_pci_dev_put; base_addr_hi = val & AMD_PMC_BASE_ADDR_LO_MASK; base_addr = ((u64)base_addr_hi << 32 | base_addr_lo); @@ -598,6 +592,10 @@ static int amd_pmc_probe(struct platform_device *pdev) platform_set_drvdata(pdev, dev); amd_pmc_dbgfs_register(dev); return 0; + +err_pci_dev_put: + pci_dev_put(rdev); + return pcibios_err_to_errno(err); } static int amd_pmc_remove(struct platform_device *pdev) From patchwork Fri Oct 22 17:28:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Goswami, Sanket" X-Patchwork-Id: 12578297 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 32FB6C433F5 for ; Fri, 22 Oct 2021 17:29:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0962160FF2 for ; Fri, 22 Oct 2021 17:29:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233648AbhJVRcM (ORCPT ); Fri, 22 Oct 2021 13:32:12 -0400 Received: from mail-co1nam11on2082.outbound.protection.outlook.com ([40.107.220.82]:23355 "EHLO NAM11-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S233582AbhJVRcM (ORCPT ); Fri, 22 Oct 2021 13:32:12 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kpJpLgjpYhCiDUS5HPf0DYA/1X31XzLK/RuSbsVxZVclTgH989o/TbeZwxkinWkjOALZzfkBIgsWucE5Z1j9eaXiEoOiukUMWS06/yjhq4eacQIgjvLlJ57OaCMwG48QtMsbP1VZSj5fD6qSablw1XurkXuR0M0IgOgUCuNctr61zHYWtpjhDe/d3TOLmv5EL6Vpis/GkTscH4S3aVJaEKlchkmNY+piQM2Z5SJn2urpWKDhJEkskoJJOM1mq9wJsVG4NZnNyZqPGQeulqA+XNYnNioaa7oUGR1VGHmtqp/lz1aLnrfJV8PWx+bsg0pp4xlSC5awvOadoNVSeCLZAg== 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=ym1X+FmyECfloOqN4zFWIn31RsgxwS4N14EZzEE4ZRE=; b=m0yuKrYXZmIsfGt4T7h7tMmGm2QlWhBBMMkqYnE/zMGJ17+8UcpeVZZYrQo0dtGJUvQnE3RlpHA/w/m6hENGnVMT4aWd8Y00m82LmGzwG6by6UVdHXyYhLnZHONXrU10zaWblIeJA4TQGELD+o+3100w5rOPWDDAufakYcaiCdOnJSbj3LODsaQUvuFidacTn88NW/7ZYC0eBar4sisA/4WvDsRkllxtVBxIpTWfoENWJpgwVCEPvrjbFFg6Osk6uikE2JENLuYNB593RPrpcKoJ+Y2p4vMJ3iluIa5PIxy38VMa235K4+F57mWIGoxTJB4S2uD4vmPPkpAsSEO0rg== 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=ym1X+FmyECfloOqN4zFWIn31RsgxwS4N14EZzEE4ZRE=; b=NoRZOpMW8MvKl3GV6y2MvrwFlpH6JMk7diPbWGjhBJuEFe8vKBxmWN0rnQrP4g45dSkkpqZjky8bwiHBKTnH3YNsJuplt9g8WbTylpM8R2XfmsFc0FL4p4EoH+88cewAX3x+4apPdeLdKfO300hKTAWZnnHI5l0QzN3bvwPpo/M= Received: from BN9PR03CA0718.namprd03.prod.outlook.com (2603:10b6:408:ef::33) by BN6PR1201MB2530.namprd12.prod.outlook.com (2603:10b6:404:b0::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.16; Fri, 22 Oct 2021 17:29:52 +0000 Received: from BN8NAM11FT068.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ef:cafe::14) by BN9PR03CA0718.outlook.office365.com (2603:10b6:408:ef::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18 via Frontend Transport; Fri, 22 Oct 2021 17:29:52 +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 BN8NAM11FT068.mail.protection.outlook.com (10.13.177.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4628.16 via Frontend Transport; Fri, 22 Oct 2021 17:29:52 +0000 Received: from amd-Mandolin-PCO.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.2308.15; Fri, 22 Oct 2021 12:29:49 -0500 From: Sanket Goswami To: , , CC: , Sanket Goswami Subject: [PATCH v3 3/3] platform/x86: amd-pmc: Add support for AMD Smart Trace Buffer Date: Fri, 22 Oct 2021 22:58:45 +0530 Message-ID: <20211022172845.2608-4-Sanket.Goswami@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211022172845.2608-1-Sanket.Goswami@amd.com> References: <20211022172845.2608-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: 97c48052-1496-493e-729a-08d995818e4e X-MS-TrafficTypeDiagnostic: BN6PR1201MB2530: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: H1IFAeLIeAB7IwhmAdDPAcZDrdIjTtyN8EPNdi5DpWi6purswWO6FIzSwNfr6geYtri0+c48lGjTzJuEDBILjsp29FpKQ4+KI3c3XzqiEQQJfpkDdgYm0GADNG9jgyI+Vl6eYf+43LsOT2nnnbIfrnZVYI5fKTSGMTnbKO4BIeAVf+Cahm13e9X8gAbhLlmSuMdoqQoTUjxlCWS1TdCcy98rIkGjwzifhDCNEKx5nURStNKEEqXxtBwiD2k9/6qBL4Pycx5FQ7TFmj63EZdTwN/jdEDJ8lCa9flI6G+vzWziqZhnFHLi4n3g67dUaugVx+oOSwqBg625HYJockyRWb1/6wpHSm9GysEaH9OzSw29e7abr6gQuW+aLXPovLnMTCggMgckfdzwLeJ9EzIWetrFa8d8wj6qW0we69yriRgbFPCuJjnyVIBke0eEnS54h9jBIANI9LJE1CeVf19gtwZUNSVvzkaKR9dxA89AE3MQEaVNeJR+UIr9wPEV6sf6e4QnrH9UJO9m5YYcDwdUrsRm5KNtRuQdhz0cXVzbPIhbKe8+SC3RjAAkgSHmi+A4pO/75R8DZ5GOkai9F4gSDlPtLbYFpqALGLyqM3x3HwZ9bgI/y9SPpmgSt4Vs42uLlYhm8I5hfthltX36BqtGBevXkTqHrqW1FLNy0cYOxhX3jB4/BP3KTGsmwdmaoaF+KQHu5fXH2LrFhALBuJMUfdo/jScAhJYoNDB/y5WWBl8= 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)(8936002)(8676002)(5660300002)(47076005)(2906002)(426003)(336012)(16526019)(1076003)(316002)(82310400003)(186003)(81166007)(26005)(2616005)(110136005)(4326008)(36860700001)(70206006)(54906003)(70586007)(7696005)(83380400001)(6666004)(508600001)(356005)(36756003)(86362001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2021 17:29:52.0021 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 97c48052-1496-493e-729a-08d995818e4e 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: BN8NAM11FT068.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB2530 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org STB (Smart Trace Buffer), is a debug trace buffer which is used to help isolate failures by analyzing the last feature that a system was running before hitting a failure. This nonintrusive way is always running in the background and trace is stored into the SoC. This patch provides mechanism to access the STB buffer using the read and write routines. Co-developed-by: Shyam Sundar S K Signed-off-by: Shyam Sundar S K Signed-off-by: Sanket Goswami --- Changes in v3: - Address review comments from Mark Gross. Changes in v2: - Create amd_pmc_stb_debugfs_fops structure to get STB data. - Address review comments from Hans. drivers/platform/x86/amd-pmc.c | 120 +++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c index 50cb65e38d11..665d57ff222d 100644 --- a/drivers/platform/x86/amd-pmc.c +++ b/drivers/platform/x86/amd-pmc.c @@ -35,6 +35,12 @@ #define AMD_PMC_SCRATCH_REG_CZN 0x94 #define AMD_PMC_SCRATCH_REG_YC 0xD14 +/* STB Registers */ +#define AMD_PMC_STB_INDEX_ADDRESS 0xF8 +#define AMD_PMC_STB_INDEX_DATA 0xFC +#define AMD_PMC_STB_PMI_0 0x03E30600 +#define AMD_PMC_STB_PREDEF 0xC6000001 + /* 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 @@ -82,6 +88,7 @@ #define SOC_SUBSYSTEM_IP_MAX 12 #define DELAY_MIN_US 2000 #define DELAY_MAX_US 3000 +#define FIFO_SIZE 4096 enum amd_pmc_def { MSG_TEST = 0x01, MSG_OS_HINT_PCO, @@ -128,8 +135,14 @@ struct amd_pmc_dev { #endif /* CONFIG_DEBUG_FS */ }; +static bool enable_stb; +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_write_stb(struct amd_pmc_dev *dev, u32 data); +static int amd_pmc_read_stb(struct amd_pmc_dev *dev, u32 *buf); static inline u32 amd_pmc_reg_read(struct amd_pmc_dev *dev, int reg_offset) { @@ -176,6 +189,51 @@ static int amd_pmc_get_smu_version(struct amd_pmc_dev *dev) return 0; } +static int amd_pmc_stb_debugfs_open(struct inode *inode, struct file *filp) +{ + struct amd_pmc_dev *dev = filp->f_inode->i_private; + u32 *buf; + int rc; + + buf = devm_kmalloc(dev->dev, FIFO_SIZE * sizeof(u32), GFP_KERNEL); + if (!buf) + return -ENOMEM; + + rc = amd_pmc_read_stb(dev, buf); + if (rc) + goto out; + + filp->private_data = buf; + +out: + return rc; +} + +static ssize_t amd_pmc_stb_debugfs_read(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, + FIFO_SIZE * sizeof(u32)); +} + +static int amd_pmc_stb_debugfs_release(struct inode *inode, struct file *filp) +{ + kfree(filp->private_data); + filp->private_data = NULL; + + return 0; +} + +const struct file_operations amd_pmc_stb_debugfs_fops = { + .owner = THIS_MODULE, + .open = amd_pmc_stb_debugfs_open, + .read = amd_pmc_stb_debugfs_read, + .release = amd_pmc_stb_debugfs_release, +}; + static int amd_pmc_idlemask_read(struct amd_pmc_dev *pdev, struct device *dev, struct seq_file *s) { @@ -289,6 +347,10 @@ static void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev) &s0ix_stats_fops); 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); } #else static inline void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev) @@ -488,6 +550,9 @@ static int __maybe_unused amd_pmc_suspend(struct device *dev) if (rc) dev_err(pdev->dev, "suspend failed\n"); + if (enable_stb) + amd_pmc_write_stb(pdev, AMD_PMC_STB_PREDEF); + return rc; } @@ -508,6 +573,10 @@ static int __maybe_unused amd_pmc_resume(struct device *dev) /* Dump the IdleMask to see the blockers */ amd_pmc_idlemask_read(pdev, dev, NULL); + /* Write data incremented by 1 to distinguish in stb_read */ + if (enable_stb) + amd_pmc_write_stb(pdev, AMD_PMC_STB_PREDEF + 1); + return 0; } @@ -524,6 +593,57 @@ static const struct pci_device_id pmc_pci_ids[] = { { } }; +static int amd_pmc_write_stb(struct amd_pmc_dev *dev, u32 data) +{ + int rc; + + rc = pci_write_config_dword(dev->rdev, AMD_PMC_STB_INDEX_ADDRESS, AMD_PMC_STB_PMI_0); + if (rc) { + dev_err(dev->dev, "failed to write addr in stb: 0x%X\n", + AMD_PMC_STB_INDEX_ADDRESS); + pci_dev_put(dev->rdev); + return pcibios_err_to_errno(rc); + } + + rc = pci_write_config_dword(dev->rdev, AMD_PMC_STB_INDEX_DATA, data); + if (rc) { + dev_err(dev->dev, "failed to write data in stb: 0x%X\n", + AMD_PMC_STB_INDEX_DATA); + pci_dev_put(dev->rdev); + return pcibios_err_to_errno(rc); + } + + return 0; +} + +static int amd_pmc_read_stb(struct amd_pmc_dev *dev, u32 *buf) +{ + int i, err; + u32 value; + + err = pci_write_config_dword(dev->rdev, AMD_PMC_STB_INDEX_ADDRESS, AMD_PMC_STB_PMI_0); + if (err) { + dev_err(dev->dev, "error writing addr to stb: 0x%X\n", + AMD_PMC_STB_INDEX_ADDRESS); + pci_dev_put(dev->rdev); + return pcibios_err_to_errno(err); + } + + for (i = 0; i < FIFO_SIZE; i++) { + err = pci_read_config_dword(dev->rdev, AMD_PMC_STB_INDEX_DATA, &value); + if (err) { + dev_err(dev->dev, "error reading data from stb: 0x%X\n", + AMD_PMC_STB_INDEX_DATA); + pci_dev_put(dev->rdev); + return pcibios_err_to_errno(err); + } + + *buf++ = value; + } + + return 0; +} + static int amd_pmc_probe(struct platform_device *pdev) { struct amd_pmc_dev *dev = &pmc;