Commit f0121bfe authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge an earlier EC driver change for 6.12.

parents 71bf41b8 dc171114

drivers/acpi/ec.c

+49 −6
Original line number Diff line number Diff line
@@ -783,6 +783,9 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, 
	unsigned long tmp;

	int ret = 0;



	if (t->rdata)

		memset(t->rdata, 0, t->rlen);



	/* start transaction */

	spin_lock_irqsave(&ec->lock, tmp);

	/* Enable GPE for command processing (IBF=0/OBF=1) */
@@ -819,8 +822,6 @@ static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t) 


	if (!ec || (!t) || (t->wlen && !t->wdata) || (t->rlen && !t->rdata))

		return -EINVAL;

	if (t->rdata)

		memset(t->rdata, 0, t->rlen);



	mutex_lock(&ec->mutex);

	if (ec->global_lock) {
@@ -847,7 +848,7 @@ static int acpi_ec_burst_enable(struct acpi_ec *ec) 
				.wdata = NULL, .rdata = &d,

				.wlen = 0, .rlen = 1};



	return acpi_ec_transaction(ec, &t);

	return acpi_ec_transaction_unlocked(ec, &t);

}



static int acpi_ec_burst_disable(struct acpi_ec *ec)
@@ -857,7 +858,7 @@ static int acpi_ec_burst_disable(struct acpi_ec *ec) 
				.wlen = 0, .rlen = 0};



	return (acpi_ec_read_status(ec) & ACPI_EC_FLAG_BURST) ?

				acpi_ec_transaction(ec, &t) : 0;

				acpi_ec_transaction_unlocked(ec, &t) : 0;

}



static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 *data)
@@ -873,6 +874,19 @@ static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 *data) 
	return result;

}



static int acpi_ec_read_unlocked(struct acpi_ec *ec, u8 address, u8 *data)

{

	int result;

	u8 d;

	struct transaction t = {.command = ACPI_EC_COMMAND_READ,

				.wdata = &address, .rdata = &d,

				.wlen = 1, .rlen = 1};



	result = acpi_ec_transaction_unlocked(ec, &t);

	*data = d;

	return result;

}



static int acpi_ec_write(struct acpi_ec *ec, u8 address, u8 data)

{

	u8 wdata[2] = { address, data };
@@ -883,6 +897,16 @@ static int acpi_ec_write(struct acpi_ec *ec, u8 address, u8 data) 
	return acpi_ec_transaction(ec, &t);

}



static int acpi_ec_write_unlocked(struct acpi_ec *ec, u8 address, u8 data)

{

	u8 wdata[2] = { address, data };

	struct transaction t = {.command = ACPI_EC_COMMAND_WRITE,

				.wdata = wdata, .rdata = NULL,

				.wlen = 2, .rlen = 0};



	return acpi_ec_transaction_unlocked(ec, &t);

}



int ec_read(u8 addr, u8 *val)

{

	int err;
@@ -1323,6 +1347,7 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address, 
	struct acpi_ec *ec = handler_context;

	int result = 0, i, bytes = bits / 8;

	u8 *value = (u8 *)value64;

	u32 glk;



	if ((address > 0xFF) || !value || !handler_context)

		return AE_BAD_PARAMETER;
@@ -1330,13 +1355,25 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address, 
	if (function != ACPI_READ && function != ACPI_WRITE)

		return AE_BAD_PARAMETER;



	mutex_lock(&ec->mutex);



	if (ec->global_lock) {

		acpi_status status;



		status = acpi_acquire_global_lock(ACPI_EC_UDELAY_GLK, &glk);

		if (ACPI_FAILURE(status)) {

			result = -ENODEV;

			goto unlock;

		}

	}



	if (ec->busy_polling || bits > 8)

		acpi_ec_burst_enable(ec);



	for (i = 0; i < bytes; ++i, ++address, ++value) {

		result = (function == ACPI_READ) ?

			acpi_ec_read(ec, address, value) :

			acpi_ec_write(ec, address, *value);

			acpi_ec_read_unlocked(ec, address, value) :

			acpi_ec_write_unlocked(ec, address, *value);

		if (result < 0)

			break;

	}
@@ -1344,6 +1381,12 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address, 
	if (ec->busy_polling || bits > 8)

		acpi_ec_burst_disable(ec);



	if (ec->global_lock)

		acpi_release_global_lock(glk);



unlock:

	mutex_unlock(&ec->mutex);



	switch (result) {

	case -EINVAL:

		return AE_BAD_PARAMETER;