From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S938923AbcIYGEe (ORCPT <rfc822;w@1wt.eu>);
        Sun, 25 Sep 2016 02:04:34 -0400
Received: from host.buserror.net ([209.198.135.123]:59134 "EHLO
        host.buserror.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S934317AbcIYGEc (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Sun, 25 Sep 2016 02:04:32 -0400
Date: Sun, 25 Sep 2016 01:04:01 -0500
From: Scott Wood <oss@buserror.net>
To: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
        Paul Mackerras <paulus@samba.org>,
        Michael Ellerman <mpe@ellerman.id.au>, Zhao Qiang <qiang.zhao@nxp.com>,
        "David S. Miller" <davem@davemloft.net>, linuxppc-dev@lists.ozlabs.org,
        linux-kernel@vger.kernel.org, stable@vger.kernel.org
Message-ID: <20160925060401.GA30936@home.buserror.net>
References: <20160816062620.41D9C1A2456@localhost.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20160816062620.41D9C1A2456@localhost.localdomain>
User-Agent: Mutt/1.5.24 (2015-08-30)
X-SA-Exim-Connect-IP: 75.72.173.242
X-SA-Exim-Mail-From: oss@buserror.net
X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP
        *  -15 BAYES_00 BODY: Bayes spam probability is 0 to 1%
        *      [score: 0.0000]
Subject: Re: [v2] soc: fsl/qe: fix Oops on CPM1 (and likely CPM2)
X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:57:07 +0000)
X-SA-Exim-Scanned: Yes (on host.buserror.net)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Aug 16, 2016 at 08:26:20AM +0200, Christophe Leroy wrote:
> fixes: 0e6e01ff694ee ("CPM/QE: use genalloc to manage CPM/QE muram")
> Cc: stable@vger.linux.org
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
[snip]
>  	muram_pbase = of_translate_address(np, zero);
>  	if (muram_pbase == (phys_addr_t)OF_BAD_ADDR) {
> -		pr_err("Cannot translate zero through CPM muram node");
> +		pr_err("Cannot translate zero through CPM/QE muram node");
>  		ret = -ENODEV;
>  		goto out_pool;
>  	}
> @@ -83,14 +88,14 @@ int cpm_muram_init(void)
>  		ret = gen_pool_add(muram_pool, r.start - muram_pbase +
>  				   GENPOOL_OFFSET, resource_size(&r), -1);
>  		if (ret) {
> -			pr_err("QE: couldn't add muram to pool!\n");
> +			pr_err("CPM/QE: couldn't add muram to pool!\n");
>  			goto out_pool;
>  		}
>  	}
>  
>  	muram_vbase = ioremap(muram_pbase, max - muram_pbase + 1);
>  	if (!muram_vbase) {
> -		pr_err("Cannot map QE muram");
> +		pr_err("Cannot map CPM/QE muram");
>  		ret = -ENOMEM;
>  		goto out_pool;
>  	}

These string changes are not related to the bugfix.  Particularly since
this is aimed at stable, I'm removing this part of the patch when
applying.

-Scott