2.6.34: arch/powerpc/sysdev/micropatch.c not compiling

2.6.34: arch/powerpc/sysdev/micropatch.c not compiling

Post by LEROY Chri » Tue, 06 Jul 2010 17:40:02


When activating micropatch option, the kernel does not compile.

It looks like a spi_t is not defined anywhere.

CC arch/powerpc/sysdev/micropatch.o
arch/powerpc/sysdev/micropatch.c: In function pm_load_patch
arch/powerpc/sysdev/micropatch.c:629: erreur: expected
smor _attribute__before token
arch/powerpc/sysdev/micropatch.c:629: erreur: ppundeclared (first
use in this function)
arch/powerpc/sysdev/micropatch.c:629: erreur: (Each undeclared
identifier is reported only once
arch/powerpc/sysdev/micropatch.c:629: erreur: for each function it
appears in.)
cc1: warnings being treated as errors
arch/powerpc/sysdev/micropatch.c:630: erreur: ISO C89 interdit les
manges de dlarations et de code
arch/powerpc/sysdev/micropatch.c:671: erreur: pi_tundeclared (first
use in this function)
arch/powerpc/sysdev/micropatch.c:671: erreur: expected expression before
token
make[1]: *** [arch/powerpc/sysdev/micropatch.o] Erreur 1
make: *** [arch/powerpc/sysdev] Erreur 2

Regards

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to XXXX@XXXXX.COM
More majordomo info at http://www.yqcomputer.com/
Please read the FAQ at http://www.yqcomputer.com/
 
 
 

2.6.34: arch/powerpc/sysdev/micropatch.c not compiling

Post by Tony Breed » Wed, 07 Jul 2010 09:10:01


powerpc problems should alos CC linuxppc-dev.

> smor _attribute__before >€token
> arch/powerpc/sysdev/micropatch.c:629: erreur: pp>ndeclared
> (first use in this>function)
> arch/powerpc/sysdev/micropatch.c:629: erreur: (Each >ndeclared
> identifier is reported>only once
> arch/powerpc/sysdev/micropatch.c:629: erreur: for each f>nction it
> ap>ears in.)
> cc1: warnings being treated>as errors
> arch/powerpc/sysdev/micropatch.c:630: erreur: ISO C89 in>erdit les
> mlanges de dclarations >t de code
> arch/powerpc/sysdev/micropatch.c:671: erreur: pi_tgt;undeclared
> (first use in thi> function)
> arch/powerpc/sysdev/micropatch.c:671: erreur: expected>expression
> before >€token
> make[1]: *** [arch/powerpc/sysdev/micropatc>.o] Erreur 1
> make: *** [arch/powerpc/sysdev] Erreur 2

spi_t was removed in commit 644b2a680ccc51a9ec4d6beb12e9d47d2dee98e2
(powerpc/cpm: Remove SPI defines and spi structs). Anton, Kumar it looks like
something along the lines of:

diff --git a/arch/powerpc/sysdev/micropatch.c b/arch/powerpc/sysdev/micropatch.c
index d8d6028..aa1785e 100644
--- a/arch/powerpc/sysdev/micropatch.c
+++ b/arch/powerpc/sysdev/micropatch.c
@@ -626,7 +626,6 @@ cpm_load_patch(cpm8xx_t *cp)
volatile uint *dp; /* Dual-ported RAM. */
volatile cpm8xx_t *commproc;
volatile iic_t *iip;
- volatile spi_t *spp;
volatile smc_uart_t *smp;
int i;

@@ -668,8 +667,8 @@ cpm_load_patch(cpm8xx_t *cp)
/* Put SPI above the IIC, also 32-byte aligned.
*/
i = (RPBASE + sizeof(iic_t) + 31) & ~31;
- spp = (spi>t *)&commproc->cp_dparam[PROFF_SPI]>
- spp->spi_rpbase = i;
+ smp = (smc_uart>t *)&commproc->cp_dparam[PROFF_SPI]>
+ smp->smc_rpbase = i;

# if defined(CONFIG_I2C_SPI_UCODE_PATCH)
> commproc->cp_cpmcr1 = 0x802a;


Would help?

Yours Tony
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to XXXX@XXXXX.COM
More majordomo info at http://www.yqcomputer.com/
Please read the FAQ at http://www.yqcomputer.com/

 
 
 

2.6.34: arch/powerpc/sysdev/micropatch.c not compiling

Post by Anton Voro » Sat, 10 Jul 2010 02:00:02


> > smor _attribute__before tok>n
[...]
> - spp = (spi_t *>&commproc->cp_dparam[PR>FF_SPI];
> -> spp->spi_rp>ase = i;
> + smp = (smc_uart_t *>&commproc->cp_dparam[PR>FF_SPI];
> +> smp->smc_rp>ase > i;
>
> # if defined(CONFIG_I2C_SPI_UCO>E_PATCH)
> > commproc->cp_cpmcr1 > 0x>02a>
>
>
> Would help?

While this will fix the issue, I think this is not technically
correct (i.e. micropatching SPI controller via I2C pram struct,
even though the structs appear to be identical).

As the spi_param is needed outside of the SPI driver, we'd
better re-introduce the struct, I think.

I'll send some fixes for this and other issues in this file.

Thanks,

--
Anton Vorontsov
email: XXXX@XXXXX.COM
irc://irc.freenode.net/bd2
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to XXXX@XXXXX.COM
More majordomo info at http://www.yqcomputer.com/
Please read the FAQ at http://www.yqcomputer.com/