system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-21 11:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up command packing on MRST.

Browse source 
Don't pass more bytes in the command length field than we filled.

Signed-off-by: Andy Ross <andy.ross@windriver.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Andy Ross 2010-07-26 10:05:03 +01:00 committed by Matthew Garrett
parent ed6f2b4da3
commit 6c8d0fdbe8
1 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/platform/x86/intel_scu_ipc.c
View file

@ -154,7 +154,7 @@ static inline int busy_loop(void) /* Wait till scu status is busy */
/* Read/Write power control(PMIC in Langwell, MSIC in PenWell) registers */ /* Read/Write power control(PMIC in Langwell, MSIC in PenWell) registers */
static int pwr_reg_rdwr(u16 *addr, u8 *data, u32 count, u32 op, u32 id) static int pwr_reg_rdwr(u16 *addr, u8 *data, u32 count, u32 op, u32 id)
{ {
int nc; int i, nc, bytes;
u32 offset = 0; u32 offset = 0;
u32 err = 0; u32 err = 0;
u8 cbuf[IPC_WWBUF_SIZE] = { }; u8 cbuf[IPC_WWBUF_SIZE] = { };
@ -170,25 +170,18 @@ static int pwr_reg_rdwr(u16 *addr, u8 *data, u32 count, u32 op, u32 id)
} }
if (platform != MRST_CPU_CHIP_PENWELL) { if (platform != MRST_CPU_CHIP_PENWELL) {
/* Entry is 4 bytes for read/write, 5 bytes for read modify */ bytes = 0;
for (nc = 0; nc < count; nc++, offset += 3) { for(i=0; i<count; i++) {
cbuf[offset] = addr[nc]; cbuf[bytes++] = addr[i];
cbuf[offset + 1] = addr[nc] >> 8; cbuf[bytes++] = addr[i] >> 8;
if (id != IPC_CMD_PCNTRL_R) if (id != IPC_CMD_PCNTRL_R)
cbuf[offset + 2] = data[nc]; cbuf[bytes++] = data[i];
if (id == IPC_CMD_PCNTRL_M) { if (id == IPC_CMD_PCNTRL_M)
cbuf[offset + 3] = data[nc + 1]; cbuf[bytes++] = data[i + 1];
offset += 1;
}
} }
for (nc = 0, offset = 0; nc < count; nc++, offset += 4) for(i=0; i<bytes; i+=4)
ipc_data_writel(wbuf[nc], offset); /* Write wbuff */ ipc_data_writel(wbuf[i/4], i);
ipc_command(bytes << 16 | id << 12 | 0 << 8 | op);
if (id != IPC_CMD_PCNTRL_M)
ipc_command((count*4) << 16 | id << 12 | 0 << 8 | op);
else
ipc_command((count*5) << 16 | id << 12 | 0 << 8 | op);
} else { } else {
for (nc = 0; nc < count; nc++, offset += 2) { for (nc = 0; nc < count; nc++, offset += 2) {
cbuf[offset] = addr[nc]; cbuf[offset] = addr[nc];