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

Make it possible for boards to disable PCI REQ signals in the PCI controller, signed off by Ithamar R. Adema 

SVN-Revision: 20264
owl
John Crispin 2010-03-18 10:56:00 +00:00
parent f0aa9bc04f
commit 10af553b63
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/ifxmips/files/arch/mips/ifxmips/board.c
View File

@ -55,6 +55,7 @@ enum {
}; };
extern int ifxmips_pci_external_clock; extern int ifxmips_pci_external_clock;
extern int ifxmips_pci_req_mask;
static unsigned int chiprev; static unsigned int chiprev;
static int cmdline_mac; static int cmdline_mac;
@ -70,6 +71,7 @@ struct ifxmips_board {
struct gpio_led *ifxmips_leds; struct gpio_led *ifxmips_leds;
struct gpio_led *gpio_leds; struct gpio_led *gpio_leds;
int pci_external_clock; int pci_external_clock;
int pci_req_mask;
int num_devs; int num_devs;
}; };
@ -392,6 +394,8 @@ int __init ifxmips_init_devices(void)
ifxmips_gpio_dev.resource = &board->gpiodev_resource; ifxmips_gpio_dev.resource = &board->gpiodev_resource;
if (board->pci_external_clock) if (board->pci_external_clock)
ifxmips_pci_external_clock = 1; ifxmips_pci_external_clock = 1;
if (board->pci_req_mask)
ifxmips_pci_req_mask = board->pci_req_mask;
printk(KERN_INFO "using board definition %s\n", board->name); printk(KERN_INFO "using board definition %s\n", board->name);
return platform_add_devices(board->devs, board->num_devs); return platform_add_devices(board->devs, board->num_devs);
} }

6
target/linux/ifxmips/files/arch/mips/pci/pci-ifxmips.c
View File

@ -54,6 +54,10 @@ static struct pci_controller ifxmips_pci_controller =
u32 ifxmips_pci_mapped_cfg; u32 ifxmips_pci_mapped_cfg;
int ifxmips_pci_external_clock = 0; int ifxmips_pci_external_clock = 0;
/* Since the PCI REQ pins can be reused for other functionality, make it possible
to exclude those from interpretation by the PCI controller */
int ifxmips_pci_req_mask = 0xf;
static int __init static int __init
ifxmips_pci_set_external_clk(char *str) ifxmips_pci_set_external_clk(char *str)
{ {
@ -126,7 +130,7 @@ ifxmips_pci_startup(void)
/* enable external 2 PCI masters */ /* enable external 2 PCI masters */
temp_buffer = ifxmips_r32(PCI_CR_PC_ARB); temp_buffer = ifxmips_r32(PCI_CR_PC_ARB);
temp_buffer &= (~(0xf << 16)); temp_buffer &= (~(ifxmips_pci_req_mask << 16));
/* enable internal arbiter */ /* enable internal arbiter */
temp_buffer |= (1 << INTERNAL_ARB_ENABLE_BIT); temp_buffer |= (1 << INTERNAL_ARB_ENABLE_BIT);
/* enable internal PCI master reqest */ /* enable internal PCI master reqest */