[PATCH 1/4] alpha: replace dead links in Kconfig help text

[PATCH 1/4] alpha: replace dead links in Kconfig help text

[Matt Turner]

The Linux/Alpha FAQ, the unix-ag LX164 overview, the Rawhide install
HOWTO and the Ruffian FAQ are all gone. Point the "Alpha system type"
help at the system and motherboard lists on the alphalinux.org wiki
instead, give LX164 a one-line description in place of its link, and
drop the others.

Signed-off-by: Matt Turner <mattst88@gmail.com>
---
 arch/alpha/Kconfig | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git ./arch/alpha/Kconfig ./arch/alpha/Kconfig
index 92cc7bb8d29a..7c1cc676ddfe 100644
--- ./arch/alpha/Kconfig
+++ ./arch/alpha/Kconfig
@@ -127,9 +127,10 @@ choice
 	  run on any supported Alpha system. However, if you configure a
 	  kernel for your specific system, it will be faster and smaller.
 
-	  To find out what type of Alpha system you have, you may want to
-	  check out the Linux/Alpha FAQ, accessible on the WWW from
-	  <http://www.alphalinux.org/>. In summary:
+	  To find out what type of Alpha system you have, see the system and
+	  motherboard lists at
+	  <https://alphalinux.org/wiki/hardware:systems> and
+	  <https://alphalinux.org/wiki/hardware:motherboards>. In summary:
 
 	  Alcor/Alpha-XLT     AS 600, AS 500, XL-300, XL-366
 	  DP264               DP264 / DS20 / ES40 / DS10 / DS10L
@@ -184,8 +185,8 @@ config ALPHA_EIGER
 config ALPHA_LX164
 	bool "LX164"
 	help
-	  A technical overview of this board is available at
-	  <http://www.unix-ag.org/Linux-Alpha/Architectures/LX164.html>.
+	  AlphaPC164-LX, a 21164A-based single-board computer using the
+	  Pyxis chipset.
 
 config ALPHA_MARVEL
 	bool "Marvel"
@@ -224,14 +225,11 @@ config ALPHA_RAWHIDE
 	select HAVE_EISA
 	help
 	  AlphaServer 1200, AlphaServer 4000 and AlphaServer 4100 machines.
-	  See HOWTO at
-	  <http://www.alphalinux.org/docs/rawhide/4100_install.shtml>.
 
 config ALPHA_RUFFIAN
 	bool "Ruffian"
 	help
-	  Samsung APC164UX.  There is a page on known problems and workarounds
-	  at <http://www.alphalinux.org/faq/FAQ-11.html>.
+	  Samsung APC164UX.
 
 config ALPHA_RX164
 	bool "RX164"
@@ -372,9 +370,7 @@ config ALPHA_SRM
 	help
 	  There are two different types of booting firmware on Alphas: SRM,
 	  which is command line driven, and ARC, which uses menus and arrow
-	  keys. Details about the Linux/Alpha booting process are contained in
-	  the Linux/Alpha FAQ, accessible on the WWW from
-	  <http://www.alphalinux.org/>.
+	  keys.
 
 	  The usual way to load Linux on an Alpha machine is to use MILO
 	  (a bootloader that lets you pass command line parameters to the
-- 
2.54.0

[PATCH 2/4] alpha: correct system descriptions in Kconfig help text

[Matt Turner]

Fix the system lists in the "Alpha system type" choice and the platform
help texts, cross-checked against the alphalinux.org wiki and the
kernel sources:

 - There is no AlphaServer GS40 or DS10E. Wildfire also shipped with
   EV68 (21264C) CPUs.
 - "AS" means AlphaServer elsewhere in the list, but the Alcor "AS 600,
   AS 500" are AlphaStations, as is the Noritake "AlphaServer 600A".
 - Takara is 21164-based, not "11164".
 - Linux 6.10 dropped support for CPUs before EV56, which took the
   AlphaStation 600 and Alpha XL 300 with it. Say once that EV56 or
   later is required rather than qualifying every entry.
 - Add systems missing from their entries: the UP1500 (Nautilus), DS15
   and TS202c (Titan), Digital Server 3300 (Noritake), Digital Server
   5300 and 7300 (Rawhide), and the Ruffian boards in place of
   "Samsung APC164UX".
 - Add Eiger, Nautilus and RX164 to the summary list and help text to
   PC164, RX164, SX164 and Shark, which had none. Note that the Ruffian
   and RX164 boards have no SRM console.

Also drop the Jensen and EV4/EV5 references removed in 6.10, and the
claim that SRM cannot boot from IDE, which is not true of SRM in
general. NR_CPUS can be set to 32 on any platform, so say what the
hardware supports instead of implying a per-platform kernel limit.

Signed-off-by: Matt Turner <mattst88@gmail.com>
---
 arch/alpha/Kconfig | 85 ++++++++++++++++++++++++++++++----------------
 1 file changed, 55 insertions(+), 30 deletions(-)

diff --git ./arch/alpha/Kconfig ./arch/alpha/Kconfig
index 7c1cc676ddfe..920dd10e7df0 100644
--- ./arch/alpha/Kconfig
+++ ./arch/alpha/Kconfig
@@ -126,28 +126,35 @@ choice
 	  This is the system type of your hardware.  A "generic" kernel will
 	  run on any supported Alpha system. However, if you configure a
 	  kernel for your specific system, it will be faster and smaller.
+	  Only EV56 (21164A) and later CPUs are supported.
 
 	  To find out what type of Alpha system you have, see the system and
 	  motherboard lists at
 	  <https://alphalinux.org/wiki/hardware:systems> and
 	  <https://alphalinux.org/wiki/hardware:motherboards>. In summary:
 
-	  Alcor/Alpha-XLT     AS 600, AS 500, XL-300, XL-366
-	  DP264               DP264 / DS20 / ES40 / DS10 / DS10L
+	  Alcor/Alpha-XLT     AlphaStation 500, Alpha XL 366, 433
+	  DP264               DP264, UP2000(+), DS10, DS10L, DS20, DS20E,
+	                      ES40, XP900, XP1000
+	  Eiger               Eiger (OEM)
 	  LX164               AlphaPC164-LX
+	  Marvel              AlphaServer ES47, ES80, GS1280
 	  Miata               Personal Workstation 433/500/600 a/au
-	  Marvel              AlphaServer ES47 / ES80 / GS1280
-	  Mikasa              AS 1000
-	  Noritake            AS 1000A, AS 600A, AS 800
+	  Mikasa              AlphaServer 1000
+	  Nautilus            UP1000, UP1100, UP1500
+	  Noritake            AlphaServer 1000A, 800, AlphaStation 600A,
+	                      Digital Server 3300
 	  PC164               AlphaPC164
-	  Rawhide             AS 1200, AS 4000, AS 4100
+	  Rawhide             AlphaServer 1200, 4000, 4100,
+	                      Digital Server 5300, 7300
 	  Ruffian             RPX164-2, AlphaPC164-UX, AlphaPC164-BX
+	  RX164               AlphaPC164-RX
 	  SX164               AlphaPC164-SX
-	  Sable               AS 2000, AS 2100
-	  Shark               DS 20L
+	  Sable               AlphaServer 2000, 2100
+	  Shark               AlphaServer DS20L, API NetWorks CS20
 	  Takara              Takara (OEM)
-	  Titan               AlphaServer ES45 / DS25 / DS15
-	  Wildfire            AlphaServer GS 40/80/160/320
+	  Titan               AlphaServer DS15, DS25, ES45, TS202c
+	  Wildfire            AlphaServer GS80, GS160, GS320
 
 	  If you don't know what to do, choose "generic".
 
@@ -168,13 +175,14 @@ config ALPHA_ALCOR
 	  controller (256-bit memory bus) and a PCI interface.  It also does
 	  all the work required to support an external Bcache and to maintain
 	  memory coherence when a PCI device DMAs into (or out of) memory.
+	  It is used by the AlphaStation 500 and the Alpha XL 366 and 433.
 
 config ALPHA_DP264
 	bool "DP264"
 	help
 	  Various 21264 systems with the tsunami core logic chipset.
-	  API Networks: 264DP, UP2000(+), CS20;
-	  Compaq: DS10(E,L), XP900, XP1000, DS20(E), ES40.
+	  API NetWorks: 264DP, UP2000(+);
+	  Compaq: DS10, DS10L, XP900, XP1000, DS20, DS20E, ES40.
 
 config ALPHA_EIGER
 	bool "Eiger"
@@ -197,8 +205,8 @@ config ALPHA_MIATA
 	bool "Miata"
 	select HAVE_EISA
 	help
-	  The Digital PersonalWorkStation (PWS 433a, 433au, 500a, 500au, 600a,
-	  or 600au).
+	  The Digital Personal Workstation (PWS 433a, 433au, 500a, 500au,
+	  600a, or 600au).
 
 config ALPHA_MIKASA
 	bool "Mikasa"
@@ -208,34 +216,47 @@ config ALPHA_MIKASA
 config ALPHA_NAUTILUS
 	bool "Nautilus"
 	help
-	  Alpha systems based on the AMD 751 & ALI 1543C chipsets.
+	  UP1000, UP1100 and UP1500 systems based on the AMD 751 or 761
+	  chipset.
 
 config ALPHA_NORITAKE
 	bool "Noritake"
 	select HAVE_EISA
 	help
-	  AlphaServer 1000A, AlphaServer 600A, and AlphaServer 800-based
-	  systems.
+	  AlphaServer 1000A, AlphaServer 800, AlphaStation 600A and
+	  Digital Server 3300 systems.
 
 config ALPHA_PC164
 	bool "PC164"
+	help
+	  AlphaPC164, a 21164A-based single-board computer using the CIA
+	  chipset.
 
 config ALPHA_RAWHIDE
 	bool "Rawhide"
 	select HAVE_EISA
 	help
-	  AlphaServer 1200, AlphaServer 4000 and AlphaServer 4100 machines.
+	  AlphaServer 1200, 4000 and 4100 and Digital Server 5300 and 7300
+	  machines.
 
 config ALPHA_RUFFIAN
 	bool "Ruffian"
 	help
-	  Samsung APC164UX.
+	  DeskStation RPX164-2, AlphaPC164-UX and AlphaPC164-BX boards.
+	  They have no SRM console and can only boot Linux through MILO.
 
 config ALPHA_RX164
 	bool "RX164"
+	help
+	  AlphaPC164-RX, a 21164PC-based single-board computer using the
+	  Polaris chipset. It has no SRM console and can only boot Linux
+	  through MILO.
 
 config ALPHA_SX164
 	bool "SX164"
+	help
+	  AlphaPC164-SX, a 21164PC-based single-board computer using the
+	  Pyxis chipset.
 
 config ALPHA_SABLE
 	bool "Sable"
@@ -245,21 +266,26 @@ config ALPHA_SABLE
 
 config ALPHA_SHARK
 	bool "Shark"
+	help
+	  AlphaServer DS20L and API NetWorks CS20 systems based on the
+	  Tsunami chipset.
 
 config ALPHA_TAKARA
 	bool "Takara"
 	help
-	  Alpha 11164-based OEM single-board computer.
+	  Alpha 21164-based OEM single-board computer.
 
 config ALPHA_TITAN
 	bool "Titan"
 	help
-	  AlphaServer ES45/DS25 SMP based on EV68 and Titan chipset.
+	  AlphaServer DS15, DS25, ES45 and TS202c based on EV68 and the
+	  Titan chipset.
 
 config ALPHA_WILDFIRE
 	bool "Wildfire"
 	help
-	  AlphaServer GS 40/80/160/320 SMP based on the EV67 core.
+	  AlphaServer GS80, GS160 and GS320 SMP based on the EV67 or EV68
+	  core.
 
 endchoice
 
@@ -378,10 +404,9 @@ config ALPHA_SRM
 	  loaded either from ARC or can be installed directly as a permanent
 	  firmware replacement from floppy (which requires changing a certain
 	  jumper on the motherboard). If you want to do either of these, say N
-	  here. If MILO doesn't work on your system (true for Jensen
-	  motherboards), you can bypass it altogether and boot Linux directly
-	  from an SRM console; say Y here in order to do that. Note that you
-	  won't be able to boot from an IDE disk using SRM.
+	  here. If MILO doesn't work on your system, you can bypass it
+	  altogether and boot Linux directly from an SRM console; say Y here
+	  in order to do that.
 
 	  If unsure, say N.
 
@@ -414,8 +439,8 @@ config NR_CPUS
 	default "32" if ALPHA_GENERIC || ALPHA_MARVEL
 	default "4" if !ALPHA_GENERIC && !ALPHA_MARVEL
 	help
-	  MARVEL support can handle a maximum of 32 CPUs, all the others
-	  with working support have a maximum of 4 CPUs.
+	  The kernel supports at most 32 CPUs. Only Marvel and Wildfire
+	  systems have more than 4.
 
 config ARCH_SPARSEMEM_ENABLE
 	bool "Sparse Memory Support"
@@ -439,8 +464,8 @@ config ALPHA_WTINT
 	  For emulation under QEMU, definitely say Y here, as we have other
 	  mechanisms for measuring time than the cycle counter.
 
-	  For EV4 (but not LCA), EV5 and EV56 systems, or for systems running
-	  MILO, sleep mode is not supported so you might as well say N here.
+	  For EV56 systems, or for systems running MILO, sleep mode is not
+	  supported so you might as well say N here.
 
 	  For SMP systems we cannot use the cycle counter for timing anyway,
 	  so you might as well say Y here.
-- 
2.54.0

[PATCH 3/4] alpha: link platform help text to the alphalinux.org wiki

[Matt Turner]

The alphalinux.org wiki has a page for each system and motherboard
covering its CPUs, firmware, Linux status and known issues. Link each
platform's help text to the pages for the systems it supports.

Signed-off-by: Matt Turner <mattst88@gmail.com>
---
 arch/alpha/Kconfig | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git ./arch/alpha/Kconfig ./arch/alpha/Kconfig
index 920dd10e7df0..0fc61d986a7d 100644
--- ./arch/alpha/Kconfig
+++ ./arch/alpha/Kconfig
@@ -177,6 +177,8 @@ config ALPHA_ALCOR
 	  memory coherence when a PCI device DMAs into (or out of) memory.
 	  It is used by the AlphaStation 500 and the Alpha XL 366 and 433.
 
+	  See <https://alphalinux.org/wiki/hardware:systems:alcor>.
+
 config ALPHA_DP264
 	bool "DP264"
 	help
@@ -184,23 +186,37 @@ config ALPHA_DP264
 	  API NetWorks: 264DP, UP2000(+);
 	  Compaq: DS10, DS10L, XP900, XP1000, DS20, DS20E, ES40.
 
+	  See:
+	  <https://alphalinux.org/wiki/hardware:systems:webbrick>
+	  <https://alphalinux.org/wiki/hardware:systems:goldrush>
+	  <https://alphalinux.org/wiki/hardware:systems:clipper>
+	  <https://alphalinux.org/wiki/hardware:systems:monet>
+	  <https://alphalinux.org/wiki/hardware:motherboards:pc264dp>
+	  <https://alphalinux.org/wiki/hardware:motherboards:up2000>
+
 config ALPHA_EIGER
 	bool "Eiger"
 	help
 	  Apparently an obscure OEM single-board computer based on the
 	  Typhoon/Tsunami chipset family. Information on it is scanty.
 
+	  See <https://alphalinux.org/wiki/hardware:motherboards:eiger>.
+
 config ALPHA_LX164
 	bool "LX164"
 	help
 	  AlphaPC164-LX, a 21164A-based single-board computer using the
 	  Pyxis chipset.
 
+	  See <https://alphalinux.org/wiki/hardware:motherboards:pc164lx>.
+
 config ALPHA_MARVEL
 	bool "Marvel"
 	help
 	  AlphaServer ES47 / ES80 / GS1280 based on EV7.
 
+	  See <https://alphalinux.org/wiki/hardware:systems:marvel>.
+
 config ALPHA_MIATA
 	bool "Miata"
 	select HAVE_EISA
@@ -208,17 +224,26 @@ config ALPHA_MIATA
 	  The Digital Personal Workstation (PWS 433a, 433au, 500a, 500au,
 	  600a, or 600au).
 
+	  See <https://alphalinux.org/wiki/hardware:systems:miata>.
+
 config ALPHA_MIKASA
 	bool "Mikasa"
 	help
 	  AlphaServer 1000-based Alpha systems.
 
+	  See <https://alphalinux.org/wiki/hardware:systems:mikasa>.
+
 config ALPHA_NAUTILUS
 	bool "Nautilus"
 	help
 	  UP1000, UP1100 and UP1500 systems based on the AMD 751 or 761
 	  chipset.
 
+	  See:
+	  <https://alphalinux.org/wiki/hardware:motherboards:up1000>
+	  <https://alphalinux.org/wiki/hardware:motherboards:up1100>
+	  <https://alphalinux.org/wiki/hardware:motherboards:up1500>
+
 config ALPHA_NORITAKE
 	bool "Noritake"
 	select HAVE_EISA
@@ -226,12 +251,16 @@ config ALPHA_NORITAKE
 	  AlphaServer 1000A, AlphaServer 800, AlphaStation 600A and
 	  Digital Server 3300 systems.
 
+	  See <https://alphalinux.org/wiki/hardware:systems:noritake>.
+
 config ALPHA_PC164
 	bool "PC164"
 	help
 	  AlphaPC164, a 21164A-based single-board computer using the CIA
 	  chipset.
 
+	  See <https://alphalinux.org/wiki/hardware:motherboards:pc164>.
+
 config ALPHA_RAWHIDE
 	bool "Rawhide"
 	select HAVE_EISA
@@ -239,12 +268,16 @@ config ALPHA_RAWHIDE
 	  AlphaServer 1200, 4000 and 4100 and Digital Server 5300 and 7300
 	  machines.
 
+	  See <https://alphalinux.org/wiki/hardware:systems:rawhide>.
+
 config ALPHA_RUFFIAN
 	bool "Ruffian"
 	help
 	  DeskStation RPX164-2, AlphaPC164-UX and AlphaPC164-BX boards.
 	  They have no SRM console and can only boot Linux through MILO.
 
+	  See <https://alphalinux.org/wiki/hardware:motherboards:pc164ux>.
+
 config ALPHA_RX164
 	bool "RX164"
 	help
@@ -252,41 +285,55 @@ config ALPHA_RX164
 	  Polaris chipset. It has no SRM console and can only boot Linux
 	  through MILO.
 
+	  See <https://alphalinux.org/wiki/hardware:motherboards:pc164rx>.
+
 config ALPHA_SX164
 	bool "SX164"
 	help
 	  AlphaPC164-SX, a 21164PC-based single-board computer using the
 	  Pyxis chipset.
 
+	  See <https://alphalinux.org/wiki/hardware:motherboards:pc164sx>.
+
 config ALPHA_SABLE
 	bool "Sable"
 	select HAVE_EISA
 	help
 	  Digital AlphaServer 2000 and 2100-based systems.
 
+	  See <https://alphalinux.org/wiki/hardware:systems:sable>.
+
 config ALPHA_SHARK
 	bool "Shark"
 	help
 	  AlphaServer DS20L and API NetWorks CS20 systems based on the
 	  Tsunami chipset.
 
+	  See <https://alphalinux.org/wiki/hardware:systems:shark>.
+
 config ALPHA_TAKARA
 	bool "Takara"
 	help
 	  Alpha 21164-based OEM single-board computer.
 
+	  See <https://alphalinux.org/wiki/hardware:motherboards:takara>.
+
 config ALPHA_TITAN
 	bool "Titan"
 	help
 	  AlphaServer DS15, DS25, ES45 and TS202c based on EV68 and the
 	  Titan chipset.
 
+	  See <https://alphalinux.org/wiki/hardware:systems:titan>.
+
 config ALPHA_WILDFIRE
 	bool "Wildfire"
 	help
 	  AlphaServer GS80, GS160 and GS320 SMP based on the EV67 or EV68
 	  core.
 
+	  See <https://alphalinux.org/wiki/hardware:systems:wildfire>.
+
 endchoice
 
 # clear all implied options (don't want default values for those):
-- 
2.54.0

[PATCH 4/4] alpha: default NR_CPUS to 32 for Wildfire

[Matt Turner]

The AlphaServer GS320 has up to 32 CPUs and the Wildfire code handles
all eight QBBs, but a Wildfire-only kernel defaults to NR_CPUS=4 and
ignores the rest unless the user raises it by hand.

Signed-off-by: Matt Turner <mattst88@gmail.com>
---
 arch/alpha/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git ./arch/alpha/Kconfig ./arch/alpha/Kconfig
index 0fc61d986a7d..b5b02bb42aca 100644
--- ./arch/alpha/Kconfig
+++ ./arch/alpha/Kconfig
@@ -483,8 +483,8 @@ config NR_CPUS
 	int "Maximum number of CPUs (2-32)"
 	range 2 32
 	depends on SMP
-	default "32" if ALPHA_GENERIC || ALPHA_MARVEL
-	default "4" if !ALPHA_GENERIC && !ALPHA_MARVEL
+	default "32" if ALPHA_GENERIC || ALPHA_MARVEL || ALPHA_WILDFIRE
+	default "4"
 	help
 	  The kernel supports at most 32 CPUs. Only Marvel and Wildfire
 	  systems have more than 4.
-- 
2.54.0