r922 - in trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian: . patches
Simon Horman
horms@haydn.debian.org
Wed, 21 Jul 2004 21:33:01 -0600
Author: horms
Date: 2004-07-21 21:32:58 -0600 (Wed, 21 Jul 2004)
New Revision: 922
Modified:
trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog
trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-4
trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/substvars
trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/substvars.safe
Log:
Reversed patch to PCI initialisation code on Alpha
Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog 2004-07-21 01:52:09 UTC (rev 921)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog 2004-07-22 03:32:58 UTC (rev 922)
@@ -3,8 +3,12 @@
* Fix stack allocation in crypt(). Patch by Herbert Xu
(closes: #257120)
. crypto/cipher.c
+ * Reversed patch to PCI initialisation code on Alpha
+ Patch by Herbert Xu, Steve Langasek
+ (closes: #253787)
+ . arch/alpha/kernel/core_cia.c
- -- Simon Horman <horms@debian.org> Tue, 20 Jul 2004 16:58:26 +0900
+ -- Simon Horman <horms@debian.org> Thu, 22 Jul 2004 12:27:39 +0900
kernel-source-2.4.26 (2.4.26-3) unstable; urgency=low
Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-4
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-4 2004-07-21 01:52:09 UTC (rev 921)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-4 2004-07-22 03:32:58 UTC (rev 922)
@@ -12,3 +12,40 @@
if (!nbytes)
return 0;
+diff -urN kernel-source-2.4.26/arch/alpha/kernel/core_cia.c kernel-source-2.4.26-1/arch/alpha/kernel/core_cia.c
+--- kernel-source-2.4.26/arch/alpha/kernel/core_cia.c 2003-08-25 21:44:39.000000000 +1000
++++ kernel-source-2.4.26-1/arch/alpha/kernel/core_cia.c 2003-09-03 20:26:49.000000000 +1000
+@@ -775,22 +775,9 @@
+ *(vip)CIA_IOC_PCI_W0_MASK = (hose->sg_isa->size - 1) & 0xfff00000;
+ *(vip)CIA_IOC_PCI_T0_BASE = virt_to_phys(hose->sg_isa->ptes) >> 2;
+
++ *(vip)CIA_IOC_PCI_W2_BASE = __direct_map_base | 1;
++ *(vip)CIA_IOC_PCI_W2_MASK = (__direct_map_size - 1) & 0xfff00000;
++ *(vip)CIA_IOC_PCI_T2_BASE = 0 >> 2;
+- if (cia_rev == 1) {
+- __direct_map_base = 0x40000000;
+-
+- *(vip)CIA_IOC_PCI_W1_BASE = 0x40000000 | 1;
+- *(vip)CIA_IOC_PCI_W1_MASK = (0x40000000 - 1) & 0xfff00000;
+- *(vip)CIA_IOC_PCI_T1_BASE = 0 >> 2;
+-
+- *(vip)CIA_IOC_PCI_W2_BASE = 0x80000000 | 1;
+- *(vip)CIA_IOC_PCI_W2_MASK = (0x40000000 - 1) & 0xfff00000;
+- *(vip)CIA_IOC_PCI_T2_BASE = 0x40000000 >> 2;
+- } else {
+- *(vip)CIA_IOC_PCI_W2_BASE = __direct_map_base | 1;
+- *(vip)CIA_IOC_PCI_W2_MASK =
+- (__direct_map_size - 1) & 0xfff00000;
+- *(vip)CIA_IOC_PCI_T2_BASE = 0 >> 2;
+- }
+
+ /* On PYXIS we have the monster window, selected by bit 40, so
+ there is no need for window3 to be enabled.
+@@ -797,6 +810,7 @@
+ if (is_pyxis) {
+ *(vip)CIA_IOC_PCI_W3_BASE = 0;
+ } else if (cia_rev == 1) {
++ *(vip)CIA_IOC_PCI_W1_BASE = 0;
+ tbia_window = 3;
+ } else if (max_low_pfn > (0x100000000UL >> PAGE_SHIFT)) {
+ *(vip)CIA_IOC_PCI_W3_BASE = 0;
Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/substvars
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/substvars 2004-07-21 01:52:09 UTC (rev 921)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/substvars 2004-07-22 03:32:58 UTC (rev 922)
@@ -1,2 +1,2 @@
-kt-depends=kernel-source-2.4.26 (= 2.4.26-1) | kernel-source-2.4.26 (= 2.4.26-2) | kernel-source-2.4.26 (= 2.4.26-3)
-kt-provides=kernel-tree-2.4.26-1, kernel-tree-2.4.26-2, kernel-tree-2.4.26-3
+kt-depends=kernel-source-2.4.26 (= 2.4.26-1) | kernel-source-2.4.26 (= 2.4.26-2) | kernel-source-2.4.26 (= 2.4.26-3) | kernel-source-2.4.26 (= 2.4.26-4)
+kt-provides=kernel-tree-2.4.26-1, kernel-tree-2.4.26-2, kernel-tree-2.4.26-3, kernel-tree-2.4.26-4
Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/substvars.safe
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/substvars.safe 2004-07-21 01:52:09 UTC (rev 921)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/substvars.safe 2004-07-22 03:32:58 UTC (rev 922)
@@ -1,2 +1,2 @@
-kt-depends=kernel-source-2.4.26 (= 2.4.26-1) | kernel-source-2.4.26 (= 2.4.26-2) | kernel-source-2.4.26 (= 2.4.26-3)
-kt-provides=kernel-tree-2.4.26-1, kernel-tree-2.4.26-2, kernel-tree-2.4.26-3
+kt-depends=kernel-source-2.4.26 (= 2.4.26-1) | kernel-source-2.4.26 (= 2.4.26-2) | kernel-source-2.4.26 (= 2.4.26-3) | kernel-source-2.4.26 (= 2.4.26-4)
+kt-provides=kernel-tree-2.4.26-1, kernel-tree-2.4.26-2, kernel-tree-2.4.26-3, kernel-tree-2.4.26-4