From: David Daney <ddaney@caviumnetworks.com>
To: Borislav Petkov <bp@alien8.de>
Cc: Aaro Koskinen <aaro.koskinen@nokia.com>,
Ralf Baechle <ralf@linux-mips.org>,
David Daney <david.daney@cavium.com>,
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:56:58 -0700 [thread overview]
Message-ID: <5594541A.9010602@caviumnetworks.com> (raw)
In-Reply-To: <20150701113128.GE29656@pd.tnic>
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@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.
It seems obvious and corrects a build issue, so ...
Acked-by: David Daney <david.daney@cavium.com>
>
> 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
>
next prev parent reply other threads:[~2015-07-01 21:12 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
2015-07-01 20:56 ` David Daney [this message]
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=5594541A.9010602@caviumnetworks.com \
--to=ddaney@caviumnetworks.com \
--cc=aaro.koskinen@nokia.com \
--cc=bp@alien8.de \
--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