Message-ID: <5594541A.9010602@caviumnetworks.com>
Date: Wed, 1 Jul 2015 13:56:58 -0700
From: David Daney <ddaney@caviumnetworks.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7
MIME-Version: 1.0
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
References: <1435747132-10954-1-git-send-email-aaro.koskinen@nokia.com> <20150701113128.GE29656@pd.tnic>
In-Reply-To: <20150701113128.GE29656@pd.tnic>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2015 20:57:04.2991 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0701MB1726
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2674
Lines: 73

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
>

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