hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

work on pci. 

This is from ticket #6374

Michael Richter thanks for your patch.

SVN-Revision: 18933
owl
Hauke Mehrtens 2009-12-26 00:09:00 +00:00
parent eb15b88af2
commit 371e7aa521
2 changed files with 25 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
target/linux/amazon/files/arch/mips/amazon/pci.c
View File

@ -95,7 +95,7 @@ static int amazon_pci_config_access(unsigned char access_type,
/* Amazon support slot from 0 to 15 */ /* Amazon support slot from 0 to 15 */
/* devfn 0 & 0x20 is itself */ /* devfn 0 & 0x20 is itself */
if ((bus != 0) || (devfn == 0) || (devfn == 0x20)) if ((bus->number != 0) || (devfn == 0) || (devfn == 0x20))
return 1; return 1;
pci_addr=AMAZON_PCI_CFG_BASE | pci_addr=AMAZON_PCI_CFG_BASE |
@ -124,49 +124,42 @@ static int amazon_pci_config_access(unsigned char access_type,
static int amazon_pci_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *val) static int amazon_pci_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *val)
{ {
u32 data = 0; u32 data = 0;
int ret = PCIBIOS_SUCCESSFUL;
if (amazon_pci_config_access(PCI_ACCESS_READ, bus, devfn, where, &data)) { if (amazon_pci_config_access(PCI_ACCESS_READ, bus, devfn, where, &data))
data = ~0; return PCIBIOS_DEVICE_NOT_FOUND;
ret = -1;
}
switch (size) { if (size == 1)
case 1: *val = (data >> ((where & 3) << 3)) & 0xff;
*((u8 *) val) = (data >> ((where & 3) << 3)) & 0xff; else if (size == 2)
break; *val = (data >> ((where & 3) << 3)) & 0xffff;
case 2: else
*((u16 *) val) = (data >> ((where & 3) << 3)) & 0xffff; *val = data;
break;
case 4:
*val = data;
break;
default:
return -1;
}
return ret; return PCIBIOS_SUCCESSFUL;
} }
static int amazon_pci_write(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 val) static int amazon_pci_write(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 val)
{ {
if (size != 4) { u32 data = 0;
u32 data;
if (size == 4)
{
data = val;
} else {
if (amazon_pci_config_access(PCI_ACCESS_READ, bus, devfn, where, &data)) if (amazon_pci_config_access(PCI_ACCESS_READ, bus, devfn, where, &data))
return -1; return PCIBIOS_DEVICE_NOT_FOUND;
if (size == 1) if (size == 1)
val = (data & ~(0xff << ((where & 3) << 3))) | (val << ((where & 3) << 3)); data = (data & ~(0xff << ((where & 3) << 3))) |
(val << ((where & 3) << 3));
else if (size == 2) else if (size == 2)
val = (data & ~(0xffff << ((where & 3) << 3))) | (val << ((where & 3) << 3)); data = (data & ~(0xffff << ((where & 3) << 3))) |
else (val << ((where & 3) << 3));
return -1;
} }
if (amazon_pci_config_access(PCI_ACCESS_WRITE, bus, devfn, where, &val)) if (amazon_pci_config_access(PCI_ACCESS_WRITE, bus, devfn, where, &data))
return -1; return PCIBIOS_DEVICE_NOT_FOUND;
return PCIBIOS_SUCCESSFUL; return PCIBIOS_SUCCESSFUL;
} }
@ -182,7 +175,7 @@ static struct pci_controller amazon_pci_controller = {
.io_resource = &pci_io_resource .io_resource = &pci_io_resource
}; };
int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
switch (slot) { switch (slot) {
case 13: case 13:
@ -240,7 +233,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
return 0; return 0;
} }
int amazon_pci_init(void) int __init amazon_pci_init(void)
{ {
u32 temp_buffer; u32 temp_buffer;
@ -286,7 +279,7 @@ int amazon_pci_init(void)
//use 8 dw burse length //use 8 dw burse length
AMAZON_PCI_REG32(FPI_BURST_LENGTH) = 0x303; AMAZON_PCI_REG32(FPI_BURST_LENGTH) = 0x303;
set_io_port_base(ioremap(AMAZON_PCI_IO_BASE, AMAZON_PCI_IO_SIZE)); amazon_pci_controller.io_map_base = (unsigned long)ioremap(AMAZON_PCI_IO_BASE, AMAZON_PCI_IO_SIZE);
register_pci_controller(&amazon_pci_controller); register_pci_controller(&amazon_pci_controller);
return 0; return 0;
} }

20
target/linux/amazon/patches-2.6.30/230-fix_pci.patch
View File

@ -1,20 +0,0 @@
--- a/arch/mips/amazon/pci.c
+++ b/arch/mips/amazon/pci.c
@@ -182,7 +182,7 @@ static struct pci_controller amazon_pci_
.io_resource = &pci_io_resource
};
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{
switch (slot) {
case 13:
@@ -240,7 +240,7 @@ int pcibios_plat_dev_init(struct pci_dev
return 0;
}
-int amazon_pci_init(void)
+int __init amazon_pci_init(void)
{
u32 temp_buffer;