From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6868C2D0A3 for ; Tue, 3 Nov 2020 15:51:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8446C22370 for ; Tue, 3 Nov 2020 15:51:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604418675; bh=Z9m+LW2XQrfA6qf3zJhS50veimbgKuuy+K500cKjDkk=; h=Subject:To:Cc:From:Date:List-ID:From; b=GENIVUPpVR5n4U5GZyHSyIx4eDUp1eqQwby+4p5fT2jALz5Cjb2GUKTEiMV3GAx8u 7egubfwQN1l+RTOzNxJ9mQ8Od+0GLiouqNmNAKtPBGMunHECeHwIoGaBvlVMZq5s99 zN0B554mfbBCvawcUdc0fJ+xKYSGJstxnBPln2Ic= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726312AbgKCPvP (ORCPT ); Tue, 3 Nov 2020 10:51:15 -0500 Received: from wforward1-smtp.messagingengine.com ([64.147.123.30]:39321 "EHLO wforward1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726690AbgKCPvO (ORCPT ); Tue, 3 Nov 2020 10:51:14 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailforward.west.internal (Postfix) with ESMTP id 8A48B7BA; Tue, 3 Nov 2020 10:51:13 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 03 Nov 2020 10:51:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=TQfKq5 MK4VAnYmbzOfSrLibvZFHSeFPD4nSCPrOWKQQ=; b=kAkG28Xur2VYJrAag4RX8v AjfYhIXNG269SKN7AGIaML5uspJlkez50pjARUI2U5djwiVdXyG8mlK5ClAfVaSI 8ZmEzpquddxRzQjHPWQFxRxV2KY88DjFgX8CeKNCAroXgmL38TD3gKoirbt6U9nd wty71l1Lg4vmU8u976NsCxJOLxJciW4BfxiBPc3dWBYq4j1KZFi34cH2OYxnPnY6 RTx/69vxAQI6cU2u6SFExF4lw4JCIFEku420va1e0XSZgk8f7nWF4zdcaVTFCCxf dp5yN+GEF0w92dAZVLat6n/joBQmI95KDQz3CS0ISAv5+12+ZFubdR5UHFiPeszA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddtfedgjeekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecuggftrfgrthhtvghrnhepieetveehuedvhfdtgfdvieeiheehfeelveevheejud etveeuveeludejjefgteehnecukfhppeekfedrkeeirdejgedrieegnecuvehluhhsthgv rhfuihiivgepgeenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorghhrd gtohhm X-ME-Proxy: Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) by mail.messagingengine.com (Postfix) with ESMTPA id 83AAE3064688; Tue, 3 Nov 2020 10:51:12 -0500 (EST) Subject: FAILED: patch "[PATCH] drm/amd/psp: Fix sysfs: cannot create duplicate filename" failed to apply to 5.9-stable tree To: andrey.grodzovsky@amd.com, alexander.deucher@amd.com Cc: From: Date: Tue, 03 Nov 2020 16:51:34 +0100 Message-ID: <1604418694231208@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From f1bcddffe46b349a82445a8d9efd5f5fcb72557f Mon Sep 17 00:00:00 2001 From: Andrey Grodzovsky Date: Fri, 16 Oct 2020 10:50:44 -0400 Subject: [PATCH] drm/amd/psp: Fix sysfs: cannot create duplicate filename psp sysfs not cleaned up on driver unload for sienna_cichlid Fixes: ce87c98db428e7 ("drm/amdgpu: Include sienna_cichlid in USBC PD FW support.") Signed-off-by: Andrey Grodzovsky Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org # 5.9.x diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index a9cae6d943c4..96a9699f87ba 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -208,7 +208,8 @@ static int psp_sw_fini(void *handle) adev->psp.ta_fw = NULL; } - if (adev->asic_type == CHIP_NAVI10) + if (adev->asic_type == CHIP_NAVI10 || + adev->asic_type == CHIP_SIENNA_CICHLID) psp_sysfs_fini(adev); return 0;