From patchwork Fri Feb 24 07:19:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Yaraganavi X-Patchwork-Id: 6914 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 3C5AD23EB0 for ; Fri, 24 Feb 2012 07:20:14 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id F289DA18106 for ; Fri, 24 Feb 2012 07:20:13 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id z7so3647504iab.11 for ; Thu, 23 Feb 2012 23:20:13 -0800 (PST) MIME-Version: 1.0 Received: by 10.50.89.232 with SMTP id br8mr1075716igb.30.1330068013783; Thu, 23 Feb 2012 23:20:13 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.11.10 with SMTP id r10csp3927ibr; Thu, 23 Feb 2012 23:20:13 -0800 (PST) Received: by 10.68.134.228 with SMTP id pn4mr3282600pbb.52.1330068013001; Thu, 23 Feb 2012 23:20:13 -0800 (PST) Received: from mail-pz0-f50.google.com (mail-pz0-f50.google.com [209.85.210.50]) by mx.google.com with ESMTPS id p6si5026314pbd.263.2012.02.23.23.20.09 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 23 Feb 2012 23:20:12 -0800 (PST) Received-SPF: pass (google.com: domain of santoshsy@gmail.com designates 209.85.210.50 as permitted sender) client-ip=209.85.210.50; Authentication-Results: mx.google.com; spf=pass (google.com: domain of santoshsy@gmail.com designates 209.85.210.50 as permitted sender) smtp.mail=santoshsy@gmail.com; dkim=pass header.i=@gmail.com Received: by mail-pz0-f50.google.com with SMTP id d2so2431277dal.37 for ; Thu, 23 Feb 2012 23:20:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=4eEP+DHiSqGh11KaElbGV54cG6Fkobqc3l1kg74W/9w=; b=hxe050W4IGRZCv+75xo/5ZK7mzV9C0uY2WOqIAvfY2L5gpmkRgQcptSdqurIXsBdK3 UK2LK7MSfDA74JxzTgobSk5zm3pdoTs1J/7NuKw6UOKCG9mMm50n/uJ6WlcjC3FqisjA bLwoMYGxgNaFxaeJn02UQ6FkwgK1c9buqsgi0= Received: by 10.68.195.71 with SMTP id ic7mr3198832pbc.105.1330068009940; Thu, 23 Feb 2012 23:20:09 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id e8sm3627150pbg.47.2012.02.23.23.20.03 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 23 Feb 2012 23:20:09 -0800 (PST) From: Santosh Y To: James.Bottomley@hansenpartnership.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, patches@linaro.org, linux-samsung-soc@vger.kernel.org, arnd@linaro.org, girish.shivananjappa@linaro.org, saugata.das@linaro.org, vishak.g@samsung.com, venkat@linaro.org, k.rajesh@samsung.com, yejin.moon@samsung.com, dsaxena@linaro.org, ilho215.lee@samsung.com, nala.la@samsung.com, stephen.doel@linaro.org, sreekumar.c@samsung.com, Santosh Yaraganavi , Vinayak Holikatti Subject: [PATCH v2 3/5] [SCSI] ufshcd: UFSHCI error handling Date: Fri, 24 Feb 2012 12:49:03 +0530 Message-Id: <1330067945-9128-4-git-send-email-santoshsy@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1330067945-9128-1-git-send-email-santoshsy@gmail.com> References: <1330067945-9128-1-git-send-email-santoshsy@gmail.com> X-Gm-Message-State: ALoCoQn/pv0xlrxsCrFtAR6giZ60dCIlwLm7XueF25qRzooCAe8355HuX0+jtc/p3iZsjTsgAZrC From: Santosh Yaraganavi UFSHCI error handling includes support for: - UFS host controller errors - System bus errors - Unipro errors Signed-off-by: Santosh Yaraganavi Signed-off-by: Vinayak Holikatti Reviewed-by: Arnd Bergmann Reviewed-by: Vishak G Reviewed-by: Girish K S --- v1 -> v2: - ufshcd_do_reset(): change return value to SUCCESS/FAILED, since the function can also be called from UFSHCD registered SCSI midlayer error handling routines. Ex: .eh_host_reset_handler which expects return value SUCCESS/FAILED - ufshcd_do_reset(): aquire spin_lock_irqsave only for instructions which share common data structure. drivers/scsi/ufs/ufshcd.c | 97 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index e4335f5..1c6a9ed 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -139,6 +139,8 @@ struct uic_command { * @ufshcd_state: UFSHCD states * @int_enable_mask: Interrupt Mask Bits * @uic_workq: Work queue for UIC completion handling + * @feh_workq: Work queue for fatal controller error handling + * @errors: HBA errors */ struct ufs_hba { void __iomem *mmio_base; @@ -172,6 +174,10 @@ struct ufs_hba { /* Work Queues */ struct work_struct uic_workq; + struct work_struct feh_workq; + + /* HBA Errors */ + u32 errors; }; /** @@ -896,6 +902,9 @@ static int ufshcd_make_hba_operational(struct ufs_hba *hba) /* Configure interrupt aggregation */ ufshcd_config_int_aggr(hba, INT_AGGR_CONFIG); + if (hba->ufshcd_state == UFSHCD_STATE_RESET) + scsi_unblock_requests(hba->host); + hba->ufshcd_state = UFSHCD_STATE_OPERATIONAL; scsi_scan_host(hba->host); out: @@ -997,6 +1006,51 @@ static int ufshcd_initialize_hba(struct ufs_hba *hba) } /** + * ufshcd_do_reset - reset the host controller + * @hba: per adapter instance + * + * Returns SUCCESS/FAILED + */ +static int ufshcd_do_reset(struct ufs_hba *hba) +{ + struct ufshcd_lrb *lrbp; + unsigned long flags; + int tag; + + /* block commands from midlayer */ + scsi_block_requests(hba->host); + + spin_lock_irqsave(hba->host->host_lock, flags); + hba->ufshcd_state = UFSHCD_STATE_RESET; + + /* send controller to reset state */ + ufshcd_hba_stop(hba); + spin_unlock_irqrestore(hba->host->host_lock, flags); + + /* abort outstanding commands */ + for (tag = 0; tag < hba->nutrs; tag++) { + if (test_bit(tag, &hba->outstanding_reqs)) { + lrbp = &hba->lrb[tag]; + scsi_dma_unmap(lrbp->cmd); + lrbp->cmd->result = DID_RESET << 16; + lrbp->cmd->scsi_done(lrbp->cmd); + lrbp->cmd = NULL; + } + } + + /* clear outstanding request bit maps */ + hba->outstanding_reqs = 0; + + /* start the initialization process */ + if (ufshcd_initialize_hba(hba)) { + dev_err(&hba->pdev->dev, + "Reset: Controller initialization failed\n"); + return FAILED; + } + return SUCCESS; +} + +/** * ufshcd_slave_alloc - handle initial SCSI device configurations * @sdev: pointer to SCSI device * @@ -1248,12 +1302,54 @@ static void ufshcd_uic_cc_handler (struct work_struct *work) } /** + * ufshcd_fatal_err_handler - handle fatal errors + * @hba: per adapter instance + */ +static void ufshcd_fatal_err_handler(struct work_struct *work) +{ + struct ufs_hba *hba; + hba = container_of(work, struct ufs_hba, feh_workq); + + /* check if reset is already in progress */ + if (hba->ufshcd_state != UFSHCD_STATE_RESET) + ufshcd_do_reset(hba); +} + +/** + * ufshcd_err_handler - Check for fatal errors + * @work: pointer to a work queue structure + */ +static void ufshcd_err_handler(struct ufs_hba *hba) +{ + u32 reg; + + if (hba->errors & INT_FATAL_ERRORS) + goto fatal_eh; + + if (hba->errors & UIC_ERROR) { + + reg = readl(hba->mmio_base + + REG_UIC_ERROR_CODE_PHY_ADAPTER_LAYER); + if (reg & UIC_DATA_LINK_LAYER_ERROR_PA_INIT) + goto fatal_eh; + } + return; +fatal_eh: + hba->ufshcd_state = UFSHCD_STATE_ERROR; + schedule_work(&hba->feh_workq); +} + +/** * ufshcd_sl_intr - Interrupt service routine * @hba: per adapter instance * @intr_status: contains interrupts generated by the controller */ static void ufshcd_sl_intr(struct ufs_hba *hba, u32 intr_status) { + hba->errors = UFSHCD_ERROR_MASK & intr_status; + if (hba->errors) + ufshcd_err_handler(hba); + if (intr_status & UIC_COMMAND_COMPL) schedule_work(&hba->uic_workq); @@ -1499,6 +1595,7 @@ ufshcd_probe(struct pci_dev *pdev, const struct pci_device_id *id) /* Initialize work queues */ INIT_WORK(&hba->uic_workq, ufshcd_uic_cc_handler); + INIT_WORK(&hba->feh_workq, ufshcd_fatal_err_handler); /* IRQ registration */ err = request_irq(pdev->irq, ufshcd_intr, IRQF_SHARED, UFSHCD, hba);