[Glibc-bsd-commits] r3588 - in trunk/kfreebsd-9/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-07-14 23:49:33 +0000 (Thu, 14 Jul 2011)
New Revision: 3588

Added:
   trunk/kfreebsd-9/debian/patches/006_mips_qemu.diff
Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/series
Log:
Fix initialization of i8259 controller on Malta.  (Closes: #633618).

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-07-14 23:10:37 UTC (rev 3587)
+++ trunk/kfreebsd-9/debian/changelog	2011-07-14 23:49:33 UTC (rev 3588)
@@ -3,8 +3,9 @@
   * Revert part of 005_linux_cflags.diff which isn't going to be
     accepted by upstream, and caused build breakage on GNU/Linux. Bring
     back needed parts of the sed kludge.
+  * Fix initialization of i8259 controller on Malta.  (Closes: #633618).
 
- -- Robert Millan <rmh at debian.org>  Wed, 13 Jul 2011 21:35:23 +0200
+ -- Robert Millan <rmh at debian.org>  Fri, 15 Jul 2011 01:49:14 +0200
 
 kfreebsd-9 (9.0~svn223966-1) experimental; urgency=low
 

Added: trunk/kfreebsd-9/debian/patches/006_mips_qemu.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/006_mips_qemu.diff	                        (rev 0)
+++ trunk/kfreebsd-9/debian/patches/006_mips_qemu.diff	2011-07-14 23:49:33 UTC (rev 3588)
@@ -0,0 +1,44 @@
+
+Fix initialization of i8259 controller.  Opposite side is in
+qemu-0.14.1+dfsg/hw/i8259.c: pic_ioport_write()
+
+--- a/sys/mips/malta/gt_pci.c
++++ b/sys/mips/malta/gt_pci.c
+@@ -326,15 +326,15 @@
+ 	    ICW4_8086);
+ 
+ 	/* mask all interrupts */
+-	bus_space_write_1(sc->sc_st, sc->sc_ioh_icu1, 0,
++	bus_space_write_1(sc->sc_st, sc->sc_ioh_icu1, 1,
+ 	    sc->sc_imask & 0xff);
+ 
+ 	/* enable special mask mode */
+-	bus_space_write_1(sc->sc_st, sc->sc_ioh_icu1, 1,
++	bus_space_write_1(sc->sc_st, sc->sc_ioh_icu1, 0,
+ 	    OCW3_SEL | OCW3_ESMM | OCW3_SMM);
+ 
+ 	/* read IRR by default */
+-	bus_space_write_1(sc->sc_st, sc->sc_ioh_icu1, 1,
++	bus_space_write_1(sc->sc_st, sc->sc_ioh_icu1, 0,
+ 	    OCW3_SEL | OCW3_RR);
+ 
+ 	/* reset, program device, 4 bytes */
+@@ -348,15 +348,15 @@
+ 	    ICW4_8086);
+ 
+ 	/* mask all interrupts */
+-	bus_space_write_1(sc->sc_st, sc->sc_ioh_icu2, 0,
++	bus_space_write_1(sc->sc_st, sc->sc_ioh_icu2, 1,
+ 	    sc->sc_imask & 0xff);
+ 
+ 	/* enable special mask mode */
+-	bus_space_write_1(sc->sc_st, sc->sc_ioh_icu2, 1,
++	bus_space_write_1(sc->sc_st, sc->sc_ioh_icu2, 0,
+ 	    OCW3_SEL | OCW3_ESMM | OCW3_SMM);
+ 
+ 	/* read IRR by default */
+-	bus_space_write_1(sc->sc_st, sc->sc_ioh_icu2, 1,
++	bus_space_write_1(sc->sc_st, sc->sc_ioh_icu2, 0,
+ 	    OCW3_SEL | OCW3_RR);
+ 
+ 	/*

Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series	2011-07-14 23:10:37 UTC (rev 3587)
+++ trunk/kfreebsd-9/debian/patches/series	2011-07-14 23:49:33 UTC (rev 3588)
@@ -3,6 +3,7 @@
 003_glibc_dev_aicasm.diff
 004_xargs.diff
 005_linux_cflags.diff
+006_mips_qemu.diff
 007_clone_signals.diff
 #009_disable_duped_modules.diff
 020_linker.diff