From patchwork Mon May 10 10:18:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 433097 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2774003jao; Mon, 10 May 2021 05:05:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjVtfYN+i7Uq5Mlt0kdKbs3wBbCH1Vw6oU4DFvhIJ1lcuA4CF2WMydUazK5yyudcN4wO7G X-Received: by 2002:a17:906:3949:: with SMTP id g9mr25568743eje.7.1620648315072; Mon, 10 May 2021 05:05:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620648315; cv=none; d=google.com; s=arc-20160816; b=PJuUjS9yUFhNgZmqdyTdu3k28MXnjcbm/9NBIid5s1izn3HY0SA4zkyG9GIljwmq6p 5TQVWH7F1Yx61GSH2e8orvLzl6lJvSo31QiHt3Kq8SyxC3bUGJqJ/w9teBEq5Z0G67g/ +EQihQllwcwzW/8Yn0ZOGiuiFHmEIPuzXh2kZw540/Y+QGApGgHy2EmUD7f7ahXt2KhC RfRXulgr9GzNnpwEBR9SdCzL9r/TjiC8Sf1y/R9JmzRTd+JAIzaI4rZw+exVDMfJrh1N wY5gzcRgG9FmF1CF4yJu3x1FpUKdiq9yXxvTkfO3WXCniPTU7FiVmDjY8ZcKhFe4PY2q 8weQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SY4y7sakvQQX0GcnMYqPLw9x5EqcnibKWLLwFQJUwhc=; b=PnLx2MXIXfcffi8mai1Vb2vvrfwkaGDNBVCXPZ7w6hSTzjfKL2s/gIsBdTqgVtFNlr I0Lr/GKLBbWulDLRjAyebCnAvUlU4s6sX9RHvUS5zsTDkVArjhbI79U5l5ovvfSTFuBB iJPSUdDOdGrFhzg64f0XLTUueq7I+OB7NwwGCmvoHnAY4U0GQzrac1ojv62uVciTj8gD OtAqSl6/9prWnvh4xBlwgZ3jQmmTPwKJVGv67QU9v5ocRhjmhgl6M3i4yeTN2yhCaS7F comtgd9cZXOYTDLkOCGmtNUcLkpScbYWeDb8EKYPxMMrvJ+Zg4jBRMcj0e1G2Vzzpqr7 8fdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1FYl8MgP; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r17si13500365edw.273.2021.05.10.05.05.14; Mon, 10 May 2021 05:05:15 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1FYl8MgP; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237633AbhEJLPq (ORCPT + 12 others); Mon, 10 May 2021 07:15:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:46208 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236496AbhEJLIP (ORCPT ); Mon, 10 May 2021 07:08:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0F6016199D; Mon, 10 May 2021 11:01:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644503; bh=WhF6uKum6G33mRzMhCdLDaGU2CoRECY0syxpn7YVxh8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1FYl8MgPhPWMHDjtcIps/jr0PXkDizUxBZxHOJmh1rWi53/TXAfaeShuI7jAxlQuW FoRuW8WnuYSi+O8fG6IEy5buxMjJDSAY5VDarIXPGLT+3GxpLfu4gVGYR7Bl8m0Buc xjoQuUcz8S8IQZf91kHh+prX7yy7uUP7XaGp7ryE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Loic Poulain , Manivannan Sadhasivam , Sasha Levin Subject: [PATCH 5.12 108/384] bus: mhi: pci_generic: Implement PCI shutdown callback Date: Mon, 10 May 2021 12:18:17 +0200 Message-Id: <20210510102018.448890485@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Loic Poulain [ Upstream commit 757072abe1c0b67cb226936c709291889658a222 ] Deinit the device on shutdown to halt MHI/PCI operation on device side. This change fixes floating device state with some hosts that do not fully shutdown PCIe device when rebooting. Signed-off-by: Loic Poulain Reviewed-by: Manivannan Sadhasivam Link: https://lore.kernel.org/r/1616169037-7969-1-git-send-email-loic.poulain@linaro.org Signed-off-by: Manivannan Sadhasivam Signed-off-by: Sasha Levin --- drivers/bus/mhi/pci_generic.c | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.30.2 diff --git a/drivers/bus/mhi/pci_generic.c b/drivers/bus/mhi/pci_generic.c index 356c19ce4bbf..ef549c695b55 100644 --- a/drivers/bus/mhi/pci_generic.c +++ b/drivers/bus/mhi/pci_generic.c @@ -516,6 +516,12 @@ static void mhi_pci_remove(struct pci_dev *pdev) mhi_unregister_controller(mhi_cntrl); } +static void mhi_pci_shutdown(struct pci_dev *pdev) +{ + mhi_pci_remove(pdev); + pci_set_power_state(pdev, PCI_D3hot); +} + static void mhi_pci_reset_prepare(struct pci_dev *pdev) { struct mhi_pci_device *mhi_pdev = pci_get_drvdata(pdev); @@ -686,6 +692,7 @@ static struct pci_driver mhi_pci_driver = { .id_table = mhi_pci_id_table, .probe = mhi_pci_probe, .remove = mhi_pci_remove, + .shutdown = mhi_pci_shutdown, .err_handler = &mhi_pci_err_handler, .driver.pm = &mhi_pci_pm_ops };