From patchwork Wed Jul 12 04:23:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cyril Bur X-Patchwork-Id: 786979 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x6m7W0dCPz9s7h for ; Wed, 12 Jul 2017 14:24:19 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="BLu1NYJF"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id: References:In-Reply-To:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=R8ctm+kiHyjtWgWO2jLzkZkhcorIZfrMhuCJxZwlkQw=; b=BLu1NYJFzGLpNFJV1UjCxLjEBD Z1r0J1k2nsc4BQCXIqtConY9Qz2wT6I9ysM7RX3vVejUn9UYKEX47+RLFZc+Qn2jHn8mf7nBO2GGU ShAiF62bRlQRXMs2Iwq+k2cR+khXx/JGfRNbELPF3zedlPrntm4Al5Ubfm37j+D1NnE/Y8el6fG/f HIqQA8gNcU61VXB076pynv6yk0LR5aydjbUnfUawtmP0IIdV6BzU7WT6tRV7+raEMOir+GeCefW6n O6B5grtMu0Tlz7OLxpcq81WF49axImjtTdaFxJQpBdiAUIU7E0KwWovswAs6F1hgXWuWtq1kjP7ZW UoitzrQA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dV9C7-0001Mq-82; Wed, 12 Jul 2017 04:24:11 +0000 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5] helo=mx0a-001b2d01.pphosted.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dV9C3-0001Ld-Jc for linux-mtd@lists.infradead.org; Wed, 12 Jul 2017 04:24:09 +0000 Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v6C4NhFq138107 for ; Wed, 12 Jul 2017 00:23:43 -0400 Received: from e23smtp04.au.ibm.com (e23smtp04.au.ibm.com [202.81.31.146]) by mx0b-001b2d01.pphosted.com with ESMTP id 2bncjc87ps-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 12 Jul 2017 00:23:38 -0400 Received: from localhost by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 12 Jul 2017 14:23:35 +1000 Received: from d23relay10.au.ibm.com (202.81.31.229) by e23smtp04.au.ibm.com (202.81.31.210) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 12 Jul 2017 14:23:34 +1000 Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay10.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v6C4NWVE22085820 for ; Wed, 12 Jul 2017 14:23:32 +1000 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v6C4NVmm012053 for ; Wed, 12 Jul 2017 14:23:31 +1000 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.192.253.14]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v6C4NUR7012036; Wed, 12 Jul 2017 14:23:31 +1000 Received: from camb691.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher DHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id 078DBA038B; Wed, 12 Jul 2017 14:23:31 +1000 (AEST) From: Cyril Bur To: linuxppc-dev@lists.ozlabs.org, linux-mtd@lists.infradead.org Subject: [PATCH v3 10/10] mtd: powernv_flash: Use opal_async_wait_response_interruptible() Date: Wed, 12 Jul 2017 14:23:04 +1000 X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170712042304.19745-1-cyrilbur@gmail.com> References: <20170712042304.19745-1-cyrilbur@gmail.com> X-TM-AS-MML: disable x-cbid: 17071204-0012-0000-0000-00000255F3D9 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17071204-0013-0000-0000-0000076F6435 Message-Id: <20170712042304.19745-11-cyrilbur@gmail.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-07-11_13:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=2 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1706020000 definitions=main-1707120068 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170711_212407_815353_5A4E36BB X-CRM114-Status: GOOD ( 15.76 ) X-Spam-Score: -3.8 (---) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-3.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is CUSTOM_MED 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (cyrilbur[at]gmail.com) 0.7 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [148.163.158.5 listed in list.dnswl.org] -2.8 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [148.163.158.5 listed in wl.mailspike.net] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.9 NML_ADSP_CUSTOM_MED ADSP custom_med hit, and not from a mailing list X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stewart@linux.vnet.ibm.com, benh@kernel.crashing.org, alistair@popple.id.au, dwmw2@infradead.org, rlippert@google.com MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The OPAL calls performed in this driver shouldn't be using opal_async_wait_response() as this performs a wait_event() which, on long running OPAL calls could result in hung task warnings. wait_event() prevents timely signal delivery which is also undesirable. This patch also attempts to quieten down the use of dev_err() when errors haven't actually occurred and also to return better information up the stack rather than always -EIO. Signed-off-by: Cyril Bur --- drivers/mtd/devices/powernv_flash.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/devices/powernv_flash.c b/drivers/mtd/devices/powernv_flash.c index d7243b72ba6e..cfa274ba7e40 100644 --- a/drivers/mtd/devices/powernv_flash.c +++ b/drivers/mtd/devices/powernv_flash.c @@ -90,16 +90,34 @@ static int powernv_flash_async_op(struct mtd_info *mtd, enum flash_op op, goto out_success; if (rc != OPAL_ASYNC_COMPLETION) { - dev_err(dev, "opal_flash_async_op(op=%d) failed (rc %d)\n", + if (rc != OPAL_BUSY) + dev_err(dev, "opal_flash_async_op(op=%d) failed (rc %d)\n", op, rc); - rc = -EIO; + rc = opal_error_code(rc); goto out; } - rc = opal_async_wait_response(token, &msg); + rc = opal_async_wait_response_interruptible(token, &msg); if (rc) { - dev_err(dev, "opal async wait failed (rc %d)\n", rc); - rc = -EIO; + /* + * Awkward, we've been interrupted but we cannot return. If we + * do return the mtd core will free the buffer we've just + * passed to OPAL but OPAL will continue to read or write from + * that memory. + * Future work will introduce a call to tell OPAL to stop + * using the buffer. + * It may be tempting to ultimately return 0 if we're doing a + * read or a write since we are going to end up waiting until + * OPAL is done. However, because the MTD core sends us the + * userspace request in chunks, we must report EINTR so that + * it doesn't just send us the next chunk, thus defeating the + * point of the _interruptible wait. + */ + rc = -EINTR; + if (op == FLASH_OP_READ || op == FLASH_OP_WRITE) { + if (opal_async_wait_response(token, &msg)) + dev_err(dev, "opal async wait failed (rc %d)\n", rc); + } goto out; }