aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/sunvdc.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-07-12 16:47:50 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-16 07:04:28 -0400
commit43fdf27470b216ebdef47e09ff83bed2f2894b13 (patch)
tree76b9b838089e5679471026037c93325c228df84a /drivers/block/sunvdc.c
parent133f09a169f3022be3de671b29658b7ecb375022 (diff)
[SPARC64]: Abstract out mdesc accesses for better MD update handling.
Since we have to be able to handle MD updates, having an in-tree set of data structures representing the MD objects actually makes things more painful. The MD itself is easy to parse, and we can implement the existing interfaces using direct parsing of the MD binary image. The MD is now reference counted, so accesses have to now take the form: handle = mdesc_grab(); ... operations on MD ... mdesc_release(handle); The only remaining issue are cases where code holds on to references to MD property values. mdesc_get_property() returns a direct pointer to the property value, most cases just pull in the information they need and discard the pointer, but there are few that use the pointer directly over a long lifetime. Those will be fixed up in a subsequent changeset. A preliminary handler for MD update events from domain services is there, it is rudimentry but it works and handles all of the reference counting. It does not check the generation number of the MDs, and it does not generate a "add/delete" list for notification to interesting parties about MD changes but that will be forthcoming. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/block/sunvdc.c')
-rw-r--r--drivers/block/sunvdc.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
index 8dbbeace52a1..0f5e3caf85d7 100644
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -750,7 +750,7 @@ static struct vio_driver_ops vdc_vio_ops = {
750static int __devinit vdc_port_probe(struct vio_dev *vdev, 750static int __devinit vdc_port_probe(struct vio_dev *vdev,
751 const struct vio_device_id *id) 751 const struct vio_device_id *id)
752{ 752{
753 struct mdesc_node *endp; 753 struct mdesc_handle *hp;
754 struct vdc_port *port; 754 struct vdc_port *port;
755 unsigned long flags; 755 unsigned long flags;
756 struct vdc *vp; 756 struct vdc *vp;
@@ -763,26 +763,24 @@ static int __devinit vdc_port_probe(struct vio_dev *vdev,
763 return -ENODEV; 763 return -ENODEV;
764 } 764 }
765 765
766 endp = vio_find_endpoint(vdev); 766 hp = mdesc_grab();
767 if (!endp) {
768 printk(KERN_ERR PFX "Port lacks channel-endpoint.\n");
769 return -ENODEV;
770 }
771 767
772 port_id = md_get_property(vdev->mp, "id", NULL); 768 port_id = mdesc_get_property(hp, vdev->mp, "id", NULL);
769 err = -ENODEV;
773 if (!port_id) { 770 if (!port_id) {
774 printk(KERN_ERR PFX "Port lacks id property.\n"); 771 printk(KERN_ERR PFX "Port lacks id property.\n");
775 return -ENODEV; 772 goto err_out_release_mdesc;
776 } 773 }
777 if ((*port_id << PARTITION_SHIFT) & ~(u64)MINORMASK) { 774 if ((*port_id << PARTITION_SHIFT) & ~(u64)MINORMASK) {
778 printk(KERN_ERR PFX "Port id [%lu] too large.\n", *port_id); 775 printk(KERN_ERR PFX "Port id [%lu] too large.\n", *port_id);
779 return -ENODEV; 776 goto err_out_release_mdesc;
780 } 777 }
781 778
782 port = kzalloc(sizeof(*port), GFP_KERNEL); 779 port = kzalloc(sizeof(*port), GFP_KERNEL);
780 err = -ENOMEM;
783 if (!port) { 781 if (!port) {
784 printk(KERN_ERR PFX "Cannot allocate vdc_port.\n"); 782 printk(KERN_ERR PFX "Cannot allocate vdc_port.\n");
785 return -ENOMEM; 783 goto err_out_release_mdesc;
786 } 784 }
787 785
788 port->vp = vp; 786 port->vp = vp;
@@ -797,7 +795,7 @@ static int __devinit vdc_port_probe(struct vio_dev *vdev,
797 snprintf(port->disk_name, sizeof(port->disk_name), 795 snprintf(port->disk_name, sizeof(port->disk_name),
798 VDCBLK_NAME "%c", 'a' + (port->dev_no % 26)); 796 VDCBLK_NAME "%c", 'a' + (port->dev_no % 26));
799 797
800 err = vio_driver_init(&port->vio, vdev, VDEV_DISK, endp, 798 err = vio_driver_init(&port->vio, vdev, VDEV_DISK,
801 vdc_versions, ARRAY_SIZE(vdc_versions), 799 vdc_versions, ARRAY_SIZE(vdc_versions),
802 &vdc_vio_ops, port->disk_name); 800 &vdc_vio_ops, port->disk_name);
803 if (err) 801 if (err)
@@ -828,6 +826,8 @@ static int __devinit vdc_port_probe(struct vio_dev *vdev,
828 826
829 dev_set_drvdata(&vdev->dev, port); 827 dev_set_drvdata(&vdev->dev, port);
830 828
829 mdesc_release(hp);
830
831 return 0; 831 return 0;
832 832
833err_out_free_tx_ring: 833err_out_free_tx_ring:
@@ -839,6 +839,8 @@ err_out_free_ldc:
839err_out_free_port: 839err_out_free_port:
840 kfree(port); 840 kfree(port);
841 841
842err_out_release_mdesc:
843 mdesc_release(hp);
842 return err; 844 return err;
843} 845}
844 846