Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 367764a4 authored by Pawel Moll's avatar Pawel Moll Committed by Samuel Ortiz
Browse files

mfd: vexpress: Handle pending config transactions 



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: default avatarPawel Moll <pawel.moll@arm.com>
Reviewed-by: default avatarJon Medhurst <tixy@linaro.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 8bf874a4

drivers/mfd/vexpress-config.c

+21 −14
Original line number Original line Diff line number Diff line
@@ -184,13 +184,14 @@ static int vexpress_config_schedule(struct vexpress_config_trans *trans) 




	spin_lock_irqsave(&bridge->transactions_lock, flags);

	spin_lock_irqsave(&bridge->transactions_lock, flags);





	if (list_empty(&bridge->transactions)) {

		vexpress_config_dump_trans("Executing", trans);

		vexpress_config_dump_trans("Executing", trans);



	if (list_empty(&bridge->transactions))

		status = bridge->info->func_exec(trans->func->func,

		status = bridge->info->func_exec(trans->func->func,

				trans->offset, trans->write, trans->data);

				trans->offset, trans->write, trans->data);

	else

	} else {

		vexpress_config_dump_trans("Queuing", trans);

		status = VEXPRESS_CONFIG_STATUS_WAIT;

		status = VEXPRESS_CONFIG_STATUS_WAIT;

	}





	switch (status) {

	switch (status) {

	case VEXPRESS_CONFIG_STATUS_DONE:

	case VEXPRESS_CONFIG_STATUS_DONE:
@@ -212,25 +213,31 @@ void vexpress_config_complete(struct vexpress_config_bridge *bridge, 
{

{

	struct vexpress_config_trans *trans;

	struct vexpress_config_trans *trans;

	unsigned long flags;

	unsigned long flags;

	const char *message = "Completed";





	spin_lock_irqsave(&bridge->transactions_lock, flags);

	spin_lock_irqsave(&bridge->transactions_lock, flags);





	trans = list_first_entry(&bridge->transactions,

	trans = list_first_entry(&bridge->transactions,

			struct vexpress_config_trans, list);

			struct vexpress_config_trans, list);

	vexpress_config_dump_trans("Completed", trans);



	trans->status = status;

	trans->status = status;



	do {

		vexpress_config_dump_trans(message, trans);

		list_del(&trans->list);

		list_del(&trans->list);

		complete(&trans->completion);





	if (!list_empty(&bridge->transactions)) {

		if (list_empty(&bridge->transactions))

		vexpress_config_dump_trans("Pending", trans);

			break;





		bridge->info->func_exec(trans->func->func, trans->offset,

		trans = list_first_entry(&bridge->transactions,

				trans->write, trans->data);

				struct vexpress_config_trans, list);

	}

		vexpress_config_dump_trans("Executing pending", trans);

	spin_unlock_irqrestore(&bridge->transactions_lock, flags);

		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);

EXPORT_SYMBOL(vexpress_config_complete);