Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760060Ab3DZKwh (ORCPT ); Fri, 26 Apr 2013 06:52:37 -0400 Received: from queue01c.mail.zen.net.uk ([212.23.3.237]:55001 "EHLO queue01c.mail.zen.net.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750939Ab3DZKwg (ORCPT ); Fri, 26 Apr 2013 06:52:36 -0400 Message-ID: <1366973488.3385.18.camel@linaro1.home> Subject: Re: [PATCH v2] mfd: vexpress: Handle pending config transactions From: "Jon Medhurst (Tixy)" To: Pawel Moll Cc: Samuel Ortiz , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Date: Fri, 26 Apr 2013 11:51:28 +0100 In-Reply-To: <1366910091-17971-1-git-send-email-pawel.moll@arm.com> References: <1366821084-12815-1-git-send-email-pawel.moll@arm.com> <1366910091-17971-1-git-send-email-pawel.moll@arm.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.4.4-3 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Originating-Smarthost01-IP: [82.69.122.217] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3044 Lines: 89 On Thu, 2013-04-25 at 18:14 +0100, Pawel Moll wrote: > The config transactions "scheduler" was hopelessly broken, > repeating completed transaction instead of picking up > next pending one. > > Fixed now. Also improved debug messages. > > Signed-off-by: Pawel Moll Yes, looks really fixed now. :-) Reviewed-by: Jon Medhurst > --- > drivers/mfd/vexpress-config.c | 35 +++++++++++++++++++++-------------- > 1 file changed, 21 insertions(+), 14 deletions(-) > > diff --git a/drivers/mfd/vexpress-config.c b/drivers/mfd/vexpress-config.c > index 3c1723aa..84ce6b9 100644 > --- a/drivers/mfd/vexpress-config.c > +++ b/drivers/mfd/vexpress-config.c > @@ -184,13 +184,14 @@ static int vexpress_config_schedule(struct vexpress_config_trans *trans) > > spin_lock_irqsave(&bridge->transactions_lock, flags); > > - vexpress_config_dump_trans("Executing", trans); > - > - if (list_empty(&bridge->transactions)) > + if (list_empty(&bridge->transactions)) { > + vexpress_config_dump_trans("Executing", trans); > status = bridge->info->func_exec(trans->func->func, > trans->offset, trans->write, trans->data); > - else > + } else { > + vexpress_config_dump_trans("Queuing", trans); > status = VEXPRESS_CONFIG_STATUS_WAIT; > + } > > switch (status) { > case VEXPRESS_CONFIG_STATUS_DONE: > @@ -212,25 +213,31 @@ void vexpress_config_complete(struct vexpress_config_bridge *bridge, > { > struct vexpress_config_trans *trans; > unsigned long flags; > + const char *message = "Completed"; > > spin_lock_irqsave(&bridge->transactions_lock, flags); > > trans = list_first_entry(&bridge->transactions, > struct vexpress_config_trans, list); > - vexpress_config_dump_trans("Completed", trans); > - > trans->status = status; > - list_del(&trans->list); > > - if (!list_empty(&bridge->transactions)) { > - vexpress_config_dump_trans("Pending", trans); > + do { > + vexpress_config_dump_trans(message, trans); > + list_del(&trans->list); > + complete(&trans->completion); > > - bridge->info->func_exec(trans->func->func, trans->offset, > - trans->write, trans->data); > - } > - spin_unlock_irqrestore(&bridge->transactions_lock, flags); > + if (list_empty(&bridge->transactions)) > + break; > + > + trans = list_first_entry(&bridge->transactions, > + struct vexpress_config_trans, list); > + vexpress_config_dump_trans("Executing pending", trans); > + trans->status = bridge->info->func_exec(trans->func->func, > + trans->offset, trans->write, trans->data); > + message = "Finished pending"; > + } while (trans->status == VEXPRESS_CONFIG_STATUS_DONE); > > - complete(&trans->completion); > + spin_unlock_irqrestore(&bridge->transactions_lock, flags); > } > EXPORT_SYMBOL(vexpress_config_complete); > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/