From: Borislav Petkov <bp@alien8.de>
To: Aaro Koskinen <aaro.koskinen@nokia.com>,
Ralf Baechle <ralf@linux-mips.org>,
David Daney <david.daney@cavium.com>
Cc: Doug Thompson <dougthompson@xmission.com>,
Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH RESEND] octeon_edac: fix broken build
Date: Wed, 1 Jul 2015 13:31:28 +0200 [thread overview]
Message-ID: <20150701113128.GE29656@pd.tnic> (raw)
In-Reply-To: <1435747132-10954-1-git-send-email-aaro.koskinen@nokia.com>
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@vger.kernel.org # v4.0+
> Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
> ---
> 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.
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
--
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
--
next prev parent reply other threads:[~2015-07-01 11:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-01 10:38 [PATCH RESEND] octeon_edac: fix broken build Aaro Koskinen
2015-07-01 11:31 ` Borislav Petkov [this message]
2015-07-01 20:56 ` David Daney
2015-07-02 6:35 ` Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150701113128.GE29656@pd.tnic \
--to=bp@alien8.de \
--cc=aaro.koskinen@nokia.com \
--cc=david.daney@cavium.com \
--cc=dougthompson@xmission.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@osg.samsung.com \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox