kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[MIPS] IP32: Enable PCI bridges

Browse source 
Fixe MACE PCI addressing by adding the bus number parameter.
Remove check of the used slot since every slot should be valid.
Converted mkaddr from #define to inline function.

Signed-off-by: Giuseppe Sacco <eppesuig@debian.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Giuseppe Sacco 2007-10-04 23:09:12 +02:00 committed by Ralf Baechle
parent 804b3f9a16
commit 8cfaf45367
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
arch/mips/pci/ops-mace.c
View file

@ -29,22 +29,20 @@
* 4 N/C * 4 N/C
*/ */
#define chkslot(_bus,_devfn) \ static inline int mkaddr(struct pci_bus *bus, unsigned int devfn,
do { \ unsigned int reg)
if ((_bus)->number > 0 || PCI_SLOT (_devfn) < 1 \ {
|| PCI_SLOT (_devfn) > 3) \ return ((bus->number & 0xff) << 16) |
return PCIBIOS_DEVICE_NOT_FOUND; \ (devfn & 0xff) << 8) |
} while (0) (reg & 0xfc);
}
#define mkaddr(_devfn, _reg) \
((((_devfn) & 0xffUL) << 8) | ((_reg) & 0xfcUL))
static int static int
mace_pci_read_config(struct pci_bus *bus, unsigned int devfn, mace_pci_read_config(struct pci_bus *bus, unsigned int devfn,
int reg, int size, u32 *val) int reg, int size, u32 *val)
{ {
chkslot(bus, devfn); mace->pci.config_addr = mkaddr(bus, devfn, reg);
mace->pci.config_addr = mkaddr(devfn, reg);
switch (size) { switch (size) {
case 1: case 1:
*val = mace->pci.config_data.b[(reg & 3) ^ 3]; *val = mace->pci.config_data.b[(reg & 3) ^ 3];
@ -66,8 +64,7 @@ static int
mace_pci_write_config(struct pci_bus *bus, unsigned int devfn, mace_pci_write_config(struct pci_bus *bus, unsigned int devfn,
int reg, int size, u32 val) int reg, int size, u32 val)
{ {
chkslot(bus, devfn); mace->pci.config_addr = mkaddr(bus, devfn, reg);
mace->pci.config_addr = mkaddr(devfn, reg);
switch (size) { switch (size) {
case 1: case 1:
mace->pci.config_data.b[(reg & 3) ^ 3] = val; mace->pci.config_data.b[(reg & 3) ^ 3] = val;