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 S1752080AbcBJWKz (ORCPT <rfc822;w@1wt.eu>);
	Wed, 10 Feb 2016 17:10:55 -0500
Received: from mailapp01.imgtec.com ([195.59.15.196]:47611 "EHLO
	mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750749AbcBJWKy (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 10 Feb 2016 17:10:54 -0500
Date: Wed, 10 Feb 2016 14:10:49 -0800
From: Paul Burton <paul.burton@imgtec.com>
To: Ralf Baechle <ralf@linux-mips.org>
CC: <linux-mips@linux-mips.org>, "Steven J. Hill" <Steven.Hill@imgtec.com>,
        Joshua Kinard <kumba@gentoo.org>, <linux-kernel@vger.kernel.org>,
        =?utf-8?B?UmFmYcWCIE1pxYJlY2tp?= <zajec5@gmail.com>,
        James Hogan <james.hogan@imgtec.com>,
        Markos Chandras <markos.chandras@imgtec.com>
Subject: Re: [PATCH] MIPS: tlb-r4k: panic if the MMU doesn't support PAGE_SIZE
Message-ID: <20160210221049.GA26712@NP-P-BURTON>
References: <1436803964-29820-1-git-send-email-paul.burton@imgtec.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Disposition: inline
In-Reply-To: <1436803964-29820-1-git-send-email-paul.burton@imgtec.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-Originating-IP: [10.100.200.47]
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Jul 13, 2015 at 05:12:44PM +0100, Paul Burton wrote:
> After writing the appropriate mask to the cop0 PageMask register, read
> the register back & check it matches what we want. If it doesn't then
> the MMU does not support the page size the kernel is configured for and
> we're better off bailing than continuing to do odd things with TLB
> exceptions.
> 
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
> ---

Hi Ralf,

This patch is marked as accepted in patchwork[1] but is not present in
upstream. Did you lose it somehow? Could you please merge it?

Thanks,
    Paul

[1] http://patchwork.linux-mips.org/patch/10691/

>  arch/mips/mm/tlb-r4k.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
> index 08318ec..4330315 100644
> --- a/arch/mips/mm/tlb-r4k.c
> +++ b/arch/mips/mm/tlb-r4k.c
> @@ -19,6 +19,7 @@
>  #include <asm/cpu.h>
>  #include <asm/cpu-type.h>
>  #include <asm/bootinfo.h>
> +#include <asm/hazards.h>
>  #include <asm/mmu_context.h>
>  #include <asm/pgtable.h>
>  #include <asm/tlb.h>
> @@ -486,6 +487,10 @@ static void r4k_tlb_configure(void)
>  	 *     be set to fixed-size pages.
>  	 */
>  	write_c0_pagemask(PM_DEFAULT_MASK);
> +	back_to_back_c0_hazard();
> +	if (read_c0_pagemask() != PM_DEFAULT_MASK)
> +		panic("MMU doesn't support PAGE_SIZE=0x%lx", PAGE_SIZE);
> +
>  	write_c0_wired(0);
>  	if (current_cpu_type() == CPU_R10000 ||
>  	    current_cpu_type() == CPU_R12000 ||
> -- 
> 2.4.5
>