Hello Patrick Rudolph, Aaron Durbin, Piotr Król, Julius Werner, Krystian Hebel, Patrick Rudolph, Stefan Reinauer, Paul Menzel, build bot (Jenkins), Patrick Georgi, Werner Zeh, Huang Jin, York Yang, David Hendricks, Martin Roth, Michał Żygowski,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/29547
to look at the new patch set (#52).
Change subject: security/vboot: Add measured boot mode
......................................................................
security/vboot: Add measured boot mode
* Introduce a measured boot mode into vboot.
* Add hook for stage measurements in prog_ops.
* Implement and hook-up CRTM in vboot and check for suspend.
* Documentation will be done in a follow up
Change-Id: I339a2f1051e44f36aba9f99828f130592a09355e
Signed-off-by: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com>
Signed-off-by: Werner Zeh <werner.zeh(a)siemens.com>
---
M src/cpu/intel/haswell/Makefile.inc
M src/cpu/intel/model_2065x/Makefile.inc
M src/cpu/intel/model_206ax/Makefile.inc
M src/lib/cbfs.c
M src/lib/fmap.c
M src/lib/prog_loaders.c
M src/lib/prog_ops.c
M src/security/tpm/tspi/tspi.c
M src/security/vboot/Kconfig
M src/security/vboot/Makefile.inc
A src/security/vboot/vboot_crtm.c
A src/security/vboot/vboot_crtm.h
M src/security/vboot/vboot_logic.c
M src/soc/amd/stoneyridge/Makefile.inc
M src/soc/intel/baytrail/Makefile.inc
M src/soc/intel/braswell/Makefile.inc
M src/soc/intel/broadwell/Makefile.inc
M src/soc/intel/fsp_baytrail/Makefile.inc
M src/soc/intel/fsp_broadwell_de/Makefile.inc
M src/soc/mediatek/mt8183/include/soc/memlayout.ld
M src/soc/rockchip/rk3288/include/soc/memlayout.ld
M util/abuild/abuild
22 files changed, 400 insertions(+), 62 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/29547/52
--
To view, visit https://review.coreboot.org/c/coreboot/+/29547
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I339a2f1051e44f36aba9f99828f130592a09355e
Gerrit-Change-Number: 29547
Gerrit-PatchSet: 52
Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com>
Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org>
Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com>
Gerrit-Reviewer: Huang Jin <huang.jin(a)intel.com>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Krystian Hebel <krystian.hebel(a)3mdeb.com>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Michał Żygowski <michal.zygowski(a)3mdeb.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com>
Gerrit-Reviewer: Piotr Król <piotr.krol(a)3mdeb.com>
Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-Reviewer: York Yang <york.yang(a)intel.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-MessageType: newpatchset
Julien Viard de Galbert has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/25444 )
Change subject: soc/intel/denverton + mb: Change UART IRQ line in conflict with ME
......................................................................
Patch Set 10:
> Patch Set 10:
>
> Hi Julien,
> Was this tested on the latest spsInfo/spsManuf? Thanks..
Hi Vanessa,
I don't remember testing without the patch since I added it.
Also I did quit Scaleway last December, so I no longer have access to NDA documentation/firmware from Intel and can't do that particular test.
So I guess, either you can test it or we should drop this patch...
Best Regards,
Julien
--
To view, visit https://review.coreboot.org/c/coreboot/+/25444
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I0c59ff80ef19b54c2de1a6a8205afe6482adfdff
Gerrit-Change-Number: 25444
Gerrit-PatchSet: 10
Gerrit-Owner: Julien Viard de Galbert <coreboot-review-ju(a)vdg.name>
Gerrit-Reviewer: David Guckian <david.guckian(a)intel.com>
Gerrit-Reviewer: Julien Viard de Galbert <coreboot-review-ju(a)vdg.name>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Reviewer: Vanessa Eusebio <vanessa.f.eusebio(a)intel.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Lijian Zhao <lijian.zhao(a)intel.com>
Gerrit-Comment-Date: Thu, 14 Feb 2019 09:24:52 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/29547 )
Change subject: security/vboot: Add measured boot mode
......................................................................
Patch Set 51:
(4 comments)
Still missing documentation.
It would be easier to understand if Documentation would hold:
* What is measured
* When it's measured
* Which PCR is extendend
* Which (weak) functions are invoked
* What needs to be called prior to measuring
https://review.coreboot.org/#/c/29547/51/src/lib/cbfs.c
File src/lib/cbfs.c:
https://review.coreboot.org/#/c/29547/51/src/lib/cbfs.c@38
PS51, Line 38:
vboot_measure_region_hook exists in two files and is marked as weak.
https://review.coreboot.org/#/c/29547/51/src/lib/cbfs.c@70
PS51, Line 70: vboot_measure_region_hook(&rdev, name, *type);
possible null pointer dereference
check if ret is not an error ?
https://review.coreboot.org/#/c/29547/51/src/lib/fmap.c
File src/lib/fmap.c:
https://review.coreboot.org/#/c/29547/51/src/lib/fmap.c@88
PS51, Line 88: vboot_measure_region_hook(area, name, 0);
check if ret is not an error ?
https://review.coreboot.org/#/c/29547/51/src/lib/fmap.c@102
PS51, Line 102: e
check if ret is not an error ?
--
To view, visit https://review.coreboot.org/c/coreboot/+/29547
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I339a2f1051e44f36aba9f99828f130592a09355e
Gerrit-Change-Number: 29547
Gerrit-PatchSet: 51
Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com>
Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org>
Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com>
Gerrit-Reviewer: Huang Jin <huang.jin(a)intel.com>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Krystian Hebel <krystian.hebel(a)3mdeb.com>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Michał Żygowski <michal.zygowski(a)3mdeb.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com>
Gerrit-Reviewer: Piotr Król <piotr.krol(a)3mdeb.com>
Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-Reviewer: York Yang <york.yang(a)intel.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Thu, 14 Feb 2019 09:04:37 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Werner Zeh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/29547 )
Change subject: security/vboot: Add measured boot mode
......................................................................
Patch Set 51: Code-Review+1
(1 comment)
https://review.coreboot.org/#/c/29547/51/src/security/vboot/vboot_crtm.c
File src/security/vboot/vboot_crtm.c:
https://review.coreboot.org/#/c/29547/51/src/security/vboot/vboot_crtm.c@208
PS51, Line 208: return 1;
No error message here like in vboot_measure_prog_hook()?
--
To view, visit https://review.coreboot.org/c/coreboot/+/29547
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I339a2f1051e44f36aba9f99828f130592a09355e
Gerrit-Change-Number: 29547
Gerrit-PatchSet: 51
Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com>
Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org>
Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com>
Gerrit-Reviewer: Huang Jin <huang.jin(a)intel.com>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Krystian Hebel <krystian.hebel(a)3mdeb.com>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Michał Żygowski <michal.zygowski(a)3mdeb.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com>
Gerrit-Reviewer: Piotr Król <piotr.krol(a)3mdeb.com>
Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-Reviewer: York Yang <york.yang(a)intel.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Thu, 14 Feb 2019 08:21:10 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31337 )
Change subject: superio/nsc/pc87417: Use common early_serial
......................................................................
superio/nsc/pc87417: Use common early_serial
Change-Id: If32fa5970ca7ca634833a0e39da66c1f89ed33fe
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
Reviewed-on: https://review.coreboot.org/c/31337
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Felix Held <felix-coreboot(a)felixheld.de>
---
M src/superio/nsc/pc87417/Kconfig
M src/superio/nsc/pc87417/Makefile.inc
D src/superio/nsc/pc87417/early_serial.c
M src/superio/nsc/pc87417/pc87417.h
4 files changed, 1 insertion(+), 33 deletions(-)
Approvals:
build bot (Jenkins): Verified
Felix Held: Looks good to me, approved
diff --git a/src/superio/nsc/pc87417/Kconfig b/src/superio/nsc/pc87417/Kconfig
index 3237e7f..347bab2 100644
--- a/src/superio/nsc/pc87417/Kconfig
+++ b/src/superio/nsc/pc87417/Kconfig
@@ -15,3 +15,4 @@
config SUPERIO_NSC_PC87417
bool
+ select SUPERIO_NSC_COMMON_PRE_RAM
diff --git a/src/superio/nsc/pc87417/Makefile.inc b/src/superio/nsc/pc87417/Makefile.inc
index 4294561..b9f0b10 100644
--- a/src/superio/nsc/pc87417/Makefile.inc
+++ b/src/superio/nsc/pc87417/Makefile.inc
@@ -18,6 +18,4 @@
bootblock-$(CONFIG_SUPERIO_NSC_PC87417) += early_init.c
romstage-$(CONFIG_SUPERIO_NSC_PC87417) += early_init.c
-bootblock-$(CONFIG_SUPERIO_NSC_PC87417) += early_serial.c
-romstage-$(CONFIG_SUPERIO_NSC_PC87417) += early_serial.c
ramstage-$(CONFIG_SUPERIO_NSC_PC87417) += superio.c
diff --git a/src/superio/nsc/pc87417/early_serial.c b/src/superio/nsc/pc87417/early_serial.c
deleted file mode 100644
index 372709a..0000000
--- a/src/superio/nsc/pc87417/early_serial.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2000 AG Electronics Ltd.
- * Copyright (C) 2003-2004 Linux Networx
- * Copyright (C) 2004 Tyan
- *
- * 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.
- */
-
-#include <arch/io.h>
-#include <device/pnp.h>
-#include <stdint.h>
-#include "pc87417.h"
-
-void pc87417_enable_serial(pnp_devfn_t dev, u16 iobase)
-{
- pnp_set_logical_device(dev);
- pnp_set_enable(dev, 0);
- pnp_set_iobase(dev, PNP_IDX_IO0, iobase);
- pnp_set_enable(dev, 1);
-}
diff --git a/src/superio/nsc/pc87417/pc87417.h b/src/superio/nsc/pc87417/pc87417.h
index f118308..b50a920 100644
--- a/src/superio/nsc/pc87417/pc87417.h
+++ b/src/superio/nsc/pc87417/pc87417.h
@@ -113,7 +113,6 @@
#include <arch/io.h>
#include <stdint.h>
-void pc87417_enable_serial(pnp_devfn_t dev, u16 iobase);
void pc87417_disable_dev(pnp_devfn_t dev);
void pc87417_enable_dev(pnp_devfn_t dev);
--
To view, visit https://review.coreboot.org/c/coreboot/+/31337
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: If32fa5970ca7ca634833a0e39da66c1f89ed33fe
Gerrit-Change-Number: 31337
Gerrit-PatchSet: 3
Gerrit-Owner: Peter Lemenkov <lemenkov(a)gmail.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Peter Lemenkov <lemenkov(a)gmail.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-MessageType: merged
Peter Lemenkov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31336
Change subject: superio/nsc/pc87366: Use common early_serial
......................................................................
superio/nsc/pc87366: Use common early_serial
Change-Id: I1f03182cd760ea63df78ef3e2b2604c3322b4f3f
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
---
M src/superio/nsc/pc87366/Kconfig
M src/superio/nsc/pc87366/Makefile.inc
D src/superio/nsc/pc87366/early_serial.c
M src/superio/nsc/pc87366/pc87366.h
4 files changed, 1 insertion(+), 36 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/31336/1
diff --git a/src/superio/nsc/pc87366/Kconfig b/src/superio/nsc/pc87366/Kconfig
index e42aa07..bf17117 100644
--- a/src/superio/nsc/pc87366/Kconfig
+++ b/src/superio/nsc/pc87366/Kconfig
@@ -15,3 +15,4 @@
config SUPERIO_NSC_PC87366
bool
+ select SUPERIO_NSC_COMMON_PRE_RAM
diff --git a/src/superio/nsc/pc87366/Makefile.inc b/src/superio/nsc/pc87366/Makefile.inc
index 6e558ac..f432530 100644
--- a/src/superio/nsc/pc87366/Makefile.inc
+++ b/src/superio/nsc/pc87366/Makefile.inc
@@ -15,6 +15,4 @@
## GNU General Public License for more details.
##
-bootblock-$(CONFIG_SUPERIO_NSC_PC87366) += early_serial.c
-romstage-$(CONFIG_SUPERIO_NSC_PC87366) += early_serial.c
ramstage-$(CONFIG_SUPERIO_NSC_PC87366) += superio.c
diff --git a/src/superio/nsc/pc87366/early_serial.c b/src/superio/nsc/pc87366/early_serial.c
deleted file mode 100644
index b088093..0000000
--- a/src/superio/nsc/pc87366/early_serial.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2000 AG Electronics Ltd.
- * Copyright (C) 2003-2004 Linux Networx
- *
- * 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.
- */
-
-#include <arch/io.h>
-#include <device/pnp.h>
-#include <stdint.h>
-#include "pc87366.h"
-
-void pc87366_enable_serial(pnp_devfn_t dev, u16 iobase)
-{
- pnp_set_logical_device(dev);
- pnp_set_enable(dev, 0);
- pnp_set_iobase(dev, PNP_IDX_IO0, iobase);
- pnp_set_enable(dev, 1);
-}
diff --git a/src/superio/nsc/pc87366/pc87366.h b/src/superio/nsc/pc87366/pc87366.h
index 7f4a995..b1df69f 100644
--- a/src/superio/nsc/pc87366/pc87366.h
+++ b/src/superio/nsc/pc87366/pc87366.h
@@ -34,9 +34,4 @@
#define PC87366_VLM 0x0D
#define PC87366_TMS 0x0E
-#include <arch/io.h>
-#include <stdint.h>
-
-void pc87366_enable_serial(pnp_devfn_t dev, u16 iobase);
-
#endif /* SUPERIO_NSC_PC87366_H */
--
To view, visit https://review.coreboot.org/c/coreboot/+/31336
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I1f03182cd760ea63df78ef3e2b2604c3322b4f3f
Gerrit-Change-Number: 31336
Gerrit-PatchSet: 1
Gerrit-Owner: Peter Lemenkov <lemenkov(a)gmail.com>
Gerrit-MessageType: newchange
Peter Lemenkov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31335
Change subject: superio/nsc/pc87360: Use common early_serial
......................................................................
superio/nsc/pc87360: Use common early_serial
Change-Id: Id866c30d676e3c3ff53bfc2547abffce6e9b5e07
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
---
M src/superio/nsc/pc87360/Kconfig
M src/superio/nsc/pc87360/Makefile.inc
D src/superio/nsc/pc87360/early_serial.c
M src/superio/nsc/pc87360/pc87360.h
4 files changed, 1 insertion(+), 36 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/31335/1
diff --git a/src/superio/nsc/pc87360/Kconfig b/src/superio/nsc/pc87360/Kconfig
index cd432b4..b70b935 100644
--- a/src/superio/nsc/pc87360/Kconfig
+++ b/src/superio/nsc/pc87360/Kconfig
@@ -15,3 +15,4 @@
config SUPERIO_NSC_PC87360
bool
+ select SUPERIO_NSC_COMMON_PRE_RAM
diff --git a/src/superio/nsc/pc87360/Makefile.inc b/src/superio/nsc/pc87360/Makefile.inc
index e0ee98a..81e2d3d 100644
--- a/src/superio/nsc/pc87360/Makefile.inc
+++ b/src/superio/nsc/pc87360/Makefile.inc
@@ -15,6 +15,4 @@
## GNU General Public License for more details.
##
-bootblock-$(CONFIG_SUPERIO_NSC_PC87360) += early_serial.c
-romstage-$(CONFIG_SUPERIO_NSC_PC87360) += early_serial.c
ramstage-$(CONFIG_SUPERIO_NSC_PC87360) += superio.c
diff --git a/src/superio/nsc/pc87360/early_serial.c b/src/superio/nsc/pc87360/early_serial.c
deleted file mode 100644
index 371761e..0000000
--- a/src/superio/nsc/pc87360/early_serial.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2000 AG Electronics Ltd.
- * Copyright (C) 2003-2004 Linux Networx
- *
- * 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.
- */
-
-#include <arch/io.h>
-#include <device/pnp.h>
-#include <stdint.h>
-#include "pc87360.h"
-
-void pc87360_enable_serial(pnp_devfn_t dev, u16 iobase)
-{
- pnp_set_logical_device(dev);
- pnp_set_enable(dev, 0);
- pnp_set_iobase(dev, PNP_IDX_IO0, iobase);
- pnp_set_enable(dev, 1);
-}
diff --git a/src/superio/nsc/pc87360/pc87360.h b/src/superio/nsc/pc87360/pc87360.h
index 31680b4..c969746 100644
--- a/src/superio/nsc/pc87360/pc87360.h
+++ b/src/superio/nsc/pc87360/pc87360.h
@@ -30,9 +30,4 @@
#define PC87360_FSCM 0x09
#define PC87360_WDT 0x0A
-#include <arch/io.h>
-#include <stdint.h>
-
-void pc87360_enable_serial(pnp_devfn_t dev, u16 iobase);
-
#endif /* SUPERIO_NSC_PC87360_H */
--
To view, visit https://review.coreboot.org/c/coreboot/+/31335
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Id866c30d676e3c3ff53bfc2547abffce6e9b5e07
Gerrit-Change-Number: 31335
Gerrit-PatchSet: 1
Gerrit-Owner: Peter Lemenkov <lemenkov(a)gmail.com>
Gerrit-MessageType: newchange
Peter Lemenkov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31334
Change subject: superio/nsc/pc87309: Use common early_serial
......................................................................
superio/nsc/pc87309: Use common early_serial
Change-Id: If856ec6d5bcf4951d0e09464526239f5a508d4b0
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
---
M src/superio/nsc/pc87309/Kconfig
M src/superio/nsc/pc87309/Makefile.inc
D src/superio/nsc/pc87309/early_serial.c
M src/superio/nsc/pc87309/pc87309.h
4 files changed, 1 insertion(+), 34 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/31334/1
diff --git a/src/superio/nsc/pc87309/Kconfig b/src/superio/nsc/pc87309/Kconfig
index d4b841e..ff72706 100644
--- a/src/superio/nsc/pc87309/Kconfig
+++ b/src/superio/nsc/pc87309/Kconfig
@@ -15,3 +15,4 @@
config SUPERIO_NSC_PC87309
bool
+ select SUPERIO_NSC_COMMON_PRE_RAM
diff --git a/src/superio/nsc/pc87309/Makefile.inc b/src/superio/nsc/pc87309/Makefile.inc
index 0f0b367..6c7a8ab 100644
--- a/src/superio/nsc/pc87309/Makefile.inc
+++ b/src/superio/nsc/pc87309/Makefile.inc
@@ -14,6 +14,4 @@
## GNU General Public License for more details.
##
-bootblock-$(CONFIG_SUPERIO_NSC_PC87309) += early_serial.c
-romstage-$(CONFIG_SUPERIO_NSC_PC87309) += early_serial.c
ramstage-$(CONFIG_SUPERIO_NSC_PC87309) += superio.c
diff --git a/src/superio/nsc/pc87309/early_serial.c b/src/superio/nsc/pc87309/early_serial.c
deleted file mode 100644
index 6b1ccd2..0000000
--- a/src/superio/nsc/pc87309/early_serial.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe(a)hermann-uwe.de>
- *
- * 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.
- */
-
-#include <arch/io.h>
-#include <device/pnp_def.h>
-#include "pc87309.h"
-
-void pc87309_enable_serial(pnp_devfn_t dev, u16 iobase)
-{
- pnp_set_logical_device(dev);
- pnp_set_enable(dev, 0);
- pnp_set_iobase(dev, PNP_IDX_IO0, iobase);
- pnp_set_enable(dev, 1);
-}
diff --git a/src/superio/nsc/pc87309/pc87309.h b/src/superio/nsc/pc87309/pc87309.h
index dfc2de1..3b912ea 100644
--- a/src/superio/nsc/pc87309/pc87309.h
+++ b/src/superio/nsc/pc87309/pc87309.h
@@ -27,9 +27,4 @@
#define PC87309_KBCM 0x05 /* Mouse */
#define PC87309_KBCK 0x06 /* Keyboard */
-#include <arch/io.h>
-#include <stdint.h>
-
-void pc87309_enable_serial(pnp_devfn_t dev, u16 iobase);
-
#endif /* SUPERIO_NSC_PC87309_H */
--
To view, visit https://review.coreboot.org/c/coreboot/+/31334
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: If856ec6d5bcf4951d0e09464526239f5a508d4b0
Gerrit-Change-Number: 31334
Gerrit-PatchSet: 1
Gerrit-Owner: Peter Lemenkov <lemenkov(a)gmail.com>
Gerrit-MessageType: newchange
Peter Lemenkov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31333
Change subject: superio/nsc/pc87392: Remove unused early_serial
......................................................................
superio/nsc/pc87392: Remove unused early_serial
Change-Id: I9437ee3f8830dc831aacfc62b9dd1943b73b98d4
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
---
D src/superio/nsc/pc87392/early_serial.c
1 file changed, 0 insertions(+), 26 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/33/31333/1
diff --git a/src/superio/nsc/pc87392/early_serial.c b/src/superio/nsc/pc87392/early_serial.c
deleted file mode 100644
index f8eb255..0000000
--- a/src/superio/nsc/pc87392/early_serial.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Sven Schnelle <svens(a)stackframe.org>
- *
- * 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.
- */
-
-#include <arch/io.h>
-#include "pc87392.h"
-
-static void pc87392_enable_serial(pnp_devfn_t dev, u16 iobase)
-{
- pnp_set_logical_device(dev);
- pnp_set_enable(dev, 0);
- pnp_set_iobase(dev, PNP_IDX_IO0, iobase);
- pnp_set_enable(dev, 1);
-}
--
To view, visit https://review.coreboot.org/c/coreboot/+/31333
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I9437ee3f8830dc831aacfc62b9dd1943b73b98d4
Gerrit-Change-Number: 31333
Gerrit-PatchSet: 1
Gerrit-Owner: Peter Lemenkov <lemenkov(a)gmail.com>
Gerrit-MessageType: newchange
Peter Lemenkov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31332
Change subject: superio/nsc: Introduce common early_serial
......................................................................
superio/nsc: Introduce common early_serial
Change-Id: I0860e95258b87f059a3a9c31e382d758403d0428
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
---
M src/superio/nsc/Makefile.inc
A src/superio/nsc/common/Kconfig
A src/superio/nsc/common/early_serial.c
A src/superio/nsc/common/nsc.h
4 files changed, 80 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/31332/1
diff --git a/src/superio/nsc/Makefile.inc b/src/superio/nsc/Makefile.inc
index a792573..8323591 100644
--- a/src/superio/nsc/Makefile.inc
+++ b/src/superio/nsc/Makefile.inc
@@ -13,6 +13,10 @@
## GNU General Public License for more details.
##
+## include generic nsc pre-ram stage driver
+bootblock-$(CONFIG_SUPERIO_NSC_COMMON_PRE_RAM) += common/early_serial.c
+romstage-$(CONFIG_SUPERIO_NSC_COMMON_PRE_RAM) += common/early_serial.c
+
subdirs-y += pc87309
subdirs-y += pc87360
subdirs-y += pc87366
diff --git a/src/superio/nsc/common/Kconfig b/src/superio/nsc/common/Kconfig
new file mode 100644
index 0000000..e486071
--- /dev/null
+++ b/src/superio/nsc/common/Kconfig
@@ -0,0 +1,19 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2011 Advanced Micro Devices, Inc.
+##
+## 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; version 2 of the License.
+##
+## 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.
+##
+
+# Generic NSC romstage driver - Just enough UART initialisation code for
+# pre-ram.
+config SUPERIO_NSC_COMMON_PRE_RAM
+ bool
diff --git a/src/superio/nsc/common/early_serial.c b/src/superio/nsc/common/early_serial.c
new file mode 100644
index 0000000..2cd9f05
--- /dev/null
+++ b/src/superio/nsc/common/early_serial.c
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2000 AG Electronics Ltd.
+ * Copyright (C) 2003-2004 Linux Networx
+ * Copyright (C) 2004 Tyan
+ * Copyright (C) 2007 Uwe Hermann <uwe(a)hermann-uwe.de>
+ *
+ * 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.
+ */
+
+#include <arch/io.h>
+#include <device/pnp_def.h>
+#include <stdint.h>
+#include "nsc.h"
+
+void nsc_enable_serial(pnp_devfn_t dev, u16 iobase)
+{
+ pnp_set_logical_device(dev);
+ pnp_set_enable(dev, 0);
+ pnp_set_iobase(dev, PNP_IDX_IO0, iobase);
+ pnp_set_enable(dev, 1);
+}
diff --git a/src/superio/nsc/common/nsc.h b/src/superio/nsc/common/nsc.h
new file mode 100644
index 0000000..76112dc
--- /dev/null
+++ b/src/superio/nsc/common/nsc.h
@@ -0,0 +1,26 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2014 Edward O'Callaghan <eocallaghan(a)alterapraxis.com>
+ * Copyright (C) 2014 Felix Held <felix-coreboot(a)felixheld.de>
+ *
+ * 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.
+ */
+
+#ifndef SUPERIO_NSC_COMMON_PRE_RAM_H
+#define SUPERIO_NSC_COMMON_PRE_RAM_H
+
+#include <device/pnp_def.h>
+#include <stdint.h>
+
+void nsc_enable_serial(pnp_devfn_t dev, u16 iobase);
+
+#endif /* SUPERIO_NSC_COMMON_PRE_RAM_H */
--
To view, visit https://review.coreboot.org/c/coreboot/+/31332
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I0860e95258b87f059a3a9c31e382d758403d0428
Gerrit-Change-Number: 31332
Gerrit-PatchSet: 1
Gerrit-Owner: Peter Lemenkov <lemenkov(a)gmail.com>
Gerrit-MessageType: newchange