From patchwork Sat Oct 27 20:09:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 194631 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D4D662C0093 for ; Sun, 28 Oct 2012 07:10:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752145Ab2J0UKV (ORCPT ); Sat, 27 Oct 2012 16:10:21 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:44950 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758551Ab2J0UKR (ORCPT ); Sat, 27 Oct 2012 16:10:17 -0400 Received: by mail-pb0-f46.google.com with SMTP id rr4so3454458pbb.19 for ; Sat, 27 Oct 2012 13:10:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=DEQzFfpD6WfYcrO2A/BJEjKcEVnrmcM0nIB2Xl8tcKA=; b=fKG+GXYiOsrLvbvrznt4xJZHIS6WBcKyw5/XQYgoLrM7XriHUd+KzqCWwFBLiv15my PP/q80ahbc2ksxn9IlORtIve+K40NfDp8lP4CfmaEBExQ+OACf+oHcmO+L26fb1fhWvB ofCU9duUUBabIIepfVfWAq3Fvu/5DF6RxcNSAp4xy3UoMa/+7+yrV+b1kqeg8EMkrodd j2vQcuouKsxtqrnS81MLX7P729fWnHvEWL3mbl1GwYexNP9lp1vzXNXEfYYMgj/Wt8wC GLo9rNAkcQgmBRp2iK43d3jLIj/Q1WuLfrgPHh3EkDCaQD4oKotKFN7g/2y1rakfAVvT ExrQ== Received: by 10.68.231.41 with SMTP id td9mr11072360pbc.128.1351368617484; Sat, 27 Oct 2012 13:10:17 -0700 (PDT) Received: from ld-irv-0074.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by mx.google.com with ESMTPS id a10sm3129763paw.17.2012.10.27.13.10.16 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 27 Oct 2012 13:10:17 -0700 (PDT) From: Brian Norris To: Jeff Garzik Cc: Tejun Heo , , , Kevin Cernekee , Brian Norris Subject: [RFC v2 3/3] ahci_platform: perform platform exit in host_stop() hook Date: Sat, 27 Oct 2012 13:09:36 -0700 Message-Id: <1351368576-5264-4-git-send-email-computersforpeace@gmail.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1351368576-5264-1-git-send-email-computersforpeace@gmail.com> References: <1351368576-5264-1-git-send-email-computersforpeace@gmail.com> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org AHCI platform devices may provide an exit() routine, via ahci_platform_data, that powers off the SATA core. Such a routine should be executed from the ata_port_operations host_stop() hook. That way, the ATA subsystem can perform any last-minute hardware cleanup (via devres, for example), then trigger the power-off at the appropriate time. This patch fixes bus errors triggered during module removal or device unbinding, seen on an SoC SATA core. Signed-off-by: Brian Norris --- drivers/ata/ahci_platform.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c index d9fbd10..dcd23a9 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -23,6 +23,8 @@ #include #include "ahci.h" +static void ahci_host_stop(struct ata_host *host); + enum ahci_type { AHCI, /* standard platform ahci */ IMX53_AHCI, /* ahci on i.mx53 */ @@ -45,6 +47,15 @@ static struct platform_device_id ahci_devtype[] = { }; MODULE_DEVICE_TABLE(platform, ahci_devtype); +struct ata_port_operations ahci_platform_ops = { + .inherits = &ahci_ops, + .host_stop = ahci_host_stop, +}; + +struct ata_port_operations ahci_platform_retry_srst_ops = { + .inherits = &ahci_pmp_retry_srst_ops, + .host_stop = ahci_host_stop, +}; static const struct ata_port_info ahci_port_info[] = { /* by features */ @@ -52,20 +63,20 @@ static const struct ata_port_info ahci_port_info[] = { .flags = AHCI_FLAG_COMMON, .pio_mask = ATA_PIO4, .udma_mask = ATA_UDMA6, - .port_ops = &ahci_ops, + .port_ops = &ahci_platform_ops, }, [IMX53_AHCI] = { .flags = AHCI_FLAG_COMMON, .pio_mask = ATA_PIO4, .udma_mask = ATA_UDMA6, - .port_ops = &ahci_pmp_retry_srst_ops, + .port_ops = &ahci_platform_retry_srst_ops, }, [STRICT_AHCI] = { AHCI_HFLAGS (AHCI_HFLAG_DELAY_ENGINE), .flags = AHCI_FLAG_COMMON, .pio_mask = ATA_PIO4, .udma_mask = ATA_UDMA6, - .port_ops = &ahci_ops, + .port_ops = &ahci_platform_ops, }, }; @@ -202,15 +213,20 @@ err0: static int __devexit ahci_remove(struct platform_device *pdev) { struct device *dev = &pdev->dev; - struct ahci_platform_data *pdata = dev_get_platdata(dev); struct ata_host *host = dev_get_drvdata(dev); ata_host_detach(host); + return 0; +} + +static void ahci_host_stop(struct ata_host *host) +{ + struct device *dev = host->dev; + struct ahci_platform_data *pdata = dev_get_platdata(dev); + if (pdata && pdata->exit) pdata->exit(dev); - - return 0; } #ifdef CONFIG_PM