add legacy resource support to sysfs
PATCH 1/1 add legacy resource support to sysfs
This sits on top of my last two patches to sysfs (the one that adds mmap support and the one that exports PCI resources in sysfs). It adds per-bus legacy_io and legacy_mem files for use by userspace applications that want to do legacy port I/O or access legacy ISA memory. It's protected by a new HAVE_PCI_LEGACY ifdef modeled after HAVE_PCI_MMAP since not all arches will support it. It's really just an RFC at this point, I have to rediff once Greg incorporates the above patches (the second of which I have to rediff and resubmit).
Thanks,
Jesse
===== arch/ia64/pci/pci.c 1.59 vs edited =====
arch/ia64/pci/pci.c +119 -1
@@ -6,6 +6,7 @@* Copyright (C) 2002 Hewlett-Packard Co * David Mosberger-Tang <[email protected]> * Bjorn Helgaas <[email protected]> +* Copyright (C) 2004 Silicon Graphics, Inc. * * Note: Above list of copyright holders is incomplete... */
@@ -518,7 +519,7 @@* Leave vm_pgoff as-is, the PCI space address is the physical * address on this platform. */ - vma->vm_flags |= (VM_SHM |VM_LOCKED |VM_IO ); + vma->vm_flags |= (VM_SHM |VM_RESERVED |VM_IO );if (write_combine) vma->vm_page_prot =pgprot_writecombine (vma->vm_page_prot);
@@ -530,6 +531,123 @@return -EAGAIN ;return 0 ; +} + +/** +* pci_mmap_legacy_page_range - map legacy memory space to userland +* @bus: bus whose legacy space we're mapping +* @vma: vma passed in by mmap +* +* Map legacy memory space for this device back to userspace using a machine +* vector to get the base address. +*/ +int +pci_mmap_legacy_page_range (struct pci_bus *bus,struct vm_area_struct *vma) +{ +unsigned long addr; +int ret; + +if ((ret =pci_get_legacy_mem (bus, &addr))) +return ret; + + vma->vm_pgoff += addr >>PAGE_SHIFT ; + +/* +* Leave vm_pgoff as-is, the PCI space address is the physical +* address on this platform. +*/ + vma->vm_flags |= (VM_SHM |VM_RESERVED |VM_IO ); + +if (remap_pfn_range (vma, vma->vm_start, vma->vm_pgoff, + vma->vm_end - vma->vm_start, vma->vm_page_prot)) +return -EAGAIN ; + +return 0 ; +} + +/** +* ia64_pci_get_legacy_mem - generic legacy mem routine +* @bus: bus to get legacy memory base address for +* @addr: caller allocated variable for the base address +* +* Find the base of legacy memory for @dev. This is typically the first +* megabyte of bus address space for @dev or is simply 0 on platforms whose +* chipsets support legacy I/O and memory routing. Returns 0 on success +* or a standard error code on failure. +* +* This is the ia64 generic version of this routine. Other platforms +* are free to override it with a machine vector. +*/ +int ia64_pci_get_legacy_mem (struct pci_bus *bus,unsigned long *addr) +{ + *addr =0 ; +return 0 ; +} + +/** +* ia64_pci_legacy_read - read from legacy I/O space +* @bus: bus to read +* @port: legacy port value +* @val: caller allocated storage for returned value +* @size: number of bytes to read +* +* Simply reads @size bytes from @port and puts the result in @val. +* +* Again, this (and the write routine) are generic versions that can be +* overridden by the platform. This is necessary on platforms that don't +* support legacy I/O routing or that hard fail on legacy I/O timeouts. +*/ +int ia64_pci_legacy_read (struct pci_bus *bus,u16 port,u32 *val,u8 size) +{ +int ret = size; + +switch (size) { +case 1 : + *val =inb (port); +break ; +case 2 : + *val =inw (port); +break ; +case 4 : + *val =inl (port); +break ; +default : + ret = -EINVAL ; +break ; + } + +return ret; +} + +/** +* ia64_pci_legacy_write - perform a legacy I/O write +* @bus: bus pointer +* @port: port to write +* @val: value to write +* @size: number of bytes to write from @val +* +* Simply writes @size bytes of @val to @port. +*/ +int ia64_pci_legacy_write (struct pci_dev *bus,u16 port,u32 val,u8 size) +{ +int ret =0 ; + +switch (size) { +case 1 : +outb (val, port); +break ; +case 2 : +outw (val, port); +break ; +case 4 : +outl (val, port); +break ; +default : + ret = -EINVAL ; +break ; + } + +return ret; }/**
===== arch/ia64/sn/pci/pci_dma.c 1.2 vs edited =====
arch/ia64/sn/pci/pci_dma.c +74 -0
77 lines not on this page · raw message
===== drivers/pci/pci-sysfs.c 1.14 vs edited =====
drivers/pci/pci-sysfs.c +67 -0
73 lines not on this page · raw message
===== drivers/pci/probe.c 1.72 vs edited =====
drivers/pci/probe.c +24 -0
@@ -802,6 +802,30 @@ b->class_dev.class = &pcibus_class;sprintf (b->class_dev.class_id,"%04x:%02x" ,pci_domain_nr (b), bus); error =class_device_register (&b->class_dev); + +#ifdef HAVE_PCI_LEGACY + b->legacy_io =kmalloc (sizeof (struct bin_attribute ) *2 , +GFP_ATOMIC ); +if (b->legacy_io) { + b->legacy_io->attr.name ="legacy_io" ; + b->legacy_io->size =0xffff ; + b->legacy_io->attr.mode =S_IRUSR |S_IWUSR ; + b->legacy_io->attr.owner =THIS_MODULE ; + b->legacy_io->read = pci_read_legacy_io; + b->legacy_io->write = pci_write_legacy_io; +sysfs_create_bin_file (&b->bridge->kobj, b->legacy_io); + +/* Allocated above after the legacy_io struct */ + b->legacy_mem = b->legacy_io +1 ; + b->legacy_mem->attr.name ="legacy_mem" ; + b->legacy_mem->size =1024 *1024 ; + b->legacy_mem->attr.mode =S_IRUSR |S_IWUSR ; + b->legacy_mem->attr.owner =THIS_MODULE ; + b->legacy_mem->mmap = pci_mmap_legacy_mem; +sysfs_create_bin_file (&b->bridge->kobj, b->legacy_mem); + } +#endif +if (error) goto class_dev_reg_err; error =class_device_create_file (&b->class_dev, &class_device_attr_cpuaffinity);
===== include/asm-ia64/machvec.h 1.29 vs edited =====
include/asm-ia64/machvec.h +24 -0
@@ -20,6 +20,7 @@struct irq_desc ;struct page ;struct mm_struct ; +struct pci_bus ;typedef void ia64_mv_setup_t (char **);typedef void ia64_mv_cpu_init_t (void );
@@ -31,6 +32,11 @@typedef struct irq_desc *ia64_mv_irq_desc (unsigned int );typedef u8 ia64_mv_irq_to_vector (unsigned int );typedef unsigned int ia64_mv_local_vector_to_irq (u8 ); +typedef int ia64_mv_pci_get_legacy_mem_t (struct pci_bus *,unsigned long *); +typedef int ia64_mv_pci_legacy_read_t (struct pci_bus *,u16 port,u32 *val, +u8 size); +typedef int ia64_mv_pci_legacy_write_t (struct pci_bus *,u16 port,u32 val, +u8 size);/* DMA-mapping interface: */ typedef void ia64_mv_dma_init (void );
@@ -125,6 +131,9 @@# define platform_irq_desc ia64_mv.irq_desc# define platform_irq_to_vector ia64_mv.irq_to_vector# define platform_local_vector_to_irq ia64_mv.local_vector_to_irq +# define platform_pci_get_legacy_mem ia64_mv.pci_get_legacy_mem +# define platform_pci_legacy_read ia64_mv.pci_legacy_read +# define platform_pci_legacy_write ia64_mv.pci_legacy_write# define platform_inb ia64_mv.inb# define platform_inw ia64_mv.inw# define platform_inl ia64_mv.inl
@@ -172,6 +181,9 @@ia64_mv_irq_desc *irq_desc;ia64_mv_irq_to_vector *irq_to_vector;ia64_mv_local_vector_to_irq *local_vector_to_irq; +ia64_mv_pci_get_legacy_mem_t *pci_get_legacy_mem; +ia64_mv_pci_legacy_read_t *pci_legacy_read; +ia64_mv_pci_legacy_write_t *pci_legacy_write;ia64_mv_inb_t *inb;ia64_mv_inw_t *inw;ia64_mv_inl_t *inl;
@@ -215,6 +227,9 @@ platform_irq_desc, \ platform_irq_to_vector, \ platform_local_vector_to_irq, \ + platform_pci_get_legacy_mem, \ + platform_pci_legacy_read, \ + platform_pci_legacy_write, \ platform_inb, \ platform_inw, \ platform_inl, \
@@ -329,6 +344,15 @@#endif #ifndef platform_local_vector_to_irq# define platform_local_vector_to_irq __ia64_local_vector_to_irq +#endif +#ifndef platform_pci_get_legacy_mem +# define platform_pci_get_legacy_mem ia64_pci_get_legacy_mem +#endif +#ifndef platform_pci_legacy_read +# define platform_pci_legacy_read ia64_pci_legacy_read +#endif +#ifndef platform_pci_legacy_write +# define platform_pci_legacy_write ia64_pci_legacy_write#endif #ifndef platform_inb# define platform_inb __ia64_inb
===== include/asm-ia64/machvec_init.h 1.8 vs edited =====
include/asm-ia64/machvec_init.h +3 -0
@@ -5,6 +5,9 @@extern ia64_mv_irq_desc __ia64_irq_desc;extern ia64_mv_irq_to_vector __ia64_irq_to_vector;extern ia64_mv_local_vector_to_irq __ia64_local_vector_to_irq; +extern ia64_mv_pci_get_legacy_mem_t ia64_pci_get_legacy_mem; +extern ia64_mv_pci_legacy_read_t ia64_pci_legacy_read; +extern ia64_mv_pci_legacy_write_t ia64_pci_legacy_write;extern ia64_mv_inb_t __ia64_inb;extern ia64_mv_inw_t __ia64_inw;
===== include/asm-ia64/machvec_sn2.h 1.16 vs edited =====
include/asm-ia64/machvec_sn2.h +6 -0
@@ -43,6 +43,9 @@extern ia64_mv_irq_desc sn_irq_desc;extern ia64_mv_irq_to_vector sn_irq_to_vector;extern ia64_mv_local_vector_to_irq sn_local_vector_to_irq; +extern ia64_mv_pci_get_legacy_mem_t sn_pci_get_legacy_mem; +extern ia64_mv_pci_legacy_read_t sn_pci_legacy_read; +extern ia64_mv_pci_legacy_write_t sn_pci_legacy_write;extern ia64_mv_inb_t __sn_inb;extern ia64_mv_inw_t __sn_inw;extern ia64_mv_inl_t __sn_inl;
@@ -105,6 +108,9 @@#define platform_irq_desc sn_irq_desc#define platform_irq_to_vector sn_irq_to_vector#define platform_local_vector_to_irq sn_local_vector_to_irq +#define platform_pci_get_legacy_mem sn_pci_get_legacy_mem +#define platform_pci_legacy_read sn_pci_legacy_read +#define platform_pci_legacy_write sn_pci_legacy_write#define platform_dma_init machvec_noop#define platform_dma_alloc_coherent sn_dma_alloc_coherent#define platform_dma_free_coherent sn_dma_free_coherent
===== include/asm-ia64/pci.h 1.27 vs edited =====
include/asm-ia64/pci.h +14 -0
@@ -85,6 +85,20 @@#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); +#define HAVE_PCI_LEGACY +extern int pci_mmap_legacy_page_range (struct pci_bus *bus, +struct vm_area_struct *vma); +extern ssize_t pci_read_legacy_io (struct kobject *kobj,char *buf,loff_t off, +size_t count); +extern ssize_t pci_write_legacy_io (struct kobject *kobj,char *buf,loff_t off, +size_t count); +extern int pci_mmap_legacy_mem (struct kobject *kobj, +struct bin_attribute *attr, +struct vm_area_struct *vma); + +#define pci_get_legacy_mem platform_pci_get_legacy_mem +#define pci_legacy_read platform_pci_legacy_read +#define pci_legacy_write platform_pci_legacy_writestruct pci_window {struct resource resource;
===== include/asm-ia64/sn/sn_sal.h 1.17 vs edited =====
include/asm-ia64/sn/sn_sal.h +46 -0
52 lines not on this page · raw message
===== include/linux/pci.h 1.143 vs edited =====
include/linux/pci.h +2 -0
@@ -594,6 +594,8 @@unsigned short pad2;struct device *bridge;struct class_device class_dev; +struct bin_attribute *legacy_io;/* legacy I/O for this bus */ +struct bin_attribute *legacy_mem;/* legacy mem */ };#define pci_bus_b (n) list_entry(n, struct pci_bus, node)