Merge tag 'ntb-4.6' of git://github.com/jonmason/ntb
[deliverable/linux.git] / drivers / rapidio / rio.c
index e42f97e9e62a76ed33006919397344c283ff19cf..0dcaa660cba1cf6969adfc9980c3ee305424509a 100644 (file)
 
 #include "rio.h"
 
+/*
+ * struct rio_pwrite - RIO portwrite event
+ * @node:    Node in list of doorbell events
+ * @pwcback: Doorbell event callback
+ * @context: Handler specific context to pass on event
+ */
+struct rio_pwrite {
+       struct list_head node;
+
+       int (*pwcback)(struct rio_mport *mport, void *context,
+                      union rio_pw_msg *msg, int step);
+       void *context;
+};
+
 MODULE_DESCRIPTION("RapidIO Subsystem Core");
 MODULE_AUTHOR("Matt Porter <mporter@kernel.crashing.org>");
 MODULE_AUTHOR("Alexandre Bounine <alexandre.bounine@idt.com>");
@@ -137,6 +151,20 @@ void rio_free_net(struct rio_net *net)
 }
 EXPORT_SYMBOL_GPL(rio_free_net);
 
+/**
+ * rio_local_set_device_id - Set the base/extended device id for a port
+ * @port: RIO master port
+ * @did: Device ID value to be written
+ *
+ * Writes the base/extended device id from a device.
+ */
+void rio_local_set_device_id(struct rio_mport *port, u16 did)
+{
+       rio_local_write_config_32(port, RIO_DID_CSR,
+                                 RIO_SET_DID(port->sys_size, did));
+}
+EXPORT_SYMBOL_GPL(rio_local_set_device_id);
+
 /**
  * rio_add_device- Adds a RIO device to the device model
  * @rdev: RIO device
@@ -500,7 +528,71 @@ int rio_release_outb_dbell(struct rio_dev *rdev, struct resource *res)
 }
 
 /**
- * rio_request_inb_pwrite - request inbound port-write message service
+ * rio_add_mport_pw_handler - add port-write message handler into the list
+ *                            of mport specific pw handlers
+ * @mport:   RIO master port to bind the portwrite callback
+ * @context: Handler specific context to pass on event
+ * @pwcback: Callback to execute when portwrite is received
+ *
+ * Returns 0 if the request has been satisfied.
+ */
+int rio_add_mport_pw_handler(struct rio_mport *mport, void *context,
+                            int (*pwcback)(struct rio_mport *mport,
+                            void *context, union rio_pw_msg *msg, int step))
+{
+       int rc = 0;
+       struct rio_pwrite *pwrite;
+
+       pwrite = kzalloc(sizeof(struct rio_pwrite), GFP_KERNEL);
+       if (!pwrite) {
+               rc = -ENOMEM;
+               goto out;
+       }
+
+       pwrite->pwcback = pwcback;
+       pwrite->context = context;
+       mutex_lock(&mport->lock);
+       list_add_tail(&pwrite->node, &mport->pwrites);
+       mutex_unlock(&mport->lock);
+out:
+       return rc;
+}
+EXPORT_SYMBOL_GPL(rio_add_mport_pw_handler);
+
+/**
+ * rio_del_mport_pw_handler - remove port-write message handler from the list
+ *                            of mport specific pw handlers
+ * @mport:   RIO master port to bind the portwrite callback
+ * @context: Registered handler specific context to pass on event
+ * @pwcback: Registered callback function
+ *
+ * Returns 0 if the request has been satisfied.
+ */
+int rio_del_mport_pw_handler(struct rio_mport *mport, void *context,
+                            int (*pwcback)(struct rio_mport *mport,
+                            void *context, union rio_pw_msg *msg, int step))
+{
+       int rc = -EINVAL;
+       struct rio_pwrite *pwrite;
+
+       mutex_lock(&mport->lock);
+       list_for_each_entry(pwrite, &mport->pwrites, node) {
+               if (pwrite->pwcback == pwcback && pwrite->context == context) {
+                       list_del(&pwrite->node);
+                       kfree(pwrite);
+                       rc = 0;
+                       break;
+               }
+       }
+       mutex_unlock(&mport->lock);
+
+       return rc;
+}
+EXPORT_SYMBOL_GPL(rio_del_mport_pw_handler);
+
+/**
+ * rio_request_inb_pwrite - request inbound port-write message service for
+ *                          specific RapidIO device
  * @rdev: RIO device to which register inbound port-write callback routine
  * @pwcback: Callback routine to execute when port-write is received
  *
@@ -525,6 +617,7 @@ EXPORT_SYMBOL_GPL(rio_request_inb_pwrite);
 
 /**
  * rio_release_inb_pwrite - release inbound port-write message service
+ *                          associated with specific RapidIO device
  * @rdev: RIO device which registered for inbound port-write callback
  *
  * Removes callback from the rio_dev structure. Returns 0 if the request
@@ -545,6 +638,24 @@ int rio_release_inb_pwrite(struct rio_dev *rdev)
 }
 EXPORT_SYMBOL_GPL(rio_release_inb_pwrite);
 
+/**
+ * rio_pw_enable - Enables/disables port-write handling by a master port
+ * @mport: Master port associated with port-write handling
+ * @enable:  1=enable,  0=disable
+ */
+void rio_pw_enable(struct rio_mport *mport, int enable)
+{
+       if (mport->ops->pwenable) {
+               mutex_lock(&mport->lock);
+
+               if ((enable && ++mport->pwe_refcnt == 1) ||
+                   (!enable && mport->pwe_refcnt && --mport->pwe_refcnt == 0))
+                       mport->ops->pwenable(mport, enable);
+               mutex_unlock(&mport->lock);
+       }
+}
+EXPORT_SYMBOL_GPL(rio_pw_enable);
+
 /**
  * rio_map_inb_region -- Map inbound memory region.
  * @mport: Master port.
@@ -588,6 +699,56 @@ void rio_unmap_inb_region(struct rio_mport *mport, dma_addr_t lstart)
 }
 EXPORT_SYMBOL_GPL(rio_unmap_inb_region);
 
+/**
+ * rio_map_outb_region -- Map outbound memory region.
+ * @mport: Master port.
+ * @destid: destination id window points to
+ * @rbase: RIO base address window translates to
+ * @size: Size of the memory region
+ * @rflags: Flags for mapping.
+ * @local: physical address of memory region mapped
+ *
+ * Return: 0 -- Success.
+ *
+ * This function will create the mapping from RIO space to local memory.
+ */
+int rio_map_outb_region(struct rio_mport *mport, u16 destid, u64 rbase,
+                       u32 size, u32 rflags, dma_addr_t *local)
+{
+       int rc = 0;
+       unsigned long flags;
+
+       if (!mport->ops->map_outb)
+               return -ENODEV;
+
+       spin_lock_irqsave(&rio_mmap_lock, flags);
+       rc = mport->ops->map_outb(mport, destid, rbase, size,
+               rflags, local);
+       spin_unlock_irqrestore(&rio_mmap_lock, flags);
+
+       return rc;
+}
+EXPORT_SYMBOL_GPL(rio_map_outb_region);
+
+/**
+ * rio_unmap_inb_region -- Unmap the inbound memory region
+ * @mport: Master port
+ * @destid: destination id mapping points to
+ * @rstart: RIO base address window translates to
+ */
+void rio_unmap_outb_region(struct rio_mport *mport, u16 destid, u64 rstart)
+{
+       unsigned long flags;
+
+       if (!mport->ops->unmap_outb)
+               return;
+
+       spin_lock_irqsave(&rio_mmap_lock, flags);
+       mport->ops->unmap_outb(mport, destid, rstart);
+       spin_unlock_irqrestore(&rio_mmap_lock, flags);
+}
+EXPORT_SYMBOL_GPL(rio_unmap_outb_region);
+
 /**
  * rio_mport_get_physefb - Helper function that returns register offset
  *                      for Physical Layer Extended Features Block.
@@ -970,52 +1131,66 @@ rd_err:
 }
 
 /**
- * rio_inb_pwrite_handler - process inbound port-write message
+ * rio_inb_pwrite_handler - inbound port-write message handler
+ * @mport:  mport device associated with port-write
  * @pw_msg: pointer to inbound port-write message
  *
  * Processes an inbound port-write message. Returns 0 if the request
  * has been satisfied.
  */
-int rio_inb_pwrite_handler(union rio_pw_msg *pw_msg)
+int rio_inb_pwrite_handler(struct rio_mport *mport, union rio_pw_msg *pw_msg)
 {
        struct rio_dev *rdev;
        u32 err_status, em_perrdet, em_ltlerrdet;
        int rc, portnum;
-
-       rdev = rio_get_comptag((pw_msg->em.comptag & RIO_CTAG_UDEVID), NULL);
-       if (rdev == NULL) {
-               /* Device removed or enumeration error */
-               pr_debug("RIO: %s No matching device for CTag 0x%08x\n",
-                       __func__, pw_msg->em.comptag);
-               return -EIO;
-       }
-
-       pr_debug("RIO: Port-Write message from %s\n", rio_name(rdev));
+       struct rio_pwrite *pwrite;
 
 #ifdef DEBUG_PW
        {
-       u32 i;
-       for (i = 0; i < RIO_PW_MSG_SIZE/sizeof(u32);) {
+               u32 i;
+
+               pr_debug("%s: PW to mport_%d:\n", __func__, mport->id);
+               for (i = 0; i < RIO_PW_MSG_SIZE / sizeof(u32); i = i + 4) {
                        pr_debug("0x%02x: %08x %08x %08x %08x\n",
-                                i*4, pw_msg->raw[i], pw_msg->raw[i + 1],
-                                pw_msg->raw[i + 2], pw_msg->raw[i + 3]);
-                       i += 4;
-       }
+                               i * 4, pw_msg->raw[i], pw_msg->raw[i + 1],
+                               pw_msg->raw[i + 2], pw_msg->raw[i + 3]);
+               }
        }
 #endif
 
-       /* Call an external service function (if such is registered
-        * for this device). This may be the service for endpoints that send
-        * device-specific port-write messages. End-point messages expected
-        * to be handled completely by EP specific device driver.
+       rdev = rio_get_comptag((pw_msg->em.comptag & RIO_CTAG_UDEVID), NULL);
+       if (rdev) {
+               pr_debug("RIO: Port-Write message from %s\n", rio_name(rdev));
+       } else {
+               pr_debug("RIO: %s No matching device for CTag 0x%08x\n",
+                       __func__, pw_msg->em.comptag);
+       }
+
+       /* Call a device-specific handler (if it is registered for the device).
+        * This may be the service for endpoints that send device-specific
+        * port-write messages. End-point messages expected to be handled
+        * completely by EP specific device driver.
         * For switches rc==0 signals that no standard processing required.
         */
-       if (rdev->pwcback != NULL) {
+       if (rdev && rdev->pwcback) {
                rc = rdev->pwcback(rdev, pw_msg, 0);
                if (rc == 0)
                        return 0;
        }
 
+       mutex_lock(&mport->lock);
+       list_for_each_entry(pwrite, &mport->pwrites, node)
+               pwrite->pwcback(mport, pwrite->context, pw_msg, 0);
+       mutex_unlock(&mport->lock);
+
+       if (!rdev)
+               return 0;
+
+       /*
+        * FIXME: The code below stays as it was before for now until we decide
+        * how to do default PW handling in combination with per-mport callbacks
+        */
+
        portnum = pw_msg->em.is_port & 0xFF;
 
        /* Check if device and route to it are functional:
@@ -2027,6 +2202,8 @@ int rio_mport_initialize(struct rio_mport *mport)
        mport->host_deviceid = rio_get_hdid(mport->id);
        mport->nscan = NULL;
        mutex_init(&mport->lock);
+       mport->pwe_refcnt = 0;
+       INIT_LIST_HEAD(&mport->pwrites);
 
        return 0;
 }
This page took 0.033368 seconds and 5 git commands to generate.