Change in coreboot[master]: superio/winbond/w83627dhg: Boards use common config entry/exit function
Keith Hui has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40964 )
Change subject: superio/winbond/w83627dhg: Boards use common config entry/exit function ......................................................................
superio/winbond/w83627dhg: Boards use common config entry/exit function
These 4 boards, using this super I/O, do more early init on it than just enabling early serial. Change them to use the common config entry/exit function. Allows to drop the duplicate just this chip holds.
Change-Id: Ia3cbf6fa9a7719fc420559b9343786c1f66858a4 Signed-off-by: Keith Hui buurin@gmail.com --- M src/mainboard/asus/p5gc-mx/early_init.c M src/mainboard/asus/p5ql-em/early_init.c M src/mainboard/asus/p5qpl-am/early_init.c M src/mainboard/intel/dg41wv/early_init.c 4 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/64/40964/1
diff --git a/src/mainboard/asus/p5gc-mx/early_init.c b/src/mainboard/asus/p5gc-mx/early_init.c index 4a17c37..be43fba 100644 --- a/src/mainboard/asus/p5gc-mx/early_init.c +++ b/src/mainboard/asus/p5gc-mx/early_init.c @@ -27,7 +27,7 @@ int need_reset = 0; u8 reg, old_reg;
- pnp_enter_ext_func_mode(GPIO_DEV); + pnp_enter_conf_state(GPIO_DEV); pnp_set_logical_device(GPIO_DEV);
reg = 0x9a; @@ -54,7 +54,7 @@ pnp_write_config(GPIO_DEV, 0xe1, reg); need_reset += ((reg & 0x20) != (old_reg & 0x20));
- pnp_exit_ext_func_mode(GPIO_DEV); + pnp_exit_conf_state(GPIO_DEV);
return need_reset; } diff --git a/src/mainboard/asus/p5ql-em/early_init.c b/src/mainboard/asus/p5ql-em/early_init.c index 3803801..1301018 100644 --- a/src/mainboard/asus/p5ql-em/early_init.c +++ b/src/mainboard/asus/p5ql-em/early_init.c @@ -67,7 +67,7 @@ break; }
- pnp_enter_ext_func_mode(GPIO_DEV); + pnp_enter_conf_state(GPIO_DEV); pnp_set_logical_device(GPIO_DEV);
/* @@ -99,7 +99,7 @@ old_reg = pnp_read_config(GPIO_DEV, 0xf5); /* GPIO4x data */ pnp_write_config(GPIO_DEV, 0xf5, old_reg | reg); need_reset += ((reg & 0x1) != (old_reg & 0x1)); - pnp_exit_ext_func_mode(GPIO_DEV); + pnp_exit_conf_state(GPIO_DEV);
return need_reset; } diff --git a/src/mainboard/asus/p5qpl-am/early_init.c b/src/mainboard/asus/p5qpl-am/early_init.c index afcd531..18cb314 100644 --- a/src/mainboard/asus/p5qpl-am/early_init.c +++ b/src/mainboard/asus/p5qpl-am/early_init.c @@ -69,7 +69,7 @@ break; }
- pnp_enter_ext_func_mode(GPIO_DEV); + pnp_enter_conf_state(GPIO_DEV); pnp_set_logical_device(GPIO_DEV);
if (CONFIG(BOARD_ASUS_P5QPL_AM)) { @@ -121,7 +121,7 @@ pnp_write_config(GPIO_DEV, 0xf5, old_reg | reg); need_reset += ((reg & 0x18) != (old_reg & 0x18)); } - pnp_exit_ext_func_mode(GPIO_DEV); + pnp_exit_conf_state(GPIO_DEV);
return need_reset; } diff --git a/src/mainboard/intel/dg41wv/early_init.c b/src/mainboard/intel/dg41wv/early_init.c index 584b936..c8d7c67 100644 --- a/src/mainboard/intel/dg41wv/early_init.c +++ b/src/mainboard/intel/dg41wv/early_init.c @@ -25,12 +25,12 @@ void bootblock_mainboard_early_init(void) { /* Set GPIOs on superio, enable UART */ - pnp_enter_ext_func_mode(SERIAL_DEV); + pnp_enter_conf_state(SERIAL_DEV); pnp_set_logical_device(SERIAL_DEV);
pnp_write_config(SERIAL_DEV, 0x2c, 0x13);
- pnp_exit_ext_func_mode(SERIAL_DEV); + pnp_exit_conf_state(SERIAL_DEV);
winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40964 )
Change subject: superio/winbond/w83627dhg: Boards use common config entry/exit function ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/c/coreboot/+/40964/3//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/40964/3//COMMIT_MSG@7 PS3, Line 7: superio/winbond/w83627dhg: Boards use common config entry/exit function Maybe:
mb: Use common Winbond W83627DHG config entry/exit functions
Keith Hui has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40964 )
Change subject: superio/winbond/w83627dhg: Boards use common config entry/exit function ......................................................................
Patch Set 3:
This change is ready for review.
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/40964
to look at the new patch set (#5).
Change subject: mb: Use common Winbond W83627DHG config entry/exit functions ......................................................................
mb: Use common Winbond W83627DHG config entry/exit functions
These 4 boards, using this super I/O, do more early init on it than just enabling early serial. Change them to use the common config entry/exit function. Allows to drop the duplicate just this chip holds.
Change-Id: Ia3cbf6fa9a7719fc420559b9343786c1f66858a4 Signed-off-by: Keith Hui buurin@gmail.com --- M src/mainboard/asus/p5gc-mx/early_init.c M src/mainboard/asus/p5ql-em/early_init.c M src/mainboard/asus/p5qpl-am/early_init.c M src/mainboard/intel/dg41wv/early_init.c 4 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/64/40964/5
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40964 )
Change subject: mb: Use common Winbond W83627DHG config entry/exit functions ......................................................................
Patch Set 5:
Build failures:
``` CC bootblock/superio/smsc/smscsuperio/early_serial.o src/superio/smsc/smscsuperio/early_serial.c:14:13: error: static declaration of 'pnp_enter_conf_state' follows non-static declaration static void pnp_enter_conf_state(pnp_devfn_t dev) ^~~~~~~~~~~~~~~~~~~~ In file included from src/superio/smsc/smscsuperio/early_serial.c:4: src/include/device/pnp_ops.h:12:6: note: previous declaration of 'pnp_enter_conf_state' was here void pnp_enter_conf_state(pnp_devfn_t dev); ^~~~~~~~~~~~~~~~~~~~ src/superio/smsc/smscsuperio/early_serial.c:21:13: error: static declaration of 'pnp_exit_conf_state' follows non-static declaration static void pnp_exit_conf_state(pnp_devfn_t dev) ^~~~~~~~~~~~~~~~~~~ In file included from src/superio/smsc/smscsuperio/early_serial.c:4: src/include/device/pnp_ops.h:13:6: note: previous declaration of 'pnp_exit_conf_state' was here void pnp_exit_conf_state(pnp_devfn_t dev); ^~~~~~~~~~~~~~~~~~~ ```
Keith Hui has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40964 )
Change subject: mb: Use common Winbond W83627DHG config entry/exit functions ......................................................................
Patch Set 5:
Patch Set 5:
Build failures:
CC bootblock/superio/smsc/smscsuperio/early_serial.o src/superio/smsc/smscsuperio/early_serial.c:14:13: error: static declaration of 'pnp_enter_conf_state' follows non-static declaration static void pnp_enter_conf_state(pnp_devfn_t dev) ^~~~~~~~~~~~~~~~~~~~ In file included from src/superio/smsc/smscsuperio/early_serial.c:4: src/include/device/pnp_ops.h:12:6: note: previous declaration of 'pnp_enter_conf_state' was here void pnp_enter_conf_state(pnp_devfn_t dev); ^~~~~~~~~~~~~~~~~~~~ src/superio/smsc/smscsuperio/early_serial.c:21:13: error: static declaration of 'pnp_exit_conf_state' follows non-static declaration static void pnp_exit_conf_state(pnp_devfn_t dev) ^~~~~~~~~~~~~~~~~~~ In file included from src/superio/smsc/smscsuperio/early_serial.c:4: src/include/device/pnp_ops.h:13:6: note: previous declaration of 'pnp_exit_conf_state' was here void pnp_exit_conf_state(pnp_devfn_t dev); ^~~~~~~~~~~~~~~~~~~
This depends on CB:40962, which was postponed due to breakage in google boards. Now I'm trying to force Jenkins to run again so it can tell me where the breakages were, but without much success.
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/40964
to look at the new patch set (#6).
Change subject: superio/winbond/w83627dhg: Boards use common config entry/exit function ......................................................................
superio/winbond/w83627dhg: Boards use common config entry/exit function
These 4 boards, using this super I/O, do more early init on it than just enabling early serial. Change them to use the common config entry/exit function. Allows to drop the duplicate just this chip holds.
Change-Id: Ia3cbf6fa9a7719fc420559b9343786c1f66858a4 Signed-off-by: Keith Hui buurin@gmail.com --- M src/mainboard/asus/p5gc-mx/early_init.c M src/mainboard/asus/p5ql-em/early_init.c M src/mainboard/asus/p5qpl-am/early_init.c M src/mainboard/intel/dg41wv/early_init.c 4 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/64/40964/6
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/40964
to look at the new patch set (#7).
Change subject: mb: Use common Winbond W83627DHG config entry/exit functions ......................................................................
mb: Use common Winbond W83627DHG config entry/exit functions
These 4 boards, using this super I/O, do more early init on it than just enabling early serial. Change them to use the common config entry/exit function. Allows to drop the duplicate just this chip holds.
Change-Id: Ia3cbf6fa9a7719fc420559b9343786c1f66858a4 Signed-off-by: Keith Hui buurin@gmail.com --- M src/mainboard/asus/p5gc-mx/early_init.c M src/mainboard/asus/p5ql-em/early_init.c M src/mainboard/asus/p5qpl-am/early_init.c M src/mainboard/intel/dg41wv/early_init.c 4 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/64/40964/7
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40964 )
Change subject: mb: Use common Winbond W83627DHG config entry/exit functions ......................................................................
Patch Set 9: Code-Review+1
Stefan Reinauer has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/40964?usp=email )
Change subject: mb: Use common Winbond W83627DHG config entry/exit functions ......................................................................
Abandoned
-
Keith Hui (Code Review) -
Paul Menzel (Code Review)
-
Stefan Reinauer (Code Review)