[patch][v2] fix sirq mfgpt conflict

[Marc Jones]

This is the same as the v3 patches we did earlier.
Marc

[Peter Stuge]

On Thu, May 15, 2008 at 05:02:33PM -0600, Marc Jones wrote:
> Geode platforms that use a LPC Super I/O had the LPC serial IRQ set to all
> the possible IRQs generated by the SIO. This included IRQ 7 as the default
> parallel port IRQ. This overlapped with the MFGPT driver setting IRQ7 for it's
> own use. This fix removes IRQ7 from the serial IRQ list for all the mainboards
> that were setting it to prevent the conflict and crash when the MFGPT driver
> loads.
>
> Signed-off-by: Marc Jones

Acked-by: Peter Stuge
> Index: coreboot-v2/src/mainboard/amd/db800/Config.lb
>
> --- coreboot-v2.orig/src/mainboard/amd/db800/Config.lb	2008-05-15 16:17:34.000000000 -0600
> +++ coreboot-v2/src/mainboard/amd/db800/Config.lb	2008-05-15 16:19:49.000000000 -0600
> @@ -127,8 +127,8 @@
>    		# IRQ 12 and 1 unmasked,  Keyboard and Mouse IRQs. OK
>    		# SIRQ Mode = Active(Quiet) mode. Save power....
>    		# Invert mask = IRQ 12 and 1 are active high. Keyboard and Mouse, UARTs, etc IRQs. OK
> 	register "lpc_serirq_enable" = "0x000010da"
> 	register "lpc_serirq_polarity" = "0x0000EF25"
> 	register "lpc_serirq_enable" = "0x0000105a"
> 	register "lpc_serirq_polarity" = "0x0000EFA5"
> register "lpc_serirq_mode" = "1"
> register "enable_gpio_int_route" = "0x0D0C0700"
> register "enable_ide_nand_flash" = "0"	# 0:ide mode, 1:flash
> Index: coreboot-v2/src/mainboard/digitallogic/msm800sev/Config.lb
>
> --- coreboot-v2.orig/src/mainboard/digitallogic/msm800sev/Config.lb	2008-05-15 16:17:51.000000000 -0600
> +++ coreboot-v2/src/mainboard/digitallogic/msm800sev/Config.lb	2008-05-15 16:20:25.000000000 -0600
> @@ -128,9 +128,9 @@
>    		# Invert mask = IRQ 12 and 1 are active high. Keyboard and Mouse IRQs. OK
>    		# How to get these? Boot linux and do this:
>    		# rdmsr 0x51400025
> 	register "lpc_serirq_enable" = "0x000010da"
> 	register "lpc_serirq_enable" = "0x0000105a"
> # rdmsr 0x5140004e -- polairy is high 16 bits of low 32 bits
> 	register "lpc_serirq_polarity" = "0x0000EF25"
> 	register "lpc_serirq_polarity" = "0x0000EFA5"
> # mode is high 10 bits (determined from code)
> register "lpc_serirq_mode" = "1"
> # Don't yet know how to find this.
> Index: coreboot-v2/src/mainboard/iei/pcisa-lx-800-r10/Config.lb
>
> --- coreboot-v2.orig/src/mainboard/iei/pcisa-lx-800-r10/Config.lb	2008-05-15 16:20:49.000000000 -0600
> +++ coreboot-v2/src/mainboard/iei/pcisa-lx-800-r10/Config.lb	2008-05-15 16:21:23.000000000 -0600
> @@ -78,8 +78,8 @@
>    		# IRQ 12 and 1 unmasked,  Keyboard and Mouse IRQs. OK
>    		# SIRQ Mode = Active(Quiet) mode. Save power....
>    		# Invert mask = IRQ 12 and 1 are active high. Keyboard and Mouse, UARTs, etc IRQs. OK
> 	register "lpc_serirq_enable" = "0x000010da"
> 	register "lpc_serirq_polarity" = "0x0000EF25"
> 	register "lpc_serirq_enable" = "0x0000105a"
> 	register "lpc_serirq_polarity" = "0x0000EFA5"
> register "lpc_serirq_mode" = "1"
> register "enable_gpio_int_route" = "0x0D0C0700"
> register "enable_ide_nand_flash" = "0"	# 0:ide mode, 1:flash
> Index: coreboot-v2/src/mainboard/pcengines/alix1c/Config.lb
>
> --- coreboot-v2.orig/src/mainboard/pcengines/alix1c/Config.lb	2008-05-15 16:21:53.000000000 -0600
> +++ coreboot-v2/src/mainboard/pcengines/alix1c/Config.lb	2008-05-15 16:22:14.000000000 -0600
> @@ -148,9 +148,9 @@
>    		# Invert mask = IRQ 12 and 1 are active high. Keyboard and Mouse IRQs. OK
>    		# How to get these? Boot linux and do this:
>    		# rdmsr 0x51400025
> 	register "lpc_serirq_enable" = "0x000010da"
> 	register "lpc_serirq_enable" = "0x0000105a"
> # rdmsr 0x5140004e -- polairy is high 16 bits of low 32 bits
> 	register "lpc_serirq_polarity" = "0x0000EF25"
> 	register "lpc_serirq_polarity" = "0x0000EFA5"
> # mode is high 10 bits (determined from code)
> register "lpc_serirq_mode" = "1"
> # Don't yet know how to find this.

[Marc Jones]

Peter Stuge wrote:
> On Thu, May 15, 2008 at 05:02:33PM -0600, Marc Jones wrote:
> > Geode platforms that use a LPC Super I/O had the LPC serial IRQ set to all
> > the possible IRQs generated by the SIO. This included IRQ 7 as the default
> > parallel port IRQ. This overlapped with the MFGPT driver setting IRQ7 for it's
> > own use. This fix removes IRQ7 from the serial IRQ list for all the mainboards
> > that were setting it to prevent the conflict and crash when the MFGPT driver
> > loads.
> >
> > Signed-off-by: Marc Jones
>
> Acked-by: Peter Stuge

r3329
Thanks,
Marc

[ron minnich]

Acked-by: Ronald G. Minnich