From patchwork Tue Sep 26 22:59:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 146259 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3528559vqu; Thu, 28 Sep 2023 11:56:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGuqNpc/xRNbOrNqVus3+yDeAOEa+CrOxQriYntMFkW4H8guH6REQ/jxb7RuGrnhoAL2NoT X-Received: by 2002:a05:6a00:2442:b0:690:f877:aa1e with SMTP id d2-20020a056a00244200b00690f877aa1emr3304724pfj.12.1695927404383; Thu, 28 Sep 2023 11:56:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1695927404; cv=pass; d=google.com; s=arc-20160816; b=x497cSkTieRZeEJf1sNGuuDITs35jokXvXPKIapfR95kcVE2rYvr+Zf4jPl0xZrA9z VTyE2pzRS7JDtasxXQCdYNcy5N8xV3ElfMnl7nJv+ZLIkNdHIVDIz9mbc29BG1px2gzS vi18Dk8sAEaIQMlxI/HLdAvPVzwWmTBUhNXdd2P1Skisj3Bw5feuJ8tHKtkxrP2HsYdO ZvT5h1T9HotGk4dUJ98YQlyhBDJOcz1ACFUcTGuTrKbiJibM090ghGxcns3V8a+sOW5u KBXsdgMtLxYgN5EgRGw2TzYNSaUwik2rFJNAi3624z+gSKvuRpqpGGSG3Bh+eh0bNPzb iLkQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=677s5/v2RCD50dIi6oZiOGkmwZEmYBXuyVLUMjCt/w4=; fh=ABVm0psAHlO3wUFuG4B/8TQE9V6/c2W7vr8KVwJc/z8=; b=sN+PWT5N7MZjUMgWPxu3t2ll+s4eXCRtNsNEKQ8RstChGQpeJLq1o94UVugM6Q8MNd arFpAn5iu8v526GA10Q1M4d4zh/k8HFZbjCnUvRpZ+W2c/NYXODeNISu0SLyup0DgO+A 9kqTxjJiQM3t5TosvwaaJv8xUHhp7GRmiTIFx1b6Us/kM+IrhEzFi1N8pwNzC8geRUH9 Ze3Ul5bqEwcu19AfTSqQBylmaPpody457MsxmN7KMoRRpQMuAeC8eGInNrCp0bOaa5vC pYYDuCQU/2KwKEO14eolYVU/BkenmzdV7+h2Vq4f4imJYmnJ4IXSmPkOD47CQxR1ms3T tCfg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=qtFIHPme; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id s3-20020a056a0008c300b00692dfef1ebdsi14464662pfu.189.2023.09.28.11.56.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 11:56:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=qtFIHPme; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id B64C08331E03; Thu, 28 Sep 2023 09:35:39 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231150AbjI1Qf3 (ORCPT + 21 others); Thu, 28 Sep 2023 12:35:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231426AbjI1Qf0 (ORCPT ); Thu, 28 Sep 2023 12:35:26 -0400 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2048.outbound.protection.outlook.com [40.107.93.48]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42B2CBF; Thu, 28 Sep 2023 09:35:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PEbSUtWBTHUNpMP6PZWmJ1uQ2JeVAg4+9eWi1Rejf+k0HE/IHOHdkjNr4fQtcNOPJxdvh5aaZ8N1/N2e0RmW/QWo+f6C3nP7Dr4l/dsjOzg8eYEUyj4HyyGuewht1cz0XDQJK276OpygCQdrTbikOAYZ1H8yQMO/JMEr6ZpFxS7RmihdlqH357MkMSsFPSXB6d8XqXS4Spdz2JTqDRTJn74AWW4/805r3XUbTWLSF4PeWc9VVIC+qJXo5jCXUm2DT8Ql+UVGDd1dcC3Ymt4AoSJaX7IG5ZYtr+d8OzBmhhOa+95Y/AcbJ0PX8qks0AujQzE2A0+ZvXuWJu5DtQKEXA== 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=677s5/v2RCD50dIi6oZiOGkmwZEmYBXuyVLUMjCt/w4=; b=OCpFca7ZnEFVkA1rySBVm0dwtd/Z/JN4OIEqcTdcMdGkn+/iyiUzgQRIvBnmjFtTJuAa1orylBiNxpQcD3obEP3/VqKoQOUpzrW7gNaGJYwHEv/O8fV+FrFVx9S7dI4JTjOJlcpXflg/6OEcTvdQBWHCQIPTw1HMFI1bh3Fjbk2icoHUIH8w6Ws6fCGM3KUmdfmsvOE66N+yo/6PVW+WoI4LpG4JD3mWFpbJjKSF+rLVMGJokn/LteuXr467HPVLhgKwHHbiIVKWjAlFR1P5AIh2r+4YSgL2RcqTGELmxvqycDNo5HGZnyFE8E6BFzwpjuBZgQQVmrUmC9JpnZ/sfQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org 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=677s5/v2RCD50dIi6oZiOGkmwZEmYBXuyVLUMjCt/w4=; b=qtFIHPmeQe+82kan5izhcazAZ7L8XMj3Xf3eR3B1QpYtMt7XGc9B1k0M48wOei3Hd9Zoz86EexFxd7cU05TLq13Y+kGrGcbr3ZeFbnIMpBUbk5+vD8mqWKiEy+nir85bDWENP8Q7xNFKU1IC/oaXI/dNvNaS4gAzr6senivz7gw= Received: from SA1PR02CA0008.namprd02.prod.outlook.com (2603:10b6:806:2cf::13) by PH0PR12MB5420.namprd12.prod.outlook.com (2603:10b6:510:e8::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25; Thu, 28 Sep 2023 16:35:22 +0000 Received: from SA2PEPF00001508.namprd04.prod.outlook.com (2603:10b6:806:2cf:cafe::5a) by SA1PR02CA0008.outlook.office365.com (2603:10b6:806:2cf::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25 via Frontend Transport; Thu, 28 Sep 2023 16:35:22 +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; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SA2PEPF00001508.mail.protection.outlook.com (10.167.242.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6838.14 via Frontend Transport; Thu, 28 Sep 2023 16:35:22 +0000 Received: from AUS-P9-MLIMONCI.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.2507.27; Thu, 28 Sep 2023 11:35:20 -0500 From: Mario Limonciello To: , Sebastian Reichel , "Alex Deucher" CC: , , , Mario Limonciello Subject: [PATCH 1/3] drm/amd: Fix detection of _PR3 on the PCIe root port Date: Tue, 26 Sep 2023 17:59:53 -0500 Message-ID: <20230926225955.386553-2-mario.limonciello@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230926225955.386553-1-mario.limonciello@amd.com> References: <20230926225955.386553-1-mario.limonciello@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-TrafficTypeDiagnostic: SA2PEPF00001508:EE_|PH0PR12MB5420:EE_ X-MS-Office365-Filtering-Correlation-Id: 3e0c4f86-aff2-4c48-0383-08dbc040e8e9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6dQ0rlQaWgxO4Fh9COCjqm9WxK4IsJH8vtkZR1xERDfApbIUgg/y9UbZVSd4YVOJRzRjTmwmmqD3NQL8wHy/zhemRU0OV0nqgBS0AeYQd35/Sp7IKaJTD2k1F5GLUOQecSO1LjenKfNYV+JKLNQSrPpwosz2UlVC7dZjLVv06iCiOrimXQ4suoY9rJ6EgV339WWYZnaOSo3kFxePW3d8QI4zGJCZhlgGPGmpwVbhi668RQZ17IwgVF3Tehd8l9gs7iqi8ld0HOKd+glFwj859M2RpqWfKl1EAyyF4B8oZ1MyI2O9DN3DiP/oxRsuiPpATuzv/bRGd1oHqT+9MvAdvb5wMpDfoiWF+rrNX7r7j4ZpFTKriVfXU0ss7HhBymYDrq1XCBuN8UCVlzQVFxjeuOJBuF9xvvXIQcMC4SjbpPMPh/Z8DuyLK5zUNoAhMa4BygOHRJLsky70iaVx9tXjUy4XSU2NJkYoLMv1wjM/dlAiYIhuD4fqVVGKOQ6SuWp4NXUH3lkWsxk5ZvNQYPu3caeRuIg5YWu+8orhdadFayKpTg5WYnA1SLerTW+FdybGPcySXRk0wufQUy35SYVwshGKVAfRJR0Ay3ZJb0vkWErmW3fWl+oARSlxUfvC5ZJc5r8aKH3La85qF4pQCenaZEKneTRasCPgwa8H3tw8VLo5Wgo3QaWKGOStBWyWfltmvKfg5G3MMK6wVrNPXM4uMS3CXFoM/gVHKrJfdReyTeQGD+RHQi1LDYax78AONbEXTFb9IfP4M7SH5iXIIxHXyw== 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:(13230031)(4636009)(136003)(346002)(396003)(39860400002)(376002)(230922051799003)(82310400011)(451199024)(1800799009)(186009)(64100799003)(36840700001)(40470700004)(46966006)(44832011)(5660300002)(2906002)(40480700001)(70206006)(54906003)(70586007)(6636002)(316002)(110136005)(4326008)(41300700001)(8936002)(8676002)(40460700003)(36756003)(86362001)(2616005)(1076003)(16526019)(26005)(356005)(81166007)(6666004)(336012)(7696005)(83380400001)(82740400003)(36860700001)(426003)(478600001)(47076005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 16:35:22.0456 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3e0c4f86-aff2-4c48-0383-08dbc040e8e9 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: SA2PEPF00001508.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB5420 X-Spam-Status: No, score=0.2 required=5.0 tests=BAYES_00,DATE_IN_PAST_24_48, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, FORGED_SPF_HELO,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 28 Sep 2023 09:35:39 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778308774071371554 X-GMAIL-MSGID: 1778308774071371554 On some systems with Navi3x dGPU will attempt to use BACO for runtime PM but fails to resume properly. This is because on these systems the root port goes into D3cold which is incompatible with BACO. This happens because in this case dGPU is connected to a bridge between root port which causes BOCO detection logic to fail. Fix the intent of the logic by looking at root port, not the immediate upstream bridge for _PR3. Cc: stable@vger.kernel.org Suggested-by: Jun Ma Tested-by: David Perry Fixes: b10c1c5b3a4e ("drm/amdgpu: add check for ACPI power resources") Signed-off-by: Mario Limonciello Reviewed-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index e4627d92e1d0..bad2b5577e96 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -2238,7 +2238,7 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) adev->flags |= AMD_IS_PX; if (!(adev->flags & AMD_IS_APU)) { - parent = pci_upstream_bridge(adev->pdev); + parent = pcie_find_root_port(adev->pdev); adev->has_pr3 = parent ? pci_pr3_present(parent) : false; } From patchwork Tue Sep 26 22:59:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 146361 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3676485vqu; Thu, 28 Sep 2023 16:57:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHwbbmHsRZSHC8mGeRORVEbdufUEkspfe8v524HsmPTGzbz+8sCbvcoVI04jYFA+IHeag1M X-Received: by 2002:a05:6a00:993:b0:68f:cf6f:e21e with SMTP id u19-20020a056a00099300b0068fcf6fe21emr2922319pfg.28.1695945436268; Thu, 28 Sep 2023 16:57:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1695945436; cv=pass; d=google.com; s=arc-20160816; b=aT13wrtWY0CCzNy2Oxv++Mppy87S75Y61tR3Ip8lCxysnGB4YKYWLypBZcQi+bkO2l NVZ+T/9l3/weKFqZVhjHhrBdB0xDeh2o/24dGMv9ISULr3Ot4KFtxf7uSMnMB8A614yq XJGILrgyTflpDnxFFnrt/eNJCjUwn21iD0Pm7oksjBLS6KeKOHUHBujKQ+Aoz+9xY25C DCPib//TmRh2OtrV2SOFPV3LpYipSf8fkYzVVqyrvqH0sbTr0Ps8ber7qIqoHua76Nbf lXQxf4h4jo7D1TL0ylnIy8XWzJP2ha75BUxvPiCnW2IOg25sJ6geCpw7gPWgJZSUdig9 MD7w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3Def7aua7Saf96hnHEYbIARDNTIxX/ofd10KyHqIMrQ=; fh=ABVm0psAHlO3wUFuG4B/8TQE9V6/c2W7vr8KVwJc/z8=; b=O4Ecn3sP2YZybT15o4y6xaN+byt+Gk8fRgDpQKo2b4G2/Eyi8o9V9x5RjW18Gv8SHR v5ynRepJoC0mhKEaCgPLJM4lkhSFHElXsd8ZOKXAfEIDkUcC96grQ8n8ftyPHeKgRaTg rwzhfCrXMkF+fJXn5yy+idPdxaVrCOqnehAW7xKrRDGxbXAaexYKInBct/kBxr+Ta8jL jUW4tSlmnliu/Pyv2sBxeOTZVBk5tQ09BnNDlM4s8tmyUXvb3ozIyVVsdrzyiAWt4C7u V+DpDZ4c6vdg5DTcYkR4B/z/0ZdlRfClX9yaU2fJbO0lsozKB1YG6RLpTAkRsLKsUpRP vYoA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=fOoj6RoX; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id k17-20020a056a00135100b0068fba252466si19336278pfu.169.2023.09.28.16.57.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 16:57:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=fOoj6RoX; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id D0F1D805367E; Thu, 28 Sep 2023 09:36:13 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231617AbjI1Qff (ORCPT + 21 others); Thu, 28 Sep 2023 12:35:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231397AbjI1Qf1 (ORCPT ); Thu, 28 Sep 2023 12:35:27 -0400 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2079.outbound.protection.outlook.com [40.107.237.79]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 539C8193; Thu, 28 Sep 2023 09:35:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=njyOKal7PmHJuKyvRiNLdxZl1ymhP+zoAC6VJssFvtRdNbw3qwoFwNmJpj930k8XpC35gA7schffkVtEAq0dA4/mgxirzvY/1goljtEuwoADfjrhG1CLmQcCFycYw9kx61PfaxSTZVrTv4BN91aUXKiatM/guruNe5GWrhUz/adx4gpARL23246U0wVqiGqjewlwMPKf/eT7jqK/X+r/wDS8V7oBJzzEjuKpbikWWe922LZxSFiplLysH1XC3CUICyQdVl+6+r8V+XMRJiBlbSRLe0EW4Yr/WCjivcifNP0kvUoE9gc4Aa4FotlrVC/kj/rktl8PDU/mbqh/0Bu/Xw== 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=3Def7aua7Saf96hnHEYbIARDNTIxX/ofd10KyHqIMrQ=; b=Ys3SCl5cB407jRudITy2lRnkbraI+clJK4leO2RFd5x71qpw1D36A51sKoJ8Fqf+ZzHbf7iAe0U1474Dj2MpUS6ArQ2hcDSZv9RWqrdXAf8Yq4ZetTL8fdJN3HzVEvLtlxr/QFJSP5BADuUAxLUZkmPhca3qAHVmH+zVc+nOgtyLI81LdoXim9V3yOvIU6mnAeHvR1A4Bzg4K+SRF9jbCJOU4yQXylfrwkkDNIwhRuDe1xVJ10u7SaHhHw9BF4Xdugb9QIpvKQLbTXqV7ofR27KRQOoJ2RWWLjHjIkKChtB32/m0aW8J3nPbrPO3a9f/n2DJT7zdzAVgugOsdAupFA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org 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=3Def7aua7Saf96hnHEYbIARDNTIxX/ofd10KyHqIMrQ=; b=fOoj6RoXw7VdiBI+j3MeT3aVDXuL92amtAKZ7OxpVHZpTfL9Oix02+2vjUpUJ4NeQqC3KvQ/6eiW7LR+emddXdCLFcv+L8D6/WZFTBT62CisCO1D8bGZR3Gs05K8d3FrxGX1WF/VMQDZE9BxYGWOl2oceXS6/4OXhcLjWIcz/AU= Received: from SA1PR02CA0011.namprd02.prod.outlook.com (2603:10b6:806:2cf::28) by LV2PR12MB5750.namprd12.prod.outlook.com (2603:10b6:408:17e::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22; Thu, 28 Sep 2023 16:35:23 +0000 Received: from SA2PEPF00001508.namprd04.prod.outlook.com (2603:10b6:806:2cf:cafe::3f) by SA1PR02CA0011.outlook.office365.com (2603:10b6:806:2cf::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25 via Frontend Transport; Thu, 28 Sep 2023 16:35:22 +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; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SA2PEPF00001508.mail.protection.outlook.com (10.167.242.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6838.14 via Frontend Transport; Thu, 28 Sep 2023 16:35:22 +0000 Received: from AUS-P9-MLIMONCI.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.2507.27; Thu, 28 Sep 2023 11:35:21 -0500 From: Mario Limonciello To: , Sebastian Reichel , "Alex Deucher" CC: , , , Mario Limonciello Subject: [PATCH 2/3] power: supply: Don't count 'unknown' scope power supplies Date: Tue, 26 Sep 2023 17:59:54 -0500 Message-ID: <20230926225955.386553-3-mario.limonciello@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230926225955.386553-1-mario.limonciello@amd.com> References: <20230926225955.386553-1-mario.limonciello@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-TrafficTypeDiagnostic: SA2PEPF00001508:EE_|LV2PR12MB5750:EE_ X-MS-Office365-Filtering-Correlation-Id: 2df7feb7-0847-4b46-876d-08dbc040e96e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Lqn2EKFmjAVeUN2fIA5wwgdjEjzyBqJXxPfTH0O6CStFMMy0h+g54WiojlOD90Xj6Ms/WqhUelO5P3+Y/MKumXnG5TQIrwIJQeqT7OjMz4QYA1pzsNWKj+H+6Af5nd+xgXTlT/S85Ef6Omf3Dp6Gginit2WUAdUj9kYRoTCDdpobR96RfuzCwAh1cQ1Kfbuhe5ABnjwVZea1SgS281IlkVZczFGLyYs1k5exA71Lx1bUhoWMh0B6+KBdm7xjWld2y/+kjcXu9Fwzq93DmD8xxUV5R4l1sF1dQU/TBAlGuZOypil6k0U7qm1L7TjcUMEwTcqmxtwFU/Z+TZm4VCkIIyFaKdRIgD8Kzg5dJG6BRf+tes6aoem29daS//TJvh3ROe6OH20bvRnQMbwFUuLOipT3GCIySDCQkkwhbWnwUyMtrM29cyTVnDMtn5ZIsjWmpRxDu0mK++R/2bG0WAqtvaA8lijwB2Gc3Eh6DgggDhDfqz4yvTZeHDA/0QgLo9CsFTB5mjdHZ0VzdvmNJDUN/9Tbloj++IPhGcckGr4RMzv95VEScL5HyPMn3bcCVCPcPLuqbN2dL7DpMffDsMMq3Ini5pIJpd/a4bQU5be6Ts/+uWi/xhHKCT/Qz+O92Lrut9ayZMKbArKtbgZ2paPCWRz+qkfRFVkkpSCCOfC/mpC0UKalLOytC+Vlw9Ya0CJftzMKJWLXY9xoMcTRvpSZRI1JLOeDMSuAuVphElDuoLA2GxOusa+PkOavvBJYZGlIu5dGxdHr3nV4NTClichKaA== 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:(13230031)(4636009)(346002)(376002)(396003)(136003)(39860400002)(230922051799003)(186009)(451199024)(1800799009)(64100799003)(82310400011)(46966006)(36840700001)(40470700004)(2906002)(44832011)(5660300002)(4326008)(8936002)(41300700001)(8676002)(26005)(70206006)(6636002)(54906003)(110136005)(316002)(16526019)(1076003)(70586007)(40460700003)(478600001)(7696005)(82740400003)(83380400001)(36756003)(6666004)(336012)(426003)(2616005)(36860700001)(81166007)(47076005)(40480700001)(356005)(86362001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 16:35:22.9363 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2df7feb7-0847-4b46-876d-08dbc040e96e 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: SA2PEPF00001508.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5750 X-Spam-Status: No, score=-0.4 required=5.0 tests=DATE_IN_PAST_24_48, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Thu, 28 Sep 2023 09:36:13 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778327682015110312 X-GMAIL-MSGID: 1778327682015110312 On some systems AMD Navi3x dGPU triggers RAS errors on startup; but only if the amdgpu kernel module is not part of the initramfs. This is because the hardware is not properly programmed for the AC/DC state of the system when it is loaded later in boot. The AC/DC state of the system is incorrect specifically when UCSI power supplies have been initialized. These power supplies are marked as POWER_SUPPLY_SCOPE_UNKNOWN scope. As they're 'offline' the power supply count is increased but the resultant return value is power_supply_is_system_supplied() 0. To fix this look explicitly for `POWER_SUPPLY_SCOPE_SYSTEM` power supplies before incrementing the count. If no system power supply is found then the system is assumed to be on AC. Cc: stable@vger.kernel.org Tested-by: David Perry Fixes: 95339f40a8b6 ("power: supply: Fix logic checking if system is running from battery") Signed-off-by: Mario Limonciello --- drivers/power/supply/power_supply_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index d325e6dbc770..3de6e6d00815 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -349,7 +349,7 @@ static int __power_supply_is_system_supplied(struct device *dev, void *data) unsigned int *count = data; if (!psy->desc->get_property(psy, POWER_SUPPLY_PROP_SCOPE, &ret)) - if (ret.intval == POWER_SUPPLY_SCOPE_DEVICE) + if (ret.intval != POWER_SUPPLY_SCOPE_SYSTEM) return 0; (*count)++; From patchwork Tue Sep 26 22:59:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 146219 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3463960vqu; Thu, 28 Sep 2023 10:05:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEGlzOOIFnrk3Bzn9xDvYhFcH7J7Aay+MHZFLBqDa4v6HB6YUY0poAO3paAh4WU/SKM303Z X-Received: by 2002:a17:902:e852:b0:1c6:e8d:29c9 with SMTP id t18-20020a170902e85200b001c60e8d29c9mr1616757plg.50.1695920746762; Thu, 28 Sep 2023 10:05:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1695920746; cv=pass; d=google.com; s=arc-20160816; b=ORwp5Hl02bYlzFKAZTCVkIVkxlCmw9KRRsgO4bb4D5wDD6GZof8UKLpAGJcLv1Rn+s ed0FnJ6BWGLJN2ivBfC3abXoLHZvkZ0f195D0dTZo7tZ7WjTHN9ui+FzdvzRxMh5T2rf WhLSQO1Lvm2xeeBCqiCjhQhJrz4naw9bmQIVk8Q6rw0cPFu0HuoiB7P40kOewAW+eR5w pjWPlUPKh/e/bsb/3Vuvxb2Q1L8nwoKX7GeLfPmYIBW8HfQunMdJfFkNt+7B805cbfnV 3vNeRCkmxs2xqcQkIetTp8t0McI18isNdSDmv0jKjnYh1gKtO3vmhN1EWLboHBi05Q4L l3bA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=m5OIu6RRtVym6D1Xr0OA1kvs4ww2UlYO8OxBK1h0xXM=; fh=ABVm0psAHlO3wUFuG4B/8TQE9V6/c2W7vr8KVwJc/z8=; b=ccHolitu3f+TSbekF9NC2S0PtuelgnuSitAu3NNZfPsYFp9Rdi+xoF2uXYe7mkF0IL hddgCHCfs7fSCqVGiRzwUQDhVsvJw0d2WkRD308Dd4OFJCmWR4x1gGRKVQzaxOArqM+w VRWvf/cMteQ1dDzu305SdFs4cqng9qY2oSnHDs0HF9ZO+GI19Noc9FJFleocl6Mk+F8y hj2l2ZhMPpM240J3e9UOgT8HECO5l1fq1NG3XperCKwuWY13PC9FkZ8n35TVUpx+yI2f OoGXRiJEH+rkUNzBmxwaa5HgNDA4jISEaeIRYlJmPBLins3ADIUPv0cCObHhjCopma9s Qopg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=wRwAcxD0; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id u16-20020a17090341d000b001c5bd811c46si10665577ple.581.2023.09.28.10.05.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 10:05:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=wRwAcxD0; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 635AB826E8D3; Thu, 28 Sep 2023 09:36:10 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231789AbjI1Qfp (ORCPT + 21 others); Thu, 28 Sep 2023 12:35:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231520AbjI1Qfb (ORCPT ); Thu, 28 Sep 2023 12:35:31 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2044.outbound.protection.outlook.com [40.107.94.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F7EF1B2; Thu, 28 Sep 2023 09:35:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SPCiRwirDYeknCAvBFZnGYHQ2VHZWt3YQF4qVCfrf+FBP/llKyQvqjZgKMcm8/xHiA8RLuhMILc6tkuBnyKWFF3yrzjmqWNh3XBYj0H2e+vijopou1EHqeNXh3M2BDrTGGT3GkB3Q0/l6nQ/whqBPZuUKXf3VJ7FF9/ctOoNVOk5dEW75s6mvkkdYXEbqilOQJqauUNfjkT0X0Rjmr5X20S9r0esDWwU/xrNWw+SMCNlZDv9cOj7eWLiFTJqsfL0mTYZKP+lSM9NbyBmxl0/8aY+swSC2Z2v++tNVXlZTV4R4UC3K7qnCT4SPNE5afC+Jytnnxs/XIIXYK0GDtf9/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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=m5OIu6RRtVym6D1Xr0OA1kvs4ww2UlYO8OxBK1h0xXM=; b=AYq7Pa1dfA8MLgE/KXtSaC3QTeYqJS0LqsV9CSKYXAN6bH0Fo/4EE8JuJJt1Mu51K+A1vM/Ui7wjMFooGrqdksJHQavJ3YrPD4x7jn1hDbsCyxnOJushj9b9jdkSHDKLiaAkAyz99gEMxBaCltjz5kw0whdKdEnq/HhPRKp30qShyYDBJzQucZsdvWULWoOTdp+hA/TWC6vjnlHJfHxFeI4KaH9XmKZOBpDTyHIhkgoKKR2yh4Csu+hqHzguhKkcQPqSRLltz5tnj1Ujamw4fA4Po/yslfJ9Qu7+5fq3m2YtRew6Syfb0/Rlk5gezp9aEiIir+MhY+YR21+Udjva0g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org 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=m5OIu6RRtVym6D1Xr0OA1kvs4ww2UlYO8OxBK1h0xXM=; b=wRwAcxD0ps5tCRDBgpU1mm9eqWXcVOoqs1MDJgzHqzckX/Zti5pabBpziyNdUziWdD4Y77cNufNtOwHfXi8NhWWDHGbNdKNXr47Vv5jmW3+3nKGELJRCMtaB1sdTMrbMpEa7LVR2wwMdQdK9TYf8dTtGB1zscIkRFfGggIsTaIw= Received: from SA1PR02CA0024.namprd02.prod.outlook.com (2603:10b6:806:2cf::24) by PH7PR12MB8037.namprd12.prod.outlook.com (2603:10b6:510:27d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22; Thu, 28 Sep 2023 16:35:23 +0000 Received: from SA2PEPF00001508.namprd04.prod.outlook.com (2603:10b6:806:2cf:cafe::7f) by SA1PR02CA0024.outlook.office365.com (2603:10b6:806:2cf::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25 via Frontend Transport; Thu, 28 Sep 2023 16:35:23 +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; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SA2PEPF00001508.mail.protection.outlook.com (10.167.242.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6838.14 via Frontend Transport; Thu, 28 Sep 2023 16:35:23 +0000 Received: from AUS-P9-MLIMONCI.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.2507.27; Thu, 28 Sep 2023 11:35:22 -0500 From: Mario Limonciello To: , Sebastian Reichel , "Alex Deucher" CC: , , , Mario Limonciello Subject: [PATCH 3/3] Revert "drm/amd/pm: workaround for the wrong ac power detection on smu 13.0.0" Date: Tue, 26 Sep 2023 17:59:55 -0500 Message-ID: <20230926225955.386553-4-mario.limonciello@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230926225955.386553-1-mario.limonciello@amd.com> References: <20230926225955.386553-1-mario.limonciello@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-TrafficTypeDiagnostic: SA2PEPF00001508:EE_|PH7PR12MB8037:EE_ X-MS-Office365-Filtering-Correlation-Id: a1d6e7fd-742b-4f1c-f9b6-08dbc040e9c1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pedckA6Vl7QvB7qD5+Hg7vlIMm5JCV5Zgyx9e2mWrNTQmzQzuLIAxQWW2HHbYiq1Bd293+Su7fd7V4s8jjfbfAqxA0NVsX9W1zIoc+ofdUKVu5OrjEpivchGRhSmVlY5+niL2WiwTENVhYx9UEzeEwxc8miWLpYO3Dd9JxYUsPIYbGerbdQpTNgsjYsWYah1feDOPFt9xqtehdao5fT4B+fg49FQ1jxPrjeqrDEdfNPqpI3CTyiYoG5Faoy9CFvIFgE8ItMIm3xDvSIzE48ajYYlODK6uQ9wWdlSabHCCKVNHsaGOeoLfyxTbGFw/srYv50FAza38UEZZ3PoKTvIrqinTi/pc8cvcyJqYG4WCo36KbfCrp2c0qBeuyMGN9hyZw08QmihGlyrMWXbJrWrTndxNfUhqoOFSZjWaZ3TS5dBII0NnjnUw7Fh21LlJ4P2jm2pmmF90uZuqcFj+tG1UJEFsTNEtdaGTHbQ2g6JDrgaUWqMM5Bx55CoHktCeEiY8hJ0Fy4223Fh24udcGTWtVdKPtE/f/Ipqw5kJKr/46PZLsTyLrHRJ84Oln6oI0aj1M+k6Ch5GPPoVWT9v5o7L+YhoyHkAPddSPGIjDKE9cELb84bqsKlA6vQJTpC9zYHkz/BqpIPyVdmqNjPgmEwBNCPsp4rZwLD8j+4TlntIMc8g3TT2CposDNqvBwp7FoUyj0a9zwXRwh53lVWZX4SOC7Bw8cc7fTMFsxptjlhm4GGMKqU3jSk2Zd9Yj22JR1FssSgoFhSpjgRrAwNW2fG9g== 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:(13230031)(4636009)(136003)(396003)(39860400002)(376002)(346002)(230922051799003)(82310400011)(64100799003)(1800799009)(451199024)(186009)(40470700004)(46966006)(36840700001)(83380400001)(66574015)(16526019)(26005)(2616005)(1076003)(8676002)(44832011)(5660300002)(336012)(426003)(8936002)(4326008)(82740400003)(81166007)(7696005)(356005)(36860700001)(47076005)(6666004)(478600001)(86362001)(40480700001)(110136005)(70206006)(54906003)(316002)(6636002)(41300700001)(70586007)(36756003)(2906002)(40460700003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 16:35:23.4675 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a1d6e7fd-742b-4f1c-f9b6-08dbc040e9c1 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: SA2PEPF00001508.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8037 X-Spam-Status: No, score=-0.4 required=5.0 tests=DATE_IN_PAST_24_48, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Thu, 28 Sep 2023 09:36:10 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778301793168439786 X-GMAIL-MSGID: 1778301793168439786 This workaround is not necessary with the power supply core fixed. This reverts commit 0e5e1a84f0b8c814d502a135824244127fed8f23. Signed-off-by: Mario Limonciello --- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 3 ++- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c index d86499ac8931..8d1e39589057 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c @@ -1021,7 +1021,8 @@ static int smu_v13_0_process_pending_interrupt(struct smu_context *smu) { int ret = 0; - if (smu_cmn_feature_is_enabled(smu, SMU_FEATURE_ACDC_BIT)) + if (smu->dc_controlled_by_gpio && + smu_cmn_feature_is_enabled(smu, SMU_FEATURE_ACDC_BIT)) ret = smu_v13_0_allow_ih_interrupt(smu); return ret; diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c index 1c15fa911176..684b4e01fac2 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c @@ -3001,6 +3001,7 @@ static const struct pptable_funcs smu_v13_0_0_ppt_funcs = { .enable_mgpu_fan_boost = smu_v13_0_0_enable_mgpu_fan_boost, .get_power_limit = smu_v13_0_0_get_power_limit, .set_power_limit = smu_v13_0_set_power_limit, + .set_power_source = smu_v13_0_set_power_source, .get_power_profile_mode = smu_v13_0_0_get_power_profile_mode, .set_power_profile_mode = smu_v13_0_0_set_power_profile_mode, .run_btc = smu_v13_0_run_btc,