Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Tue, 23 Jul 2002 16:36:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Tue, 23 Jul 2002 16:36:00 -0400 Received: from ztxmail04.ztx.compaq.com ([161.114.1.208]:29960 "EHLO ztxmail04.ztx.compaq.com") by vger.kernel.org with ESMTP id ; Tue, 23 Jul 2002 16:35:57 -0400 Date: Tue, 23 Jul 2002 16:34:52 -0400 From: Jay Estabrook To: "France, George" Cc: Martin Brulisauer , linux-kernel@vger.kernel.org Subject: [Jay.Estabrook@compaq.com: Re: kbuild 2.5.26 - arch/alpha] Message-ID: <20020723163452.E2868@linux04.mro.cpqcorp.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3950 Lines: 109 Sigh; I never could get the hang of Tuesdays... ;-} diff -ur old/arch/alpha/kernel/core_cia.c new/arch/alpha/kernel/core_cia.c --- old/arch/alpha/kernel/core_cia.c Sun Oct 21 13:30:58 2001 +++ new/arch/alpha/kernel/core_cia.c Mon Jun 17 13:39:42 2002 @@ -370,7 +370,7 @@ } static inline void -cia_prepare_tbia_workaround(void) +cia_prepare_tbia_workaround(int cia_rev, int is_pyxis) { unsigned long *ppte, pte; long i; @@ -382,10 +382,20 @@ for (i = 0; i < CIA_BROKEN_TBIA_SIZE / sizeof(unsigned long); ++i) ppte[i] = pte; - *(vip)CIA_IOC_PCI_W1_BASE = CIA_BROKEN_TBIA_BASE | 3; - *(vip)CIA_IOC_PCI_W1_MASK = (CIA_BROKEN_TBIA_SIZE*1024 - 1) - & 0xfff00000; - *(vip)CIA_IOC_PCI_T1_BASE = virt_to_phys(ppte) >> 2; + if (is_pyxis || cia_rev != 1) { + /* We can use W1 for SG on PYXIS/CIA rev 2. */ + *(vip)CIA_IOC_PCI_W1_BASE = CIA_BROKEN_TBIA_BASE | 3; + *(vip)CIA_IOC_PCI_W1_MASK = (CIA_BROKEN_TBIA_SIZE*1024 - 1) + & 0xfff00000; + *(vip)CIA_IOC_PCI_T1_BASE = virt_to_phys(ppte) >> 2; + } else { + /* CIA rev 1 can't use W1 or W2 for SG, apparently, + so use W3, which we made sure is not used for DAC. */ + *(vip)CIA_IOC_PCI_W3_BASE = CIA_BROKEN_TBIA_BASE | 3; + *(vip)CIA_IOC_PCI_W3_MASK = (CIA_BROKEN_TBIA_SIZE*1024 - 1) + & 0xfff00000; + *(vip)CIA_IOC_PCI_T3_BASE = virt_to_phys(ppte) >> 2; + } } static void __init @@ -684,10 +694,10 @@ /* * Set up the PCI to main memory translation windows. * - * Window 0 is scatter-gather 8MB at 8MB (for isa) - * Window 1 is scatter-gather 1MB at 768MB (for tbia) + * Window 0 is S/G 8MB at 8MB (for isa) + * Window 1 is S/G 1MB at 768MB (for tbia) (unused for CIA rev 1) * Window 2 is direct access 2GB at 2GB - * Window 3 is DAC access 4GB at 8GB + * Window 3 is DAC access 4GB at 8GB (or S/G for tbia if CIA rev 1) * * ??? NetBSD hints that page tables must be aligned to 32K, * possibly due to a hardware bug. This is over-aligned @@ -697,6 +707,7 @@ hose->sg_pci = NULL; hose->sg_isa = iommu_arena_new(hose, 0x00800000, 0x00800000, 32768); + __direct_map_base = 0x80000000; __direct_map_size = 0x80000000; @@ -715,8 +726,14 @@ are compared against W_DAC. We can, however, directly map 4GB, which is better than before. However, due to assumptions made elsewhere, we should not claim that we support DAC unless that - 4GB covers all of physical memory. */ - if (is_pyxis || max_low_pfn > (0x100000000 >> PAGE_SHIFT)) { + 4GB covers all of physical memory. + + Also, don't do DAC on CIA rev 1, it has other problems and is + unlikely to have more than 2GB of memory anyway, so direct is + fine. + */ + if (cia_rev == 1 || is_pyxis || + max_low_pfn > (0x100000000UL >> PAGE_SHIFT)) { *(vip)CIA_IOC_PCI_W3_BASE = 0; } else { *(vip)CIA_IOC_PCI_W3_BASE = 0x00000000 | 1 | 8; @@ -728,7 +745,7 @@ } /* Prepare workaround for apparently broken tbia. */ - cia_prepare_tbia_workaround(); + cia_prepare_tbia_workaround(cia_rev, is_pyxis); } void __init ----- Forwarded message from Jay Estabrook ----- Date: Tue, 23 Jul 2002 16:18:09 -0400 From: Jay Estabrook Subject: Re: kbuild 2.5.26 - arch/alpha To: George France Cc: Martin Brulisauer , linux-kernel@vger.kernel.org --Jay++ ----------------------------------------------------------------------------- Jay A Estabrook HPTC - LINUX support Hewlett-Packard Company - MRO1-2/K15 (508) 467-2080 200 Forest Street, Marlboro MA 01752 Jay.Estabrook@hp.com ----------------------------------------------------------------------------- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/