hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

intel_scu_ipc: fix data packing of PMIC command on Moorestown 

Data is 2-byte per entry for PMIC read-modify-update command.

Signed-off-by: Hong Liu <hong.liu@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Hong Liu 2010-07-26 10:05:52 +01:00 committed by Matthew Garrett
parent 6c8d0fdbe8
commit 215c330fe9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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 i, nc, bytes; int i, nc, bytes, d;
u32 offset = 0; u32 offset = 0;
u32 err = 0; u32 err = 0;
u8 cbuf[IPC_WWBUF_SIZE] = { }; u8 cbuf[IPC_WWBUF_SIZE] = { };
@ -171,13 +171,14 @@ 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) {
bytes = 0; bytes = 0;
d = 0;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
cbuf[bytes++] = addr[i]; cbuf[bytes++] = addr[i];
cbuf[bytes++] = addr[i] >> 8; cbuf[bytes++] = addr[i] >> 8;
if (id != IPC_CMD_PCNTRL_R) if (id != IPC_CMD_PCNTRL_R)
cbuf[bytes++] = data[i]; cbuf[bytes++] = data[d++];
if (id == IPC_CMD_PCNTRL_M) if (id == IPC_CMD_PCNTRL_M)
cbuf[bytes++] = data[i + 1]; cbuf[bytes++] = data[d++];
} }
for (i = 0; i < bytes; i += 4) for (i = 0; i < bytes; i += 4)
ipc_data_writel(wbuf[i/4], i); ipc_data_writel(wbuf[i/4], i);