spkmodem console
Change-Id: Ie497e4c8da05001ffe67c4a541bd24aa859ac0e2 Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/2987 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
committed by
Ronald G. Minnich
parent
8a6f7a77f3
commit
45988dab6b
@ -28,6 +28,10 @@
|
|||||||
#if CONFIG_CONSOLE_NE2K
|
#if CONFIG_CONSOLE_NE2K
|
||||||
#include <console/ne2k.h>
|
#include <console/ne2k.h>
|
||||||
#endif
|
#endif
|
||||||
|
#if CONFIG_SPKMODEM
|
||||||
|
#include <console/spkmodem.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
void console_tx_byte(unsigned char byte)
|
void console_tx_byte(unsigned char byte)
|
||||||
{
|
{
|
||||||
@ -52,6 +56,9 @@ void console_tx_byte(unsigned char byte)
|
|||||||
#if CONFIG_CONSOLE_CBMEM
|
#if CONFIG_CONSOLE_CBMEM
|
||||||
cbmemc_tx_byte(byte);
|
cbmemc_tx_byte(byte);
|
||||||
#endif
|
#endif
|
||||||
|
#if CONFIG_SPKMODEM
|
||||||
|
spkmodem_tx_byte(byte);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void console_tx_flush(void)
|
void console_tx_flush(void)
|
||||||
|
@ -119,6 +119,12 @@ config TTYS0_LCS
|
|||||||
default 3
|
default 3
|
||||||
depends on CONSOLE_SERIAL8250 || CONSOLE_SERIAL8250MEM
|
depends on CONSOLE_SERIAL8250 || CONSOLE_SERIAL8250MEM
|
||||||
|
|
||||||
|
config SPKMODEM
|
||||||
|
bool "spkmodem (console on speaker) console output"
|
||||||
|
default n
|
||||||
|
help
|
||||||
|
Send coreboot debug output through speaker
|
||||||
|
|
||||||
# Use "select HAVE_USBDEBUG" on southbridges which have Debug Port code.
|
# Use "select HAVE_USBDEBUG" on southbridges which have Debug Port code.
|
||||||
config HAVE_USBDEBUG
|
config HAVE_USBDEBUG
|
||||||
def_bool n
|
def_bool n
|
||||||
|
@ -20,6 +20,7 @@ bootblock-y += die.c
|
|||||||
|
|
||||||
ramstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.c
|
ramstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.c
|
||||||
ramstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem_console.c
|
ramstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem_console.c
|
||||||
|
ramstage-$(CONFIG_SPKMODEM) += spkmodem_console.c
|
||||||
ramstage-$(CONFIG_USBDEBUG) += usbdebug_console.c
|
ramstage-$(CONFIG_USBDEBUG) += usbdebug_console.c
|
||||||
ramstage-$(CONFIG_CONSOLE_LOGBUF) += logbuf_console.c
|
ramstage-$(CONFIG_CONSOLE_LOGBUF) += logbuf_console.c
|
||||||
ramstage-$(CONFIG_CONSOLE_NE2K) += ne2k_console.c
|
ramstage-$(CONFIG_CONSOLE_NE2K) += ne2k_console.c
|
||||||
|
@ -119,6 +119,10 @@ void console_init(void)
|
|||||||
#if CONFIG_CONSOLE_CBMEM
|
#if CONFIG_CONSOLE_CBMEM
|
||||||
cbmemc_init();
|
cbmemc_init();
|
||||||
#endif
|
#endif
|
||||||
|
#if CONFIG_SPKMODEM
|
||||||
|
spkmodem_init();
|
||||||
|
#endif
|
||||||
|
|
||||||
static const char console_test[] =
|
static const char console_test[] =
|
||||||
"\n\ncoreboot-"
|
"\n\ncoreboot-"
|
||||||
COREBOOT_VERSION
|
COREBOOT_VERSION
|
||||||
|
46
src/console/spkmodem_console.c
Normal file
46
src/console/spkmodem_console.c
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of the coreboot project.
|
||||||
|
*
|
||||||
|
* Copyright (C) 2013 Vladimir Serbinenko
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <console/console.h>
|
||||||
|
#include <console/spkmodem.h>
|
||||||
|
|
||||||
|
static void spkmodem_tx_flush(void)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
static unsigned char spkmodem_rx_byte(void)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int spkmodem_tst_byte(void)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static const struct console_driver spkmodem_console __console = {
|
||||||
|
.init = spkmodem_init,
|
||||||
|
.tx_byte = spkmodem_tx_byte,
|
||||||
|
.tx_flush = spkmodem_tx_flush,
|
||||||
|
.rx_byte = spkmodem_rx_byte,
|
||||||
|
.tst_byte = spkmodem_tst_byte,
|
||||||
|
};
|
||||||
|
|
@ -36,6 +36,9 @@
|
|||||||
#if CONFIG_CONSOLE_CBMEM
|
#if CONFIG_CONSOLE_CBMEM
|
||||||
#include <console/cbmem_console.h>
|
#include <console/cbmem_console.h>
|
||||||
#endif
|
#endif
|
||||||
|
#if CONFIG_SPKMODEM
|
||||||
|
#include <console/spkmodem.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef __PRE_RAM__
|
#ifndef __PRE_RAM__
|
||||||
unsigned char console_rx_byte(void);
|
unsigned char console_rx_byte(void);
|
||||||
|
7
src/include/console/spkmodem.h
Normal file
7
src/include/console/spkmodem.h
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
#ifndef SPKMODEM_H
|
||||||
|
#define SPKMODEM_H 1
|
||||||
|
|
||||||
|
void spkmodem_init(void);
|
||||||
|
void spkmodem_tx_byte(unsigned char c);
|
||||||
|
|
||||||
|
#endif
|
@ -47,6 +47,8 @@ romstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem.c
|
|||||||
romstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
|
romstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
|
||||||
romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c
|
romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c
|
||||||
romstage-$(CONFIG_USBDEBUG) += usbdebug.c
|
romstage-$(CONFIG_USBDEBUG) += usbdebug.c
|
||||||
|
romstage-$(CONFIG_SPKMODEM) += spkmodem.c
|
||||||
|
|
||||||
romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
|
romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
|
||||||
romstage-$(CONFIG_EARLY_CBMEM_INIT) += cbmem.c
|
romstage-$(CONFIG_EARLY_CBMEM_INIT) += cbmem.c
|
||||||
romstage-y += compute_ip_checksum.c
|
romstage-y += compute_ip_checksum.c
|
||||||
@ -81,6 +83,7 @@ ramstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250.c
|
|||||||
ramstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem.c
|
ramstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem.c
|
||||||
ramstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
|
ramstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
|
||||||
ramstage-$(CONFIG_USBDEBUG) += usbdebug.c
|
ramstage-$(CONFIG_USBDEBUG) += usbdebug.c
|
||||||
|
ramstage-$(CONFIG_SPKMODEM) += spkmodem.c
|
||||||
ramstage-$(CONFIG_BOOTSPLASH) += jpeg.c
|
ramstage-$(CONFIG_BOOTSPLASH) += jpeg.c
|
||||||
ramstage-$(CONFIG_TRACE) += trace.c
|
ramstage-$(CONFIG_TRACE) += trace.c
|
||||||
ramstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
|
ramstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
|
||||||
|
128
src/lib/spkmodem.c
Normal file
128
src/lib/spkmodem.c
Normal file
@ -0,0 +1,128 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of the coreboot project.
|
||||||
|
*
|
||||||
|
* Copyright (C) 2013 Vladimir Serbinenko
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <console/console.h>
|
||||||
|
#include <arch/io.h>
|
||||||
|
#include <console/spkmodem.h>
|
||||||
|
#include <cpu/x86/tsc.h>
|
||||||
|
|
||||||
|
#define SPEAKER_PIT_FREQUENCY 0x1234dd
|
||||||
|
|
||||||
|
|
||||||
|
enum {
|
||||||
|
PIT_COUNTER_0 = 0x40,
|
||||||
|
PIT_COUNTER_1 = 0x41,
|
||||||
|
PIT_COUNTER_2 = 0x42,
|
||||||
|
PIT_CTRL = 0x43,
|
||||||
|
PIT_SPEAKER_PORT = 0x61,
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
enum {
|
||||||
|
PIT_SPK_TMR2 = 0x01,
|
||||||
|
PIT_SPK_DATA = 0x02,
|
||||||
|
PIT_SPK_TMR2_LATCH = 0x20
|
||||||
|
};
|
||||||
|
|
||||||
|
enum {
|
||||||
|
PIT_CTRL_SELECT_MASK = 0xc0,
|
||||||
|
PIT_CTRL_SELECT_0 = 0x00,
|
||||||
|
PIT_CTRL_SELECT_1 = 0x40,
|
||||||
|
PIT_CTRL_SELECT_2 = 0x80,
|
||||||
|
|
||||||
|
PIT_CTRL_READLOAD_MASK= 0x30,
|
||||||
|
PIT_CTRL_COUNTER_LATCH = 0x00,
|
||||||
|
PIT_CTRL_READLOAD_LSB = 0x10,
|
||||||
|
PIT_CTRL_READLOAD_MSB = 0x20,
|
||||||
|
PIT_CTRL_READLOAD_WORD = 0x30,
|
||||||
|
|
||||||
|
PIT_CTRL_MODE_MASK = 0x0e,
|
||||||
|
PIT_CTRL_INTR_ON_TERM = 0x00,
|
||||||
|
PIT_CTRL_PROGR_ONE_SHOT = 0x02,
|
||||||
|
|
||||||
|
PIT_CTRL_RATE_GEN = 0x04,
|
||||||
|
|
||||||
|
PIT_CTRL_SQUAREWAVE_GEN = 0x06,
|
||||||
|
PIT_CTRL_SOFTSTROBE = 0x08,
|
||||||
|
|
||||||
|
PIT_CTRL_HARDSTROBE = 0x0a,
|
||||||
|
|
||||||
|
|
||||||
|
PIT_CTRL_COUNT_MASK = 0x01,
|
||||||
|
PIT_CTRL_COUNT_BINARY = 0x00,
|
||||||
|
PIT_CTRL_COUNT_BCD = 0x01
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
static void
|
||||||
|
make_tone (uint16_t freq_count, unsigned int duration)
|
||||||
|
{
|
||||||
|
outb (PIT_CTRL_SELECT_2
|
||||||
|
| PIT_CTRL_READLOAD_WORD
|
||||||
|
| PIT_CTRL_SQUAREWAVE_GEN
|
||||||
|
| PIT_CTRL_COUNT_BINARY, PIT_CTRL);
|
||||||
|
|
||||||
|
outb (freq_count & 0xff, PIT_COUNTER_2);
|
||||||
|
|
||||||
|
outb ((freq_count >> 8) & 0xff, PIT_COUNTER_2);
|
||||||
|
|
||||||
|
outb (inb (PIT_SPEAKER_PORT)
|
||||||
|
| PIT_SPK_TMR2 | PIT_SPK_DATA,
|
||||||
|
PIT_SPEAKER_PORT);
|
||||||
|
|
||||||
|
for (; duration; duration--) {
|
||||||
|
unsigned short counter, previous_counter = 0xffff;
|
||||||
|
while (1) {
|
||||||
|
counter = inb (PIT_COUNTER_2);
|
||||||
|
counter |= ((uint16_t) inb (PIT_COUNTER_2)) << 8;
|
||||||
|
if (counter > previous_counter)
|
||||||
|
{
|
||||||
|
previous_counter = counter;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
previous_counter = counter;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void spkmodem_tx_byte(unsigned char c)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
make_tone (SPEAKER_PIT_FREQUENCY / 200, 4);
|
||||||
|
for (i = 7; i >= 0; i--) {
|
||||||
|
if ((c >> i) & 1)
|
||||||
|
make_tone (SPEAKER_PIT_FREQUENCY / 2000, 20);
|
||||||
|
else
|
||||||
|
make_tone (SPEAKER_PIT_FREQUENCY / 4000, 40);
|
||||||
|
make_tone (SPEAKER_PIT_FREQUENCY / 1000, 10);
|
||||||
|
}
|
||||||
|
make_tone (SPEAKER_PIT_FREQUENCY / 200, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
void spkmodem_init(void)
|
||||||
|
{
|
||||||
|
/* Some cards need time to come online. Output some message to get it started. */
|
||||||
|
spkmodem_tx_byte('S');
|
||||||
|
spkmodem_tx_byte('P');
|
||||||
|
spkmodem_tx_byte('K');
|
||||||
|
spkmodem_tx_byte('\r');
|
||||||
|
spkmodem_tx_byte('\n');
|
||||||
|
}
|
Reference in New Issue
Block a user