From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 23 Jun 2005 00:02:37 +0100 (BST) Received: from mms1.broadcom.com ([IPv6:::ffff:216.31.210.17]:51214 "EHLO MMS1.broadcom.com") by linux-mips.org with ESMTP id ; Thu, 23 Jun 2005 00:02:02 +0100 Received: from 10.10.64.121 by MMS1.broadcom.com with SMTP (Broadcom SMTP Relay (Email Firewall v6.1.0)); Wed, 22 Jun 2005 16:00:58 -0700 X-Server-Uuid: 146C3151-C1DE-4F71-9D02-C3BE503878DD Received: from mail-irva-8.broadcom.com ([10.10.64.221]) by mail-irva-1.broadcom.com (Post.Office MTA v3.5.3 release 223 ID# 0-72233U7200L2200S0V35) with ESMTP id com for ; Wed, 22 Jun 2005 16:00:45 -0700 Received: from mon-irva-10.broadcom.com (mon-irva-10.broadcom.com [10.10.64.171]) by mail-irva-8.broadcom.com (MOS 3.5.6-GR) with ESMTP id BFO30544; Wed, 22 Jun 2005 16:00:43 -0700 (PDT) Received: from mail-sj1-5.sj.broadcom.com (mail-sj1-5.sj.broadcom.com [10.16.128.236]) by mon-irva-10.broadcom.com (8.9.1/8.9.1) with ESMTP id QAA02058 for ; Wed, 22 Jun 2005 16:00:42 -0700 (PDT) Received: from localhost.localdomain (ldt-sj3-054 [10.21.3.41]) by mail-sj1-5.sj.broadcom.com (8.12.9/8.12.9/SSF) with ESMTP id j5MN0gov008133 for ; Wed, 22 Jun 2005 16:00:42 -0700 (PDT) Received: (from adi@localhost) by localhost.localdomain (8.11.6/8.9.3) id j5MN0gG17934 for linux-mips@linux-mips.org; Wed, 22 Jun 2005 16:00:42 -0700 Date: Wed, 22 Jun 2005 16:00:42 -0700 From: "Andrew Isaacson" To: linux-mips@linux-mips.org Subject: [patch 1/5] SiByte fixes for 2.6.12 Message-ID: <20050622230042.GA17919@broadcom.com> MIME-Version: 1.0 In-Reply-To: <20050622230003.GA17725@broadcom.com> User-Agent: Mutt/1.4.2.1i X-WSS-ID: 6EA732202AW2764033-01-01 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 8140 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: adi@broadcom.com Precedence: bulk X-list: linux-mips SB1 does not use the R4K TLB code. Signed-Off-By: Andrew Isaacson Index: linux-2.6-work/arch/mips/kernel/cpu-probe.c =================================================================== --- linux-2.6-work.orig/arch/mips/kernel/cpu-probe.c 2005-06-22 11:17:22.000000000 -0700 +++ linux-2.6-work/arch/mips/kernel/cpu-probe.c 2005-06-22 11:17:29.000000000 -0700 @@ -583,6 +583,8 @@ switch (c->processor_id & 0xff00) { case PRID_IMP_SB1: c->cputype = CPU_SB1; + c->options &= ~MIPS_CPU_4KTLB; + c->options |= MIPS_CPU_TLB; #ifdef CONFIG_SB1_PASS_1_WORKAROUNDS /* FPU in pass1 is known to have issues. */ c->options &= ~(MIPS_CPU_FPU | MIPS_CPU_32FPR); --