From patchwork Thu Aug 3 07:18:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cyril Bur X-Patchwork-Id: 797034 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xNM0c4ylNz9s82 for ; Thu, 3 Aug 2017 17:20:48 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xNM0c3kGMzDrVv for ; Thu, 3 Aug 2017 17:20:48 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xNLz53fhNzDrLq for ; Thu, 3 Aug 2017 17:19:29 +1000 (AEST) Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v737JHP4087964 for ; Thu, 3 Aug 2017 03:19:27 -0400 Received: from e23smtp04.au.ibm.com (e23smtp04.au.ibm.com [202.81.31.146]) by mx0a-001b2d01.pphosted.com with ESMTP id 2c3y4fgn0m-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 03 Aug 2017 03:19:26 -0400 Received: from localhost by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 3 Aug 2017 17:18:40 +1000 Received: from d23relay06.au.ibm.com (202.81.31.225) by e23smtp04.au.ibm.com (202.81.31.210) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 3 Aug 2017 17:18:38 +1000 Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay06.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v737IcAO19791952 for ; Thu, 3 Aug 2017 17:18:38 +1000 Received: from d23av03.au.ibm.com (localhost [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v737IT0S010335 for ; Thu, 3 Aug 2017 17:18:29 +1000 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.192.253.14]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v737ITCX010329 for ; Thu, 3 Aug 2017 17:18:29 +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 CF458A01E5 for ; Thu, 3 Aug 2017 17:18:37 +1000 (AEST) From: Cyril Bur To: skiboot@lists.ozlabs.org Date: Thu, 3 Aug 2017 17:18:01 +1000 X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170803071808.7256-1-cyril.bur@au1.ibm.com> References: <20170803071808.7256-1-cyril.bur@au1.ibm.com> X-TM-AS-MML: disable x-cbid: 17080307-0012-0000-0000-000002586DB6 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17080307-0013-0000-0000-00000772EDCB Message-Id: <20170803071808.7256-5-cyril.bur@au1.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-08-03_03:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1706020000 definitions=main-1708030112 Subject: [Skiboot] [PATCH v2 04/11] libflash/mbox-flash: Allow mbox-flash to tell the driver msg timeouts X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Currently when mbox-flash decides that a message times out the driver has no way of knowing to drop the message and will continue waiting for a response indefinitely preventing more messages from ever being sent. This is a problem if the BMC crashes or has some other issue where it won't ever respond to our outstanding message. This patch provides a method for mbox-flash to tell the driver how long it should wait before it no longer needs to care about the response. Signed-off-by: Cyril Bur --- hw/lpc-mbox.c | 12 +++++++++--- include/lpc-mbox.h | 2 +- libflash/mbox-flash.c | 17 +++++++++-------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/hw/lpc-mbox.c b/hw/lpc-mbox.c index 74214938..f303f4d5 100644 --- a/hw/lpc-mbox.c +++ b/hw/lpc-mbox.c @@ -64,6 +64,7 @@ struct mbox { struct lock lock; /* Protect in_flight */ struct bmc_mbox_msg *in_flight; uint8_t sequence; + unsigned long timeout; }; static struct mbox mbox; @@ -115,7 +116,7 @@ static void bmc_mbox_send_message(struct bmc_mbox_msg *msg) bmc_mbox_outb(MBOX_CTRL_INT_SEND, MBOX_HOST_CTRL); } -int bmc_mbox_enqueue(struct bmc_mbox_msg *msg) +int bmc_mbox_enqueue(struct bmc_mbox_msg *msg, unsigned int timeout_sec) { if (!mbox.base) { prlog(PR_CRIT, "Using MBOX without init!\n"); @@ -125,10 +126,15 @@ int bmc_mbox_enqueue(struct bmc_mbox_msg *msg) lock(&mbox.lock); if (mbox.in_flight) { prlog(PR_DEBUG, "MBOX message already in flight\n"); - unlock(&mbox.lock); - return OPAL_BUSY; + if (mftb() > mbox.timeout) { + prlog(PR_ERR, "In flight message dropped on the floor\n"); + } else { + unlock(&mbox.lock); + return OPAL_BUSY; + } } + mbox.timeout = mftb() + secs_to_tb(timeout_sec); mbox.in_flight = msg; unlock(&mbox.lock); msg->seq = ++mbox.sequence; diff --git a/include/lpc-mbox.h b/include/lpc-mbox.h index c4b1015b..569f1f72 100644 --- a/include/lpc-mbox.h +++ b/include/lpc-mbox.h @@ -63,7 +63,7 @@ struct bmc_mbox_msg { uint8_t bmc; }; -int bmc_mbox_enqueue(struct bmc_mbox_msg *msg); +int bmc_mbox_enqueue(struct bmc_mbox_msg *msg, unsigned int timeout_sec); int bmc_mbox_register_callback(void (*callback)(struct bmc_mbox_msg *msg, void *priv), void *drv_data); int bmc_mbox_register_attn(void (*callback)(uint8_t bits, void *priv), diff --git a/libflash/mbox-flash.c b/libflash/mbox-flash.c index 90e6e860..2914901e 100644 --- a/libflash/mbox-flash.c +++ b/libflash/mbox-flash.c @@ -252,13 +252,14 @@ static bool is_reboot(struct mbox_flash_data *mbox_flash) return mbox_flash->reboot; } -static int msg_send(struct mbox_flash_data *mbox_flash, struct bmc_mbox_msg *msg) +static int msg_send(struct mbox_flash_data *mbox_flash, struct bmc_mbox_msg *msg, + unsigned int timeout_sec) { if (is_reboot(mbox_flash)) return FLASH_ERR_AGAIN; mbox_flash->busy = true; mbox_flash->rc = 0; - return bmc_mbox_enqueue(msg); + return bmc_mbox_enqueue(msg, timeout_sec); } static int wait_for_bmc(struct mbox_flash_data *mbox_flash, unsigned int timeout_sec) @@ -307,7 +308,7 @@ static int mbox_flash_ack(struct mbox_flash_data *mbox_flash, uint8_t reg) /* Clear this first so msg_send() doesn't freak out */ mbox_flash->reboot = false; - rc = msg_send(mbox_flash, msg); + rc = msg_send(mbox_flash, msg, MBOX_DEFAULT_TIMEOUT); /* Still need to deal with it, we've only acked it now. */ mbox_flash->reboot = true; @@ -499,7 +500,7 @@ static int mbox_flash_mark_write(struct mbox_flash_data *mbox_flash, msg_put_u16(msg, 2, end - start); /* Total Length */ } - rc = msg_send(mbox_flash, msg); + rc = msg_send(mbox_flash, msg, MBOX_DEFAULT_TIMEOUT); if (rc) { prlog(PR_ERR, "Failed to enqueue/send BMC MBOX message\n"); goto out; @@ -554,7 +555,7 @@ static int mbox_flash_flush(struct mbox_flash_data *mbox_flash) if (!msg) return FLASH_ERR_MALLOC_FAILED; - rc = msg_send(mbox_flash, msg); + rc = msg_send(mbox_flash, msg, MBOX_DEFAULT_TIMEOUT); if (rc) { prlog(PR_ERR, "Failed to enqueue/send BMC MBOX message\n"); goto out; @@ -609,7 +610,7 @@ static int mbox_window_move(struct mbox_flash_data *mbox_flash, return FLASH_ERR_MALLOC_FAILED; msg_put_u16(msg, 0, bytes_to_blocks(mbox_flash, pos)); - rc = msg_send(mbox_flash, msg); + rc = msg_send(mbox_flash, msg, MBOX_DEFAULT_TIMEOUT); if (rc) { prlog(PR_ERR, "Failed to enqueue/send BMC MBOX message\n"); goto out; @@ -772,7 +773,7 @@ static int mbox_flash_get_info(struct blocklevel_device *bl, const char **name, *name = NULL; mbox_flash->busy = true; - rc = msg_send(mbox_flash, msg); + rc = msg_send(mbox_flash, msg, MBOX_DEFAULT_TIMEOUT); if (rc) { prlog(PR_ERR, "Failed to enqueue/send BMC MBOX message\n"); goto out; @@ -965,7 +966,7 @@ static int protocol_init(struct mbox_flash_data *mbox_flash) return FLASH_ERR_MALLOC_FAILED; msg_put_u8(msg, 0, mbox_flash->version); - rc = msg_send(mbox_flash, msg); + rc = msg_send(mbox_flash, msg, MBOX_DEFAULT_TIMEOUT); if (rc) { prlog(PR_ERR, "Failed to enqueue/send BMC MBOX message\n"); goto out;