lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tile: switch to GENERIC_PCI_IOMAP

Browse Source 
tile now has working stubs for ioport_map and ioremap
such that the generic pci_iomap will DTRT: cast to
pointer on memory and return NULL and log message on IO map.

Switch it over to GENERIC_PCI_IOMAP.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin
2011-11-29 20:42:56 +02:00
parent 8593dd375a
commit 8455012130
3 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/tile/Kconfig
View File

@@ -321,6 +321,7 @@ config PCI
bool "PCI support" bool "PCI support"
default y default y
select PCI_DOMAINS select PCI_DOMAINS
select GENERIC_PCI_IOMAP
---help--- ---help---
Enable PCI root complex support, so PCIe endpoint devices can Enable PCI root complex support, so PCIe endpoint devices can
be attached to the Tile chip. Many, but not all, PCI devices be attached to the Tile chip. Many, but not all, PCI devices

2
arch/tile/include/asm/pci.h
View File

@@ -16,6 +16,7 @@
#define _ASM_TILE_PCI_H #define _ASM_TILE_PCI_H
#include <linux/pci.h> #include <linux/pci.h>
#include <asm-generic/pci_iomap.h>
/* /*
* Structure of a PCI controller (host bridge) * Structure of a PCI controller (host bridge)
@@ -49,7 +50,6 @@ struct pci_controller {
int __devinit tile_pci_init(void); int __devinit tile_pci_init(void);
int __devinit pcibios_init(void); int __devinit pcibios_init(void);
void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) {} static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) {}
void __devinit pcibios_fixup_bus(struct pci_bus *bus); void __devinit pcibios_fixup_bus(struct pci_bus *bus);

21
arch/tile/kernel/pci.c
View File

@@ -465,27 +465,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
return 0; return 0;
} }
void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
{
unsigned long start = pci_resource_start(dev, bar);
unsigned long len = pci_resource_len(dev, bar);
unsigned long flags = pci_resource_flags(dev, bar);
if (!len)
return NULL;
if (max && len > max)
len = max;
if (!(flags & IORESOURCE_MEM)) {
pr_info("PCI: Trying to map invalid resource %#lx\n", flags);
start = 0;
}
return (void __iomem *)start;
}
EXPORT_SYMBOL(pci_iomap);
/**************************************************************** /****************************************************************
* *
* Tile PCI config space read/write routines * Tile PCI config space read/write routines