From 80a7695eb3c0bf8ed4042d987586c8cb74f9c8e5 Mon Sep 17 00:00:00 2001 From: Yogev Ezra Date: Wed, 20 Nov 2013 20:05:06 +0000 Subject: [PATCH] Add Vortex86 detection code. git-svn-id: svn://kolibrios.org@4261 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/detect/vortex86.inc | 92 ++++++++++++++++++++++++++++++++ kernel/trunk/kernel.asm | 2 + 2 files changed, 94 insertions(+) create mode 100644 kernel/trunk/detect/vortex86.inc diff --git a/kernel/trunk/detect/vortex86.inc b/kernel/trunk/detect/vortex86.inc new file mode 100644 index 0000000000..9f5abee1fa --- /dev/null +++ b/kernel/trunk/detect/vortex86.inc @@ -0,0 +1,92 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; ;; +;; Copyright (C) KolibriOS team 2004-2013. All rights reserved. ;; +;; Distributed under terms of the GNU General Public License ;; +;; ;; +;; 20/11/2013 yogev_ezra: Initial version ;; +;; Thanks for help to: dunkaist, eAndrew, hidnplayr, Mario ;; +;; ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +$Revision$ + +VORTEX86DEBUG = 0 ; For testing in emulators and in non-Vortex86 CPU computers, set this to 1 +VORTEX86DEBUGVALUE = 0x35504d44 ; FAKE port output = used for testing + +; Detect Vortex86 CPU and generate CPU name in string format (PCI address at 93H~90H in Vortex86 North Bridge contains SoC type) +; Available Vortex86 CPU codes taken from Coreboot project. New codes should be added to "Vortex86SoClist" below +; #define DMP_CPUID_SX 0x31504d44 ("DMP1") +; #define DMP_CPUID_DX 0x32504d44 ("DMP2") +; #define DMP_CPUID_MX 0x33504d44 ("DMP3") +; #define DMP_CPUID_DX2 0x34504d44 ("DMP4") +; #define DMP_CPUID_MX_PLUS 0x35504d44 ("DMP5") +; #define DMP_CPUID_EX 0x37504d44 ("DMP7") + +iglobal +Vortex86CPUcode dd ? ; Vortex86 CPU code in HEX format (4 bytes), can be shown as string if converted to ASCII characters +Vortex86CPUid db 0 ; Vortex86 CPU id in integer format (1=Vortex86SX, 2=Vortex86DX, ...) +Vortex86SoCname db 'Vortex86 ',0 ; This variable will hold the full name of Vortex86 SoC +Vortex86SoClist: ; List of Vortex86 CPUs known today. Add new record to this list when new CPU becomes available + db 0x31, 'SX ' ; id=1 + db 0x32, 'DX ' ; id=2 + db 0x33, 'MX ' ; id=3 + db 0x34, 'DX2' ; id=4 + db 0x35, 'MX+' ; id=5 + db 0x37, 'EX ' ; id=6 +Vortex86SoCnum = ($ - Vortex86SoClist) / 4 ; Calculate the total number of known Vortex86 CPUs (if id=Vortex86SoCnum+1 --> unknown SoC) +endg + + mov dx, 0xcf8 ; CF8h = Vortex86 PCI Configuration Address port + mov eax, 0x80000090 ; 0x80000090 = Starting PCI address to read from (32-bit register - accessed as DWORD) + out dx, eax ; Send request to PCI address port to retrieve data from this address + mov dx, 0xcfc ; CFCh = Vortex86 PCI Configuration Data port + in eax, dx ; Read data (SoC type) from PCI data port + +if VORTEX86DEBUG +; // Used for debug purposes: testing in emulator and in non-Vortex86 CPU computers + mov eax, VORTEX86DEBUGVALUE +end if + + DEBUGF 1, "K : Vortex86 SoC register returned 0x" + test eax, eax ; We need to break out in case the result is '\0' since otherwise we will fail at NULL string + jz .nullPCIoutput + mov [Vortex86CPUcode], eax + DEBUGF 1, "%x (%s): ", eax, Vortex86CPUcode + cmp ax, 4d44h ; Check whether it's Vortex86 family (all Vortex86 SoC have ID in form of "0xNN504d44") + jnz .notVortex86 + shr eax, 16 ; Discard lower word in EAX which is always 4d44h in Vortex86 family + cmp al, 50h ; The 3rd byte is always 50h in Vortex86 SoC + jnz .notVortex86 + shr ax, 8 ; Discard 3rd byte in EAX, the highest byte determines the SoC type + mov bl, al ; Copy SoC type to BL since EAX (that contains AL) is used implicitly in "LODSD" command below + mov esi, Vortex86SoClist ; ESI points to the start of Vortex86SoClist (used implicitly in "LODSD" command below) + xor ecx, ecx ; Zero ECX (it is used as counter) + cld ; Clears the DF flag in the EFLAGS register (DF=0 --> String operations increment ESI) +@@: + cmp ecx, Vortex86SoCnum ; Check if we iterated Vortex86SoCnum times already (i.e. went over the entire Vortex86SoClist) + ja .unknownVortex86 ; If the entire list was tested and our CPU is not in that list, it is unknown Vortex86 SoC + inc ecx ; Increment our counter + lodsd ; Load DWORD at address DS:ESI into EAX (puts 1 line from Vortex86SoClist into EAX, then increments ESI) + cmp bl, al ; Check if our CPU matches the current record in the list + jne @b ; No match --> repeat with next record + + shr eax, 8 ; Match found --> drop the SoC type code from Vortex86SoClist name and replace it with \0 + mov dword [Vortex86SoCname+8], eax ; Concatenate it with prefix to receive complete SoC name (\0 is string termination) + mov [Vortex86CPUid], cl ; Save the CPUid (1=Vortex86SX, 2=Vortex86DX, ..., Vortex86SoCnum+1=Unknown Vortex86) + + DEBUGF 1, "%s (id=%d)\n", Vortex86SoCname, [Vortex86CPUid]:1 + jmp .Vortex86end ; Say what we have found (CPU name and id) and exit + +.nullPCIoutput: ; Emulators and non-Vortex86 CPU computers will usually return \0 in this register + DEBUGF 1, "0 (NULL)\n" + jmp .Vortex86end + +.unknownVortex86: + mov [Vortex86CPUid], cl ; Save the CPUid (Vortex86SoCnum+1=Unknown Vortex86) + DEBUGF 1, "unknown Vortex86 CPU (has id=%d, last known is %d)\n", [Vortex86CPUid]:1, Vortex86SoCnum + jmp .Vortex86end + +.notVortex86: ; In case this register is used by other CPUs for other purpose, it's interesting what it contains + DEBUGF 1, "not a Vortex86 CPU\n" + +.Vortex86end: \ No newline at end of file diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm index e517bf4ff2..b0edef598e 100644 --- a/kernel/trunk/kernel.asm +++ b/kernel/trunk/kernel.asm @@ -1107,6 +1107,8 @@ end if mov al, 1 ; at least one CPU @@: DEBUGF 1, "K : %d CPU detected\n", eax + +include "detect/vortex86.inc" ; Vortex86 SoC detection code DEBUGF 1, "K : BAR0 %x \n", [IDE_BAR0_val]:4 DEBUGF 1, "K : BAR1 %x \n", [IDE_BAR1_val]:4