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

ramips: merge ops-rt288x.c and rt288x_pci.h into pci-rt288x.c 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17914 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Gabor Juhos 2009-10-05 18:44:06 +00:00
parent 59c181a38e
commit f72d43415a
4 changed files with 71 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x_pci.h
View File

@ -1,19 +0,0 @@
#ifdef CONFIG_PCI
#define RT2880_PCI_SLOT1_BASE 0x20000000
#define RALINK_PCI_BASE 0xA0440000
#define RT2880_PCI_PCICFG_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x0000))
#define RT2880_PCI_ARBCTL ((unsigned long*)(RALINK_PCI_BASE + 0x0080))
#define RT2880_PCI_BAR0SETUP_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x0010))
#define RT2880_PCI_CONFIG_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x0020))
#define RT2880_PCI_CONFIG_DATA ((unsigned long*)(RALINK_PCI_BASE + 0x0024))
#define RT2880_PCI_MEMBASE ((unsigned long*)(RALINK_PCI_BASE + 0x0028))
#define RT2880_PCI_IOBASE ((unsigned long*)(RALINK_PCI_BASE + 0x002C))
#define RT2880_PCI_IMBASEBAR0_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x0018))
#define RT2880_PCI_ID ((unsigned long*)(RALINK_PCI_BASE + 0x0030))
#define RT2880_PCI_CLASS ((unsigned long*)(RALINK_PCI_BASE + 0x0034))
#define RT2880_PCI_SUBID ((unsigned long*)(RALINK_PCI_BASE + 0x0038))
#define RT2880_PCI_PCIMSK_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x000C))
#endif

62
target/linux/ramips/files/arch/mips/pci/ops-rt288x.c
View File

@ -1,62 +0,0 @@
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/io.h>
#include <asm/mach-ralink/rt288x.h>
#include <asm/mach-ralink/rt288x_pci.h>
#define PCI_ACCESS_READ 0
#define PCI_ACCESS_WRITE 1
static int config_access(unsigned char access_type, struct pci_bus *bus,
unsigned int devfn, unsigned char where, u32 * data)
{
unsigned int slot = PCI_SLOT(devfn);
unsigned int address;
u8 func = PCI_FUNC(devfn);
address = (bus->number << 16) | (slot << 11) | (func << 8) | (where& 0xfc) | 0x80000000;
writel(address, RT2880_PCI_CONFIG_ADDR);
if (access_type == PCI_ACCESS_WRITE)
writel(*data, RT2880_PCI_CONFIG_DATA);
else
*data = readl(RT2880_PCI_CONFIG_DATA);
return 0;
}
int
pci_config_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 * val)
{
u32 data = 0;
if(config_access(PCI_ACCESS_READ, bus, devfn, where, &data))
return PCIBIOS_DEVICE_NOT_FOUND;
if(size == 1)
*val = (data >> ((where & 3) << 3)) & 0xff;
else if(size == 2)
*val = (data >> ((where & 3) << 3)) & 0xffff;
else
*val = data;
return PCIBIOS_SUCCESSFUL;
}
int
pci_config_write(struct pci_bus *bus, unsigned int devfn,
int where, int size, u32 val)
{
u32 data = 0;
if(size == 4)
{
data = val;
} else {
if(config_access(PCI_ACCESS_READ, bus, devfn, where, &data))
return PCIBIOS_DEVICE_NOT_FOUND;
if(size == 1)
data = (data & ~(0xff << ((where & 3) << 3))) |
(val << ((where & 3) << 3));
else if(size == 2)
data = (data & ~(0xffff << ((where & 3) << 3))) |
(val << ((where & 3) << 3));
}
if(config_access(PCI_ACCESS_WRITE, bus, devfn, where, &data))
return PCIBIOS_DEVICE_NOT_FOUND;
return PCIBIOS_SUCCESSFUL;
}

73
target/linux/ramips/files/arch/mips/pci/pci-rt288x.c
View File

@ -4,10 +4,77 @@
#include <linux/init.h> #include <linux/init.h>
#include <asm/mach-ralink/rt288x.h> #include <asm/mach-ralink/rt288x.h>
#include <asm/mach-ralink/rt288x_pci.h>
extern int pci_config_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *val); #define RT2880_PCI_SLOT1_BASE 0x20000000
extern int pci_config_write(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 val); #define RALINK_PCI_BASE 0xA0440000
#define RT2880_PCI_PCICFG_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x0000))
#define RT2880_PCI_ARBCTL ((unsigned long*)(RALINK_PCI_BASE + 0x0080))
#define RT2880_PCI_BAR0SETUP_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x0010))
#define RT2880_PCI_CONFIG_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x0020))
#define RT2880_PCI_CONFIG_DATA ((unsigned long*)(RALINK_PCI_BASE + 0x0024))
#define RT2880_PCI_MEMBASE ((unsigned long*)(RALINK_PCI_BASE + 0x0028))
#define RT2880_PCI_IOBASE ((unsigned long*)(RALINK_PCI_BASE + 0x002C))
#define RT2880_PCI_IMBASEBAR0_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x0018))
#define RT2880_PCI_ID ((unsigned long*)(RALINK_PCI_BASE + 0x0030))
#define RT2880_PCI_CLASS ((unsigned long*)(RALINK_PCI_BASE + 0x0034))
#define RT2880_PCI_SUBID ((unsigned long*)(RALINK_PCI_BASE + 0x0038))
#define RT2880_PCI_PCIMSK_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x000C))
#define PCI_ACCESS_READ 0
#define PCI_ACCESS_WRITE 1
static int config_access(unsigned char access_type, struct pci_bus *bus,
unsigned int devfn, unsigned char where, u32 * data)
{
unsigned int slot = PCI_SLOT(devfn);
unsigned int address;
u8 func = PCI_FUNC(devfn);
address = (bus->number << 16) | (slot << 11) | (func << 8) | (where& 0xfc) | 0x80000000;
writel(address, RT2880_PCI_CONFIG_ADDR);
if (access_type == PCI_ACCESS_WRITE)
writel(*data, RT2880_PCI_CONFIG_DATA);
else
*data = readl(RT2880_PCI_CONFIG_DATA);
return 0;
}
int
pci_config_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 * val)
{
u32 data = 0;
if(config_access(PCI_ACCESS_READ, bus, devfn, where, &data))
return PCIBIOS_DEVICE_NOT_FOUND;
if(size == 1)
*val = (data >> ((where & 3) << 3)) & 0xff;
else if(size == 2)
*val = (data >> ((where & 3) << 3)) & 0xffff;
else
*val = data;
return PCIBIOS_SUCCESSFUL;
}
int
pci_config_write(struct pci_bus *bus, unsigned int devfn,
int where, int size, u32 val)
{
u32 data = 0;
if(size == 4)
{
data = val;
} else {
if(config_access(PCI_ACCESS_READ, bus, devfn, where, &data))
return PCIBIOS_DEVICE_NOT_FOUND;
if(size == 1)
data = (data & ~(0xff << ((where & 3) << 3))) |
(val << ((where & 3) << 3));
else if(size == 2)
data = (data & ~(0xffff << ((where & 3) << 3))) |
(val << ((where & 3) << 3));
}
if(config_access(PCI_ACCESS_WRITE, bus, devfn, where, &data))
return PCIBIOS_DEVICE_NOT_FOUND;
return PCIBIOS_SUCCESSFUL;
}
struct pci_ops rt2880_pci_ops = { struct pci_ops rt2880_pci_ops = {
.read = pci_config_read, .read = pci_config_read,

2
target/linux/ramips/patches-2.6.30/102-rt288x-pci-driver-hook.patch
View File

@ -4,4 +4,4 @@
obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o
obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o
obj-$(CONFIG_MIKROTIK_RB532) += pci-rc32434.o ops-rc32434.o fixup-rc32434.o obj-$(CONFIG_MIKROTIK_RB532) += pci-rc32434.o ops-rc32434.o fixup-rc32434.o
+obj-$(CONFIG_SOC_RT288X) += pci-rt288x.o ops-rt288x.o +obj-$(CONFIG_SOC_RT288X) += pci-rt288x.o