add legacy resources to sysfs
Subsystems (3)
PATCH 1/1 add legacy resources to sysfs
Here's a rediff against Greg's current tree. It adds legacy_io and legacy_mem files to each PCI bus directory in sysfs for use by applications that want to do old school ISA style programming from userspace.
I'm not sure I've got the sysfs file creation correct, Greg? Am I passing the wrong thing around? The compile warnings in pci-sysfs.c for the new routines seem to indicate that... Basically I need to get to a pci_bus structure from the read/write/mmap routines, and that should be accessible from the kobject somewhere, right?
I'll need buy in from Tony, willy, Ben, and Bjorn (and of course Greg) in order to submit this for inclusion since I want to make sure that their legacy needs are fulfilled.
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 +40 -0
@@ -764,6 +764,42 @@return max; } +#ifdef HAVE_PCI_LEGACY +/** +* pci_create_legacy_files - create legacy I/O port and memory files +* @b: bus to create files under +* +* Some platforms allow access to legacy I/O port and ISA memory space on +* a per-bus basis. This routine creates the files and ties them into +* their associated read, write and mmap files from pci-sysfs.c +*/ +static void pci_create_legacy_files (struct pci_bus *b) +{ + 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); + } +} +#else /* !HAVE_PCI_LEGACY */ +static inline void pci_create_legacy_files (struct pci_bus *bus) {return ; } +#endif /* HAVE_PCI_LEGACY */ +struct pci_bus *__devinit pci_scan_bus_parented (struct device *parent,int bus,struct pci_ops *ops,void *sysdata) {int error;
@@ -802,11 +838,15 @@ 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); +if (error) goto class_dev_reg_err; error =class_device_create_file (&b->class_dev, &class_device_attr_cpuaffinity);if (error) goto class_dev_create_file_err; + +/* Create legacy_io and legacy_mem files for this bus */ +pci_create_legacy_files (b); error =sysfs_create_link (&b->class_dev.kobj, &b->bridge->kobj,"bridge" );if (error)
===== 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)
arch/ia64/pci/pci.c line 585
Quoted 9 lines · Jesse Barnes
+ * 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.arch/ia64/pci/pci.c +5
-0+int ia64_pci_get_legacy_mem (struct pci_bus *bus,unsigned long *addr) +{ + *addr =0 ; +return 0 ; +}
This is a slightly klunky interface. How about:
* 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 the base address
* or an error pointer if an error occurred
The generic one is too trivial to demonstrate with, but the sn2 one makes more sense:
arch/ia64/sn/pci/pci_dma.c line 487
Quoted 9 lines
===
arch/ia64/sn/pci/pci_dma.c1.2 vs edited ==> +intsn_pci_get_legacy_mem(struct pci_bus *bus, unsigned long *addr)arch/ia64/sn/pci/pci_dma.c +8
-0+{ +if (!SN_PCIBUS_BUSSOFT (bus)) +return -ENODEV ; + + *addr =SN_PCIBUS_BUSSOFT (bus)->bs_legacy_mem | __IA64_UNCACHED_OFFSET; + +return 0 ; +}
int sn_pci_get_legacy_mem(struct pci_bus *bus)
{
if (!SN_PCIBUS_BUSSOFT(bus))
return ERR_PTR(-ENODEV);
return SN_PCIBUS_BUSSOFT(bus)->bs_legacy_mem | __IA64_UNCACHED_OFFSET;
}drivers/pci/probe.c line 843
Quoted 6 lines
drivers/pci/probe.c +1
-0b->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); +if (error) goto class_dev_reg_err;
Actually, I rather dislike having the newline there. It implies a logical separation between registering and testing for the error, whereas the logical separation is much more like this:
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);
if (error)
goto class_dev_reg_err;
error = class_device_create_file(...)Signature · 6 lines
"Next the statesmen will invent cheap lies, putting the blame upon the nation that is attacked, and every man will be glad of those conscience-soothing falsities, and will diligently study them, and refuse to examine any refutations of them; and thus he will by and by convince himself that the war is just, and will thank God for the better sleep he enjoys after this process of grotesque self-deception." -- Mark Twain
Quoted 11 lines · Matthew Wilcox
arch/ia64/sn/pci/pci_dma.c line 487
Quoted 9 lines
===
arch/ia64/sn/pci/pci_dma.c1.2 vs edited ==> > +intsn_pci_get_legacy_mem(struct pci_bus *bus, unsigned long *addr)arch/ia64/sn/pci/pci_dma.c +8
-0+{ +if (!SN_PCIBUS_BUSSOFT (bus)) +return -ENODEV ; + + *addr =SN_PCIBUS_BUSSOFT (bus)->bs_legacy_mem | __IA64_UNCACHED_OFFSET; + +return 0 ; +}int
sn_pci_get_legacy_mem(struct pci_bus *bus)
Quoted 3 lines
{
if (!SN_PCIBUS_BUSSOFT(bus))
return ERR_PTR(-ENODEV);Huh? A pointer doesn't fit into an int on all arches. I think the original was correct.
thanks,
greg k-h
Quoted 8 lines · Matthew Wilcox
This is a slightly klunky interface. How about:
int
sn_pci_get_legacy_mem(struct pci_bus *bus)
{
if (!SN_PCIBUS_BUSSOFT(bus))
returnERR_PTR(-ENODEV);
return SN_PCIBUS_BUSSOFT(bus)->bs_legacy_mem |__IA64_UNCACHED_OFFSET;
}
Sure, that makes sense (changed the return type to char *). How does this version look?
Quoted 10 lines
Quoted 6 lines
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);
+
if (error)
gotoclass_dev_reg_err;Actually, I rather dislike having the newline there. It implies a logical separation between registering and testing for the error, whereas the logical separation is much more like this:
Yeah, I didn't mean to add that newline, it was leftover from when I had the #ifdef within that function. I've left that routine alone now, except for the addition of the callback to create the legacy files.
Thanks,
Jesse
===== arch/ia64/pci/pci.c 1.59 vs edited =====
arch/ia64/pci/pci.c +117 -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,121 @@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) +{ +char *addr; + + addr =pci_get_legacy_mem (bus); +if (IS_ERR (addr)) +return PTR_ERR (addr); + + vma->vm_pgoff += (unsigned long )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 +* +* Find the base of legacy memory for @bus. This is typically the first +* megabyte of bus address space for @bus or is simply 0 on platforms whose +* chipsets support legacy I/O and memory routing. Returns the base address +* or an error pointer if an error occurred. +* +* This is the ia64 generic version of this routine. Other platforms +* are free to override it with a machine vector. +*/ +char *ia64_pci_get_legacy_mem (struct pci_bus *bus) +{ +return (char *)__IA64_UNCACHED_OFFSET; +} + +/** +* 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 +72 -0
75 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 +39 -0
@@ -764,6 +764,42 @@return max; } +#ifdef HAVE_PCI_LEGACY +/** +* pci_create_legacy_files - create legacy I/O port and memory files +* @b: bus to create files under +* +* Some platforms allow access to legacy I/O port and ISA memory space on +* a per-bus basis. This routine creates the files and ties them into +* their associated read, write and mmap files from pci-sysfs.c +*/ +static void pci_create_legacy_files (struct pci_bus *b) +{ + 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); + } +} +#else /* !HAVE_PCI_LEGACY */ +static inline void pci_create_legacy_files (struct pci_bus *bus) {return ; } +#endif /* HAVE_PCI_LEGACY */ +struct pci_bus *__devinit pci_scan_bus_parented (struct device *parent,int bus,struct pci_ops *ops,void *sysdata) {int error;
@@ -807,6 +843,9 @@ error =class_device_create_file (&b->class_dev, &class_device_attr_cpuaffinity);if (error) goto class_dev_create_file_err; + +/* Create legacy_io and legacy_mem files for this bus */ +pci_create_legacy_files (b); error =sysfs_create_link (&b->class_dev.kobj, &b->bridge->kobj,"bridge" );if (error)
===== 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 char *ia64_mv_pci_get_legacy_mem_t (struct pci_bus *); +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)
Quoted 9 lines · Jesse Barnes
Here's a rediff against Greg's current tree. It adds
legacy_ioandlegacy_memfiles to each PCI bus directory in sysfs for use by applications that want to do old school ISA style programming from userspace.I'm not sure I've got the sysfs file creation correct, Greg? Am I passing the wrong thing around? The compile warnings in
pci-sysfs.cfor the new routines seem to indicate that... Basically I need to get to apci_busstructure from the read/write/mmap routines, and that should be accessible from the kobject somewhere, right?
You are passing the wrong things around :)
A struct pci_bus is a struct class_device, not a struct device. I think you need to rethink your goal of putting the files into the pci device directory, or just put the files into the proper /sys/class/pci_bus/* directory as your code assumes is happening.
thanks,
greg k-h
Quoted 6 lines · Greg KH
You are passing the wrong things around :)
A struct
pci_busis a structclass_device, not a struct device. I think you need to rethink your goal of putting the files into the pci device directory, or just put the files into the proper/sys/class/pci_bus/*directory as your code assumes is happening.
Something like this then? I added bin file support to class.c and use that instead from probe.c. I also fixed the container_of stuff in pci-sysfs.c.
Thanks,
Jesse
===== arch/ia64/pci/pci.c 1.59 vs edited =====
arch/ia64/pci/pci.c +117 -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,121 @@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) +{ +char *addr; + + addr =pci_get_legacy_mem (bus); +if (IS_ERR (addr)) +return PTR_ERR (addr); + + vma->vm_pgoff += (unsigned long )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 +* +* Find the base of legacy memory for @bus. This is typically the first +* megabyte of bus address space for @bus or is simply 0 on platforms whose +* chipsets support legacy I/O and memory routing. Returns the base address +* or an error pointer if an error occurred. +* +* This is the ia64 generic version of this routine. Other platforms +* are free to override it with a machine vector. +*/ +char *ia64_pci_get_legacy_mem (struct pci_bus *bus) +{ +return (char *)__IA64_UNCACHED_OFFSET; +} + +/** +* 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 +72 -0
75 lines not on this page · raw message
===== drivers/base/class.c 1.56 vs edited =====
drivers/base/class.c +16 -0
@@ -179,6 +179,22 @@sysfs_remove_file (&class_dev->kobj, &attr->attr); } +int class_device_create_bin_file (struct class_device *class_dev, +struct bin_attribute *attr) +{ +int error = -EINVAL ; +if (class_dev) + error =sysfs_create_bin_file (&class_dev->kobj, attr); +return error; +} + +void class_device_remove_bin_file (struct class_device *class_dev, +struct bin_attribute *attr) +{ +if (class_dev) +sysfs_remove_bin_file (&class_dev->kobj, attr); +} +static int class_device_dev_link (struct class_device * class_dev) {if (class_dev->dev)
===== drivers/pci/pci-sysfs.c 1.14 vs edited =====
drivers/pci/pci-sysfs.c +70 -0
76 lines not on this page · raw message
===== drivers/pci/probe.c 1.72 vs edited =====
drivers/pci/probe.c +39 -0
@@ -764,6 +764,42 @@return max; } +#ifdef HAVE_PCI_LEGACY +/** +* pci_create_legacy_files - create legacy I/O port and memory files +* @b: bus to create files under +* +* Some platforms allow access to legacy I/O port and ISA memory space on +* a per-bus basis. This routine creates the files and ties them into +* their associated read, write and mmap files from pci-sysfs.c +*/ +static void pci_create_legacy_files (struct pci_bus *b) +{ + 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; +class_device_create_bin_file (&b->class_dev, 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; +class_device_create_bin_file (&b->class_dev, b->legacy_mem); + } +} +#else /* !HAVE_PCI_LEGACY */ +static inline void pci_create_legacy_files (struct pci_bus *bus) {return ; } +#endif /* HAVE_PCI_LEGACY */ +struct pci_bus *__devinit pci_scan_bus_parented (struct device *parent,int bus,struct pci_ops *ops,void *sysdata) {int error;
@@ -807,6 +843,9 @@ error =class_device_create_file (&b->class_dev, &class_device_attr_cpuaffinity);if (error) goto class_dev_create_file_err; + +/* Create legacy_io and legacy_mem files for this bus */ +pci_create_legacy_files (b); error =sysfs_create_link (&b->class_dev.kobj, &b->bridge->kobj,"bridge" );if (error)
===== 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 char *ia64_mv_pci_get_legacy_mem_t (struct pci_bus *); +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)
Quoted 10 lines · Jesse Barnes
Quoted 6 lines · Greg KH
You are passing the wrong things around :)
A struct
pci_busis a structclass_device, not a struct device. I think you need to rethink your goal of putting the files into the pci device directory, or just put the files into the proper/sys/class/pci_bus/*directory as your code assumes is happening.Something like this then? I added bin file support to
class.cand use that instead fromprobe.c. I also fixed thecontainer_ofstuff inpci-sysfs.c.
Here it is w/o the ia64 stuff. That way people can buy off on the API and not worry about the platform stuff. I can send that to Tony separately if there's agreement on this part. I'd like to create a symlink from /sys/class/pci_bus/<bus>/legacy_* to /sys/devices/pci<foo>/legacy_* too, how do I do that?
drivers/base/class.c | 16 ++++++++++ drivers/pci/pci-sysfs.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/pci/probe.c | 39 ++++++++++++++++++++++++++ include/linux/pci.h | 2 + 4 files changed, 127 insertions(+)
Thanks,
Jesse
===== drivers/base/class.c 1.56 vs edited =====
drivers/base/class.c +16 -0
@@ -179,6 +179,22 @@sysfs_remove_file (&class_dev->kobj, &attr->attr); } +int class_device_create_bin_file (struct class_device *class_dev, +struct bin_attribute *attr) +{ +int error = -EINVAL ; +if (class_dev) + error =sysfs_create_bin_file (&class_dev->kobj, attr); +return error; +} + +void class_device_remove_bin_file (struct class_device *class_dev, +struct bin_attribute *attr) +{ +if (class_dev) +sysfs_remove_bin_file (&class_dev->kobj, attr); +} +static int class_device_dev_link (struct class_device * class_dev) {if (class_dev->dev)
===== drivers/pci/pci-sysfs.c 1.14 vs edited =====
drivers/pci/pci-sysfs.c +70 -0
76 lines not on this page · raw message
===== drivers/pci/probe.c 1.72 vs edited =====
drivers/pci/probe.c +39 -0
@@ -764,6 +764,42 @@return max; } +#ifdef HAVE_PCI_LEGACY +/** +* pci_create_legacy_files - create legacy I/O port and memory files +* @b: bus to create files under +* +* Some platforms allow access to legacy I/O port and ISA memory space on +* a per-bus basis. This routine creates the files and ties them into +* their associated read, write and mmap files from pci-sysfs.c +*/ +static void pci_create_legacy_files (struct pci_bus *b) +{ + 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; +class_device_create_bin_file (&b->class_dev, 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; +class_device_create_bin_file (&b->class_dev, b->legacy_mem); + } +} +#else /* !HAVE_PCI_LEGACY */ +static inline void pci_create_legacy_files (struct pci_bus *bus) {return ; } +#endif /* HAVE_PCI_LEGACY */ +struct pci_bus *__devinit pci_scan_bus_parented (struct device *parent,int bus,struct pci_ops *ops,void *sysdata) {int error;
@@ -807,6 +843,9 @@ error =class_device_create_file (&b->class_dev, &class_device_attr_cpuaffinity);if (error) goto class_dev_create_file_err; + +/* Create legacy_io and legacy_mem files for this bus */ +pci_create_legacy_files (b); error =sysfs_create_link (&b->class_dev.kobj, &b->bridge->kobj,"bridge" );if (error)
===== 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)
Quoted 9 lines · Jesse Barnes
Quoted 8 lines · Jesse Barnes
Quoted 6 lines · Greg KH
You are passing the wrong things around :)
A struct
pci_busis a structclass_device, not a struct device. I think you need to rethink your goal of putting the files into the pci device directory, or just put the files into the proper/sys/class/pci_bus/*directory as your code assumes is happening.
Quoted 8 lines
Quoted 2 lines
Something like this then? I added bin file support to
class.cand use that instead fromprobe.c. I also fixed thecontainer_ofstuff inpci-sysfs.c.Here it is w/o the ia64 stuff. That way people can buy off on the API and not worry about the platform stuff. I can send that to Tony separately if there's agreement on this part. I'd like to create a symlink from /sys/class/pci_bus/<bus>/legacy_* to /sys/devices/pci<foo>/legacy_* too, how do I do that?
You can make a symlink to a kobject, not a attribute. We already have a symlink in that directory to the device, so do you really need another one?
Quoted 1 line
drivers/base/class.c | 16 ++++++++++
Hm, how about splitting this further, one for the driver core stuff (you forgot the device.h change here too...) and the other for the PCI stuff?
thanks,
greg k-h
Quoted 3 lines · Greg KH
You can make a symlink to a kobject, not a attribute. We already have a symlink in that directory to the device, so do you really need another one?
I guess not, it would just be a little more convenient, but it's no biggie.
Quoted 4 lines
Quoted 1 line
drivers/base/class.c | 16 ++++++++++Hm, how about splitting this further, one for the driver core stuff (you forgot the
device.hchange here too...) and the other for the PCI stuff?
Sure, I'll split it out. Did you mean that I was missing the prototype? I'll fix that up too.
Thanks,
Jesse
Quoted 8 lines · Jesse Barnes
Quoted 4 lines · Greg KH
Quoted 1 line
drivers/base/class.c | 16 ++++++++++Hm, how about splitting this further, one for the driver core stuff (you forgot the
device.hchange here too...) and the other for the PCI stuff?Sure, I'll split it out. Did you mean that I was missing the prototype? I'll fix that up too.
Yeah, no prototype. Makes it a bit hard to use the function :)
thanks,
greg k-h
Quoted 11 lines · Greg KH
Quoted 9 lines · Jesse Barnes
Here's a rediff against Greg's current tree. It adds
legacy_ioandlegacy_memfiles to each PCI bus directory in sysfs for use by applications that want to do old school ISA style programming from userspace.I'm not sure I've got the sysfs file creation correct, Greg? Am I passing the wrong thing around? The compile warnings in
pci-sysfs.cfor the new routines seem to indicate that... Basically I need to get to apci_busstructure from the read/write/mmap routines, and that should be accessible from the kobject somewhere, right?
Quoted 6 lines
You are passing the wrong things around :)
A struct
pci_busis a structclass_device, not a struct device. I think you need to rethink your goal of putting the files into the pci device directory, or just put the files into the proper/sys/class/pci_bus/*directory as your code assumes is happening.
It makes no sense in /sys/class/pci_bus/* since we need the files to be in a bus _instance_
Ben.
Quoted 14 lines · Benjamin Herrenschmidt
Quoted 13 lines · Greg KH
Quoted 9 lines · Jesse Barnes
Here's a rediff against Greg's current tree. It adds
legacy_ioandlegacy_memfiles to each PCI bus directory in sysfs for use by applications that want to do old school ISA style programming from userspace.I'm not sure I've got the sysfs file creation correct, Greg? Am I passing the wrong thing around? The compile warnings in
pci-sysfs.cfor the new routines seem to indicate that... Basically I need to get to apci_busstructure from the read/write/mmap routines, and that should be accessible from the kobject somewhere, right?You are passing the wrong things around :)
Quoted 7 lines
Quoted 4 lines
A struct
pci_busis a structclass_device, not a struct device. I think you need to rethink your goal of putting the files into the pci device directory, or just put the files into the proper/sys/class/pci_bus/*directory as your code assumes is happening.It makes no sense in
/sys/class/pci_bus/*since we need the files to be in a bus _instance_
Hm, what do you mean by "instance"? My /sys/class/pci_bus has the individual pci busses:
$ tree /sys/class/pci_bus/
/sys/class/pci_bus/
|-- 0000:00
| |-- bridge -> ../../../devices/pci0000:00
| `-- cpuaffinity
|-- 0000:01
| |-- bridge -> ../../../devices/pci0000:00/0000:00:01.0
| `-- cpuaffinity
`-- 0000:02
|-- bridge -> ../../../devices/pci0000:00/0000:00:1e.0
`-- cpuaffinityWe already have the cpuaffinity stuff in there, why not more, pci bus specific things?
thanks,
greg k-h
Quoted 15 lines · Greg KH
Hm, what do you mean by "instance"? My
/sys/class/pci_bushas the individual pci busses:$ tree /sys/class/pci_bus/ /sys/class/pci_bus/ |-- 0000:00 | |-- bridge -> ../../../devices/pci0000:00 | `-- cpuaffinity |-- 0000:01 | |-- bridge -> ../../../devices/pci0000:00/0000:00:01.0 | `-- cpuaffinity `-- 0000:02 |-- bridge -> ../../../devices/pci0000:00/0000:00:1e.0 `-- cpuaffinity
Quoted 2 lines
We already have the cpuaffinity stuff in there, why not more, pci bus specific things?
Oh, I misread. If it's in /sys/class/pci_bus/(instance)/file it's fine, sorry, my fault.
Ben.
Quoted 2 lines · Benjamin Herrenschmidt
Oh, I misread. If it's in /sys/class/pci_bus/(instance)/file it's fine, sorry, my fault.
Ok, then here's the latest. Bjorn is on vacation so unless willy has objections I think it's good to go. I'll send the ia64 part separately to Tony as it's totally standalone.
This patch adds legacy_io and legacy_mem files to the pci_bus class hierarchy in sysfs. The files can be used (if the platform supports them) to access legacy I/O port space and legacy ISA memory space--useful for things like x86 emulators or VGA card POSTing. The interfaces are documented in Documentation/filesystems/sysfs-pci.txt.
Documentation/filesystems/sysfs-pci.txt | 26 +++++++++++ drivers/pci/pci-sysfs.c | 70 ++++++++++++++++++++++++++++++ drivers/pci/probe.c | 39 +++++++++++++++++ include/linux/pci.h | 2 4 files changed, 136 insertions(+), 1 deletion(-)
Thanks,
Jesse
===== drivers/pci/pci-sysfs.c 1.14 vs edited =====
drivers/pci/pci-sysfs.c +70 -0
@@ -179,6 +179,76 @@return count; } +#ifdef HAVE_PCI_LEGACY +/** +* pci_read_legacy_io - read byte(s) from legacy I/O port space +* @kobj: kobject corresponding to file to read from +* @buf: buffer to store results +* @off: offset into legacy I/O port space +* @count: number of bytes to read +* +* Reads 1, 2, or 4 bytes from legacy I/O port space using an arch specific +* callback routine (pci_legacy_read). +*/ +ssize_t +pci_read_legacy_io (struct kobject *kobj,char *buf,loff_t off,size_t count) +{ +struct pci_bus *bus =to_pci_bus (container_of (kobj, + struct class_device, + kobj)); + +/* Only support 1, 2 or 4 byte accesses */ +if (count !=1 && count !=2 && count !=4 ) +return -EINVAL ; + +return pci_legacy_read (bus, off, (u32 *)buf, count); +} + +/** +* pci_write_legacy_io - write byte(s) to legacy I/O port space +* @kobj: kobject corresponding to file to read from +* @buf: buffer containing value to be written +* @off: offset into legacy I/O port space +* @count: number of bytes to write +* +* Writes 1, 2, or 4 bytes from legacy I/O port space using an arch specific +* callback routine (pci_legacy_write). +*/ +ssize_t +pci_write_legacy_io (struct kobject *kobj,char *buf,loff_t off,size_t count) +{ +struct pci_bus *bus =to_pci_bus (container_of (kobj, + struct class_device, + kobj)); +/* Only support 1, 2 or 4 byte accesses */ +if (count !=1 && count !=2 && count !=4 ) +return -EINVAL ; + +return pci_legacy_write (bus, off, *(u32 *)buf, count); +} + +/** +* pci_mmap_legacy_mem - map legacy PCI memory into user memory space +* @kobj: kobject corresponding to device to be mapped +* @attr: struct bin_attribute for this file +* @vma: struct vm_area_struct passed to mmap +* +* Uses an arch specific callback, pci_mmap_legacy_page_range, to mmap +* legacy memory space (first meg of bus space) into application virtual +* memory space. +*/ +int +pci_mmap_legacy_mem (struct kobject *kobj,struct bin_attribute *attr, +struct vm_area_struct *vma) +{ +struct pci_bus *bus =to_pci_bus (container_of (kobj, + struct class_device, + kobj)); + +return pci_mmap_legacy_page_range (bus, vma); +} +#endif /* HAVE_PCI_LEGACY */ +#ifdef HAVE_PCI_MMAP /** * pci_mmap_resource - map a PCI resource into user memory space
===== drivers/pci/probe.c 1.72 vs edited =====
drivers/pci/probe.c +39 -0
@@ -764,6 +764,42 @@return max; } +#ifdef HAVE_PCI_LEGACY +/** +* pci_create_legacy_files - create legacy I/O port and memory files +* @b: bus to create files under +* +* Some platforms allow access to legacy I/O port and ISA memory space on +* a per-bus basis. This routine creates the files and ties them into +* their associated read, write and mmap files from pci-sysfs.c +*/ +static void pci_create_legacy_files (struct pci_bus *b) +{ + 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; +class_device_create_bin_file (&b->class_dev, 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; +class_device_create_bin_file (&b->class_dev, b->legacy_mem); + } +} +#else /* !HAVE_PCI_LEGACY */ +static inline void pci_create_legacy_files (struct pci_bus *bus) {return ; } +#endif /* HAVE_PCI_LEGACY */ +struct pci_bus *__devinit pci_scan_bus_parented (struct device *parent,int bus,struct pci_ops *ops,void *sysdata) {int error;
@@ -807,6 +843,9 @@ error =class_device_create_file (&b->class_dev, &class_device_attr_cpuaffinity);if (error) goto class_dev_create_file_err; + +/* Create legacy_io and legacy_mem files for this bus */ +pci_create_legacy_files (b); error =sysfs_create_link (&b->class_dev.kobj, &b->bridge->kobj,"bridge" );if (error)
===== 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)
===== Documentation/filesystems/sysfs-pci.txt 1.1 vs edited =====
Documentation/filesystems/sysfs-pci.txt +25 -1
@@ -3,7 +3,7 @@ sysfs, usually mounted at /sys, provides access to PCI resources on platforms that support it. For example, a given bus might look like this: - pci0000:17 + /sys/devices/pci0000:17 |-- 0000:17:00.0 | |-- class | |-- config
@@ -56,9 +56,33 @@ from userspace. Note that some platforms don't support mmapping of certain resources, so be sure to check the return value from any attempted mmap. +Accessing legacy resources through sysfs + +Legacy I/O port and ISA memory resources are also provided in sysfs if the +underlying platform supports them. They're located in the PCI class heirarchy, +e.g. + + /sys/class/pci_bus/0000:17/ + |-- bridge -> ../../../devices/pci0000:17 + |-- cpuaffinity + |-- legacy_io + `-- legacy_mem + +The legacy_io file is a read/write file that can be used by applications to +do legacy port I/O. The application should open the file, seek to the desired +port (e.g. 0x3e8) and do a read or a write of 1, 2 or 4 bytes. The legacy_mem +file should be mmapped with an offset corresponding to the memory offset +desired, e.g. 0xa0000 for the VGA frame buffer. The application can then +simply dereference the returned pointer (after checking for errors of course) +to access legacy memory space. + Supporting PCI access on new platforms In order to support PCI resource mapping as described above, Linux platform code must define HAVE_PCI_MMAP and provide a pci_mmap_page_range function. Platforms are free to only support subsets of the mmap functionality, but useful return codes should be provided. + +Legacy resources are protected by the HAVE_PCI_LEGACY define. Platforms +wishing to support legacy functionality should define it and provide +pci_legacy_read, pci_legacy_write and pci_mmap_legacy_page_range functions.
Here's one with additions to the cleanup routine. Please check it out to make sure it's ok. I moved around some functions to avoid having to prototype them at the top of the file.
This patch adds legacy_io and legacy_mem files to the pci_bus class hierarchy in sysfs. The files can be used (if the platform supports them) to access legacy I/O port space and legacy ISA memory space--useful for things like x86 emulators or VGA card POSTing. The interfaces are documented in Documentation/filesystems/sysfs-pci.txt.
Documentation/filesystems/sysfs-pci.txt | 26 +++++++++- drivers/pci/pci-sysfs.c | 70 +++++++++++++++++++++++++++ drivers/pci/probe.c | 82 ++++++++++++++++++++++++------ include/linux/pci.h | 2 4 files changed, 164 insertions(+), 16 deletions(-)
Thanks,
Jesse
===== Documentation/filesystems/sysfs-pci.txt 1.1 vs edited =====
Documentation/filesystems/sysfs-pci.txt +25 -1
@@ -3,7 +3,7 @@ sysfs, usually mounted at /sys, provides access to PCI resources on platforms that support it. For example, a given bus might look like this: - pci0000:17 + /sys/devices/pci0000:17 |-- 0000:17:00.0 | |-- class | |-- config
@@ -56,9 +56,33 @@ from userspace. Note that some platforms don't support mmapping of certain resources, so be sure to check the return value from any attempted mmap. +Accessing legacy resources through sysfs + +Legacy I/O port and ISA memory resources are also provided in sysfs if the +underlying platform supports them. They're located in the PCI class heirarchy, +e.g. + + /sys/class/pci_bus/0000:17/ + |-- bridge -> ../../../devices/pci0000:17 + |-- cpuaffinity + |-- legacy_io + `-- legacy_mem + +The legacy_io file is a read/write file that can be used by applications to +do legacy port I/O. The application should open the file, seek to the desired +port (e.g. 0x3e8) and do a read or a write of 1, 2 or 4 bytes. The legacy_mem +file should be mmapped with an offset corresponding to the memory offset +desired, e.g. 0xa0000 for the VGA frame buffer. The application can then +simply dereference the returned pointer (after checking for errors of course) +to access legacy memory space. + Supporting PCI access on new platforms In order to support PCI resource mapping as described above, Linux platform code must define HAVE_PCI_MMAP and provide a pci_mmap_page_range function. Platforms are free to only support subsets of the mmap functionality, but useful return codes should be provided. + +Legacy resources are protected by the HAVE_PCI_LEGACY define. Platforms +wishing to support legacy functionality should define it and provide +pci_legacy_read, pci_legacy_write and pci_mmap_legacy_page_range functions.
===== drivers/pci/pci-sysfs.c 1.14 vs edited =====
drivers/pci/pci-sysfs.c +70 -0
76 lines not on this page · raw message
===== drivers/pci/probe.c 1.72 vs edited =====
drivers/pci/probe.c +67 -15
106 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)
Greg KH
AppliedQuoted 9 lines · Jesse Barnes
Here's one with additions to the cleanup routine. Please check it out to make sure it's ok. I moved around some functions to avoid having to prototype them at the top of the file.
This patch adds
legacy_ioandlegacy_memfiles to thepci_busclass hierarchy in sysfs. The files can be used (if the platform supports them) to access legacy I/O port space and legacy ISA memory space--useful for things like x86 emulators or VGA card POSTing. The interfaces are documented inDocumentation/filesystems/sysfs-pci.txt.
Yeah, we finally got there, thanks for your patience!
Applied to my trees, thanks.
greg k-h