leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIPS] merge GT64111 PCI routines and GT64120 PCI_0 routines

Browse Source 
This patch has merged GT64111 PCI routines and GT64120 PCI_0 routines.
GT64111 PCI is almost the same as GT64120's PCI_0.
This patch don't change GT64120 PCI routines.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Yoichi Yuasa 2007-03-14 21:51:26 +09:00 committed by Ralf Baechle
parent 2a9effc678
commit 252161eccd
9 changed files with 33 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/mips/Kconfig
View File

@ -165,7 +165,7 @@ config MIPS_COBALT
select HW_HAS_PCI select HW_HAS_PCI
select I8259 select I8259
select IRQ_CPU select IRQ_CPU
select MIPS_GT64111 select PCI_GT64XXX_PCI0
select SYS_HAS_CPU_NEVADA select SYS_HAS_CPU_NEVADA
select SYS_HAS_EARLY_PRINTK select SYS_HAS_EARLY_PRINTK
select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_32BIT_KERNEL
@ -207,7 +207,7 @@ config MIPS_EV64120
depends on EXPERIMENTAL depends on EXPERIMENTAL
select DMA_NONCOHERENT select DMA_NONCOHERENT
select HW_HAS_PCI select HW_HAS_PCI
select MIPS_GT64120 select PCI_GT64XXX_PCI0
select SYS_HAS_CPU_R5000 select SYS_HAS_CPU_R5000
select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL
@ -245,7 +245,7 @@ config LASAT
select DMA_NONCOHERENT select DMA_NONCOHERENT
select SYS_HAS_EARLY_PRINTK select SYS_HAS_EARLY_PRINTK
select HW_HAS_PCI select HW_HAS_PCI
select MIPS_GT64120 select PCI_GT64XXX_PCI0
select MIPS_NILE4 select MIPS_NILE4
select R5000_CPU_SCACHE select R5000_CPU_SCACHE
select SYS_HAS_CPU_R5000 select SYS_HAS_CPU_R5000
@ -263,7 +263,7 @@ config MIPS_ATLAS
select HW_HAS_PCI select HW_HAS_PCI
select MIPS_BOARDS_GEN select MIPS_BOARDS_GEN
select MIPS_BONITO64 select MIPS_BONITO64
select MIPS_GT64120 select PCI_GT64XXX_PCI0
select MIPS_MSC select MIPS_MSC
select RM7000_CPU_SCACHE select RM7000_CPU_SCACHE
select SWAP_IO_SPACE select SWAP_IO_SPACE
@ -296,7 +296,7 @@ config MIPS_MALTA
select MIPS_BOARDS_GEN select MIPS_BOARDS_GEN
select MIPS_BONITO64 select MIPS_BONITO64
select MIPS_CPU_SCACHE select MIPS_CPU_SCACHE
select MIPS_GT64120 select PCI_GT64XXX_PCI0
select MIPS_MSC select MIPS_MSC
select SWAP_IO_SPACE select SWAP_IO_SPACE
select SYS_HAS_CPU_MIPS32_R1 select SYS_HAS_CPU_MIPS32_R1
@ -340,7 +340,7 @@ config WR_PPMC
select BOOT_ELF32 select BOOT_ELF32
select DMA_NONCOHERENT select DMA_NONCOHERENT
select HW_HAS_PCI select HW_HAS_PCI
select MIPS_GT64120 select PCI_GT64XXX_PCI0
select SWAP_IO_SPACE select SWAP_IO_SPACE
select SYS_HAS_CPU_MIPS32_R1 select SYS_HAS_CPU_MIPS32_R1
select SYS_HAS_CPU_MIPS32_R2 select SYS_HAS_CPU_MIPS32_R2
@ -398,7 +398,7 @@ config MOMENCO_OCELOT
select HW_HAS_PCI select HW_HAS_PCI
select IRQ_CPU select IRQ_CPU
select IRQ_CPU_RM7K select IRQ_CPU_RM7K
select MIPS_GT64120 select PCI_GT64XXX_PCI0
select RM7000_CPU_SCACHE select RM7000_CPU_SCACHE
select SWAP_IO_SPACE select SWAP_IO_SPACE
select SYS_HAS_CPU_RM7000 select SYS_HAS_CPU_RM7000
@ -999,10 +999,7 @@ config DDB5XXX_COMMON
config MIPS_BOARDS_GEN config MIPS_BOARDS_GEN
bool bool
config MIPS_GT64111 config PCI_GT64XXX_PCI0
bool
config MIPS_GT64120
bool bool
config MIPS_TX3927 config MIPS_TX3927

4
arch/mips/cobalt/pci.c
View File

@ -14,7 +14,7 @@
#include <asm/gt64120.h> #include <asm/gt64120.h>
extern struct pci_ops gt64111_pci_ops; extern struct pci_ops gt64xxx_pci0_ops;
static struct resource cobalt_mem_resource = { static struct resource cobalt_mem_resource = {
.start = GT_DEF_PCI0_MEM0_BASE, .start = GT_DEF_PCI0_MEM0_BASE,
@ -31,7 +31,7 @@ static struct resource cobalt_io_resource = {
}; };
static struct pci_controller cobalt_pci_controller = { static struct pci_controller cobalt_pci_controller = {
.pci_ops = &gt64111_pci_ops, .pci_ops = &gt64xxx_pci0_ops,
.mem_resource = &cobalt_mem_resource, .mem_resource = &cobalt_mem_resource,
.io_resource = &cobalt_io_resource, .io_resource = &cobalt_io_resource,
.io_offset = 0 - GT_DEF_PCI0_IO_BASE, .io_offset = 0 - GT_DEF_PCI0_IO_BASE,

4
arch/mips/gt64120/wrppmc/pci.c
View File

@ -13,7 +13,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <asm/gt64120.h> #include <asm/gt64120.h>
extern struct pci_ops gt64120_pci_ops; extern struct pci_ops gt64xxx_pci0_ops;
static struct resource pci0_io_resource = { static struct resource pci0_io_resource = {
.name = "pci_0 io", .name = "pci_0 io",
@ -30,7 +30,7 @@ static struct resource pci0_mem_resource = {
}; };
static struct pci_controller hose_0 = { static struct pci_controller hose_0 = {
.pci_ops = &gt64120_pci_ops, .pci_ops = &gt64xxx_pci0_ops,
.io_resource = &pci0_io_resource, .io_resource = &pci0_io_resource,
.mem_resource = &pci0_mem_resource, .mem_resource = &pci0_mem_resource,
}; };

4
arch/mips/mips-boards/generic/pci.c
View File

@ -65,7 +65,7 @@ static struct resource msc_io_resource = {
}; };
extern struct pci_ops bonito64_pci_ops; extern struct pci_ops bonito64_pci_ops;
extern struct pci_ops gt64120_pci_ops; extern struct pci_ops gt64xxx_pci0_ops;
extern struct pci_ops msc_pci_ops; extern struct pci_ops msc_pci_ops;
static struct pci_controller bonito64_controller = { static struct pci_controller bonito64_controller = {
@ -76,7 +76,7 @@ static struct pci_controller bonito64_controller = {
}; };
static struct pci_controller gt64120_controller = { static struct pci_controller gt64120_controller = {
.pci_ops = &gt64120_pci_ops, .pci_ops = &gt64xxx_pci0_ops,
.io_resource = &gt64120_io_resource, .io_resource = &gt64120_io_resource,
.mem_resource = &gt64120_mem_resource, .mem_resource = &gt64120_mem_resource,
}; };

3
arch/mips/pci/Makefile
View File

@ -8,8 +8,7 @@ obj-y += pci.o pci-dac.o
# PCI bus host bridge specific code # PCI bus host bridge specific code
# #
obj-$(CONFIG_MIPS_BONITO64) += ops-bonito64.o obj-$(CONFIG_MIPS_BONITO64) += ops-bonito64.o
obj-$(CONFIG_MIPS_GT64111) += ops-gt64111.o obj-$(CONFIG_PCI_GT64XXX_PCI0) += ops-gt64xxx_pci0.o
obj-$(CONFIG_MIPS_GT64120) += ops-gt64120.o
obj-$(CONFIG_PCI_MARVELL) += ops-marvell.o obj-$(CONFIG_PCI_MARVELL) += ops-marvell.o
obj-$(CONFIG_MIPS_MSC) += ops-msc.o obj-$(CONFIG_MIPS_MSC) += ops-msc.o
obj-$(CONFIG_MIPS_NILE4) += ops-nile4.o obj-$(CONFIG_MIPS_NILE4) += ops-nile4.o

100
arch/mips/pci/ops-gt64111.c
View File

@ -1,100 +0,0 @@
/*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* Copyright (C) 1995, 1996, 1997, 2002 by Ralf Baechle
* Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv)
*/
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <asm/pci.h>
#include <asm/io.h>
#include <asm/gt64120.h>
#include <asm/mach-cobalt/cobalt.h>
/*
* Device 31 on the GT64111 is used to generate PCI special
* cycles, so we shouldn't expected to find a device there ...
*/
static inline int pci_range_ck(struct pci_bus *bus, unsigned int devfn)
{
if (bus->number == 0 && PCI_SLOT(devfn) < 31)
return 0;
return -1;
}
static int gt64111_pci_read_config(struct pci_bus *bus, unsigned int devfn,
int where, int size, u32 * val)
{
if (pci_range_ck(bus, devfn))
return PCIBIOS_DEVICE_NOT_FOUND;
switch (size) {
case 4:
PCI_CFG_SET(devfn, where);
*val = GT_READ(GT_PCI0_CFGDATA_OFS);
return PCIBIOS_SUCCESSFUL;
case 2:
PCI_CFG_SET(devfn, (where & ~0x3));
*val = GT_READ(GT_PCI0_CFGDATA_OFS)
>> ((where & 3) * 8);
return PCIBIOS_SUCCESSFUL;
case 1:
PCI_CFG_SET(devfn, (where & ~0x3));
*val = GT_READ(GT_PCI0_CFGDATA_OFS)
>> ((where & 3) * 8);
return PCIBIOS_SUCCESSFUL;
}
return PCIBIOS_BAD_REGISTER_NUMBER;
}
static int gt64111_pci_write_config(struct pci_bus *bus, unsigned int devfn,
int where, int size, u32 val)
{
u32 tmp;
if (pci_range_ck(bus, devfn))
return PCIBIOS_DEVICE_NOT_FOUND;
switch (size) {
case 4:
PCI_CFG_SET(devfn, where);
GT_WRITE(GT_PCI0_CFGDATA_OFS, val);
return PCIBIOS_SUCCESSFUL;
case 2:
PCI_CFG_SET(devfn, (where & ~0x3));
tmp = GT_READ(GT_PCI0_CFGDATA_OFS);
tmp &= ~(0xffff << ((where & 0x3) * 8));
tmp |= (val << ((where & 0x3) * 8));
GT_WRITE(GT_PCI0_CFGDATA_OFS, tmp);
return PCIBIOS_SUCCESSFUL;
case 1:
PCI_CFG_SET(devfn, (where & ~0x3));
tmp = GT_READ(GT_PCI0_CFGDATA_OFS);
tmp &= ~(0xff << ((where & 0x3) * 8));
tmp |= (val << ((where & 0x3) * 8));
GT_WRITE(GT_PCI0_CFGDATA_OFS, tmp);
return PCIBIOS_SUCCESSFUL;
}
return PCIBIOS_BAD_REGISTER_NUMBER;
}
struct pci_ops gt64111_pci_ops = {
.read = gt64111_pci_read_config,
.write = gt64111_pci_write_config,
};

30
arch/mips/pci/ops-gt64120.c → arch/mips/pci/ops-gt64xxx_pci0.c
View File

@ -39,8 +39,8 @@
#define PCI_CFG_TYPE1_DEV_SHF 11 #define PCI_CFG_TYPE1_DEV_SHF 11
#define PCI_CFG_TYPE1_BUS_SHF 16 #define PCI_CFG_TYPE1_BUS_SHF 16
static int gt64120_pcibios_config_access(unsigned char access_type, static int gt64xxx_pci0_pcibios_config_access(unsigned char access_type,
struct pci_bus *bus, unsigned int devfn, int where, u32 * data) struct pci_bus *bus, unsigned int devfn, int where, u32 * data)
{ {
unsigned char busnum = bus->number; unsigned char busnum = bus->number;
u32 intr; u32 intr;
@ -100,13 +100,13 @@ static int gt64120_pcibios_config_access(unsigned char access_type,
* We can't address 8 and 16 bit words directly. Instead we have to * We can't address 8 and 16 bit words directly. Instead we have to
* read/write a 32bit word and mask/modify the data we actually want. * read/write a 32bit word and mask/modify the data we actually want.
*/ */
static int gt64120_pcibios_read(struct pci_bus *bus, unsigned int devfn, static int gt64xxx_pci0_pcibios_read(struct pci_bus *bus, unsigned int devfn,
int where, int size, u32 * val) int where, int size, u32 * val)
{ {
u32 data = 0; u32 data = 0;
if (gt64120_pcibios_config_access(PCI_ACCESS_READ, bus, devfn, where, if (gt64xxx_pci0_pcibios_config_access(PCI_ACCESS_READ, bus, devfn,
&data)) where, &data))
return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_DEVICE_NOT_FOUND;
if (size == 1) if (size == 1)
@ -119,16 +119,16 @@ static int gt64120_pcibios_read(struct pci_bus *bus, unsigned int devfn,
return PCIBIOS_SUCCESSFUL; return PCIBIOS_SUCCESSFUL;
} }
static int gt64120_pcibios_write(struct pci_bus *bus, unsigned int devfn, static int gt64xxx_pci0_pcibios_write(struct pci_bus *bus, unsigned int devfn,
int where, int size, u32 val) int where, int size, u32 val)
{ {
u32 data = 0; u32 data = 0;
if (size == 4) if (size == 4)
data = val; data = val;
else { else {
if (gt64120_pcibios_config_access(PCI_ACCESS_READ, bus, devfn, if (gt64xxx_pci0_pcibios_config_access(PCI_ACCESS_READ, bus,
where, &data)) devfn, where, &data))
return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_DEVICE_NOT_FOUND;
if (size == 1) if (size == 1)
@ -139,14 +139,14 @@ static int gt64120_pcibios_write(struct pci_bus *bus, unsigned int devfn,
(val << ((where & 3) << 3)); (val << ((where & 3) << 3));
} }
if (gt64120_pcibios_config_access(PCI_ACCESS_WRITE, bus, devfn, where, if (gt64xxx_pci0_pcibios_config_access(PCI_ACCESS_WRITE, bus, devfn,
&data)) where, &data))
return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_DEVICE_NOT_FOUND;
return PCIBIOS_SUCCESSFUL; return PCIBIOS_SUCCESSFUL;
} }
struct pci_ops gt64120_pci_ops = { struct pci_ops gt64xxx_pci0_ops = {
.read = gt64120_pcibios_read, .read = gt64xxx_pci0_pcibios_read,
.write = gt64120_pcibios_write .write = gt64xxx_pci0_pcibios_write
}; };

4
arch/mips/pci/pci-lasat.c
View File

@ -12,7 +12,7 @@
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
extern struct pci_ops nile4_pci_ops; extern struct pci_ops nile4_pci_ops;
extern struct pci_ops gt64120_pci_ops; extern struct pci_ops gt64xxx_pci0_ops;
static struct resource lasat_pci_mem_resource = { static struct resource lasat_pci_mem_resource = {
.name = "LASAT PCI MEM", .name = "LASAT PCI MEM",
.start = 0x18000000, .start = 0x18000000,
@ -38,7 +38,7 @@ static int __init lasat_pci_setup(void)
switch (mips_machtype) { switch (mips_machtype) {
case MACH_LASAT_100: case MACH_LASAT_100:
lasat_pci_controller.pci_ops = &gt64120_pci_ops; lasat_pci_controller.pci_ops = &gt64xxx_pci0_ops;
break; break;
case MACH_LASAT_200: case MACH_LASAT_200:
lasat_pci_controller.pci_ops = &nile4_pci_ops; lasat_pci_controller.pci_ops = &nile4_pci_ops;

2
arch/mips/pci/pci-ocelot.c
View File

@ -81,7 +81,7 @@ static struct resource ocelot_io_resource = {
}; };
static struct pci_controller ocelot_pci_controller = { static struct pci_controller ocelot_pci_controller = {
.pci_ops = gt64120_pci_ops; .pci_ops = gt64xxx_pci0_ops;
.mem_resource = &ocelot_mem_resource; .mem_resource = &ocelot_mem_resource;
.io_resource = &ocelot_io_resource; .io_resource = &ocelot_io_resource;
}; };