s390/cio: Generalize the TIC handler

Refactor ccwchain_handle_tic() into a routine that handles a channel
program address (which itself is a CCW pointer), rather than a CCW pointer
that is only a TIC CCW.  This will make it easier to reuse this code for
other CCW commands.

Signed-off-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20190606202831.44135-4-farman@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>

diff --git a/drivers/s390/cio/vfio_ccw_cp.c b/drivers/s390/cio/vfio_ccw_cp.c
index 628daf1a8f9a6955bfd5a0bdf52b2f901eab0706..52735cdb0270c1b223f7dcf0a8df674c97756e3f 100644 (file)
--- a/drivers/s390/cio/vfio_ccw_cp.c
+++ b/drivers/s390/cio/vfio_ccw_cp.c
@@ -497,13 +497,13 @@ static int tic_target_chain_exists(struct ccw1 *tic, struct channel_program *cp)
 static int ccwchain_loop_tic(struct ccwchain *chain,
                             struct channel_program *cp);
 
-static int ccwchain_handle_tic(struct ccw1 *tic, struct channel_program *cp)
+static int ccwchain_handle_ccw(u32 cda, struct channel_program *cp)
 {
        struct ccwchain *chain;
        int len, ret;
 
        /* Get chain length. */
-       len = ccwchain_calc_length(tic->cda, cp);
+       len = ccwchain_calc_length(cda, cp);
        if (len < 0)
                return len;
 
@@ -511,10 +511,10 @@ static int ccwchain_handle_tic(struct ccw1 *tic, struct channel_program *cp)
        chain = ccwchain_alloc(cp, len);
        if (!chain)
                return -ENOMEM;
-       chain->ch_iova = tic->cda;
+       chain->ch_iova = cda;
 
        /* Copy the new chain from user. */
-       ret = copy_ccw_from_iova(cp, chain->ch_ccw, tic->cda, len);
+       ret = copy_ccw_from_iova(cp, chain->ch_ccw, cda, len);
        if (ret) {
                ccwchain_free(chain);
                return ret;
@@ -540,7 +540,8 @@ static int ccwchain_loop_tic(struct ccwchain *chain, struct channel_program *cp)
                if (tic_target_chain_exists(tic, cp))
                        continue;
 
-               ret = ccwchain_handle_tic(tic, cp);
+               /* Build a ccwchain for the next segment */
+               ret = ccwchain_handle_ccw(tic->cda, cp);
                if (ret)
                        return ret;
        }