x86: move suspend wakeup code to C (e44b7b75) · Commits · 戴 / test

arch/x86/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -181,7 +181,7 @@ config X86_BIOS_REBOOT

		config X86_TRAMPOLINE
		bool
		depends on X86_SMP \|\| (X86_VOYAGER && SMP)
		depends on X86_SMP \|\| (X86_VOYAGER && SMP) \|\| (64BIT && ACPI_SLEEP)
		default y

		config KTIME_SCALAR

arch/x86/boot/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ subdir- := compressed

		setup-y += a20.o cmdline.o copy.o cpu.o cpucheck.o edd.o
		setup-y += header.o main.o mca.o memory.o pm.o pmjump.o
		setup-y += printf.o string.o tty.o video.o version.o
		setup-y += printf.o string.o tty.o video.o video-mode.o version.o
		setup-$(CONFIG_X86_APM_BOOT) += apm.o
		setup-$(CONFIG_X86_VOYAGER) += voyager.o

arch/x86/boot/boot.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -286,6 +286,11 @@ int getchar_timeout(void);
		/* video.c */
		void set_video(void);

		/* video-mode.c */
		int set_mode(u16 mode);
		int mode_defined(u16 mode);
		void probe_cards(int unsafe);

		/* video-vesa.c */
		void vesa_store_edid(void);

arch/x86/boot/video-bios.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ static int set_bios_mode(u8 mode)
		if (new_mode == mode)
		return 0; /* Mode change OK */

		#ifndef _WAKEUP
		if (new_mode != boot_params.screen_info.orig_video_mode) {
		/* Mode setting failed, but we didn't end up where we
		started. That's bad. Try to revert to the original
		@@ -59,13 +60,18 @@ static int set_bios_mode(u8 mode)
		: "+a" (ax)
		: : "ebx", "ecx", "edx", "esi", "edi");
		}
		#endif
		return -1;
		}

		static int bios_probe(void)
		{
		u8 mode;
		#ifdef _WAKEUP
		u8 saved_mode = 0x03;
		#else
		u8 saved_mode = boot_params.screen_info.orig_video_mode;
		#endif
		u16 crtc;
		struct mode_info *mi;
		int nmodes = 0;

arch/x86/boot/video-mode.c

0 → 100644

+173 −0

Original line number	Diff line number	Diff line
		/* -- linux-c -- ------------------------------------------------------- *
		*
		* Copyright (C) 1991, 1992 Linus Torvalds
		* Copyright 2007-2008 rPath, Inc. - All Rights Reserved
		*
		* This file is part of the Linux kernel, and is made available under
		* the terms of the GNU General Public License version 2.
		*
		* ----------------------------------------------------------------------- */

		/*
		* arch/i386/boot/video-mode.c
		*
		* Set the video mode. This is separated out into a different
		* file in order to be shared with the ACPI wakeup code.
		*/

		#include "boot.h"
		#include "video.h"
		#include "vesa.h"

		/*
		* Common variables
		*/
		int adapter; /* 0=CGA/MDA/HGC, 1=EGA, 2=VGA+ */
		u16 video_segment;
		int force_x, force_y; /* Don't query the BIOS for cols/rows */

		int do_restore; /* Screen contents changed during mode flip */
		int graphic_mode; /* Graphic mode with linear frame buffer */

		/* Probe the video drivers and have them generate their mode lists. */
		void probe_cards(int unsafe)
		{
		struct card_info *card;
		static u8 probed[2];

		if (probed[unsafe])
		return;

		probed[unsafe] = 1;

		for (card = video_cards; card < video_cards_end; card++) {
		if (card->unsafe == unsafe) {
		if (card->probe)
		card->nmodes = card->probe();
		else
		card->nmodes = 0;
		}
		}
		}

		/* Test if a mode is defined */
		int mode_defined(u16 mode)
		{
		struct card_info *card;
		struct mode_info *mi;
		int i;

		for (card = video_cards; card < video_cards_end; card++) {
		mi = card->modes;
		for (i = 0; i < card->nmodes; i++, mi++) {
		if (mi->mode == mode)
		return 1;
		}
		}

		return 0;
		}

		/* Set mode (without recalc) */
		static int raw_set_mode(u16 mode, u16 *real_mode)
		{
		int nmode, i;
		struct card_info *card;
		struct mode_info *mi;

		/* Drop the recalc bit if set */
		mode &= ~VIDEO_RECALC;

		/* Scan for mode based on fixed ID, position, or resolution */
		nmode = 0;
		for (card = video_cards; card < video_cards_end; card++) {
		mi = card->modes;
		for (i = 0; i < card->nmodes; i++, mi++) {
		int visible = mi->x \|\| mi->y;

		if ((mode == nmode && visible) \|\|
		mode == mi->mode \|\|
		mode == (mi->y << 8)+mi->x) {
		*real_mode = mi->mode;
		return card->set_mode(mi);
		}

		if (visible)
		nmode++;
		}
		}

		/* Nothing found? Is it an "exceptional" (unprobed) mode? */
		for (card = video_cards; card < video_cards_end; card++) {
		if (mode >= card->xmode_first &&
		mode < card->xmode_first+card->xmode_n) {
		struct mode_info mix;
		*real_mode = mix.mode = mode;
		mix.x = mix.y = 0;
		return card->set_mode(&mix);
		}
		}

		/* Otherwise, failure... */
		return -1;
		}

		/*
		* Recalculate the vertical video cutoff (hack!)
		*/
		static void vga_recalc_vertical(void)
		{
		unsigned int font_size, rows;
		u16 crtc;
		u8 pt, ov;

		set_fs(0);
		font_size = rdfs8(0x485); /* BIOS: font size (pixels) */
		rows = force_y ? force_y : rdfs8(0x484)+1; /* Text rows */

		rows = font_size; / Visible scan lines */
		rows--; /* ... minus one */

		crtc = vga_crtc();

		pt = in_idx(crtc, 0x11);
		pt &= ~0x80; /* Unlock CR0-7 */
		out_idx(pt, crtc, 0x11);

		out_idx((u8)rows, crtc, 0x12); /* Lower height register */

		ov = in_idx(crtc, 0x07); /* Overflow register */
		ov &= 0xbd;
		ov \|= (rows >> (8-1)) & 0x02;
		ov \|= (rows >> (9-6)) & 0x40;
		out_idx(ov, crtc, 0x07);
		}

		/* Set mode (with recalc if specified) */
		int set_mode(u16 mode)
		{
		int rv;
		u16 real_mode;

		/* Very special mode numbers... */
		if (mode == VIDEO_CURRENT_MODE)
		return 0; /* Nothing to do... */
		else if (mode == NORMAL_VGA)
		mode = VIDEO_80x25;
		else if (mode == EXTENDED_VGA)
		mode = VIDEO_8POINT;

		rv = raw_set_mode(mode, &real_mode);
		if (rv)
		return rv;

		if (mode & VIDEO_RECALC)
		vga_recalc_vertical();

		/* Save the canonical mode number for the kernel, not
		an alias, size specification or menu position */
		#ifndef _WAKEUP
		boot_params.hdr.vid_mode = real_mode;
		#endif
		return 0;
		}

Admin message