Power5,Power6 BSR driver
Subsystems (2)
PATCH 1/1 Power5,Power6 BSR driver
From: Sonny Rao <[email protected]>
Adds a character driver for BSR support on IBM POWER systems including Power5 and Power6. The BSR is an optional processor facility not currently implemented by any other processors. It's primary purpose is large SMP synchronization. More details on the BSR are in comments to the code which follows.
After addressing any issues from the community I'm hoping this can be queued for 2.6.27.
drivers/char/bsr.c new file +307 -0
@@ -0,0 +1,307 @@ +/* IBM POWER Barrier Synchronization Register Driver +* +* Copyright IBM Corporation 2008 +* +* Author: Sonny Rao <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include <linux/kernel.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/of_platform.h> +#include <linux/module.h> +#include <linux/cdev.h> +#include <linux/list.h> +#include <linux/mm.h> +#include <asm/io.h> + +/* +This driver exposes a special register which can be used for fast +synchronization across a large SMP machine. The hardware is exposed +as an array of bytes where each process will write to one of the bytes to +indicate it has finished the current stage and this update is broadcast to +all processors without having to bounce a cacheline between them. In +POWER5 and POWER6 there is one of these registers per SMP, but it is +presented in two forms; first, it is given as a whole and then as a number +of smaller registers which alias to parts of the single whole register. +This can potentially allow multiple groups of processes to each have their +own private synchronization device. + +Note that this hardware *must* be written to using *only* single byte writes. +It may be read using 1, 2, 4, or 8 byte loads which must be aligned since +this region is treated as cache-inhibited processes should also use a +full sync before and after writing to the BSR to ensure all stores and +the BSR update have made it to all chips in the system +*/ + +/* This is arbitrary number, up to Power6 it's been 17 or fewer */ +#define BSR_MAX_DEVS (32) + +struct bsr_dev { +u64 bsr_addr;/* Real address */ +u64 bsr_len;/* length of mem region we can map */ +unsigned bsr_bytes;/* size of the BSR reg itself */ +unsigned bsr_stride;/* interval at which BSR repeats in the page */ +unsigned bsr_type;/* maps to enum below */ +unsigned bsr_num;/* bsr id number for its type */ +int bsr_minor; + +dev_t bsr_dev; +struct cdev bsr_cdev; +struct device *bsr_device; +char bsr_name[32 ]; + +}; + +static unsigned num_bsr_devs; +static struct bsr_dev *bsr_devs; +static struct class *bsr_class; +static int bsr_major; + +enum { +BSR_8 =0 , +BSR_16 =1 , +BSR_64 =2 , +BSR_128 =3 , +BSR_UNKNOWN =4 , +BSR_MAX =5 , +}; + +static unsigned bsr_types[BSR_MAX ]; + +static ssize_t +bsr_size_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +struct bsr_dev *bsr_dev =dev_get_drvdata (dev); +return sprintf (buf,"%u\n" , bsr_dev->bsr_bytes); +} + +static ssize_t +bsr_stride_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +struct bsr_dev *bsr_dev =dev_get_drvdata (dev); +return sprintf (buf,"%u\n" , bsr_dev->bsr_stride); +} + +static ssize_t +bsr_len_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +struct bsr_dev *bsr_dev =dev_get_drvdata (dev); +return sprintf (buf,"%lu\n" , bsr_dev->bsr_len); +} + +static struct device_attribute bsr_dev_attrs[] = { +__ATTR (bsr_size,S_IRUGO , bsr_size_show,NULL ), +__ATTR (bsr_stride,S_IRUGO , bsr_stride_show,NULL ), +__ATTR (bsr_length,S_IRUGO , bsr_len_show,NULL ), + __ATTR_NULL +}; + +static int bsr_mmap (struct file *filp,struct vm_area_struct *vma) +{ +unsigned long size = vma->vm_end - vma->vm_start; +struct bsr_dev *dev = filp->private_data; + +if (size > dev->bsr_len || (size & (PAGE_SIZE -1 ))) +return -EINVAL ; + + vma->vm_flags |= (VM_IO |VM_DONTEXPAND ); + vma->vm_page_prot =pgprot_noncached (vma->vm_page_prot); + +if (io_remap_pfn_range (vma, vma->vm_start, dev->bsr_addr >>PAGE_SHIFT , + size, vma->vm_page_prot)) +return -EAGAIN ; + +return 0 ; +} + +static int bsr_open (struct inode * inode,struct file * filp) +{ +struct cdev *cdev = inode->i_cdev; + struct bsr_dev *dev = container_of(cdev, struct bsr_dev, bsr_cdev); + + filp->private_data = dev; +return 0 ; +} + +const static struct file_operations bsr_fops = { + .owner =THIS_MODULE , + .mmap = bsr_mmap, + .open = bsr_open, +}; + +static void bsr_cleanup_devs (void ) +{ +int i; +for (i=0 ; i < num_bsr_devs; i++) { +struct bsr_dev *cur = bsr_devs + i; +if (cur->bsr_device) { +cdev_del (&cur->bsr_cdev); +device_del (cur->bsr_device); + } + } + +kfree (bsr_devs); +} + +static int bsr_create_devs (struct device_node *bn) +{ +int reg_len, bsr_stride_len, bsr_bytes_len; +const u64 *reg; +const u32 *bsr_stride; +const u32 *bsr_bytes; +unsigned i; + + reg =of_get_property (bn,"reg" , ®_len); + bsr_stride =of_get_property (bn,"ibm,lock-stride" , &bsr_stride_len); + bsr_bytes =of_get_property (bn,"ibm,#lock-bytes" , &bsr_bytes_len); + +if (!reg || !bsr_stride || !bsr_bytes || + (bsr_stride_len != bsr_bytes_len) || + (bsr_stride_len/4 != reg_len/16 )) { +printk (KERN_ERR "bsr of-node has missing/incorrect property\n" ); +return -ENODEV ; + } + + num_bsr_devs = reg_len/16 ; + +/* only a warning, its informational since we'll fail and exit */ +WARN_ON (num_bsr_devs >BSR_MAX_DEVS ); + + bsr_devs =kzalloc (sizeof (struct bsr_dev ) * num_bsr_devs,GFP_KERNEL ); +if (!bsr_devs) +return -ENOMEM ; + +for (i=0 ; i < num_bsr_devs; i++) { +struct bsr_dev *cur = bsr_devs + i; +int result; + + cur->bsr_minor = i; + cur->bsr_addr = reg[i*2 ]; + cur->bsr_len = reg[i*2 +1 ]; + cur->bsr_bytes = bsr_bytes[i]; + cur->bsr_stride = bsr_stride[i]; + cur->bsr_dev =MKDEV (bsr_major, i); + +switch (cur->bsr_bytes) { +case 8 : + cur->bsr_type =BSR_8 ; +break ; +case 16 : + cur->bsr_type =BSR_16 ; +break ; +case 64 : + cur->bsr_type =BSR_64 ; +break ; +case 128 : + cur->bsr_type =BSR_128 ; +break ; +default : + cur->bsr_type =BSR_UNKNOWN ; +printk (KERN_INFO "unknown BSR size %d\n" ,cur->bsr_bytes); + } + + cur->bsr_num = bsr_types[cur->bsr_type]; + bsr_types[cur->bsr_type] = cur->bsr_num +1 ; +snprintf (cur->bsr_name,32 ,"bsr%d_%d" , + cur->bsr_bytes, cur->bsr_num); + +cdev_init (&cur->bsr_cdev, &bsr_fops); + result =cdev_add (&cur->bsr_cdev, cur->bsr_dev,1 ); +if (result) + goto out_err; + + cur->bsr_device =device_create (bsr_class,NULL , + cur->bsr_dev, + cur->bsr_name); +if (!cur->bsr_device) { +printk (KERN_ERR "device_create failed for %s\n" , + cur->bsr_name); +cdev_del (&cur->bsr_cdev); + goto out_err; + } +dev_set_drvdata (cur->bsr_device, cur); + } + +return 0 ; + + out_err: + +bsr_cleanup_devs (); +return -ENODEV ; +} + +static int __init bsr_init (void ) +{ +struct device_node *np; +dev_t bsr_dev =MKDEV (bsr_major,0 ); +int ret = -ENODEV ; +int result; + + np =of_find_compatible_node (NULL ,"ibm,bsr" ,"ibm,bsr" ); +if (!np) + goto out_err; + + bsr_class =class_create (THIS_MODULE ,"bsr" ); +if (IS_ERR (bsr_class)) { +printk (KERN_ERR "class_create() failed for bsr_class\n" ); + goto out_err; + } + bsr_class->dev_attrs = bsr_dev_attrs; + + result =alloc_chrdev_region (&bsr_dev,0 ,BSR_MAX_DEVS ,"bsr" ); + bsr_major =MAJOR (bsr_dev); +if (result <0 ) { +printk (KERN_ERR "alloc_chrdev_region() failed for bsr\n" ); + goto out_err_1; + } + +if ((ret =bsr_create_devs (np)) <0 ) + goto out_err_2; + +of_node_put (np); + +return 0 ; + + out_err_2: +unregister_chrdev_region (bsr_dev,BSR_MAX_DEVS ); + + out_err_1: +class_destroy (bsr_class); +of_node_put (np); + + out_err: + +return ret; +} + +static void __exit bsr_exit(void) +{ + +bsr_cleanup_devs (); + +if (bsr_class) +class_destroy (bsr_class); + +if (bsr_major) +unregister_chrdev_region (MKDEV (bsr_major,0 ),BSR_MAX_DEVS ); +} + +module_init (bsr_init); +module_exit (bsr_exit); +MODULE_LICENSE ("GPL" ); +MODULE_AUTHOR ("Sonny Rao <[email protected]>" );
drivers/char/Makefile +1 -0
@@ -57,6 +57,7 @@ obj-$(CONFIG_VIOCONS) += viocons.o obj-$(CONFIG_VIOTAPE) += viotape.o obj-$(CONFIG_HVCS) += hvcs.o +obj-$(CONFIG_IBM_BSR) += bsr.o obj-$(CONFIG_SGI_MBCS) += mbcs.o obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o obj-$(CONFIG_BFIN_OTP) += bfin-otp.o
drivers/char/Kconfig +8 -0
@@ -649,6 +649,14 @@ which will also be compiled when this driver is built as a module. +config IBM_BSR + tristate "IBM POWER Barrier Synchronization Register support" + depends on PPC_PSERIES + help + This devices exposes a hardware mechanism for fast synchronization + of threads across a large system which avoids bouncing a cacheline + between several cores on a system + source "drivers/char/ipmi/Kconfig" config DS1620
Hi, mainly a couple of coding style things, but one minor bug (I think).
Quoted 6 lines · [email protected] wrote:
From: Sonny Rao <[email protected]>
drivers/char/bsr.c new file +4
-0+static int bsr_mmap (struct file *filp,struct vm_area_struct *vma) +{ +unsigned long size = vma->vm_end - vma->vm_start; +struct bsr_dev *dev = filp->private_data;
drivers/char/bsr.c line 127
Quoted 10 lines
drivers/char/bsr.c new file +10
-0+ +if (size > dev->bsr_len || (size & (PAGE_SIZE -1 ))) +return -EINVAL ; + + vma->vm_flags |= (VM_IO |VM_DONTEXPAND ); + vma->vm_page_prot =pgprot_noncached (vma->vm_page_prot); + +if (io_remap_pfn_range (vma, vma->vm_start, dev->bsr_addr >>PAGE_SHIFT , + size, vma->vm_page_prot)) +return -EAGAIN ;
Indentation is wrong.
drivers/char/bsr.c line 150
Quoted 4 lines
drivers/char/bsr.c new file +4
-0+static void bsr_cleanup_devs (void ) +{ +int i; +for (i=0 ; i < num_bsr_devs; i++) {
i = 0
Quoted 15 lines
drivers/char/bsr.c new file +15
-0+struct bsr_dev *cur = bsr_devs + i; +if (cur->bsr_device) { +cdev_del (&cur->bsr_cdev); +device_del (cur->bsr_device); + } + } + +kfree (bsr_devs); +} + +static int bsr_create_devs (struct device_node *bn) +{ +int reg_len, bsr_stride_len, bsr_bytes_len; +const u64 *reg; +const u32 *bsr_stride;
drivers/char/bsr.c line 175
Quoted 10 lines
drivers/char/bsr.c new file +10
-0+const u32 *bsr_bytes; +unsigned i; + + reg =of_get_property (bn,"reg" , ®_len); + bsr_stride =of_get_property (bn,"ibm,lock-stride" , &bsr_stride_len); + bsr_bytes =of_get_property (bn,"ibm,#lock-bytes" , &bsr_bytes_len); + +if (!reg || !bsr_stride || !bsr_bytes || + (bsr_stride_len != bsr_bytes_len) || + (bsr_stride_len/4 != reg_len/16 )) {
bsr_stride_len / 4 != reg_len / 16
Quoted 3 lines
drivers/char/bsr.c new file +3
-0+printk (KERN_ERR "bsr of-node has missing/incorrect property\n" ); +return -ENODEV ; + }
...
Quoted 5 lines
drivers/char/bsr.c new file +5
-0+static int __init bsr_init (void ) +{ +struct device_node *np; +dev_t bsr_dev =MKDEV (bsr_major,0 ); +int ret = -ENODEV ;
drivers/char/bsr.c line 262
Quoted 10 lines
drivers/char/bsr.c new file +10
-0+int result; + + np =of_find_compatible_node (NULL ,"ibm,bsr" ,"ibm,bsr" ); +if (!np) + goto out_err; + + bsr_class =class_create (THIS_MODULE ,"bsr" ); +if (IS_ERR (bsr_class)) { +printk (KERN_ERR "class_create() failed for bsr_class\n" ); + goto out_err;
At this point I think you can leak a reference to np.
Quoted 28 lines
drivers/char/bsr.c new file +28
-0+ } + bsr_class->dev_attrs = bsr_dev_attrs; + + result =alloc_chrdev_region (&bsr_dev,0 ,BSR_MAX_DEVS ,"bsr" ); + bsr_major =MAJOR (bsr_dev); +if (result <0 ) { +printk (KERN_ERR "alloc_chrdev_region() failed for bsr\n" ); + goto out_err_1; + } + +if ((ret =bsr_create_devs (np)) <0 ) + goto out_err_2; + +of_node_put (np); + +return 0 ; + + out_err_2: +unregister_chrdev_region (bsr_dev,BSR_MAX_DEVS ); + + out_err_1: +class_destroy (bsr_class); +of_node_put (np); + + out_err: + +return ret; +}
Quoted 6 lines · Nathan Lynch
Hi, mainly a couple of coding style things, but one minor bug (I think).
Quoted 2 lines · [email protected] wrote:
From: Sonny Rao <[email protected]>
Quoted 16 lines
Quoted 4 lines
drivers/char/bsr.c new file +4
-0+static int bsr_mmap (struct file *filp,struct vm_area_struct *vma) +{ +unsigned long size = vma->vm_end - vma->vm_start; +struct bsr_dev *dev = filp->private_data;drivers/char/bsr.c line 127
Quoted 10 lines
drivers/char/bsr.c new file +10
-0+ +if (size > dev->bsr_len || (size & (PAGE_SIZE -1 ))) +return -EINVAL ; + + vma->vm_flags |= (VM_IO |VM_DONTEXPAND ); + vma->vm_page_prot =pgprot_noncached (vma->vm_page_prot); + +if (io_remap_pfn_range (vma, vma->vm_start, dev->bsr_addr >>PAGE_SHIFT , + size, vma->vm_page_prot)) +return -EAGAIN ;Indentation is wrong.
Yeah I noticed that too.
Quoted 51 lines
drivers/char/bsr.c line 150
Quoted 4 lines
drivers/char/bsr.c new file +4
-0+static void bsr_cleanup_devs (void ) +{ +int i; +for (i=0 ; i < num_bsr_devs; i++) {i = 0Quoted 15 lines
drivers/char/bsr.c new file +15
-0+struct bsr_dev *cur = bsr_devs + i; +if (cur->bsr_device) { +cdev_del (&cur->bsr_cdev); +device_del (cur->bsr_device); + } + } + +kfree (bsr_devs); +} + +static int bsr_create_devs (struct device_node *bn) +{ +int reg_len, bsr_stride_len, bsr_bytes_len; +const u64 *reg; +const u32 *bsr_stride;drivers/char/bsr.c line 175
Quoted 10 lines
drivers/char/bsr.c new file +10
-0+const u32 *bsr_bytes; +unsigned i; + + reg =of_get_property (bn,"reg" , ®_len); + bsr_stride =of_get_property (bn,"ibm,lock-stride" , &bsr_stride_len); + bsr_bytes =of_get_property (bn,"ibm,#lock-bytes" , &bsr_bytes_len); + +if (!reg || !bsr_stride || !bsr_bytes || + (bsr_stride_len != bsr_bytes_len) || + (bsr_stride_len/4 != reg_len/16 )) {bsr_stride_len / 4 != reg_len / 16Quoted 3 lines
drivers/char/bsr.c new file +3
-0+printk (KERN_ERR "bsr of-node has missing/incorrect property\n" ); +return -ENODEV ; + }...
Quoted 9 lines
drivers/char/bsr.c new file +9
-0+static int __init bsr_init (void ) +{ +struct device_node *np; +dev_t bsr_dev =MKDEV (bsr_major,0 ); +int ret = -ENODEV ; +int result; + + np =of_find_compatible_node (NULL ,"ibm,bsr" ,"ibm,bsr" ); +if (!np)
Quoted 8 lines
drivers/char/bsr.c line 262
Quoted 6 lines
drivers/char/bsr.c new file +6
-0+ goto out_err; + + bsr_class =class_create (THIS_MODULE ,"bsr" ); +if (IS_ERR (bsr_class)) { +printk (KERN_ERR "class_create() failed for bsr_class\n" ); + goto out_err;At this point I think you can leak a reference to np.
Yeah, you're right.
Quoted 21 lines
Quoted 21 lines
drivers/char/bsr.c new file +20
-0+ } + bsr_class->dev_attrs = bsr_dev_attrs; + + result =alloc_chrdev_region (&bsr_dev,0 ,BSR_MAX_DEVS ,"bsr" ); + bsr_major =MAJOR (bsr_dev); +if (result <0 ) { +printk (KERN_ERR "alloc_chrdev_region() failed for bsr\n" ); + goto out_err_1; + } + +if ((ret =bsr_create_devs (np)) <0 ) + goto out_err_2; + +of_node_put (np); + +return 0 ; + + out_err_2: +unregister_chrdev_region (bsr_dev,BSR_MAX_DEVS ); +
Quoted 8 lines
drivers/char/bsr.c line 290
Quoted 8 lines
+
out_err_1:drivers/char/bsr.c new file +7
-0+class_destroy (bsr_class); +of_node_put (np); + + out_err: + +return ret; +}
Ok Will fix and send out again
Signature · 1 line
Sonny Rao, LTC Ozlabs
Quoted 3 lines · Sonny Rao
Quoted 2 lines · Nathan Lynch
Hi, mainly a couple of coding style things, but one minor bug (I think).
<snip>
Quoted 2 lines
Ok Will fix and send out again
From: Sonny Rao <[email protected]>
Adds a character driver for BSR support on IBM POWER systems including Power5 and Power6. The BSR is an optional processor facility not currently implemented by any other processors. It's primary purpose is large SMP synchronization. More details on the BSR are in comments to the code which follows.
After addressing any issues from the community I'm hoping this can be queued for 2.6.27.
drivers/char/bsr.c new file +309 -0
@@ -0,0 +1,309 @@ +/* IBM POWER Barrier Synchronization Register Driver +* +* Copyright IBM Corporation 2008 +* +* Author: Sonny Rao <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include <linux/kernel.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/of_platform.h> +#include <linux/module.h> +#include <linux/cdev.h> +#include <linux/list.h> +#include <linux/mm.h> +#include <asm/io.h> + +/* +This driver exposes a special register which can be used for fast +synchronization across a large SMP machine. The hardware is exposed +as an array of bytes where each process will write to one of the bytes to +indicate it has finished the current stage and this update is broadcast to +all processors without having to bounce a cacheline between them. In +POWER5 and POWER6 there is one of these registers per SMP, but it is +presented in two forms; first, it is given as a whole and then as a number +of smaller registers which alias to parts of the single whole register. +This can potentially allow multiple groups of processes to each have their +own private synchronization device. + +Note that this hardware *must* be written to using *only* single byte writes. +It may be read using 1, 2, 4, or 8 byte loads which must be aligned since +this region is treated as cache-inhibited processes should also use a +full sync before and after writing to the BSR to ensure all stores and +the BSR update have made it to all chips in the system +*/ + +/* This is arbitrary number, up to Power6 it's been 17 or fewer */ +#define BSR_MAX_DEVS (32) + +struct bsr_dev { +u64 bsr_addr;/* Real address */ +u64 bsr_len;/* length of mem region we can map */ +unsigned bsr_bytes;/* size of the BSR reg itself */ +unsigned bsr_stride;/* interval at which BSR repeats in the page */ +unsigned bsr_type;/* maps to enum below */ +unsigned bsr_num;/* bsr id number for its type */ +int bsr_minor; + +dev_t bsr_dev; +struct cdev bsr_cdev; +struct device *bsr_device; +char bsr_name[32 ]; + +}; + +static unsigned num_bsr_devs; +static struct bsr_dev *bsr_devs; +static struct class *bsr_class; +static int bsr_major; + +enum { +BSR_8 =0 , +BSR_16 =1 , +BSR_64 =2 , +BSR_128 =3 , +BSR_UNKNOWN =4 , +BSR_MAX =5 , +}; + +static unsigned bsr_types[BSR_MAX ]; + +static ssize_t +bsr_size_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +struct bsr_dev *bsr_dev =dev_get_drvdata (dev); +return sprintf (buf,"%u\n" , bsr_dev->bsr_bytes); +} + +static ssize_t +bsr_stride_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +struct bsr_dev *bsr_dev =dev_get_drvdata (dev); +return sprintf (buf,"%u\n" , bsr_dev->bsr_stride); +} + +static ssize_t +bsr_len_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +struct bsr_dev *bsr_dev =dev_get_drvdata (dev); +return sprintf (buf,"%lu\n" , bsr_dev->bsr_len); +} + +static struct device_attribute bsr_dev_attrs[] = { +__ATTR (bsr_size,S_IRUGO , bsr_size_show,NULL ), +__ATTR (bsr_stride,S_IRUGO , bsr_stride_show,NULL ), +__ATTR (bsr_length,S_IRUGO , bsr_len_show,NULL ), + __ATTR_NULL +}; + +static int bsr_mmap (struct file *filp,struct vm_area_struct *vma) +{ +unsigned long size = vma->vm_end - vma->vm_start; +struct bsr_dev *dev = filp->private_data; + +if (size > dev->bsr_len || (size & (PAGE_SIZE -1 ))) +return -EINVAL ; + + vma->vm_flags |= (VM_IO |VM_DONTEXPAND ); + vma->vm_page_prot =pgprot_noncached (vma->vm_page_prot); + +if (io_remap_pfn_range (vma, vma->vm_start, dev->bsr_addr >>PAGE_SHIFT , + size, vma->vm_page_prot)) +return -EAGAIN ; + +return 0 ; +} + +static int bsr_open (struct inode * inode,struct file * filp) +{ +struct cdev *cdev = inode->i_cdev; + struct bsr_dev *dev = container_of(cdev, struct bsr_dev, bsr_cdev); + + filp->private_data = dev; +return 0 ; +} + +const static struct file_operations bsr_fops = { + .owner =THIS_MODULE , + .mmap = bsr_mmap, + .open = bsr_open, +}; + +static void bsr_cleanup_devs (void ) +{ +int i; +for (i=0 ; i < num_bsr_devs; i++) { +struct bsr_dev *cur = bsr_devs + i; +if (cur->bsr_device) { +cdev_del (&cur->bsr_cdev); +device_del (cur->bsr_device); + } + } + +kfree (bsr_devs); +} + +static int bsr_create_devs (struct device_node *bn) +{ +int reg_len, bsr_stride_len, bsr_bytes_len; +const u64 *reg; +const u32 *bsr_stride; +const u32 *bsr_bytes; +unsigned i; + + reg =of_get_property (bn,"reg" , ®_len); + bsr_stride =of_get_property (bn,"ibm,lock-stride" , &bsr_stride_len); + bsr_bytes =of_get_property (bn,"ibm,#lock-bytes" , &bsr_bytes_len); + +if (!reg || !bsr_stride || !bsr_bytes || + (bsr_stride_len != bsr_bytes_len) || + (bsr_stride_len /4 != reg_len /16 )) { +printk (KERN_ERR "bsr of-node has missing/incorrect property\n" ); +return -ENODEV ; + } + + num_bsr_devs = reg_len /16 ; + +/* only a warning, its informational since we'll fail and exit */ +WARN_ON (num_bsr_devs >BSR_MAX_DEVS ); + + bsr_devs =kzalloc (sizeof (struct bsr_dev ) * num_bsr_devs,GFP_KERNEL ); +if (!bsr_devs) +return -ENOMEM ; + +for (i =0 ; i < num_bsr_devs; i++) { +struct bsr_dev *cur = bsr_devs + i; +int result; + + cur->bsr_minor = i; + cur->bsr_addr = reg[i *2 ]; + cur->bsr_len = reg[i *2 +1 ]; + cur->bsr_bytes = bsr_bytes[i]; + cur->bsr_stride = bsr_stride[i]; + cur->bsr_dev =MKDEV (bsr_major, i); + +switch (cur->bsr_bytes) { +case 8 : + cur->bsr_type =BSR_8 ; +break ; +case 16 : + cur->bsr_type =BSR_16 ; +break ; +case 64 : + cur->bsr_type =BSR_64 ; +break ; +case 128 : + cur->bsr_type =BSR_128 ; +break ; +default : + cur->bsr_type =BSR_UNKNOWN ; +printk (KERN_INFO "unknown BSR size %d\n" ,cur->bsr_bytes); + } + + cur->bsr_num = bsr_types[cur->bsr_type]; + bsr_types[cur->bsr_type] = cur->bsr_num +1 ; +snprintf (cur->bsr_name,32 ,"bsr%d_%d" , + cur->bsr_bytes, cur->bsr_num); + +cdev_init (&cur->bsr_cdev, &bsr_fops); + result =cdev_add (&cur->bsr_cdev, cur->bsr_dev,1 ); +if (result) + goto out_err; + + cur->bsr_device =device_create (bsr_class,NULL , + cur->bsr_dev, + cur->bsr_name); +if (!cur->bsr_device) { +printk (KERN_ERR "device_create failed for %s\n" , + cur->bsr_name); +cdev_del (&cur->bsr_cdev); + goto out_err; + } +dev_set_drvdata (cur->bsr_device, cur); + } + +return 0 ; + + out_err: + +bsr_cleanup_devs (); +return -ENODEV ; +} + +static int __init bsr_init (void ) +{ +struct device_node *np; +dev_t bsr_dev =MKDEV (bsr_major,0 ); +int ret = -ENODEV ; +int result; + + np =of_find_compatible_node (NULL ,"ibm,bsr" ,"ibm,bsr" ); +if (!np) + goto out_err; + + bsr_class =class_create (THIS_MODULE ,"bsr" ); +if (IS_ERR (bsr_class)) { +printk (KERN_ERR "class_create() failed for bsr_class\n" ); + goto out_err_1; + } + bsr_class->dev_attrs = bsr_dev_attrs; + + result =alloc_chrdev_region (&bsr_dev,0 ,BSR_MAX_DEVS ,"bsr" ); + bsr_major =MAJOR (bsr_dev); +if (result <0 ) { +printk (KERN_ERR "alloc_chrdev_region() failed for bsr\n" ); + goto out_err_2; + } + +if ((ret =bsr_create_devs (np)) <0 ) + goto out_err_3; + +of_node_put (np); + +return 0 ; + + out_err_3: +unregister_chrdev_region (bsr_dev,BSR_MAX_DEVS ); + + out_err_2: +class_destroy (bsr_class); + + out_err_1: +of_node_put (np); + + out_err: + +return ret; +} + +static void __exit bsr_exit(void) +{ + +bsr_cleanup_devs (); + +if (bsr_class) +class_destroy (bsr_class); + +if (bsr_major) +unregister_chrdev_region (MKDEV (bsr_major,0 ),BSR_MAX_DEVS ); +} + +module_init (bsr_init); +module_exit (bsr_exit); +MODULE_LICENSE ("GPL" ); +MODULE_AUTHOR ("Sonny Rao <[email protected]>" );
drivers/char/Makefile +1 -0
@@ -57,6 +57,7 @@ obj-$(CONFIG_VIOCONS) += viocons.o obj-$(CONFIG_VIOTAPE) += viotape.o obj-$(CONFIG_HVCS) += hvcs.o +obj-$(CONFIG_IBM_BSR) += bsr.o obj-$(CONFIG_SGI_MBCS) += mbcs.o obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o obj-$(CONFIG_BFIN_OTP) += bfin-otp.o
drivers/char/Kconfig +8 -0
@@ -649,6 +649,14 @@ which will also be compiled when this driver is built as a module. +config IBM_BSR + tristate "IBM POWER Barrier Synchronization Register support" + depends on PPC_PSERIES + help + This devices exposes a hardware mechanism for fast synchronization + of threads across a large system which avoids bouncing a cacheline + between several cores on a system + source "drivers/char/ipmi/Kconfig" config DS1620
drivers/char/bsr.c line 195
Quoted 3 lines
drivers/char/bsr.c new file +2
-0+ cur->bsr_addr = reg[i *2 ]; + cur->bsr_len = reg[i *2 +1 ];
That's fishy... hand-reading of "reg" property without taking into account the parent's #size-cells/#address-cells... can't you use of_address_to_resource or something similar and carry a struct resource around instead ?
In fact, same goes with the way you do num_bsr_devs = reg_len / 16.
You should rather use -another- property of well known lenght, or get the #address/#size-cells of the parent and use those appropriately.
Cheers,
Ben.
Quoted 8 lines · Benjamin Herrenschmidt
drivers/char/bsr.c line 195
Quoted 3 lines
drivers/char/bsr.c new file +2
-0+ cur->bsr_addr = reg[i *2 ]; + cur->bsr_len = reg[i *2 +1 ];That's fishy... hand-reading of "reg" property without taking into account the parent's #size-cells/#address-cells... can't you use
of_address_to_resourceor something similar and carry a struct resource around instead ?
So, with this suggestion I looked at the resource API... not very well documented, and I get the feeling like it's more for carving up a PCI memory address range. In the case of the BSR, everything is already partitioned (by hardware) so I don't see the point of using this API here. Or am I missing something about it?
Quoted 4 lines
In fact, same goes with the way you do
num_bsr_devs=reg_len/ 16.You should rather use -another- property of well known lenght, or get the #address/#size-cells of the parent and use those appropriately.
Well, I check to make sure the lengths are consistent with each other right above there so we shouldn't walk off the end of anything, but I will take a look at using #size-cells / #address-cells instead.
Thanks for the comments
Sonny
Quoted 10 lines · Sonny Rao
Quoted 8 lines · Benjamin Herrenschmidt
drivers/char/bsr.c line 195
Quoted 3 lines
drivers/char/bsr.c new file +2
-0+ cur->bsr_addr = reg[i *2 ]; + cur->bsr_len = reg[i *2 +1 ];That's fishy... hand-reading of "reg" property without taking into account the parent's #size-cells/#address-cells... can't you use
of_address_to_resourceor something similar and carry a struct resource around instead ?
Quoted 5 lines
So, with this suggestion I looked at the resource API... not very well documented, and I get the feeling like it's more for carving up a PCI memory address range. In the case of the BSR, everything is already partitioned (by hardware) so I don't see the point of using this API here. Or am I missing something about it?
It's about properly parsing a "reg" property in OF. The format of the reg property depends on the parent #address-cells and #size-cells, and the addresses in there may need remapping (or not) depending on parent "ranges" properties. The special cases in prom_parse.c for PCI and ISA are purely to deal with the additional address space flags those add to addresses, but you shouldn't hit that with BSR.
Quoted 8 lines
Quoted 4 lines
In fact, same goes with the way you do
num_bsr_devs=reg_len/ 16.You should rather use -another- property of well known lenght, or get the #address/#size-cells of the parent and use those appropriately.
Well, I check to make sure the lengths are consistent with each other right above there so we shouldn't walk off the end of anything, but I will take a look at using #size-cells / #address-cells instead.
The code in prom_parse.c will do it for you :-)
Cheers,
Ben.
PATCH v3 1/1 Power5,Power6 BSR driver
Quoted 26 lines · Benjamin Herrenschmidt
Quoted 10 lines · Sonny Rao
Quoted 8 lines · Benjamin Herrenschmidt
Review
Quoted 3 lines
(quoted diff) +2
-0+ cur->bsr_addr = reg[i * 2]; + cur->bsr_len = reg[i * 2 + 1];That's fishy... hand-reading of "reg" property without taking into account the parent's #size-cells/#address-cells... can't you use
of_address_to_resourceor something similar and carry a struct resource around instead ?Quoted 5 lines
So, with this suggestion I looked at the resource API... not very well documented, and I get the feeling like it's more for carving up a PCI memory address range. In the case of the BSR, everything is already partitioned (by hardware) so I don't see the point of using this API here. Or am I missing something about it?
It's about properly parsing a "reg" property in OF. The format of the reg property depends on the parent #address-cells and #size-cells, and the addresses in there may need remapping (or not) depending on parent "ranges" properties. The special cases in
prom_parse.cfor PCI and ISA are purely to deal with the additional address space flags those add to addresses, but you shouldn't hit that with BSR.Quoted 2 lines
Quoted 2 lines
In fact, same goes with the way you do
num_bsr_devs=reg_len/ 16.
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
You should rather use -another- property of well known lenght, or get the #address/#size-cells of the parent and use those appropriately.
Well, I check to make sure the lengths are consistent with each other right above there so we shouldn't walk off the end of anything, but I will take a look at using #size-cells / #address-cells instead.
The code in
prom_parse.cwill do it for you :-)
From: Sonny Rao <[email protected]>
Adds a character driver for BSR support on IBM POWER systems including Power5 and Power6. The BSR is an optional processor facility not currently implemented by any other processors. It's primary purpose is fast large SMP synchronization. More details on the BSR are in comments to the code which follows. Patch adds BSR to pseries_defconfig
drivers/char/bsr.c new file +313 -0
@@ -0,0 +1,313 @@ +/* IBM POWER Barrier Synchronization Register Driver +* +* Copyright IBM Corporation 2008 +* +* Author: Sonny Rao <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include <linux/kernel.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/of_platform.h> +#include <linux/module.h> +#include <linux/cdev.h> +#include <linux/list.h> +#include <linux/mm.h> +#include <asm/io.h> + +/* +This driver exposes a special register which can be used for fast +synchronization across a large SMP machine. The hardware is exposed +as an array of bytes where each process will write to one of the bytes to +indicate it has finished the current stage and this update is broadcast to +all processors without having to bounce a cacheline between them. In +POWER5 and POWER6 there is one of these registers per SMP, but it is +presented in two forms; first, it is given as a whole and then as a number +of smaller registers which alias to parts of the single whole register. +This can potentially allow multiple groups of processes to each have their +own private synchronization device. + +Note that this hardware *must* be written to using *only* single byte writes. +It may be read using 1, 2, 4, or 8 byte loads which must be aligned since +this region is treated as cache-inhibited processes should also use a +full sync before and after writing to the BSR to ensure all stores and +the BSR update have made it to all chips in the system +*/ + +/* This is arbitrary number, up to Power6 it's been 17 or fewer */ +#define BSR_MAX_DEVS (32) + +struct bsr_dev { +u64 bsr_addr;/* Real address */ +u64 bsr_len;/* length of mem region we can map */ +unsigned bsr_bytes;/* size of the BSR reg itself */ +unsigned bsr_stride;/* interval at which BSR repeats in the page */ +unsigned bsr_type;/* maps to enum below */ +unsigned bsr_num;/* bsr id number for its type */ +int bsr_minor; + +dev_t bsr_dev; +struct cdev bsr_cdev; +struct device *bsr_device; +char bsr_name[32 ]; + +}; + +static unsigned num_bsr_devs; +static struct bsr_dev *bsr_devs; +static struct class *bsr_class; +static int bsr_major; + +enum { +BSR_8 =0 , +BSR_16 =1 , +BSR_64 =2 , +BSR_128 =3 , +BSR_UNKNOWN =4 , +BSR_MAX =5 , +}; + +static unsigned bsr_types[BSR_MAX ]; + +static ssize_t +bsr_size_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +struct bsr_dev *bsr_dev =dev_get_drvdata (dev); +return sprintf (buf,"%u\n" , bsr_dev->bsr_bytes); +} + +static ssize_t +bsr_stride_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +struct bsr_dev *bsr_dev =dev_get_drvdata (dev); +return sprintf (buf,"%u\n" , bsr_dev->bsr_stride); +} + +static ssize_t +bsr_len_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +struct bsr_dev *bsr_dev =dev_get_drvdata (dev); +return sprintf (buf,"%lu\n" , bsr_dev->bsr_len); +} + +static struct device_attribute bsr_dev_attrs[] = { +__ATTR (bsr_size,S_IRUGO , bsr_size_show,NULL ), +__ATTR (bsr_stride,S_IRUGO , bsr_stride_show,NULL ), +__ATTR (bsr_length,S_IRUGO , bsr_len_show,NULL ), + __ATTR_NULL +}; + +static int bsr_mmap (struct file *filp,struct vm_area_struct *vma) +{ +unsigned long size = vma->vm_end - vma->vm_start; +struct bsr_dev *dev = filp->private_data; + +if (size > dev->bsr_len || (size & (PAGE_SIZE -1 ))) +return -EINVAL ; + + vma->vm_flags |= (VM_IO |VM_DONTEXPAND ); + vma->vm_page_prot =pgprot_noncached (vma->vm_page_prot); + +if (io_remap_pfn_range (vma, vma->vm_start, dev->bsr_addr >>PAGE_SHIFT , + size, vma->vm_page_prot)) +return -EAGAIN ; + +return 0 ; +} + +static int bsr_open (struct inode * inode,struct file * filp) +{ +struct cdev *cdev = inode->i_cdev; + struct bsr_dev *dev = container_of(cdev, struct bsr_dev, bsr_cdev); + + filp->private_data = dev; +return 0 ; +} + +const static struct file_operations bsr_fops = { + .owner =THIS_MODULE , + .mmap = bsr_mmap, + .open = bsr_open, +}; + +static void bsr_cleanup_devs (void ) +{ +int i; +for (i=0 ; i < num_bsr_devs; i++) { +struct bsr_dev *cur = bsr_devs + i; +if (cur->bsr_device) { +cdev_del (&cur->bsr_cdev); +device_del (cur->bsr_device); + } + } + +kfree (bsr_devs); +} + +static int bsr_create_devs (struct device_node *bn) +{ +int bsr_stride_len, bsr_bytes_len; +const u32 *bsr_stride; +const u32 *bsr_bytes; +unsigned i; + + bsr_stride =of_get_property (bn,"ibm,lock-stride" , &bsr_stride_len); + bsr_bytes =of_get_property (bn,"ibm,#lock-bytes" , &bsr_bytes_len); + +if (!bsr_stride || !bsr_bytes || + (bsr_stride_len != bsr_bytes_len)) { +printk (KERN_ERR "bsr of-node has missing/incorrect property\n" ); +return -ENODEV ; + } + + num_bsr_devs = bsr_bytes_len /sizeof (u32); + +/* only a warning, its informational since we'll fail and exit */ +WARN_ON (num_bsr_devs >BSR_MAX_DEVS ); + + bsr_devs =kzalloc (sizeof (struct bsr_dev ) * num_bsr_devs,GFP_KERNEL ); +if (!bsr_devs) +return -ENOMEM ; + +for (i =0 ; i < num_bsr_devs; i++) { +struct bsr_dev *cur = bsr_devs + i; +struct resource res; +int result; + + result =of_address_to_resource (bn, i, &res); +if (result <0 ) { +printk (KERN_ERR "bsr of-node has invalid reg property\n" ); + goto out_err; + } + + cur->bsr_minor = i; + cur->bsr_addr = res.start; + cur->bsr_len = res.end - res.start +1 ; + cur->bsr_bytes = bsr_bytes[i]; + cur->bsr_stride = bsr_stride[i]; + cur->bsr_dev =MKDEV (bsr_major, i); + +switch (cur->bsr_bytes) { +case 8 : + cur->bsr_type =BSR_8 ; +break ; +case 16 : + cur->bsr_type =BSR_16 ; +break ; +case 64 : + cur->bsr_type =BSR_64 ; +break ; +case 128 : + cur->bsr_type =BSR_128 ; +break ; +default : + cur->bsr_type =BSR_UNKNOWN ; +printk (KERN_INFO "unknown BSR size %d\n" ,cur->bsr_bytes); + } + + cur->bsr_num = bsr_types[cur->bsr_type]; + bsr_types[cur->bsr_type] = cur->bsr_num +1 ; +snprintf (cur->bsr_name,32 ,"bsr%d_%d" , + cur->bsr_bytes, cur->bsr_num); + +cdev_init (&cur->bsr_cdev, &bsr_fops); + result =cdev_add (&cur->bsr_cdev, cur->bsr_dev,1 ); +if (result) + goto out_err; + + cur->bsr_device =device_create (bsr_class,NULL , + cur->bsr_dev, + cur->bsr_name); +if (!cur->bsr_device) { +printk (KERN_ERR "device_create failed for %s\n" , + cur->bsr_name); +cdev_del (&cur->bsr_cdev); + goto out_err; + } +dev_set_drvdata (cur->bsr_device, cur); + } + +return 0 ; + + out_err: + +bsr_cleanup_devs (); +return -ENODEV ; +} + +static int __init bsr_init (void ) +{ +struct device_node *np; +dev_t bsr_dev =MKDEV (bsr_major,0 ); +int ret = -ENODEV ; +int result; + + np =of_find_compatible_node (NULL ,"ibm,bsr" ,"ibm,bsr" ); +if (!np) + goto out_err; + + bsr_class =class_create (THIS_MODULE ,"bsr" ); +if (IS_ERR (bsr_class)) { +printk (KERN_ERR "class_create() failed for bsr_class\n" ); + goto out_err_1; + } + bsr_class->dev_attrs = bsr_dev_attrs; + + result =alloc_chrdev_region (&bsr_dev,0 ,BSR_MAX_DEVS ,"bsr" ); + bsr_major =MAJOR (bsr_dev); +if (result <0 ) { +printk (KERN_ERR "alloc_chrdev_region() failed for bsr\n" ); + goto out_err_2; + } + +if ((ret =bsr_create_devs (np)) <0 ) + goto out_err_3; + +of_node_put (np); + +return 0 ; + + out_err_3: +unregister_chrdev_region (bsr_dev,BSR_MAX_DEVS ); + + out_err_2: +class_destroy (bsr_class); + + out_err_1: +of_node_put (np); + + out_err: + +return ret; +} + +static void __exit bsr_exit(void) +{ + +bsr_cleanup_devs (); + +if (bsr_class) +class_destroy (bsr_class); + +if (bsr_major) +unregister_chrdev_region (MKDEV (bsr_major,0 ),BSR_MAX_DEVS ); +} + +module_init (bsr_init); +module_exit (bsr_exit); +MODULE_LICENSE ("GPL" ); +MODULE_AUTHOR ("Sonny Rao <[email protected]>" );
drivers/char/Makefile +1 -0
@@ -57,6 +57,7 @@ obj-$(CONFIG_VIOCONS) += viocons.o obj-$(CONFIG_VIOTAPE) += viotape.o obj-$(CONFIG_HVCS) += hvcs.o +obj-$(CONFIG_IBM_BSR) += bsr.o obj-$(CONFIG_SGI_MBCS) += mbcs.o obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o obj-$(CONFIG_BFIN_OTP) += bfin-otp.o
drivers/char/Kconfig +8 -0
@@ -649,6 +649,14 @@ which will also be compiled when this driver is built as a module. +config IBM_BSR + tristate "IBM POWER Barrier Synchronization Register support" + depends on PPC_PSERIES + help + This devices exposes a hardware mechanism for fast synchronization + of threads across a large system which avoids bouncing a cacheline + between several cores on a system + source "drivers/char/ipmi/Kconfig" config DS1620
arch/powerpc/configs/pseries_defconfig +1 -0
@@ -946,6 +946,7 @@ CONFIG_HVC_CONSOLE=y CONFIG_HVC_RTAS=y CONFIG_HVCS=m +CONFIG_IBM_BSR=m # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set CONFIG_GEN_RTC=y
Hi Sonny,
Quoted 4 lines · On Mon, 7 Jul 2008 21:58:12 -0500 Sonny Rao <[email protected]> wrote:
drivers/char/bsr.c new file +2
-0+static int bsr_create_devs (struct device_node *bn) +{
drivers/char/bsr.c line 241
Quoted 10 lines
drivers/char/bsr.c new file +10
-0+ cur->bsr_device =device_create (bsr_class,NULL , + cur->bsr_dev, + cur->bsr_name); +if (!cur->bsr_device) { +printk (KERN_ERR "device_create failed for %s\n" , + cur->bsr_name); +cdev_del (&cur->bsr_cdev); + goto out_err; + } +dev_set_drvdata (cur->bsr_device, cur);
device_create() is being removed in 2.6.27 because the above introduces a race, use device_create_drvdata() instead.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Quoted 7 lines · Stephen Rothwell
Hi Sonny,
Quoted 3 lines · On Mon, 7 Jul 2008 21:58:12 -0500 Sonny Rao <[email protected]> wrote:
(quoted diff) +2
-0+static int bsr_create_devs(struct device_node *bn) +{
Quoted 14 lines
Review
Quoted 10 lines
(quoted diff) +10
-0+ cur->bsr_device = device_create(bsr_class, NULL, + cur->bsr_dev, + cur->bsr_name); + if (!cur->bsr_device) { + printk(KERN_ERR "device_create failed for %s\n", + cur->bsr_name); + cdev_del(&cur->bsr_cdev); + goto out_err; + } + dev_set_drvdata(cur->bsr_device, cur);
device_create()is being removed in 2.6.27 because the above introduces a race, usedevice_create_drvdata()instead.
Stephen, thanks for the heads up.
From: Sonny Rao <[email protected]>
Adds a character driver for BSR support on IBM POWER systems including Power5 and Power6. The BSR is an optional processor facility not currently implemented by any other processors. It's primary purpose is fast large SMP synchronization. More details on the BSR are in comments to the code which follows. This patch adds BSR driver to pseries_defconfig.
drivers/char/bsr.c new file +312 -0
@@ -0,0 +1,312 @@ +/* IBM POWER Barrier Synchronization Register Driver +* +* Copyright IBM Corporation 2008 +* +* Author: Sonny Rao <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include <linux/kernel.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/of_platform.h> +#include <linux/module.h> +#include <linux/cdev.h> +#include <linux/list.h> +#include <linux/mm.h> +#include <asm/io.h> + +/* +This driver exposes a special register which can be used for fast +synchronization across a large SMP machine. The hardware is exposed +as an array of bytes where each process will write to one of the bytes to +indicate it has finished the current stage and this update is broadcast to +all processors without having to bounce a cacheline between them. In +POWER5 and POWER6 there is one of these registers per SMP, but it is +presented in two forms; first, it is given as a whole and then as a number +of smaller registers which alias to parts of the single whole register. +This can potentially allow multiple groups of processes to each have their +own private synchronization device. + +Note that this hardware *must* be written to using *only* single byte writes. +It may be read using 1, 2, 4, or 8 byte loads which must be aligned since +this region is treated as cache-inhibited processes should also use a +full sync before and after writing to the BSR to ensure all stores and +the BSR update have made it to all chips in the system +*/ + +/* This is arbitrary number, up to Power6 it's been 17 or fewer */ +#define BSR_MAX_DEVS (32) + +struct bsr_dev { +u64 bsr_addr;/* Real address */ +u64 bsr_len;/* length of mem region we can map */ +unsigned bsr_bytes;/* size of the BSR reg itself */ +unsigned bsr_stride;/* interval at which BSR repeats in the page */ +unsigned bsr_type;/* maps to enum below */ +unsigned bsr_num;/* bsr id number for its type */ +int bsr_minor; + +dev_t bsr_dev; +struct cdev bsr_cdev; +struct device *bsr_device; +char bsr_name[32 ]; + +}; + +static unsigned num_bsr_devs; +static struct bsr_dev *bsr_devs; +static struct class *bsr_class; +static int bsr_major; + +enum { +BSR_8 =0 , +BSR_16 =1 , +BSR_64 =2 , +BSR_128 =3 , +BSR_UNKNOWN =4 , +BSR_MAX =5 , +}; + +static unsigned bsr_types[BSR_MAX ]; + +static ssize_t +bsr_size_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +struct bsr_dev *bsr_dev =dev_get_drvdata (dev); +return sprintf (buf,"%u\n" , bsr_dev->bsr_bytes); +} + +static ssize_t +bsr_stride_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +struct bsr_dev *bsr_dev =dev_get_drvdata (dev); +return sprintf (buf,"%u\n" , bsr_dev->bsr_stride); +} + +static ssize_t +bsr_len_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +struct bsr_dev *bsr_dev =dev_get_drvdata (dev); +return sprintf (buf,"%lu\n" , bsr_dev->bsr_len); +} + +static struct device_attribute bsr_dev_attrs[] = { +__ATTR (bsr_size,S_IRUGO , bsr_size_show,NULL ), +__ATTR (bsr_stride,S_IRUGO , bsr_stride_show,NULL ), +__ATTR (bsr_length,S_IRUGO , bsr_len_show,NULL ), + __ATTR_NULL +}; + +static int bsr_mmap (struct file *filp,struct vm_area_struct *vma) +{ +unsigned long size = vma->vm_end - vma->vm_start; +struct bsr_dev *dev = filp->private_data; + +if (size > dev->bsr_len || (size & (PAGE_SIZE -1 ))) +return -EINVAL ; + + vma->vm_flags |= (VM_IO |VM_DONTEXPAND ); + vma->vm_page_prot =pgprot_noncached (vma->vm_page_prot); + +if (io_remap_pfn_range (vma, vma->vm_start, dev->bsr_addr >>PAGE_SHIFT , + size, vma->vm_page_prot)) +return -EAGAIN ; + +return 0 ; +} + +static int bsr_open (struct inode * inode,struct file * filp) +{ +struct cdev *cdev = inode->i_cdev; + struct bsr_dev *dev = container_of(cdev, struct bsr_dev, bsr_cdev); + + filp->private_data = dev; +return 0 ; +} + +const static struct file_operations bsr_fops = { + .owner =THIS_MODULE , + .mmap = bsr_mmap, + .open = bsr_open, +}; + +static void bsr_cleanup_devs (void ) +{ +int i; +for (i=0 ; i < num_bsr_devs; i++) { +struct bsr_dev *cur = bsr_devs + i; +if (cur->bsr_device) { +cdev_del (&cur->bsr_cdev); +device_del (cur->bsr_device); + } + } + +kfree (bsr_devs); +} + +static int bsr_create_devs (struct device_node *bn) +{ +int bsr_stride_len, bsr_bytes_len; +const u32 *bsr_stride; +const u32 *bsr_bytes; +unsigned i; + + bsr_stride =of_get_property (bn,"ibm,lock-stride" , &bsr_stride_len); + bsr_bytes =of_get_property (bn,"ibm,#lock-bytes" , &bsr_bytes_len); + +if (!bsr_stride || !bsr_bytes || + (bsr_stride_len != bsr_bytes_len)) { +printk (KERN_ERR "bsr of-node has missing/incorrect property\n" ); +return -ENODEV ; + } + + num_bsr_devs = bsr_bytes_len /sizeof (u32); + +/* only a warning, its informational since we'll fail and exit */ +WARN_ON (num_bsr_devs >BSR_MAX_DEVS ); + + bsr_devs =kzalloc (sizeof (struct bsr_dev ) * num_bsr_devs,GFP_KERNEL ); +if (!bsr_devs) +return -ENOMEM ; + +for (i =0 ; i < num_bsr_devs; i++) { +struct bsr_dev *cur = bsr_devs + i; +struct resource res; +int result; + + result =of_address_to_resource (bn, i, &res); +if (result <0 ) { +printk (KERN_ERR "bsr of-node has invalid reg property\n" ); + goto out_err; + } + + cur->bsr_minor = i; + cur->bsr_addr = res.start; + cur->bsr_len = res.end - res.start +1 ; + cur->bsr_bytes = bsr_bytes[i]; + cur->bsr_stride = bsr_stride[i]; + cur->bsr_dev =MKDEV (bsr_major, i); + +switch (cur->bsr_bytes) { +case 8 : + cur->bsr_type =BSR_8 ; +break ; +case 16 : + cur->bsr_type =BSR_16 ; +break ; +case 64 : + cur->bsr_type =BSR_64 ; +break ; +case 128 : + cur->bsr_type =BSR_128 ; +break ; +default : + cur->bsr_type =BSR_UNKNOWN ; +printk (KERN_INFO "unknown BSR size %d\n" ,cur->bsr_bytes); + } + + cur->bsr_num = bsr_types[cur->bsr_type]; + bsr_types[cur->bsr_type] = cur->bsr_num +1 ; +snprintf (cur->bsr_name,32 ,"bsr%d_%d" , + cur->bsr_bytes, cur->bsr_num); + +cdev_init (&cur->bsr_cdev, &bsr_fops); + result =cdev_add (&cur->bsr_cdev, cur->bsr_dev,1 ); +if (result) + goto out_err; + + cur->bsr_device =device_create_drvdata (bsr_class,NULL , + cur->bsr_dev, + cur, cur->bsr_name); +if (!cur->bsr_device) { +printk (KERN_ERR "device_create failed for %s\n" , + cur->bsr_name); +cdev_del (&cur->bsr_cdev); + goto out_err; + } + } + +return 0 ; + + out_err: + +bsr_cleanup_devs (); +return -ENODEV ; +} + +static int __init bsr_init (void ) +{ +struct device_node *np; +dev_t bsr_dev =MKDEV (bsr_major,0 ); +int ret = -ENODEV ; +int result; + + np =of_find_compatible_node (NULL ,"ibm,bsr" ,"ibm,bsr" ); +if (!np) + goto out_err; + + bsr_class =class_create (THIS_MODULE ,"bsr" ); +if (IS_ERR (bsr_class)) { +printk (KERN_ERR "class_create() failed for bsr_class\n" ); + goto out_err_1; + } + bsr_class->dev_attrs = bsr_dev_attrs; + + result =alloc_chrdev_region (&bsr_dev,0 ,BSR_MAX_DEVS ,"bsr" ); + bsr_major =MAJOR (bsr_dev); +if (result <0 ) { +printk (KERN_ERR "alloc_chrdev_region() failed for bsr\n" ); + goto out_err_2; + } + +if ((ret =bsr_create_devs (np)) <0 ) + goto out_err_3; + +of_node_put (np); + +return 0 ; + + out_err_3: +unregister_chrdev_region (bsr_dev,BSR_MAX_DEVS ); + + out_err_2: +class_destroy (bsr_class); + + out_err_1: +of_node_put (np); + + out_err: + +return ret; +} + +static void __exit bsr_exit(void) +{ + +bsr_cleanup_devs (); + +if (bsr_class) +class_destroy (bsr_class); + +if (bsr_major) +unregister_chrdev_region (MKDEV (bsr_major,0 ),BSR_MAX_DEVS ); +} + +module_init (bsr_init); +module_exit (bsr_exit); +MODULE_LICENSE ("GPL" ); +MODULE_AUTHOR ("Sonny Rao <[email protected]>" );
drivers/char/Makefile +1 -0
@@ -57,6 +57,7 @@ obj-$(CONFIG_VIOCONS) += viocons.o obj-$(CONFIG_VIOTAPE) += viotape.o obj-$(CONFIG_HVCS) += hvcs.o +obj-$(CONFIG_IBM_BSR) += bsr.o obj-$(CONFIG_SGI_MBCS) += mbcs.o obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o obj-$(CONFIG_BFIN_OTP) += bfin-otp.o
drivers/char/Kconfig +8 -0
@@ -649,6 +649,14 @@ which will also be compiled when this driver is built as a module. +config IBM_BSR + tristate "IBM POWER Barrier Synchronization Register support" + depends on PPC_PSERIES + help + This devices exposes a hardware mechanism for fast synchronization + of threads across a large system which avoids bouncing a cacheline + between several cores on a system + source "drivers/char/ipmi/Kconfig" config DS1620
arch/powerpc/configs/pseries_defconfig +1 -0
@@ -946,6 +946,7 @@ CONFIG_HVC_CONSOLE=y CONFIG_HVC_RTAS=y CONFIG_HVCS=m +CONFIG_IBM_BSR=m # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set CONFIG_GEN_RTC=y
Quoted 8 lines · On Mon, Jun 16, 2008 at 01:53:44PM -0500, [email protected] wrote:
From: Sonny Rao <[email protected]>
Adds a character driver for BSR support on IBM POWER systems including Power5 and Power6. The BSR is an optional processor facility not currently implemented by any other processors. It's primary purpose is large SMP synchronization. More details on the BSR are in comments to the code which follows.
Here's a basic, quick n' dirty testcase I have
Remember to link w/ -lpthread
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/mman.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <stdint.h>
#include <pthread.h>
static void rw_test(char *map, unsigned bytes)
{
unsigned i;
printf("reading current bsr values\n");
for (i=0 ; i < bytes;i++) {
printf("bsr[%u] = 0x%x\n",
i, map[i]);
}
printf("writing all 1s into bsr\n");
for (i=0; i< bytes; i++) {
map[i] = 0xff;
}
printf("reading current bsr values\n");
for (i=0 ; i < bytes;i++) {
printf("bsr[%u] = 0x%x\n",
i, map[i]);
}
printf("writing all byte numbers into bsr\n");
for (i=0; i< bytes; i++) {
map[i] = i;
}
printf("reading current bsr values\n");
for (i=0 ; i < bytes;i++) {
printf("bsr[%u] = 0x%x\n",
i, map[i]);
}}
struct thread_data {
pthread_t thread;
volatile char *map;
unsigned id;
uint64_t counter;
};#define be_busy(cycles) do { \
__asm__ __volatile__ ("1: addic. %0,%0,-1\n" \
" bne 1b\n" : :"r" (cycles) : "cr0"); } while(0)#define __sync() do { \
__asm__ __volatile__ ("sync\n" ::: "memory"); } while(0)
static
void * thread_fn(void * data)
{
struct thread_data *mydata = data;
__sync();
mydata->map[mydata->id]++;
__sync();
while (mydata->map[0] == 0) {
/* be_busy(10); */
mydata->counter++;
}
return NULL;
}static
void pthread_test(volatile char *map, unsigned num)
{
struct thread_data *pthreads;
unsigned i;
pthreads = malloc(sizeof(struct thread_data) * num);
if (!pthreads) {
perror("malloc");
return;
}
for (i=0; i<num; i++) {
map[i] = 0;
}
__sync();
for (i=1; i< num;i++) {
struct thread_data *cur = &pthreads[i];
cur->map = map;
cur->id = i;
if (pthread_create(&cur->thread, NULL, thread_fn, cur)) {
perror("pthread_create");
exit(1);
}
}
for (i=1; i<num;i++) {
char status;
do {
status = map[i];
} while(status == 0);
}
__sync();
map[0] = 1;
__sync();
for (i=1; i<num;i++) {
if (pthread_join(pthreads[i].thread, NULL)) {
perror("pthread_join");
}
printf("%03u %llu\n", pthreads[i].id, pthreads[i].counter);
}
free(pthreads);
}int main (int argc, char *argv[])
{
char *file;
int fd;
char *map;
int pagesize = getpagesize();
unsigned bytes;
if (argc < 3) {
fprintf(stderr, "usage: <bsr dev> <num bytes>\n");
return 1;
}
file = argv[1];
bytes = strtoul(argv[2], NULL, 0);
fd = open(file, O_RDWR);
if (fd < 0) {
perror("open");
return 1;
}
map = mmap(NULL, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (!map) {
perror("mmap");
close(fd);
return 1;
}
rw_test(map, bytes);
pthread_test(map, bytes);
close(fd);
return 0;
}