openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[SPARC64]: Fix IO/MEM space sizing for PCI. 

In pci_determine_mem_io_space(), do not hard code the region sizes.
Instead, use the values given to us in the ranges property.

Thanks goes to Mikael Petterson for the original Xorg failure
bug repoert, and strace dumps from Mikael and Dmitry Artamonow.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2007-06-12 16:54:08 -07:00
parent 4a907dec98
commit 56f5c0bd50
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/sparc64/kernel/pci_common.c
View File

@ -291,8 +291,9 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm)
for (i = 0; i < num_pbm_ranges; i++) { for (i = 0; i < num_pbm_ranges; i++) {
const struct linux_prom_pci_ranges *pr = &pbm_ranges[i]; const struct linux_prom_pci_ranges *pr = &pbm_ranges[i];
unsigned long a; unsigned long a, size;
u32 parent_phys_hi, parent_phys_lo; u32 parent_phys_hi, parent_phys_lo;
u32 size_hi, size_lo;
int type; int type;
parent_phys_hi = pr->parent_phys_hi; parent_phys_hi = pr->parent_phys_hi;
@ -300,9 +301,14 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm)
if (tlb_type == hypervisor) if (tlb_type == hypervisor)
parent_phys_hi &= 0x0fffffff; parent_phys_hi &= 0x0fffffff;
size_hi = pr->size_hi;
size_lo = pr->size_lo;
type = (pr->child_phys_hi >> 24) & 0x3; type = (pr->child_phys_hi >> 24) & 0x3;
a = (((unsigned long)parent_phys_hi << 32UL) | a = (((unsigned long)parent_phys_hi << 32UL) |
((unsigned long)parent_phys_lo << 0UL)); ((unsigned long)parent_phys_lo << 0UL));
size = (((unsigned long)size_hi << 32UL) |
((unsigned long)size_lo << 0UL));
switch (type) { switch (type) {
case 0: case 0:
@ -313,7 +319,7 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm)
case 1: case 1:
/* 16-bit IO space, 16MB */ /* 16-bit IO space, 16MB */
pbm->io_space.start = a; pbm->io_space.start = a;
pbm->io_space.end = a + ((16UL*1024UL*1024UL) - 1UL); pbm->io_space.end = a + size - 1UL;
pbm->io_space.flags = IORESOURCE_IO; pbm->io_space.flags = IORESOURCE_IO;
saw_io = 1; saw_io = 1;
break; break;
@ -321,7 +327,7 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm)
case 2: case 2:
/* 32-bit MEM space, 2GB */ /* 32-bit MEM space, 2GB */
pbm->mem_space.start = a; pbm->mem_space.start = a;
pbm->mem_space.end = a + (0x80000000UL - 1UL); pbm->mem_space.end = a + size - 1UL;
pbm->mem_space.flags = IORESOURCE_MEM; pbm->mem_space.flags = IORESOURCE_MEM;
saw_mem = 1; saw_mem = 1;
break; break;