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

Commit c7094d1d authored by Kuppuswamy Sathyanarayanan's avatar Kuppuswamy Sathyanarayanan Committed by Matthew Garrett
Browse files

ipc: Handle error conditions in ipc command 



Handle error conditions in intel_scu_ipc_command() and
pwr_reg_rdwr().

Signed-off-by: default avatarKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Signed-off-by: default avatarDavid Cohen <david.a.cohen@linux.intel.com>
Signed-off-by: default avatarMatthew Garrett <matthew.garrett@nebula.com>
parent 7f95afb3

drivers/platform/x86/intel_scu_ipc.c

+5 −3
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static int pwr_reg_rdwr(u16 *addr, u8 *data, u32 count, u32 op, u32 id) 
	}



	err = busy_loop();

	if (id == IPC_CMD_PCNTRL_R) { /* Read rbuf */

	if (!err && id == IPC_CMD_PCNTRL_R) { /* Read rbuf */

		/* Workaround: values are read as 0 without memcpy_fromio */

		memcpy_fromio(cbuf, ipcdev.ipc_base + 0x90, 16);

		for (nc = 0; nc < count; nc++)
@@ -465,8 +465,10 @@ int intel_scu_ipc_command(int cmd, int sub, u32 *in, int inlen, 
	ipc_command((inlen << 16) | (sub << 12) | cmd);

	err = busy_loop();



	if (!err) {

		for (i = 0; i < outlen; i++)

			*out++ = ipc_data_readl(4 * i);

	}



	mutex_unlock(&ipclock);

	return err;