Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp879284rwd; Thu, 15 Jun 2023 03:27:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7xf3SlwVId4yE/jOgsAm3WSGnyUQ7PKx37I21TB09EoNHn0e9hFQqOomQ1j/lWxiBpSnj+ X-Received: by 2002:a17:907:1c05:b0:973:daa0:2f6 with SMTP id nc5-20020a1709071c0500b00973daa002f6mr18073281ejc.3.1686824838749; Thu, 15 Jun 2023 03:27:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686824838; cv=none; d=google.com; s=arc-20160816; b=cNMUgomUBCQ9xxCsckWVYutLXr4VGBqn0YB28AP+OZrDF6mLfPnjV9Gnj8LeNwEeAG W3uKaLg4jnDFQmZNXfvcfbPZ+Q4tweObyU/HVzpfGr/f0J5AjSWHIAWttVU+Ht80+cUe 2wdTee1vqMN2Z0FVDG8fwZtNNp8Unm2M3N3eUjMggXCLbu4iQIQOSL4tAvcvV9Jx/skh Z4Vcz2jMamefl6G8CGwH1r85WYYGOvemDarIpK9Ro33GkHYt9oblNrFJG0vci2GAvgzJ Re7RqUSgYBE6g+V1A0v99mDJHqqbgvddIXCeFuZqFfJaPyOKvlQimusRELn8/SLfc+lO eNaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:to:from; bh=MlsXSzoDOtp/LhFSb7bZzNBMlkcHDNjQIQE9c5bYp/g=; b=Xf4QNwqppBYDhpyuODooABtBQ07Sqnvy991WeOVU1t49iY2CxGYlgMR4K5BCSF9+jT MCUFmZfOtOY1YH7uWWrVpL77O1/+Dh00GNOGccw7CeY3hURw4BUIroVKtTRuP+vIvQza HV2dGFShZVTFrxuIRj3Bm6HQn7OMr4GCd1cgR8FgwUAzA/NG1HrW/6ieMp3oJ6St4F24 itPyFzAwpFDmiGgjYnMPp4YLTtBiojvKO2CCGzE/2h/kwmIxj6/VIMJkqhC2s0EPaHS8 sHycuG3HmtCLg5XtjGqYHQFRIPrUv+3+lbfUKH7fEDsOlPyiNRqDbxfaolFR856j6PRy TxWQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gz15-20020a170906f2cf00b00982c0380cccsi137389ejb.917.2023.06.15.03.26.53; Thu, 15 Jun 2023 03:27:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241623AbjFOJmw (ORCPT + 99 others); Thu, 15 Jun 2023 05:42:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343833AbjFOJkV (ORCPT ); Thu, 15 Jun 2023 05:40:21 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 492903AAD; Thu, 15 Jun 2023 02:39:50 -0700 (PDT) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id E84311FDDA; Thu, 15 Jun 2023 09:39:37 +0000 (UTC) Received: from adalid.arch.suse.de (adalid.arch.suse.de [10.161.8.13]) by relay2.suse.de (Postfix) with ESMTP id D015E2C141; Thu, 15 Jun 2023 09:39:37 +0000 (UTC) From: Thomas Bogendoerfer To: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] MIPS: mm: Remove special handling for OCTEON CPUs Date: Thu, 15 Jun 2023 11:39:33 +0200 Message-Id: <20230615093933.121329-1-tsbogend@alpha.franken.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_FAIL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Macro cpu_has_mips_r2_exec_hazard correctly handles OCTEON CPUs, so we don't need the extra switch cases for them. Signed-off-by: Thomas Bogendoerfer --- arch/mips/mm/tlbex.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index 80e05ee98d62..8d514a9082c6 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c @@ -2123,16 +2123,8 @@ static void build_r4000_tlb_load_handler(void) uasm_i_tlbr(&p); - switch (current_cpu_type()) { - case CPU_CAVIUM_OCTEON: - case CPU_CAVIUM_OCTEON_PLUS: - case CPU_CAVIUM_OCTEON2: - break; - default: - if (cpu_has_mips_r2_exec_hazard) - uasm_i_ehb(&p); - break; - } + if (cpu_has_mips_r2_exec_hazard) + uasm_i_ehb(&p); /* Examine entrylo 0 or 1 based on ptr. */ if (use_bbit_insns()) { @@ -2197,16 +2189,8 @@ static void build_r4000_tlb_load_handler(void) uasm_i_tlbr(&p); - switch (current_cpu_type()) { - case CPU_CAVIUM_OCTEON: - case CPU_CAVIUM_OCTEON_PLUS: - case CPU_CAVIUM_OCTEON2: - break; - default: - if (cpu_has_mips_r2_exec_hazard) - uasm_i_ehb(&p); - break; - } + if (cpu_has_mips_r2_exec_hazard) + uasm_i_ehb(&p); /* Examine entrylo 0 or 1 based on ptr. */ if (use_bbit_insns()) { -- 2.35.3