From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8891DC77B7A for ; Wed, 31 May 2023 13:45:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236740AbjEaNpc (ORCPT ); Wed, 31 May 2023 09:45:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236632AbjEaNoJ (ORCPT ); Wed, 31 May 2023 09:44:09 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C1D0E43; Wed, 31 May 2023 06:42:38 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D31E3616B5; Wed, 31 May 2023 13:41:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91743C433D2; Wed, 31 May 2023 13:41:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685540488; bh=xM9bGE6k9cXHxFRbip/tz3yiUwwBm1pbywPPGFyUmWw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BariiRLUZLlb3a3FeRNofIUzbPzR3hXNhc4hRWkqlCkvgFxpHbS74ziLsccLaCQOi RkLB62TDek+cOCMNub9hq244lm2F87raCULGot5KIZHFXPU6eL7R3LvyX0u4po8M0J 0FtT3jnlVYwvh0K8kaCNaq7IYZIHX1/jZ2o94qkGzwg7LfGUjn/O6FjDlpMbmkCZ7P s7NIn/yU/o8evZUrL4RNWhIjeq/tNAZX1x3wIIee++17+6du3VjdS+4IiC07BT9S8F homRBHlSHb03GmLz6L+iljphIIJmH/aNcC5zmN4r87CuxGg/f4naZcN05pkXRRAQ8W TRaC2JjEI8o9Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Manuel Lauss , Thomas Bogendoerfer , Sasha Levin , jiaxun.yang@flygoat.com, linux-mips@vger.kernel.org Subject: [PATCH AUTOSEL 6.3 29/37] MIPS: Restore Au1300 support Date: Wed, 31 May 2023 09:40:11 -0400 Message-Id: <20230531134020.3383253-29-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531134020.3383253-1-sashal@kernel.org> References: <20230531134020.3383253-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Manuel Lauss [ Upstream commit f2041708dee30a3425f680265c337acd28293782 ] The Au1300, at least the one I have to test, uses the NetLogic vendor ID, but commit 95b8a5e0111a ("MIPS: Remove NETLOGIC support") also dropped Au1300 detection. Restore Au1300 detection. Tested on DB1300 with Au1380 chip. Signed-off-by: Manuel Lauss Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- arch/mips/kernel/cpu-probe.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 7ddf07f255f32..6f5d825958778 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -1502,6 +1502,10 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c, unsigned int cpu) break; } break; + case PRID_IMP_NETLOGIC_AU13XX: + c->cputype = CPU_ALCHEMY; + __cpu_name[cpu] = "Au1300"; + break; } } @@ -1861,6 +1865,7 @@ void cpu_probe(void) cpu_probe_mips(c, cpu); break; case PRID_COMP_ALCHEMY: + case PRID_COMP_NETLOGIC: cpu_probe_alchemy(c, cpu); break; case PRID_COMP_SIBYTE: -- 2.39.2