From patchwork Fri Oct 29 17:23:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Goswami, Sanket" X-Patchwork-Id: 12593157 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 D4DC6C433EF for ; Fri, 29 Oct 2021 17:24:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B531F610A0 for ; Fri, 29 Oct 2021 17:24:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229999AbhJ2R0t (ORCPT ); Fri, 29 Oct 2021 13:26:49 -0400 Received: from mail-bn1nam07on2057.outbound.protection.outlook.com ([40.107.212.57]:22697 "EHLO NAM02-BN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229826AbhJ2R0t (ORCPT ); Fri, 29 Oct 2021 13:26:49 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=amggs77KOLVEJHHp6wLB9e1YMYlMIMvITgorHtSsb2g6EbXZLYuaGGXfmhRnSZ73b1DeCHx4Y5dD8mSXr9ayAdtPFBIMS+pO7WUzTT2pg10mQ9+sVvGKaZpTc1f52glPmvrLQMrWKLFxyXP8TLR/Z3iJgSVtElvi+gnii2lonRuuuzCYGBFvMb77fK4QuAfItv2lYmr/w4WBvpAryBIaaoAipt6hrc+h5DEHhRRUxUkE7EfwNbliFn7FKauBxFkDg83lcWnQ63AdD1RjiBLKlRkz7BYsoGHec4xfipimoAuiX5UdwGj25aDZdYnKazNzOeoz/4IVcerT/7tFYgG4uQ== 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=QI1dNvv9FDjOtZlzdw9zka+IewxPgXzG8ObIuwRt/9k=; b=l+WzCJa3ZYe8S2qts4yMl3/Me7TgujOs9Gd/uQfquLGdRpuQ8ShLR1Yiv5+1iSvSF+k+2JyEqMpln5tdU0HyW6Bef8R1+y1CRTGlQ1p/BKgkioDBPNfLt/DXT5imOCMEczzvP52tbZtiwY+p5Xe5pdTvWS07Rh6ZD6BX5ic0cVFii3pNus8+b1jI3YLRbtfhjrCviG7hY+jzhV7K7oD07j5nTgTfyxzwu8Ftp+ogYLB8sg17g2J+7jdltLaAwbROd0NiHtOXmzSFi+0WCqeiMo6TdTLprO0GrJcXmCsD4OAG2uzKwX1/UddtoudNQFAS8pBxf8JhWbpw2308zL451w== 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=QI1dNvv9FDjOtZlzdw9zka+IewxPgXzG8ObIuwRt/9k=; b=pRi8K9OiFBPXGbRzRUz3d7AhK2Jmp5ksRMS1BrwSrQ2vALxpkbbVizdKn8Y5mq3OuGzLGezDRrPrs5iSAemVxP1A1wuN6Dh63zmiyeZ3rE72iBlpihmFDxG3uRex0wSZT6LKusB/zM5/zi8MmRwg6pNUX/PUtsc9tE1hzoFFVfg= Received: from MW4P223CA0012.NAMP223.PROD.OUTLOOK.COM (2603:10b6:303:80::17) by CH2PR12MB4181.namprd12.prod.outlook.com (2603:10b6:610:a8::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Fri, 29 Oct 2021 17:24:17 +0000 Received: from CO1NAM11FT024.eop-nam11.prod.protection.outlook.com (2603:10b6:303:80:cafe::73) by MW4P223CA0012.outlook.office365.com (2603:10b6:303:80::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.15 via Frontend Transport; Fri, 29 Oct 2021 17:24:17 +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 CO1NAM11FT024.mail.protection.outlook.com (10.13.174.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4649.14 via Frontend Transport; Fri, 29 Oct 2021 17:24:17 +0000 Received: from Celadon-CZN.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, 29 Oct 2021 12:24:13 -0500 From: Sanket Goswami To: , , CC: , Sanket Goswami Subject: [PATCH v5 1/3] platform/x86: amd-pmc: Simplify error handling path Date: Fri, 29 Oct 2021 22:53:02 +0530 Message-ID: <20211029172304.2998-2-Sanket.Goswami@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211029172304.2998-1-Sanket.Goswami@amd.com> References: <20211029172304.2998-1-Sanket.Goswami@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: 58eff0b7-cdbe-4e95-b725-08d99b00efdd X-MS-TrafficTypeDiagnostic: CH2PR12MB4181: 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: Huav1jIskObwrzapSWeZ5kjQZgAMhZXZP9bMj6A7/yD27WYhBrZFnmbH/byzLdlExwzfSmuUsQ2a9jF+Y3INsZS2/V4qV+ImmBtByD1kjvzNNttliwDaluhRIVwAO09UT5Ln73ch1hWmHcY3E5J1TtmIeegJr7xxW9lP+N06Ppl2bTHvo9il+Tddps5uPK1gc60TgcxZhW1JqN1ybe0ve5nDk/Q3hJ+wRPcJZyj/jPTeZp6VYCPN0LcP8Dlp0ch1DsraedsugzdtOVndqn59/eyRmg222GRsgFv6ZNvMcsPYrqPKIWOFtRoBDZ8a00SqWeZnqaCb4XeRgJ40JyS2cvEWQTGlmtIIgDyA4W52tJFQFbKOXeK34QGHG9/s9B8SHHwdpiN8rDxZLzrS1at7d4rT7KCmG4qasP9Y0EfcyYs+oK5zTTP+HMoEmTWLrBftFj4t3Nxgvgd8ek+TXIMP7l76UKaL+hU5yJVVNiGCAVi4NRfYBQcuBQF5dy0enQyThb+sNlNXhXfspjjVgqCCCVm2TGeTR1+XqTWLIxrlsVQE/1dnrows07ZyS2vGpdFIrUwmraF0BVnbf7t9OHFp7uErhAwazth3ZQdtC/pMGnqiukntE3mF5+Ai4+ZsgWw9i2Q9KS7lJ5vx2QObkOcVxFanefKsjr8zOcpPHz2RfBBbckc8Nzm7zQWYYJW/qCJ5mddWjPCsq0x+kXZD31WSYAyIDldV6Uos2HJlmTGD3p4= 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)(426003)(6666004)(110136005)(8936002)(186003)(54906003)(336012)(508600001)(16526019)(8676002)(36756003)(2616005)(356005)(5660300002)(86362001)(2906002)(316002)(81166007)(1076003)(47076005)(83380400001)(70206006)(4326008)(26005)(7696005)(36860700001)(82310400003)(70586007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2021 17:24:17.4567 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 58eff0b7-cdbe-4e95-b725-08d99b00efdd 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: CO1NAM11FT024.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4181 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 Tested-by: Scott Bruce --- Changes in v5: - Use goto label incase of error-exit path. Changes in v4: - No change. Changes in v3: - No change. Changes in v2: - No change. drivers/platform/x86/amd-pmc.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c index b7e50ed050a8..9af02860ed59 100644 --- a/drivers/platform/x86/amd-pmc.c +++ b/drivers/platform/x86/amd-pmc.c @@ -533,22 +533,22 @@ static int amd_pmc_probe(struct platform_device *pdev) rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0)); if (!rdev || !pci_match_id(pmc_pci_ids, rdev)) { - pci_dev_put(rdev); - return -ENODEV; + err = -ENODEV; + goto err_pci_dev_put; } dev->cpu_id = rdev->device; 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); + err = 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); + err = pcibios_err_to_errno(err); + goto err_pci_dev_put; } base_addr_lo = val & AMD_PMC_BASE_ADDR_HI_MASK; @@ -556,14 +556,14 @@ static int amd_pmc_probe(struct platform_device *pdev) 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); + err = 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); + err = pcibios_err_to_errno(err); + goto err_pci_dev_put; } base_addr_hi = val & AMD_PMC_BASE_ADDR_LO_MASK; @@ -594,6 +594,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 err; } static int amd_pmc_remove(struct platform_device *pdev) From patchwork Fri Oct 29 17:23:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Goswami, Sanket" X-Patchwork-Id: 12593159 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 80A98C433F5 for ; Fri, 29 Oct 2021 17:24:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5F036610A0 for ; Fri, 29 Oct 2021 17:24:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230119AbhJ2R1H (ORCPT ); Fri, 29 Oct 2021 13:27:07 -0400 Received: from mail-bn8nam11on2047.outbound.protection.outlook.com ([40.107.236.47]:15264 "EHLO NAM11-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230044AbhJ2R06 (ORCPT ); Fri, 29 Oct 2021 13:26:58 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k0zcBWV6fV0MrIv2LpXUjl8ljRpE1qy1GRfYkPKPdre2+N89DCCDv6x+A0rb+8q1bySDowonwIHPUTU78eFt2Wv3CWAo0gF3Vmv19/nLZKamwDjQP+yPjoFL2R7Ht7IA0IOslQYCRtpnzIQy0s5+Yc2AxDFPEJicYhamzgNsSMzb7hhKimvUQvBlBLGMIxVczXTdUKAZmhKC3ljp/H9VSv1S9BG9i28NWW5TioQyRb0+IajnUgWTTkZTNxCCeeaDLIVZLPA3jRVYoW+43k7Z4ByuL2brJFpJ8k2RlhzmK3L+UgWhaEwTLyAUVW6LdR89/9e9j4tREXIDAEJiU+Fing== 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=U38hRrotluqqmKsx3sfLbDofZQKG3uuhJBhUGIjlquQ=; b=OjcOQ4F2nRqii4pTv0RKXqwdwSpMWazVeR9BQaH1BxxOfHp6lPwpLT4xhyksiX2OD8YTgF7x6di9z5Edff6i/gNmbDmm8vyB3XoGWmdlk3U0ut/LRKQEsY1IruCnWNymxHY+ARIk/lWFVfp8gtfOQsOZ4YfAdCVe9K7UYzX1CcZsYxCZbeOpRS0PGE3HVxVITCkm0AdRctwtez3+d+XONyD763chmmsMvN84RePxNp9vV2CIxxXhPb1mNBCXIKCfCY2Lq51rWkiVeIZX3/XIfY/OQLcEAyWETekEvdVgeH7vsaf9JITTXP2RiKRbDRIq0fL84/Gmnbj2qr4UJZjBnw== 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=U38hRrotluqqmKsx3sfLbDofZQKG3uuhJBhUGIjlquQ=; b=raVOChslC1yRfGSp2g8lMjCz5PmX4Aktrj/Inf/wi7m5lJK6Lw8RxECClXSF6IC1IdcDkEm4h7Rq9ZDMincEo0uFmKaJQgomjfc7FI6cPyPcz7fEIg1dGai/Tm2/FJNqxSNZZNxpVjejDcmIU2J+oDNBNe8xFk/VeKYN3s5166s= Received: from MWHPR2201CA0056.namprd22.prod.outlook.com (2603:10b6:301:16::30) by BYAPR12MB3176.namprd12.prod.outlook.com (2603:10b6:a03:134::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.14; Fri, 29 Oct 2021 17:24:25 +0000 Received: from CO1NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:301:16:cafe::a0) by MWHPR2201CA0056.outlook.office365.com (2603:10b6:301:16::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.13 via Frontend Transport; Fri, 29 Oct 2021 17:24: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 CO1NAM11FT022.mail.protection.outlook.com (10.13.175.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4649.14 via Frontend Transport; Fri, 29 Oct 2021 17:24:25 +0000 Received: from Celadon-CZN.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, 29 Oct 2021 12:24:22 -0500 From: Sanket Goswami To: , , CC: , Sanket Goswami Subject: [PATCH v5 2/3] platform/x86: amd-pmc: Store the pci_dev instance inside struct amd_pmc_dev Date: Fri, 29 Oct 2021 22:53:03 +0530 Message-ID: <20211029172304.2998-3-Sanket.Goswami@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211029172304.2998-1-Sanket.Goswami@amd.com> References: <20211029172304.2998-1-Sanket.Goswami@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: d633dff7-9c39-47c8-f0d5-08d99b00f497 X-MS-TrafficTypeDiagnostic: BYAPR12MB3176: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LdNpIjH+3Y/V2+0art0YrSUyd5f+sdNgGjcyn3SCncjijMVXuoIkdlx5/VpH1bCO7r27tc2ya7bI79q0iWbdTubc+ZczrlY1PnBf3cp4K06bk/Hd0HSpHizZuBKI5XThMe1GLu8Babplmj9bl2EU2ixHBYYEkfxj12PUtGVZiCQT13oHaJdmnX68C7Xxxs4cphyzkmC9mfUcmGtm9+DTRvIq8g9aBIYcQdd+bZ/3tS8poxOPN83F3qcvM05NfO1iN0hwUOTXb0BAaQqdK/xhvE8wIntfasYIHsbv2MxKjDVSTKelsHv7zTJWK7o5lwaKTopBF96I5Q4YjC0FTTtNL1KqU13DBdX13YOrpHJWAerqPtMV9wx2vNGXHjEnfYazPT4kI+arTOL2j29zoR1o43Hc5Z2Czf3ndZ7id9DcviIoredkkgXirWZiIx7GR6LdixTG3vlwnZ/ed75C7UDCPOZsyvHuE4ucJpy2GJrd7/9OQ2wNj4SilRF00jbh486k1jskYS/2uBWs/2/Uf5VY8Zm0nQiqdvL+GJG4++DZNE4qU5zxJdpaVRX11QdkcR8+VJDAhu1/vqaspk3u7tbH9wsYW5qRZzLE2Ps2O3+c+Z2qAx7M7CyxICXOKnkhN7nprnsoxJhUKDrqUttGheESbZXpDMsKcrl4FkpkwdjTv+GXsB4igbyRYRsa6HYZLXUPx/BeV0Jhgj2VedYk92EhpGRC4WQIYQbgv5VDzK5hpiY= 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)(70206006)(70586007)(110136005)(4326008)(47076005)(86362001)(5660300002)(8936002)(54906003)(316002)(336012)(426003)(2616005)(8676002)(356005)(508600001)(83380400001)(186003)(16526019)(82310400003)(6666004)(2906002)(81166007)(36756003)(1076003)(7696005)(26005)(36860700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2021 17:24:25.3970 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d633dff7-9c39-47c8-f0d5-08d99b00f497 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: CO1NAM11FT022.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3176 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 Tested-by: Scott Bruce --- Changes in v5: - Remove pci_dev_put() from amd_pmc_remove() as its no longer required. Changes in v4: - No change. Changes in v3: - Add pci_dev_put() in amd_pmc_remove(). Changes in v2: - Store the rdev info in amd_pmc_probe() as suggested by Hans. drivers/platform/x86/amd-pmc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c index 9af02860ed59..ea099f7759f2 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; @@ -538,6 +539,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); From patchwork Fri Oct 29 17:23:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Goswami, Sanket" X-Patchwork-Id: 12593161 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 1E8B8C433EF for ; Fri, 29 Oct 2021 17:24:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 02DA061056 for ; Fri, 29 Oct 2021 17:24:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229968AbhJ2R1K (ORCPT ); Fri, 29 Oct 2021 13:27:10 -0400 Received: from mail-bn8nam08on2085.outbound.protection.outlook.com ([40.107.100.85]:43329 "EHLO NAM04-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230189AbhJ2R1H (ORCPT ); Fri, 29 Oct 2021 13:27:07 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J8VYZO8n3oRG9IbpaKar3LGUaNOYU7Xl00PwpF3Sgh96CJUXVch3/6ssq1ilVONJdfXkhc8k1f7uk+vGE9yT48f+7mQjned9HXNc7ZbJ/FS2YZjWUTGUceNw1j4gW6x7b9jpJEmaObunw1GNSHXO153otCGyh/+RT3O1Zgg1L7rCTYFYtMhJpPH6G45ukH/gEzZb+swHKc4T/oax+n6Zfo6Wi19ekVL2X5mteHVxEysNyv8B+3AkF2n1IXRB0HoLb4APMl2Ozk3F13vDCNHVnqEo8wDGrLOlPIjynysBgGYHauctHUouE+UXPE/uzHm6HiKdq5DWDK41FphhkJtZdQ== 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=laIUuNQj43A8JohPzC06Gi2dNhiBuTG+2pST+Z6zsZ4=; b=VHWbvvSP47JNYpo+i5Nd2Uu3pzODvjx0EhgojBnNbbVD1iP7xhFYHYzKPPkBeFxhyZR98gHqgY0eMSBAZKQSw5g63DX/mN7aw0jzaF/HTchmzHSkgHm0wolJ2xKpQ/yYeFvRjeN+H2CkwWBikmO2WDW4DFV4brCqiyXMQSFIvWwh9TauH+yhKJA5/AmXxlh1qHyJELgc1awYHZoMTvelock4KhZ9TCzbbUxTtmjE3wOeydCTL1F0iJOWe7fsGojaEQKyTTmIP9HReYTXrsQoCkX5zB2iuNMpdwbHFn4vj1hkobn4Ee8OGPHu2M06/6F4EP52KKC9cYcaEWzCGoj2LQ== 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=laIUuNQj43A8JohPzC06Gi2dNhiBuTG+2pST+Z6zsZ4=; b=iLqyRATWFIiNVzUvgMjoLl3tqjnPOFM9h6/7xnU7A1qoBwvrOaKx8eeoBEwyKnichE7yJgUl9L6/x4cScNnKnIX09u4b2aoL6edEkGr5XVOsWQSNpRBovOgkqZ3nkudcv2lsLqJky3YMIQ2WjrJfPcPblg0lWc6LHpr2GiiLXNg= Received: from MWHPR12CA0034.namprd12.prod.outlook.com (2603:10b6:301:2::20) by CH2PR12MB4197.namprd12.prod.outlook.com (2603:10b6:610:ab::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.15; Fri, 29 Oct 2021 17:24:35 +0000 Received: from CO1NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:301:2:cafe::18) by MWHPR12CA0034.outlook.office365.com (2603:10b6:301:2::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.15 via Frontend Transport; Fri, 29 Oct 2021 17:24: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 CO1NAM11FT059.mail.protection.outlook.com (10.13.174.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4649.14 via Frontend Transport; Fri, 29 Oct 2021 17:24:35 +0000 Received: from Celadon-CZN.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, 29 Oct 2021 12:24:32 -0500 From: Sanket Goswami To: , , CC: , Sanket Goswami Subject: [PATCH v5 3/3] platform/x86: amd-pmc: Add support for AMD Smart Trace Buffer Date: Fri, 29 Oct 2021 22:53:04 +0530 Message-ID: <20211029172304.2998-4-Sanket.Goswami@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211029172304.2998-1-Sanket.Goswami@amd.com> References: <20211029172304.2998-1-Sanket.Goswami@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: 3a136dc6-ab61-4135-763c-08d99b00fa81 X-MS-TrafficTypeDiagnostic: CH2PR12MB4197: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Kd1lro8aoBQyS3DBzT1x5EFjGuNIOJwcLm7TYUKyXOpJANPFVEz140Sv/vOmC7lIMfFQ5nbxgLAPgm/HdHWNmDucPbdTZ0u+tHG4htne3Tm5V+NCkeNyJZKuSU0qa2ERIyErrjSdQts+NXMsia9+Fs2mYWSHaWsu0EV+tz9+ZdfIQ+mE7odt1JH+zxa4avdxkNuKRfmv4XRTMj6HT5dwXc9gadadk48+HA7cbntvQdZCRfyE1CAnRQqXUEKrhC3CuRmsupXRPwmY6rn20kVMRIVig/XWl3yuz7b6zs+2rqmrFfI/rIAajE7TaCXOCkFYE5ruBKcepIeHTl9aiIzZz2twX4sxOnynMSnUrIrjycFSS7P5UuNAfpdgzoptXoZskUQjpmnqHTIgEWeAoqn77hsq+EJzk/uL+Nh7WToRPun9L+bAsKiOqIfuD8tkLQmy8dXy/TDSmG2QMycooFM9BnBtTEuZrBOqf43zbDnbPDo4lOo9xtrbk2Thqt37iUVZ/76bCtrwThKRnd6KozJZpcNLmiQ+sUYj5SoESc//iL3F/FQy5qHw8aRwMUkjkxVsDze0UvDEOU7Ug954Od5iUuCeJacwcSLROyT4VPn2xG2KJSB24eFbJ/JPb+ohFBLVyRj4r+qMc483E8mNi6IDldop0BKdvKy1R5NZGDYQJBmRSh86FWgzv2UFx500lt2o1ICD5RczjChpnTgN5P9WORyzjfhZ7Ay5aEXE2Xjmhtc= 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)(2616005)(186003)(26005)(508600001)(36860700001)(7696005)(36756003)(70586007)(83380400001)(16526019)(336012)(356005)(70206006)(81166007)(426003)(316002)(8676002)(8936002)(4326008)(86362001)(82310400003)(5660300002)(110136005)(54906003)(47076005)(1076003)(2906002)(6666004)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2021 17:24:35.3070 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3a136dc6-ab61-4135-763c-08d99b00fa81 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: CO1NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4197 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 Tested-by: Scott Bruce --- Changes in v5: - Use kfree() only once in .open as suggested by Hans. Changes in v4: - Use kzalloc() for memory allocation. Changes in v3: - Use sizeof(u32) with multiplier as suggested by 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 | 127 +++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c index ea099f7759f2..a39354ea96c4 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,50 @@ 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 size = FIFO_SIZE * sizeof(u32); + u32 *buf; + int rc; + + buf = kzalloc(size, GFP_KERNEL); + if (!buf) + return -ENOMEM; + + rc = amd_pmc_read_stb(dev, buf); + if (rc) { + kfree(buf); + return rc; + } + + filp->private_data = buf; + 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); + 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 +346,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) @@ -485,6 +546,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; } @@ -505,6 +569,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; } @@ -521,6 +589,65 @@ static const struct pci_device_id pmc_pci_ids[] = { { } }; +static int amd_pmc_write_stb(struct amd_pmc_dev *dev, u32 data) +{ + int err; + + err = pci_write_config_dword(dev->rdev, AMD_PMC_STB_INDEX_ADDRESS, AMD_PMC_STB_PMI_0); + if (err) { + dev_err(dev->dev, "failed to write addr in stb: 0x%X\n", + AMD_PMC_STB_INDEX_ADDRESS); + err = pcibios_err_to_errno(err); + goto err_pci_dev_put; + } + + err = pci_write_config_dword(dev->rdev, AMD_PMC_STB_INDEX_DATA, data); + if (err) { + dev_err(dev->dev, "failed to write data in stb: 0x%X\n", + AMD_PMC_STB_INDEX_DATA); + err = pcibios_err_to_errno(err); + goto err_pci_dev_put; + } + + return 0; + +err_pci_dev_put: + pci_dev_put(dev->rdev); + return err; +} + +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); + err = pcibios_err_to_errno(err); + goto err_pci_dev_put; + } + + 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); + err = pcibios_err_to_errno(err); + goto err_pci_dev_put; + } + + *buf++ = value; + } + + return 0; + +err_pci_dev_put: + pci_dev_put(dev->rdev); + return err; +} + static int amd_pmc_probe(struct platform_device *pdev) { struct amd_pmc_dev *dev = &pmc;