Skip to contentSkip to conversation

alpha 2.4.13-pre3 pci64 patches

PATCH Richard Henderson 1 participant 1 message Oct 18, 2001 Alpha port

lore
Share & tools
lore
#0 lore raw

Thanks to ink for pointing out that pyxis _does_ have a monster window enable bit, and Jay for pointing out that I thinko'd tsunami and titan configury. The final bit is a hunk that somehow got lost from one of Dave's merges.

r~

arch/alpha/kernel/core_cia.c +3 -2
diff -rup linux-dist/arch/alpha/kernel/core_cia.c 2.4.13-3/arch/alpha/kernel/core_cia.c
@@ -637,10 +637,11 @@ do_init_arch(int is_pyxis)
 	*(vip)CIA_IOC_HAE_IO = 0;
 
 	/* For PYXIS, we always use BWX bus and i/o accesses.  To that end,
-	   make sure they're enabled on the controller.  */
+	   make sure they're enabled on the controller.  At the same time,
+	   enable the monster window.  */
 	if (is_pyxis) {
 		temp = *(vip)CIA_IOC_CIA_CNFG;
-		temp |= CIA_CNFG_IOA_BWEN;
+		temp |= CIA_CNFG_IOA_BWEN | CIA_CNFG_PCI_MWEN;
 		*(vip)CIA_IOC_CIA_CNFG = temp;
 	}
 
arch/alpha/kernel/core_titan.c +1 -1
diff -rup linux-dist/arch/alpha/kernel/core_titan.c 2.4.13-3/arch/alpha/kernel/core_titan.c
@@ -368,7 +368,7 @@ titan_init_one_pachip_port(titan_pachip_
 
 	port->wsba[2].csr = 0x80000000 | 1;
 	port->wsm[2].csr  = (0x80000000 - 1) & 0xfff00000;
-	port->tba[2].csr  = 0x80000000;
+	port->tba[2].csr  = 0;
 
 	port->wsba[3].csr = 0;
 
arch/alpha/kernel/core_tsunami.c +1 -1
diff -rup linux-dist/arch/alpha/kernel/core_tsunami.c 2.4.13-3/arch/alpha/kernel/core_tsunami.c
@@ -368,7 +368,7 @@ tsunami_init_one_pchip(tsunami_pchip *pc
 
 	pchip->wsba[2].csr = 0x80000000 | 1;
 	pchip->wsm[2].csr  = (0x80000000 - 1) & 0xfff00000;
-	pchip->tba[2].csr  = 0x80000000;
+	pchip->tba[2].csr  = 0;
 
 	pchip->wsba[3].csr = 0;
 
arch/alpha/kernel/pci.c +19 -24

54 lines not on this page · raw message