CHANGELOG.md

@@ -0,0 +1,56 @@
+Change log for PC Engines fork of SeaBIOS
+=========================================
+
+Fourth digit in release number means PC Engines patch.
+
+## [Unreleased]
+
+## [rel-1.11.0.1] - 2017-11-30
+### Changed
+- rebased to 1.11.0 stable mainline
+- removed SgaBIOS option rom enable/disable sortbootorder config handling
+
+## [rel-1.10.2.1] - 2017-03-31
+### Changed
+- rebased to 1.10.2 stable mainline
+
+## [rel-1.10.0.1] - 2017-02-23
+### Changed
+- rebased to 1.10.0 mainline
+- added SgaBios option rom enable/disable sortbootorder config handling
+
+## [rel-1.9.2.4] - 2017-01-23
+### Changed
+- change debug output of version string to show, when using the sgabios and
+  also serial output
+
+## [rel-1.9.2.3] - 2017-01-03
+### Fixed
+- fix the issue that 2 banner messages with version are shown on
+  default debug level
+
+## [rel-1.9.2.2] - 2016-12-13
+### Changed
+- simplify version displayed during boot
+
+### Fixed
+- remove screen control character by disable screen cleaning when loading
+  sgabios
+
+## [rel-1.9.2.1] - 2016-10-04
+### Added
+- allowed for one-time `PXE ` boot with `N` key
+- enable/disable option for `USB` boot
+- enable/disable option for `PXE` boot
+
+### Fixed
+- prevented from printing character multiple times
+
+[Unreleased]: https://github.com/pcengines/seabios/compare/rel-1.11.0.1...apu_support
+[rel-1.11.0.1]: https://github.com/pcengines/seabios/compare/rel-1.11.0.1...rel-1.10.2.1
+[rel-1.10.2.1]: https://github.com/pcengines/seabios/compare/rel-1.10.2.1...rel-1.10.0.1
+[rel-1.10.0.1]: https://github.com/pcengines/seabios/compare/rel-1.9.2.4...rel-1.10.0.1
+[rel-1.9.2.4]: https://github.com/pcengines/seabios/compare/rel-1.9.2.3...rel-1.9.2.4
+[rel-1.9.2.3]: https://github.com/pcengines/seabios/compare/rel-1.9.2.2...rel-1.9.2.3
+[rel-1.9.2.2]: https://github.com/pcengines/seabios/compare/rel-1.9.2.1...rel-1.9.2.2
+[rel-1.9.2.1]: https://github.com/pcengines/seabios/compare/rel-1.9.2...rel-1.9.2.1

Makefile

@@ -29,7 +29,8 @@ LD32BIT_FLAG:=-melf_i386
 
 # Source files
 SRCBOTH=misc.c stacks.c output.c string.c block.c cdrom.c disk.c mouse.c kbd.c \
-    system.c serial.c clock.c resume.c pnpbios.c vgahooks.c pcibios.c apm.c \
+    system.c serial.c sercon.c clock.c resume.c pnpbios.c vgahooks.c pcibios.c \
+    apm.c cp437.c \
     hw/pci.c hw/timer.c hw/rtc.c hw/dma.c hw/pic.c hw/ps2port.c hw/serialio.c \
     hw/usb.c hw/usb-uhci.c hw/usb-ohci.c hw/usb-ehci.c \
     hw/usb-hid.c hw/usb-msc.c hw/usb-uas.c \
@@ -43,7 +44,7 @@ SRC32FLAT=$(SRCBOTH) post.c e820map.c malloc.c romfile.c x86.c optionroms.c \
     fw/paravirt.c fw/shadow.c fw/pciinit.c fw/smm.c fw/smp.c fw/mtrr.c fw/xen.c \
     fw/acpi.c fw/mptable.c fw/pirtable.c fw/smbios.c fw/romfile_loader.c \
     hw/virtio-ring.c hw/virtio-pci.c hw/virtio-blk.c hw/virtio-scsi.c \
-    hw/tpm_drivers.c
+    hw/tpm_drivers.c hw/nvme.c
 SRC32SEG=string.c output.c pcibios.c apm.c stacks.c hw/pci.c hw/serialio.c
 DIRS=src src/hw src/fw vgasrc
 

docs/Memory_Model.md

@@ -192,7 +192,7 @@ There are three low-level memory access macros:
 * GET_FARVAR / SET_FARVAR : Assigns the extra segment (%es) to the
   given segment id and then performs the given memory access via %es.
 
-* GET_FLATVAR / SET_FLATVAR : These macros take a 32bit pointer,
+* GET_FLATPTR / SET_FLATPTR : These macros take a 32bit pointer,
   construct a segment/offset pair valid in real mode, and then perform
   the given access. These macros must not be used in 16bit protected
   mode or 32bit segmented mode.
@@ -209,11 +209,11 @@ macros are also available.
 
 * GET_LOW / SET_LOW : Access internal variables marked with
   VARLOW. (There are also related macros GET_LOWFLAT / SET_LOWFLAT for
-  accessing storage allocated with malloc_low).
+  accessing storage allocated with malloc_low.)
 
 * GET_GLOBAL : Access internal variables marked with the VAR16 or
   VARFSEG flags. (There is also the related macro GET_GLOBALFLAT for
-  accessing storage allocated with malloc_fseg).
+  accessing storage allocated with malloc_fseg.)
 
 Memory available during initialization
 ======================================

docs/Releases.md

@@ -1,6 +1,19 @@
 History of SeaBIOS releases. Please see [download](Download) for
 information on obtaining these releases.
 
+SeaBIOS 1.11.0
+==============
+
+Available on 20171110. Major changes in this release:
+
+* Initial support for NVME drives
+* Support for vga emulation over a serial port in SeaBIOS (sercon)
+* Support for serial debugging using MMIO based serial ports
+* Support for scsi devices with multiple LUNs
+* Support for boot-to-boot persistent coreboot cbmem logs
+* Improved coreboot vga (cbvga) mode setting compatibility
+* Several bug fixes and code cleanups
+
 SeaBIOS 1.10.0
 ==============
 
@@ -12,6 +25,22 @@ Available on 20161026. Major changes in this release:
 * Support for virtio devices mapped above 4GB
 * Several bug fixes and code cleanups
 
+SeaBIOS 1.10.1
+--------------
+
+Available on 20161122. Stable release containing only bug fixes.
+
+
+SeaBIOS 1.10.2
+--------------
+
+Available on 20170228. Stable release containing only bug fixes.
+
+SeaBIOS 1.10.3
+--------------
+
+Available on 20171019. Stable release containing only bug fixes.
+
 SeaBIOS 1.9.0
 =============
 

src/Kconfig

@@ -227,6 +227,12 @@ menu "Hardware support"
         help
             Support floppy images stored in coreboot flash or from
             QEMU fw_cfg.
+    config NVME
+        depends on DRIVES
+        bool "NVMe controllers"
+        default y
+        help
+            Support for NVMe disk code.
 
     config PS2PORT
         depends on KEYBOARD || MOUSE
@@ -300,6 +306,11 @@ menu "Hardware support"
         default y
         help
             Support serial ports.  This also enables int 14 serial port calls.
+    config SERCON
+        bool "Serial console"
+        default y
+        help
+            Support redirecting vga output to the serial console.
     config LPT
         bool "Parallel port"
         default y
@@ -532,6 +543,19 @@ menu "Debugging"
         default 0x3f8
         help
             Base port for serial - generally 0x3f8, 0x2f8, 0x3e8, or 0x2e8.
+   config DEBUG_SERIAL_MMIO
+        depends on DEBUG_LEVEL != 0 && !DEBUG_SERIAL
+        bool "Serial port debugging via memory mapped IO"
+        default n
+        help
+            Send debugging information to serial port mapped in memory.
+   config DEBUG_SERIAL_MEM_ADDRESS
+        depends on DEBUG_SERIAL_MMIO
+        hex "Serial port memory mapped IO address"
+        help
+            On some chipsets the serial port is memory mapped, in those cases
+            provide the 32 bit address. E.g. 0xFEDC6000 for the AMD Kern
+            (a.k.a Hudson UART).
 
     config DEBUG_IO
         depends on QEMU_HARDWARE && DEBUG_LEVEL != 0

src/block.c

@@ -20,6 +20,7 @@
 #include "hw/usb-uas.h" // uas_process_op
 #include "hw/virtio-blk.h" // process_virtio_blk_op
 #include "hw/virtio-scsi.h" // virtio_scsi_process_op
+#include "hw/nvme.h" // nvme_process_op
 #include "malloc.h" // malloc_low
 #include "output.h" // dprintf
 #include "stacks.h" // call32
@@ -297,7 +298,7 @@ map_floppy_drive(struct drive_s *drive)
 
 // Fill in EDD info
 static int
-fill_generic_edd(struct segoff_s edd, struct drive_s *drive_gf
+fill_generic_edd(struct segoff_s edd, struct drive_s *drive_fl
                  , u32 dpte_so, u8 bus_iface, u32 iface_path, u32 device_path)
 {
     u16 seg = edd.seg;
@@ -311,12 +312,12 @@ fill_generic_edd(struct segoff_s edd, struct drive_s *drive_gf
 
     // EDD 1.x
 
-    u8  type    = GET_GLOBALFLAT(drive_gf->type);
-    u16 npc     = GET_GLOBALFLAT(drive_gf->pchs.cylinder);
-    u16 nph     = GET_GLOBALFLAT(drive_gf->pchs.head);
-    u16 nps     = GET_GLOBALFLAT(drive_gf->pchs.sector);
-    u64 lba     = GET_GLOBALFLAT(drive_gf->sectors);
-    u16 blksize = GET_GLOBALFLAT(drive_gf->blksize);
+    u8  type    = GET_FLATPTR(drive_fl->type);
+    u16 npc     = GET_FLATPTR(drive_fl->pchs.cylinder);
+    u16 nph     = GET_FLATPTR(drive_fl->pchs.head);
+    u16 nps     = GET_FLATPTR(drive_fl->pchs.sector);
+    u64 lba     = GET_FLATPTR(drive_fl->sectors);
+    u16 blksize = GET_FLATPTR(drive_fl->blksize);
 
     dprintf(DEBUG_HDL_13, "disk_1348 size=%d t=%d chs=%d,%d,%d lba=%d bs=%d\n"
             , size, type, npc, nph, nps, (u32)lba, blksize);
@@ -466,19 +467,19 @@ fill_ata_edd(struct segoff_s edd, struct drive_s *drive_gf)
 
 // Fill Extended Disk Drive (EDD) "Get drive parameters" info for a drive
 int noinline
-fill_edd(struct segoff_s edd, struct drive_s *drive_gf)
+fill_edd(struct segoff_s edd, struct drive_s *drive_fl)
 {
-    switch (GET_GLOBALFLAT(drive_gf->type)) {
+    switch (GET_FLATPTR(drive_fl->type)) {
     case DTYPE_ATA:
     case DTYPE_ATA_ATAPI:
-        return fill_ata_edd(edd, drive_gf);
+        return fill_ata_edd(edd, drive_fl);
     case DTYPE_VIRTIO_BLK:
     case DTYPE_VIRTIO_SCSI:
         return fill_generic_edd(
-            edd, drive_gf, 0xffffffff, EDD_PCI | EDD_SCSI
-            , edd_pci_path(GET_GLOBALFLAT(drive_gf->cntl_id), 0), 0);
+            edd, drive_fl, 0xffffffff, EDD_PCI | EDD_SCSI
+            , edd_pci_path(GET_FLATPTR(drive_fl->cntl_id), 0), 0);
     default:
-        return fill_generic_edd(edd, drive_gf, 0, 0, 0, 0);
+        return fill_generic_edd(edd, drive_fl, 0, 0, 0, 0);
     }
 }
 
@@ -502,6 +503,7 @@ block_setup(void)
     megasas_setup();
     pvscsi_setup();
     mpt_scsi_setup();
+    nvme_setup();
 }
 
 // Fallback handler for command requests not implemented by drivers
@@ -525,7 +527,7 @@ default_process_op(struct disk_op_s *op)
 static int
 process_op_both(struct disk_op_s *op)
 {
-    switch (GET_GLOBALFLAT(op->drive_gf->type)) {
+    switch (GET_FLATPTR(op->drive_fl->type)) {
     case DTYPE_ATA_ATAPI:
         return ata_atapi_process_op(op);
     case DTYPE_USB:
@@ -554,7 +556,7 @@ int VISIBLE32FLAT
 process_op_32(struct disk_op_s *op)
 {
     ASSERT32FLAT();
-    switch (op->drive_gf->type) {
+    switch (op->drive_fl->type) {
     case DTYPE_VIRTIO_BLK:
         return virtio_blk_process_op(op);
     case DTYPE_AHCI:
@@ -571,6 +573,8 @@ process_op_32(struct disk_op_s *op)
         return virtio_scsi_process_op(op);
     case DTYPE_PVSCSI:
         return pvscsi_process_op(op);
+    case DTYPE_NVME:
+        return nvme_process_op(op);
     default:
         return process_op_both(op);
     }
@@ -581,7 +585,7 @@ static int
 process_op_16(struct disk_op_s *op)
 {
     ASSERT16();
-    switch (GET_GLOBALFLAT(op->drive_gf->type)) {
+    switch (GET_FLATPTR(op->drive_fl->type)) {
     case DTYPE_FLOPPY:
         return floppy_process_op(op);
     case DTYPE_ATA:
@@ -600,11 +604,11 @@ int
 process_op(struct disk_op_s *op)
 {
     dprintf(DEBUG_HDL_13, "disk_op d=%p lba=%d buf=%p count=%d cmd=%d\n"
-            , op->drive_gf, (u32)op->lba, op->buf_fl
+            , op->drive_fl, (u32)op->lba, op->buf_fl
             , op->count, op->command);
 
     int ret, origcount = op->count;
-    if (origcount * GET_GLOBALFLAT(op->drive_gf->blksize) > 64*1024) {
+    if (origcount * GET_FLATPTR(op->drive_fl->blksize) > 64*1024) {
         op->count = 0;
         return DISK_RET_EBOUNDARY;
     }

src/block.h

@@ -10,7 +10,7 @@
 
 struct disk_op_s {
     void *buf_fl;
-    struct drive_s *drive_gf;
+    struct drive_s *drive_fl;
     u8 command;
     u16 count;
     union {
@@ -82,6 +82,7 @@ struct drive_s {
 #define DTYPE_PVSCSI       0x83
 #define DTYPE_MPT_SCSI     0x84
 #define DTYPE_SDCARD       0x90
+#define DTYPE_NVME         0x91
 
 #define MAXDESCSIZE 80
 
@@ -111,7 +112,7 @@ void map_floppy_drive(struct drive_s *drive);
 void map_hd_drive(struct drive_s *drive);
 void map_cd_drive(struct drive_s *drive);
 struct int13dpt_s;
-int fill_edd(struct segoff_s edd, struct drive_s *drive_gf);
+int fill_edd(struct segoff_s edd, struct drive_s *drive_fl);
 void block_setup(void);
 int default_process_op(struct disk_op_s *op);
 int process_op(struct disk_op_s *op);