Re: [PATCH RESEND] octeon_edac: fix broken build

[David Daney]

On 07/01/2015 04:31 AM, Borislav Petkov wrote:
> On Wed, Jul 01, 2015 at 01:38:52PM +0300, Aaro Koskinen wrote:
> > Commit debe6a623d3c ("MIPS: OCTEON: Update octeon-model.h code for new
> > SoCs.") renamed some SoC model helper functions, but forgot to update
> > the EDAC drivers resulting in build failures. Fix that.
> >
> > Cc: stable@xxxxxxxxxxxxxxx # v4.0+
> > Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
> > ---
> >   drivers/edac/octeon_edac-l2c.c | 2 +-
> >   drivers/edac/octeon_edac-lmc.c | 2 +-
> >   drivers/edac/octeon_edac-pc.c  | 2 +-
> >   3 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/edac/octeon_edac-l2c.c b/drivers/edac/octeon_edac-l2c.c
> > index 7e98084..afea7fc 100644
> > --- a/drivers/edac/octeon_edac-l2c.c
> > +++ b/drivers/edac/octeon_edac-l2c.c
> > @@ -151,7 +151,7 @@ static int octeon_l2c_probe(struct platform_device *pdev)
> >   	l2c->ctl_name = "octeon_l2c_err";
> >
> >
> > -	if (OCTEON_IS_MODEL(OCTEON_FAM_1_PLUS)) {
> > +	if (OCTEON_IS_OCTEON1PLUS()) {
> >   		union cvmx_l2t_err l2t_err;
> >   		union cvmx_l2d_err l2d_err;
> >
> > diff --git a/drivers/edac/octeon_edac-lmc.c b/drivers/edac/octeon_edac-lmc.c
> > index bb19e07..cda6dab 100644
> > --- a/drivers/edac/octeon_edac-lmc.c
> > +++ b/drivers/edac/octeon_edac-lmc.c
> > @@ -234,7 +234,7 @@ static int octeon_lmc_edac_probe(struct platform_device *pdev)
> >   	layers[0].size = 1;
> >   	layers[0].is_virt_csrow = false;
> >
> > -	if (OCTEON_IS_MODEL(OCTEON_FAM_1_PLUS)) {
> > +	if (OCTEON_IS_OCTEON1PLUS()) {
> >   		union cvmx_lmcx_mem_cfg0 cfg0;
> >
> >   		cfg0.u64 = cvmx_read_csr(CVMX_LMCX_MEM_CFG0(0));
> > diff --git a/drivers/edac/octeon_edac-pc.c b/drivers/edac/octeon_edac-pc.c
> > index 0f83c33..2ab6cf2 100644
> > --- a/drivers/edac/octeon_edac-pc.c
> > +++ b/drivers/edac/octeon_edac-pc.c
> > @@ -73,7 +73,7 @@ static int  co_cache_error_event(struct notifier_block *this,
> >   			edac_device_handle_ce(p->ed, cpu, 0, "dcache");
> >
> >   		/* Clear the error indication */
> > -		if (OCTEON_IS_MODEL(OCTEON_FAM_2))
> > +		if (OCTEON_IS_OCTEON2())
> >   			write_octeon_c0_dcacheerr(1);
> >   		else
> >   			write_octeon_c0_dcacheerr(0);
>
> I'm still waiting on an ACK for that.

It seems obvious and corrects a build issue, so ...

Acked-by: David Daney <david.daney@xxxxxxxxxx>


> Ralf, David? What's up?
>
> I started looking and then got lost in that macro "fun" in
> arch/mips/include/asm/octeon/octeon-model.h

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/