Skip to content

Commit

Permalink
sh: pci: HAVE_PCI_MMAP support.
Browse files Browse the repository at this point in the history
Derived from the MIPS version, now uses pgprot_noncached().

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Apr 20, 2009
1 parent 4c5107e commit 9833385
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/sh/drivers/pci/Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#
# Makefile for the PCI specific kernel interface routines under Linux.
#

obj-$(CONFIG_PCI_AUTO) := pci.o pci-auto.o
obj-$(CONFIG_PCI_NEW) := pci-new.o
obj-y += pci-lib.o
obj-$(CONFIG_PCI_AUTO) += pci.o pci-auto.o
obj-$(CONFIG_PCI_NEW) += pci-new.o

obj-$(CONFIG_CPU_SUBTYPE_SH7751) += pci-sh7751.o ops-sh4.o
obj-$(CONFIG_CPU_SUBTYPE_SH7751R) += pci-sh7751.o ops-sh4.o
Expand Down
26 changes: 26 additions & 0 deletions arch/sh/drivers/pci/pci-lib.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/init.h>
#include <linux/types.h>
#include <linux/pci.h>

int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
enum pci_mmap_state mmap_state, int write_combine)
{
/*
* I/O space can be accessed via normal processor loads and stores on
* this platform but for now we elect not to do this and portable
* drivers should not do this anyway.
*/
if (mmap_state == pci_mmap_io)
return -EINVAL;

/*
* Ignore write-combine; for now only return uncached mappings.
*/
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);

return remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
vma->vm_end - vma->vm_start,
vma->vm_page_prot);
}
3 changes: 3 additions & 0 deletions arch/sh/include/asm/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ extern struct pci_channel board_pci_channels[];

struct pci_dev;

#define HAVE_PCI_MMAP
extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
enum pci_mmap_state mmap_state, int write_combine);
extern void pcibios_set_master(struct pci_dev *dev);

static inline void pcibios_penalize_isa_irq(int irq, int active)
Expand Down

0 comments on commit 9833385

Please sign in to comment.