From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Manuel Lauss <manuel.lauss@gmail.com>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Sasha Levin <sashal@kernel.org>,
jiaxun.yang@flygoat.com, linux-mips@vger.kernel.org
Subject: [PATCH AUTOSEL 5.4 13/17] MIPS: Restore Au1300 support
Date: Wed, 31 May 2023 09:44:57 -0400 [thread overview]
Message-ID: <20230531134502.3384828-13-sashal@kernel.org> (raw)
In-Reply-To: <20230531134502.3384828-1-sashal@kernel.org>
From: Manuel Lauss <manuel.lauss@gmail.com>
[ 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 <manuel.lauss@gmail.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 f521cbf934e76..0307ff2337d5b 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -1763,6 +1763,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;
}
}
@@ -2092,6 +2096,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
next prev parent reply other threads:[~2023-05-31 13:52 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-31 13:44 [PATCH AUTOSEL 5.4 01/17] power: supply: ab8500: Fix external_power_changed race Sasha Levin
2023-05-31 13:44 ` [PATCH AUTOSEL 5.4 02/17] power: supply: sc27xx: " Sasha Levin
2023-05-31 13:44 ` [PATCH AUTOSEL 5.4 03/17] power: supply: bq27xxx: Use mod_delayed_work() instead of cancel() + schedule() Sasha Levin
2023-05-31 13:44 ` [PATCH AUTOSEL 5.4 04/17] ARM: dts: vexpress: add missing cache properties Sasha Levin
2023-05-31 13:44 ` [PATCH AUTOSEL 5.4 05/17] power: supply: Ratelimit no data debug output Sasha Levin
2023-05-31 13:44 ` [PATCH AUTOSEL 5.4 06/17] platform/x86: asus-wmi: Ignore WMI events with codes 0x7B, 0xC0 Sasha Levin
2023-05-31 13:44 ` [PATCH AUTOSEL 5.4 07/17] regulator: Fix error checking for debugfs_create_dir Sasha Levin
2023-05-31 13:44 ` [PATCH AUTOSEL 5.4 08/17] irqchip/meson-gpio: Mark OF related data as maybe unused Sasha Levin
2023-05-31 13:44 ` [PATCH AUTOSEL 5.4 09/17] power: supply: Fix logic checking if system is running from battery Sasha Levin
2023-05-31 13:44 ` [PATCH AUTOSEL 5.4 10/17] btrfs: handle memory allocation failure in btrfs_csum_one_bio Sasha Levin
2023-05-31 13:44 ` [PATCH AUTOSEL 5.4 11/17] parisc: Improve cache flushing for PCXL in arch_sync_dma_for_cpu() Sasha Levin
2023-05-31 13:44 ` [PATCH AUTOSEL 5.4 12/17] parisc: Flush gatt writes and adjust gatt mask in parisc_agp_mask_memory() Sasha Levin
2023-05-31 13:44 ` Sasha Levin [this message]
2023-05-31 13:44 ` [PATCH AUTOSEL 5.4 14/17] MIPS: Alchemy: fix dbdma2 Sasha Levin
2023-05-31 13:44 ` [PATCH AUTOSEL 5.4 15/17] mips: Move initrd_start check after initrd address sanitisation Sasha Levin
2023-05-31 13:45 ` [PATCH AUTOSEL 5.4 16/17] xen/blkfront: Only check REQ_FUA for writes Sasha Levin
2023-05-31 13:45 ` [PATCH AUTOSEL 5.4 17/17] drm:amd:amdgpu: Fix missing buffer object unlock in failure path Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230531134502.3384828-13-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=jiaxun.yang@flygoat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=manuel.lauss@gmail.com \
--cc=stable@vger.kernel.org \
--cc=tsbogend@alpha.franken.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®