Received: by 2002:a25:c205:0:0:0:0:0 with SMTP id s5csp1159974ybf; Thu, 27 Feb 2020 06:07:23 -0800 (PST) X-Google-Smtp-Source: APXvYqzrL62hJ53SGwik4mwthI3UE1nfKr8/8+a+v+euzx4TNdYwnk96B7vz550+0yboIJONuD9H X-Received: by 2002:a05:6808:7dd:: with SMTP id f29mr3509393oij.67.1582812443551; Thu, 27 Feb 2020 06:07:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582812443; cv=none; d=google.com; s=arc-20160816; b=etl+m8M7gC6AGqgZdHxGctKvQbcIxe8EgXhgxBkCi3GbzjzmmUmeKlm/WQUO23aAtw MoW9X6SabaG80boG3jwkkhEQwkLcNIhRTCKnHF7gno0pzaUiZl4Q7HKhRdHLnMB07s1o D09jgxbDwrrDDFUSHHrNPvd0mbcw7Aushc5OyuW7DIEhrZQVNt/5RCmW8lj3zdjwadtu L2qTF/yfPYIpLSqtMz29J2/IGB4pL7bqguQ+8N+7BrDn45pdQL3yWIm9Lq3HwnJH4rhx EC14sWN3cc09hB2NQvpq+6L890z5Hz7zmdi9CNmQm1zvxm9TWVtBsK708NKmyqHSwKUc qkQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pNym3aWQvPfIhwmSRJnYQtMyev4o3K34RRpB8kvnpjA=; b=ywgVePHQ+Rt/U3syFgFbT8ten/MOuKE0DwK62PfnKN7VwO/NaGOF2Dde/bcwccv7lT XZwUgUE2c+QFFSmTaHgrSBS1pwCwT08oaGKFB7p2ncxIlf1mQ+TKtJtlSX9BC/ACeF4x JnJ9ck7EjyQzfzakP8WV9OlMBmv76LZ5VFF1SDTT0UqrXNhguRDXjunJraGGLDh+73DF ps6tf9cBtTQPsssxEk40r5s8Lh5I7xm1sOJbh0uK2tAiIfr/dXqbr1K5NHCFszn/iRTP ft5QVLJm3PPcPqZPorKgc+4ZFSei1DttA6BfLMrA6iygdrSqwqKUrMIh2zmwRhjgIi6W kW0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zGZ0auMC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d28si1376536oic.47.2020.02.27.06.06.59; Thu, 27 Feb 2020 06:07:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zGZ0auMC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387959AbgB0OGh (ORCPT + 99 others); Thu, 27 Feb 2020 09:06:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:43734 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387940AbgB0OGa (ORCPT ); Thu, 27 Feb 2020 09:06:30 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C1E7520578; Thu, 27 Feb 2020 14:06:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582812389; bh=1+PH6IMGsNVCZMF5qZrfTQPg6A7KXplQfrrGAEMyieg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zGZ0auMCDaXhLtNehFOeKwNrvfbUL+zzL3jORa0oWHPta+17q8c/YzMYF07M4qL3j UQ4iqXaffp4g9M2Ye7hy0Lmq1thTd6i/tPLafDZIF7OrYW7NtVLc6HbIomRvBI5YSg JuLd0HySczx9PpSN8qN92PKnxrxCFUm5US+dI/2Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Prabhakar Kushwaha , Jens Axboe Subject: [PATCH 4.19 95/97] ata: ahci: Add shutdown to freeze hardware resources of ahci Date: Thu, 27 Feb 2020 14:37:43 +0100 Message-Id: <20200227132230.195272711@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227132214.553656188@linuxfoundation.org> References: <20200227132214.553656188@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Prabhakar Kushwaha commit 10a663a1b15134a5a714aa515e11425a44d4fdf7 upstream. device_shutdown() called from reboot or power_shutdown expect all devices to be shutdown. Same is true for even ahci pci driver. As no ahci shutdown function is implemented, the ata subsystem always remains alive with DMA & interrupt support. File system related calls should not be honored after device_shutdown(). So defining ahci pci driver shutdown to freeze hardware (mask interrupt, stop DMA engine and free DMA resources). Signed-off-by: Prabhakar Kushwaha Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- drivers/ata/ahci.c | 7 +++++++ drivers/ata/libata-core.c | 21 +++++++++++++++++++++ include/linux/libata.h | 1 + 3 files changed, 29 insertions(+) --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -96,6 +96,7 @@ enum board_ids { static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); static void ahci_remove_one(struct pci_dev *dev); +static void ahci_shutdown_one(struct pci_dev *dev); static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, unsigned long deadline); static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class, @@ -609,6 +610,7 @@ static struct pci_driver ahci_pci_driver .id_table = ahci_pci_tbl, .probe = ahci_init_one, .remove = ahci_remove_one, + .shutdown = ahci_shutdown_one, .driver = { .pm = &ahci_pci_pm_ops, }, @@ -1897,6 +1899,11 @@ static int ahci_init_one(struct pci_dev return 0; } +static void ahci_shutdown_one(struct pci_dev *pdev) +{ + ata_pci_shutdown_one(pdev); +} + static void ahci_remove_one(struct pci_dev *pdev) { pm_runtime_get_noresume(&pdev->dev); --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -6780,6 +6780,26 @@ void ata_pci_remove_one(struct pci_dev * ata_host_detach(host); } +void ata_pci_shutdown_one(struct pci_dev *pdev) +{ + struct ata_host *host = pci_get_drvdata(pdev); + int i; + + for (i = 0; i < host->n_ports; i++) { + struct ata_port *ap = host->ports[i]; + + ap->pflags |= ATA_PFLAG_FROZEN; + + /* Disable port interrupts */ + if (ap->ops->freeze) + ap->ops->freeze(ap); + + /* Stop the port DMA engines */ + if (ap->ops->port_stop) + ap->ops->port_stop(ap); + } +} + /* move to PCI subsystem */ int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits) { @@ -7400,6 +7420,7 @@ EXPORT_SYMBOL_GPL(ata_timing_cycle2mode) #ifdef CONFIG_PCI EXPORT_SYMBOL_GPL(pci_test_config_bits); +EXPORT_SYMBOL_GPL(ata_pci_shutdown_one); EXPORT_SYMBOL_GPL(ata_pci_remove_one); #ifdef CONFIG_PM EXPORT_SYMBOL_GPL(ata_pci_device_do_suspend); --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -1236,6 +1236,7 @@ struct pci_bits { }; extern int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits); +extern void ata_pci_shutdown_one(struct pci_dev *pdev); extern void ata_pci_remove_one(struct pci_dev *pdev); #ifdef CONFIG_PM