openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/8xx: refactor writing of CPM microcode arrays 

Create a function to refactor the writing of CPM microcode arrays.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Christophe Leroy 2019-06-14 06:41:41 +00:00 committed by Michael Ellerman
parent 9fb7e639f6
commit 372fba9c76
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
arch/powerpc/platforms/8xx/micropatch.c
View File

@ -204,9 +204,15 @@ static uint patch_2f00[] __initdata = {
}; };
#endif #endif
static void __init cpm_write_patch(cpm8xx_t *cp, int offset, uint *patch, int len)
{
if (!len)
return;
memcpy_toio(cp->cp_dpmem + offset, patch, len);
}
void __init cpm_load_patch(cpm8xx_t *cp) void __init cpm_load_patch(cpm8xx_t *cp)
{ {
volatile uint *dp; /* Dual-ported RAM. */
volatile cpm8xx_t *commproc; volatile cpm8xx_t *commproc;
#if defined(CONFIG_I2C_SPI_UCODE_PATCH) || \ #if defined(CONFIG_I2C_SPI_UCODE_PATCH) || \
defined(CONFIG_I2C_SPI_SMC1_UCODE_PATCH) defined(CONFIG_I2C_SPI_SMC1_UCODE_PATCH)
@ -216,20 +222,13 @@ void __init cpm_load_patch(cpm8xx_t *cp)
volatile smc_uart_t *smp; volatile smc_uart_t *smp;
#endif #endif
#endif #endif
int i;
commproc = cp; commproc = cp;
#ifdef CONFIG_USB_SOF_UCODE_PATCH #ifdef CONFIG_USB_SOF_UCODE_PATCH
commproc->cp_rccr = 0; commproc->cp_rccr = 0;
dp = (uint *)(commproc->cp_dpmem); cpm_write_patch(cp, 0, patch_2000, sizeof(patch_2000));
for (i=0; i<(sizeof(patch_2000)/4); i++) cpm_write_patch(cp, 0xf00, patch_2f00, sizeof(patch_2f00));
*dp++ = patch_2000[i];
dp = (uint *)&(commproc->cp_dpmem[0x0f00]);
for (i=0; i<(sizeof(patch_2f00)/4); i++)
*dp++ = patch_2f00[i];
commproc->cp_rccr = 0x0009; commproc->cp_rccr = 0x0009;
@ -241,13 +240,8 @@ void __init cpm_load_patch(cpm8xx_t *cp)
commproc->cp_rccr = 0; commproc->cp_rccr = 0;
dp = (uint *)(commproc->cp_dpmem); cpm_write_patch(cp, 0, patch_2000, sizeof(patch_2000));
for (i=0; i<(sizeof(patch_2000)/4); i++) cpm_write_patch(cp, 0xf00, patch_2f00, sizeof(patch_2f00));
*dp++ = patch_2000[i];
dp = (uint *)&(commproc->cp_dpmem[0x0f00]);
for (i=0; i<(sizeof(patch_2f00)/4); i++)
*dp++ = patch_2f00[i];
iip = (iic_t *)&commproc->cp_dparam[PROFF_IIC]; iip = (iic_t *)&commproc->cp_dparam[PROFF_IIC];
# define RPBASE 0x0500 # define RPBASE 0x0500
@ -255,9 +249,8 @@ void __init cpm_load_patch(cpm8xx_t *cp)
/* Put SPI above the IIC, also 32-byte aligned. /* Put SPI above the IIC, also 32-byte aligned.
*/ */
i = (RPBASE + sizeof(iic_t) + 31) & ~31;
spp = (struct spi_pram *)&commproc->cp_dparam[PROFF_SPI]; spp = (struct spi_pram *)&commproc->cp_dparam[PROFF_SPI];
spp->rpbase = i; spp->rpbase = (RPBASE + sizeof(iic_t) + 31) & ~31;
# if defined(CONFIG_I2C_SPI_UCODE_PATCH) # if defined(CONFIG_I2C_SPI_UCODE_PATCH)
commproc->cp_cpmcr1 = 0x802a; commproc->cp_cpmcr1 = 0x802a;
@ -271,9 +264,7 @@ void __init cpm_load_patch(cpm8xx_t *cp)
# if defined(CONFIG_I2C_SPI_SMC1_UCODE_PATCH) # if defined(CONFIG_I2C_SPI_SMC1_UCODE_PATCH)
dp = (uint *)&(commproc->cp_dpmem[0x0e00]); cpm_write_patch(cp, 0xe00, patch_2e00, sizeof(patch_2e00));
for (i=0; i<(sizeof(patch_2e00)/4); i++)
*dp++ = patch_2e00[i];
commproc->cp_cpmcr1 = 0x8080; commproc->cp_cpmcr1 = 0x8080;
commproc->cp_cpmcr2 = 0x808a; commproc->cp_cpmcr2 = 0x808a;