Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffe6e1da authored by Jordan Crouse's avatar Jordan Crouse Committed by Ingo Molnar
Browse files

x86, geode: add a VSA2 ID for General Software 



General Software writes their own VSA2 module for their version
of the Geode BIOS, which returns a different ID then the standard
VSA2.  This was causing the framebuffer driver to break for most
GSW boards.

Signed-off-by: default avatarJordan Crouse <jordan.crouse@amd.com>
Cc: tglx@linutronix.de
Cc: linux-geode@lists.infradead.org
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d3942cff

arch/x86/kernel/geode_32.c

+4 −1
Original line number Diff line number Diff line
@@ -166,6 +166,8 @@ int geode_has_vsa2(void) 
	static int has_vsa2 = -1;



	if (has_vsa2 == -1) {

		u16 val;



		/*

		 * The VSA has virtual registers that we can query for a

		 * signature.
@@ -173,7 +175,8 @@ int geode_has_vsa2(void) 
		outw(VSA_VR_UNLOCK, VSA_VRC_INDEX);

		outw(VSA_VR_SIGNATURE, VSA_VRC_INDEX);



		has_vsa2 = (inw(VSA_VRC_DATA) == VSA_SIG);

		val = inw(VSA_VRC_DATA);

		has_vsa2 = (val == AMD_VSA_SIG || val == GSW_VSA_SIG);

	}



	return has_vsa2;

include/asm-x86/geode.h

+2 −2
Original line number Diff line number Diff line
@@ -112,8 +112,8 @@ extern int geode_get_dev_base(unsigned int dev); 
#define VSA_VR_UNLOCK		0xFC53	/* unlock virtual register */

#define VSA_VR_SIGNATURE	0x0003

#define VSA_VR_MEM_SIZE		0x0200

#define VSA_SIG			0x4132	/* signature is ascii 'VSA2' */



#define AMD_VSA_SIG		0x4132	/* signature is ascii 'VSA2' */

#define GSW_VSA_SIG		0x534d  /* General Software signature */

/* GPIO */



#define GPIO_OUTPUT_VAL		0x00