Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] IP32: Enable PCI bridges
+9
-12
+9
-12
arch/mips/pci/ops-mace.c
+9
-12
arch/mips/pci/ops-mace.c
···
29
29
* 4 N/C
30
30
*/
31
31
32
-
#define chkslot(_bus,_devfn) \
33
-
do { \
34
-
if ((_bus)->number > 0 || PCI_SLOT (_devfn) < 1 \
35
-
|| PCI_SLOT (_devfn) > 3) \
36
-
return PCIBIOS_DEVICE_NOT_FOUND; \
37
-
} while (0)
32
+
static inline int mkaddr(struct pci_bus *bus, unsigned int devfn,
33
+
unsigned int reg)
34
+
{
35
+
return ((bus->number & 0xff) << 16) |
36
+
(devfn & 0xff) << 8) |
37
+
(reg & 0xfc);
38
+
}
38
39
39
-
#define mkaddr(_devfn, _reg) \
40
-
((((_devfn) & 0xffUL) << 8) | ((_reg) & 0xfcUL))
41
40
42
41
static int
43
42
mace_pci_read_config(struct pci_bus *bus, unsigned int devfn,
44
43
int reg, int size, u32 *val)
45
44
{
46
-
chkslot(bus, devfn);
47
-
mace->pci.config_addr = mkaddr(devfn, reg);
45
+
mace->pci.config_addr = mkaddr(bus, devfn, reg);
48
46
switch (size) {
49
47
case 1:
50
48
*val = mace->pci.config_data.b[(reg & 3) ^ 3];
···
64
66
mace_pci_write_config(struct pci_bus *bus, unsigned int devfn,
65
67
int reg, int size, u32 val)
66
68
{
67
-
chkslot(bus, devfn);
68
-
mace->pci.config_addr = mkaddr(devfn, reg);
69
+
mace->pci.config_addr = mkaddr(bus, devfn, reg);
69
70
switch (size) {
70
71
case 1:
71
72
mace->pci.config_data.b[(reg & 3) ^ 3] = val;