Commit 363fe5f7 authored by Eric Farman's avatar Eric Farman Committed by Cornelia Huck

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: default avatarEric Farman <farman@linux.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Message-Id: <20190606202831.44135-4-farman@linux.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent e64bd689
...@@ -497,13 +497,13 @@ static int tic_target_chain_exists(struct ccw1 *tic, struct channel_program *cp) ...@@ -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, static int ccwchain_loop_tic(struct ccwchain *chain,
struct channel_program *cp); 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; struct ccwchain *chain;
int len, ret; int len, ret;
/* Get chain length. */ /* Get chain length. */
len = ccwchain_calc_length(tic->cda, cp); len = ccwchain_calc_length(cda, cp);
if (len < 0) if (len < 0)
return len; return len;
...@@ -511,10 +511,10 @@ static int ccwchain_handle_tic(struct ccw1 *tic, struct channel_program *cp) ...@@ -511,10 +511,10 @@ static int ccwchain_handle_tic(struct ccw1 *tic, struct channel_program *cp)
chain = ccwchain_alloc(cp, len); chain = ccwchain_alloc(cp, len);
if (!chain) if (!chain)
return -ENOMEM; return -ENOMEM;
chain->ch_iova = tic->cda; chain->ch_iova = cda;
/* Copy the new chain from user. */ /* 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) { if (ret) {
ccwchain_free(chain); ccwchain_free(chain);
return ret; return ret;
...@@ -540,7 +540,8 @@ static int ccwchain_loop_tic(struct ccwchain *chain, struct channel_program *cp) ...@@ -540,7 +540,8 @@ static int ccwchain_loop_tic(struct ccwchain *chain, struct channel_program *cp)
if (tic_target_chain_exists(tic, cp)) if (tic_target_chain_exists(tic, cp))
continue; continue;
ret = ccwchain_handle_tic(tic, cp); /* Build a ccwchain for the next segment */
ret = ccwchain_handle_ccw(tic->cda, cp);
if (ret) if (ret)
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment