Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pci: Allow for PCI addresses to be 64-bit

Browse source 
PCI bus is inherently 64-bit.  While not all system require access to
the full 64-bit PCI address range some do.  This allows those systems
to enable the full PCI address width via CONFIG_SYS_PCI_64BIT.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Andrew Fleming-AFLEMING <afleming@freescale.com>
Acked-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Kumar Gala 2008-10-21 08:36:08 -05:00 • committed by Andrew Fleming-AFLEMING
parent ae5f943ba8
commit 30e76d5e3b
3 changed files with 103 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

37
drivers/pci/pci.c
View file

@ -218,12 +218,12 @@ pci_dev_t pci_find_device(unsigned int vendor, unsigned int device, int index)
* *
*/ */
unsigned long pci_hose_phys_to_bus (struct pci_controller *hose, pci_addr_t pci_hose_phys_to_bus (struct pci_controller *hose,
phys_addr_t phys_addr, phys_addr_t phys_addr,
unsigned long flags) unsigned long flags)
{ {
struct pci_region *res; struct pci_region *res;
unsigned long bus_addr; pci_addr_t bus_addr;
int i; int i;
if (!hose) { if (!hose) {
@ -252,7 +252,7 @@ Done:
} }
phys_addr_t pci_hose_bus_to_phys(struct pci_controller* hose, phys_addr_t pci_hose_bus_to_phys(struct pci_controller* hose,
unsigned long bus_addr, pci_addr_t bus_addr,
unsigned long flags) unsigned long flags)
{ {
struct pci_region *res; struct pci_region *res;
@ -288,15 +288,17 @@ Done:
int pci_hose_config_device(struct pci_controller *hose, int pci_hose_config_device(struct pci_controller *hose,
pci_dev_t dev, pci_dev_t dev,
unsigned long io, unsigned long io,
unsigned long mem, pci_addr_t mem,
unsigned long command) unsigned long command)
{ {
unsigned int bar_response, bar_size, bar_value, old_command; unsigned int bar_response, old_command;
pci_addr_t bar_value;
pci_size_t bar_size;
unsigned char pin; unsigned char pin;
int bar, found_mem64; int bar, found_mem64;
debug ("PCI Config: I/O=0x%lx, Memory=0x%lx, Command=0x%lx\n", debug ("PCI Config: I/O=0x%lx, Memory=0x%llx, Command=0x%lx\n",
io, mem, command); io, (u64)mem, command);
pci_hose_write_config_dword (hose, dev, PCI_COMMAND, 0); pci_hose_write_config_dword (hose, dev, PCI_COMMAND, 0);
@ -319,10 +321,19 @@ int pci_hose_config_device(struct pci_controller *hose,
io = io + bar_size; io = io + bar_size;
} else { } else {
if ((bar_response & PCI_BASE_ADDRESS_MEM_TYPE_MASK) == if ((bar_response & PCI_BASE_ADDRESS_MEM_TYPE_MASK) ==
PCI_BASE_ADDRESS_MEM_TYPE_64) PCI_BASE_ADDRESS_MEM_TYPE_64) {
found_mem64 = 1; u32 bar_response_upper;
u64 bar64;
pci_hose_write_config_dword(hose, dev, bar+4, 0xffffffff);
pci_hose_read_config_dword(hose, dev, bar+4, &bar_response_upper);
bar_size = ~(bar_response & PCI_BASE_ADDRESS_MEM_MASK) + 1; bar64 = ((u64)bar_response_upper << 32) | bar_response;
bar_size = ~(bar64 & PCI_BASE_ADDRESS_MEM_MASK) + 1;
found_mem64 = 1;
} else {
bar_size = (u32)(~(bar_response & PCI_BASE_ADDRESS_MEM_MASK) + 1);
}
/* round up region base address to multiple of size */ /* round up region base address to multiple of size */
mem = ((mem - 1) | (bar_size - 1)) + 1; mem = ((mem - 1) | (bar_size - 1)) + 1;
@ -332,11 +343,15 @@ int pci_hose_config_device(struct pci_controller *hose,
} }
/* Write it out and update our limit */ /* Write it out and update our limit */
pci_hose_write_config_dword (hose, dev, bar, bar_value); pci_hose_write_config_dword (hose, dev, bar, (u32)bar_value);
if (found_mem64) { if (found_mem64) {
bar += 4; bar += 4;
#ifdef CONFIG_SYS_PCI_64BIT
pci_hose_write_config_dword(hose, dev, bar, (u32)(bar_value>>32));
#else
pci_hose_write_config_dword (hose, dev, bar, 0x00000000); pci_hose_write_config_dword (hose, dev, bar, 0x00000000);
#endif
} }
} }

88
drivers/pci/pci_auto.c
View file

@ -45,14 +45,14 @@ void pciauto_region_init(struct pci_region* res)
res->bus_lower = res->bus_start ? res->bus_start : 0x1000; res->bus_lower = res->bus_start ? res->bus_start : 0x1000;
} }
void pciauto_region_align(struct pci_region *res, unsigned long size) void pciauto_region_align(struct pci_region *res, pci_size_t size)
{ {
res->bus_lower = ((res->bus_lower - 1) | (size - 1)) + 1; res->bus_lower = ((res->bus_lower - 1) | (size - 1)) + 1;
} }
int pciauto_region_allocate(struct pci_region* res, unsigned int size, unsigned int *bar) int pciauto_region_allocate(struct pci_region* res, pci_size_t size, pci_addr_t *bar)
{ {
unsigned long addr; pci_addr_t addr;
if (!res) { if (!res) {
DEBUGF("No resource"); DEBUGF("No resource");
@ -68,13 +68,13 @@ int pciauto_region_allocate(struct pci_region* res, unsigned int size, unsigned
res->bus_lower = addr + size; res->bus_lower = addr + size;
DEBUGF("address=0x%lx bus_lower=%x", addr, res->bus_lower); DEBUGF("address=0x%llx bus_lower=0x%llx", (u64)addr, (u64)res->bus_lower);
*bar = addr; *bar = addr;
return 0; return 0;
error: error:
*bar = 0xffffffff; *bar = (pci_addr_t)-1;
return -1; return -1;
} }
@ -88,7 +88,9 @@ void pciauto_setup_device(struct pci_controller *hose,
struct pci_region *prefetch, struct pci_region *prefetch,
struct pci_region *io) struct pci_region *io)
{ {
unsigned int bar_value, bar_response, bar_size; unsigned int bar_response;
pci_addr_t bar_value;
pci_size_t bar_size;
unsigned int cmdstat = 0; unsigned int cmdstat = 0;
struct pci_region *bar_res; struct pci_region *bar_res;
int bar, bar_nr = 0; int bar, bar_nr = 0;
@ -114,33 +116,46 @@ void pciauto_setup_device(struct pci_controller *hose,
& 0xffff) + 1; & 0xffff) + 1;
bar_res = io; bar_res = io;
DEBUGF("PCI Autoconfig: BAR %d, I/O, size=0x%x, ", bar_nr, bar_size); DEBUGF("PCI Autoconfig: BAR %d, I/O, size=0x%llx, ", bar_nr, (u64)bar_size);
} else { } else {
if ( (bar_response & PCI_BASE_ADDRESS_MEM_TYPE_MASK) == if ( (bar_response & PCI_BASE_ADDRESS_MEM_TYPE_MASK) ==
PCI_BASE_ADDRESS_MEM_TYPE_64) PCI_BASE_ADDRESS_MEM_TYPE_64) {
found_mem64 = 1; u32 bar_response_upper;
u64 bar64;
pci_hose_write_config_dword(hose, dev, bar+4, 0xffffffff);
pci_hose_read_config_dword(hose, dev, bar+4, &bar_response_upper);
bar_size = ~(bar_response & PCI_BASE_ADDRESS_MEM_MASK) + 1; bar64 = ((u64)bar_response_upper << 32) | bar_response;
bar_size = ~(bar64 & PCI_BASE_ADDRESS_MEM_MASK) + 1;
found_mem64 = 1;
} else {
bar_size = (u32)(~(bar_response & PCI_BASE_ADDRESS_MEM_MASK) + 1);
}
if (prefetch && (bar_response & PCI_BASE_ADDRESS_MEM_PREFETCH)) if (prefetch && (bar_response & PCI_BASE_ADDRESS_MEM_PREFETCH))
bar_res = prefetch; bar_res = prefetch;
else else
bar_res = mem; bar_res = mem;
DEBUGF("PCI Autoconfig: BAR %d, Mem, size=0x%x, ", bar_nr, bar_size); DEBUGF("PCI Autoconfig: BAR %d, Mem, size=0x%llx, ", bar_nr, (u64)bar_size);
} }
if (pciauto_region_allocate(bar_res, bar_size, &bar_value) == 0) { if (pciauto_region_allocate(bar_res, bar_size, &bar_value) == 0) {
/* Write it out and update our limit */ /* Write it out and update our limit */
pci_hose_write_config_dword(hose, dev, bar, bar_value); pci_hose_write_config_dword(hose, dev, bar, (u32)bar_value);
/*
* If we are a 64-bit decoder then increment to the
* upper 32 bits of the bar and force it to locate
* in the lower 4GB of memory.
*/
if (found_mem64) { if (found_mem64) {
bar += 4; bar += 4;
#ifdef CONFIG_SYS_PCI_64BIT
pci_hose_write_config_dword(hose, dev, bar, (u32)(bar_value>>32));
#else
/*
* If we are a 64-bit decoder then increment to the
* upper 32 bits of the bar and force it to locate
* in the lower 4GB of memory.
*/
pci_hose_write_config_dword(hose, dev, bar, 0x00000000); pci_hose_write_config_dword(hose, dev, bar, 0x00000000);
#endif
} }
cmdstat |= (bar_response & PCI_BASE_ADDRESS_SPACE) ? cmdstat |= (bar_response & PCI_BASE_ADDRESS_SPACE) ?
@ -289,35 +304,36 @@ void pciauto_config_init(struct pci_controller *hose)
if (hose->pci_mem) { if (hose->pci_mem) {
pciauto_region_init(hose->pci_mem); pciauto_region_init(hose->pci_mem);
DEBUGF("PCI Autoconfig: Bus Memory region: [%lx-%lx],\n" DEBUGF("PCI Autoconfig: Bus Memory region: [0x%llx-0x%llx],\n"
"\t\tPhysical Memory [%x-%x]\n", "\t\tPhysical Memory [%llx-%llxx]\n",
hose->pci_mem->bus_start, (u64)hose->pci_mem->bus_start,
hose->pci_mem->bus_start + hose->pci_mem->size - 1, (u64)(hose->pci_mem->bus_start + hose->pci_mem->size - 1),
hose->pci_mem->phys_start, (u64)hose->pci_mem->phys_start,
hose->pci_mem->phys_start + hose->pci_mem->size - 1); (u64)(hose->pci_mem->phys_start + hose->pci_mem->size - 1));
} }
if (hose->pci_prefetch) { if (hose->pci_prefetch) {
pciauto_region_init(hose->pci_prefetch); pciauto_region_init(hose->pci_prefetch);
DEBUGF("PCI Autoconfig: Bus Prefetchable Mem: [%lx-%lx],\n" DEBUGF("PCI Autoconfig: Bus Prefetchable Mem: [0x%llx-0x%llx],\n"
"\t\tPhysical Memory [%x-%x]\n", "\t\tPhysical Memory [%llx-%llx]\n",
hose->pci_prefetch->bus_start, (u64)hose->pci_prefetch->bus_start,
hose->pci_prefetch->bus_start + hose->pci_prefetch->size - 1, (u64)(hose->pci_prefetch->bus_start +
hose->pci_prefetch->phys_start, hose->pci_prefetch->size - 1),
hose->pci_prefetch->phys_start + (u64)hose->pci_prefetch->phys_start,
hose->pci_prefetch->size - 1); (u64)(hose->pci_prefetch->phys_start +
hose->pci_prefetch->size - 1));
} }
if (hose->pci_io) { if (hose->pci_io) {
pciauto_region_init(hose->pci_io); pciauto_region_init(hose->pci_io);
DEBUGF("PCI Autoconfig: Bus I/O region: [%lx-%lx],\n" DEBUGF("PCI Autoconfig: Bus I/O region: [0x%llx-0x%llx],\n"
"\t\tPhysical Memory: [%x-%x]\n", "\t\tPhysical Memory: [%llx-%llx]\n",
hose->pci_io->bus_start, (u64)hose->pci_io->bus_start,
hose->pci_io->bus_start + hose->pci_io->size - 1, (u64)(hose->pci_io->bus_start + hose->pci_io->size - 1),
hose->pci_io->phys_start, (u64)hose->pci_io->phys_start,
hose->pci_io->phys_start + hose->pci_io->size - 1); (u64)(hose->pci_io->phys_start + hose->pci_io->size - 1));
} }
} }

42
include/pci.h
View file

@ -101,8 +101,8 @@
#define PCI_BASE_ADDRESS_MEM_TYPE_1M 0x02 /* Below 1M [obsolete] */ #define PCI_BASE_ADDRESS_MEM_TYPE_1M 0x02 /* Below 1M [obsolete] */
#define PCI_BASE_ADDRESS_MEM_TYPE_64 0x04 /* 64 bit address */ #define PCI_BASE_ADDRESS_MEM_TYPE_64 0x04 /* 64 bit address */
#define PCI_BASE_ADDRESS_MEM_PREFETCH 0x08 /* prefetchable? */ #define PCI_BASE_ADDRESS_MEM_PREFETCH 0x08 /* prefetchable? */
#define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL) #define PCI_BASE_ADDRESS_MEM_MASK (~0x0fULL)
#define PCI_BASE_ADDRESS_IO_MASK (~0x03UL) #define PCI_BASE_ADDRESS_IO_MASK (~0x03ULL)
/* bit 1 is reserved if address_space = 1 */ /* bit 1 is reserved if address_space = 1 */
/* Header type 0 (normal devices) */ /* Header type 0 (normal devices) */
@ -111,7 +111,7 @@
#define PCI_SUBSYSTEM_ID 0x2e #define PCI_SUBSYSTEM_ID 0x2e
#define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */ #define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */
#define PCI_ROM_ADDRESS_ENABLE 0x01 #define PCI_ROM_ADDRESS_ENABLE 0x01
#define PCI_ROM_ADDRESS_MASK (~0x7ffUL) #define PCI_ROM_ADDRESS_MASK (~0x7ffULL)
#define PCI_CAPABILITY_LIST 0x34 /* Offset of first capability list entry */ #define PCI_CAPABILITY_LIST 0x34 /* Offset of first capability list entry */
@ -312,13 +312,21 @@
#include <pci_ids.h> #include <pci_ids.h>
struct pci_region { #ifdef CONFIG_SYS_PCI_64BIT
unsigned long bus_start; /* Start on the bus */ typedef u64 pci_addr_t;
phys_addr_t phys_start; /* Start in physical address space */ typedef u64 pci_size_t;
unsigned long size; /* Size */ #else
unsigned long flags; /* Resource flags */ typedef u32 pci_addr_t;
typedef u32 pci_size_t;
#endif
unsigned long bus_lower; struct pci_region {
pci_addr_t bus_start; /* Start on the bus */
phys_addr_t phys_start; /* Start in physical address space */
pci_size_t size; /* Size */
unsigned long flags; /* Resource flags */
pci_addr_t bus_lower;
}; };
#define PCI_REGION_MEM 0x00000000 /* PCI memory space */ #define PCI_REGION_MEM 0x00000000 /* PCI memory space */
@ -330,9 +338,9 @@ struct pci_region {
#define PCI_REGION_RO 0x00000200 /* Read-only memory */ #define PCI_REGION_RO 0x00000200 /* Read-only memory */
extern __inline__ void pci_set_region(struct pci_region *reg, extern __inline__ void pci_set_region(struct pci_region *reg,
unsigned long bus_start, pci_addr_t bus_start,
phys_addr_t phys_start, phys_addr_t phys_start,
unsigned long size, pci_size_t size,
unsigned long flags) { unsigned long flags) {
reg->bus_start = bus_start; reg->bus_start = bus_start;
reg->phys_start = phys_start; reg->phys_start = phys_start;
@ -433,9 +441,9 @@ extern __inline__ void pci_set_ops(struct pci_controller *hose,
extern void pci_setup_indirect(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data); extern void pci_setup_indirect(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data);
extern phys_addr_t pci_hose_bus_to_phys(struct pci_controller* hose, extern phys_addr_t pci_hose_bus_to_phys(struct pci_controller* hose,
unsigned long addr, unsigned long flags); pci_addr_t addr, unsigned long flags);
extern unsigned long pci_hose_phys_to_bus(struct pci_controller* hose, extern pci_addr_t pci_hose_phys_to_bus(struct pci_controller* hose,
phys_addr_t addr, unsigned long flags); phys_addr_t addr, unsigned long flags);
#define pci_phys_to_bus(dev, addr, flags) \ #define pci_phys_to_bus(dev, addr, flags) \
pci_hose_phys_to_bus(pci_bus_to_hose(PCI_BUS(dev)), (addr), (flags)) pci_hose_phys_to_bus(pci_bus_to_hose(PCI_BUS(dev)), (addr), (flags))
@ -483,8 +491,8 @@ extern int pci_hose_scan(struct pci_controller *hose);
extern int pci_hose_scan_bus(struct pci_controller *hose, int bus); extern int pci_hose_scan_bus(struct pci_controller *hose, int bus);
extern void pciauto_region_init(struct pci_region* res); extern void pciauto_region_init(struct pci_region* res);
extern void pciauto_region_align(struct pci_region *res, unsigned long size); extern void pciauto_region_align(struct pci_region *res, pci_size_t size);
extern int pciauto_region_allocate(struct pci_region* res, unsigned int size, unsigned int *bar); extern int pciauto_region_allocate(struct pci_region* res, pci_size_t size, pci_addr_t *bar);
extern void pciauto_setup_device(struct pci_controller *hose, extern void pciauto_setup_device(struct pci_controller *hose,
pci_dev_t dev, int bars_num, pci_dev_t dev, int bars_num,
struct pci_region *mem, struct pci_region *mem,
@ -500,7 +508,7 @@ extern pci_dev_t pci_find_class(int wanted_class, int wanted_sub_code,
extern int pci_hose_config_device(struct pci_controller *hose, extern int pci_hose_config_device(struct pci_controller *hose,
pci_dev_t dev, pci_dev_t dev,
unsigned long io, unsigned long io,
unsigned long mem, pci_addr_t mem,
unsigned long command); unsigned long command);
#ifdef CONFIG_MPC824X #ifdef CONFIG_MPC824X