hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390/cio: Use cpa range elsewhere within vfio-ccw 

Since we have a little function to see whether a channel
program address falls within a range of CCWs, let's use
it in the other places of code that make these checks.

(Why isn't ccw_head fully removed?  Well, because this
way some longs lines don't have to be reflowed.)

Signed-off-by: Eric Farman <farman@linux.ibm.com>
Message-Id: <20190222183941.29596-3-farman@linux.ibm.com>
Reviewed-by: Farhan Ali <alifm@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Eric Farman 2019-02-22 19:39:41 +01:00 committed by Cornelia Huck
parent 48bd0eee8e
commit 2904337fd9
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/s390/cio/vfio_ccw_cp.c
View File

@ -443,13 +443,11 @@ static int ccwchain_calc_length(u64 iova, struct channel_program *cp)
static int tic_target_chain_exists(struct ccw1 *tic, struct channel_program *cp) static int tic_target_chain_exists(struct ccw1 *tic, struct channel_program *cp)
{ {
struct ccwchain *chain; struct ccwchain *chain;
u32 ccw_head, ccw_tail; u32 ccw_head;
list_for_each_entry(chain, &cp->ccwchain_list, next) { list_for_each_entry(chain, &cp->ccwchain_list, next) {
ccw_head = chain->ch_iova; ccw_head = chain->ch_iova;
ccw_tail = ccw_head + (chain->ch_len - 1) * sizeof(struct ccw1); if (is_cpa_within_range(tic->cda, ccw_head, chain->ch_len))
if ((ccw_head <= tic->cda) && (tic->cda <= ccw_tail))
return 1; return 1;
} }
@ -516,13 +514,11 @@ static int ccwchain_fetch_tic(struct ccwchain *chain,
{ {
struct ccw1 *ccw = chain->ch_ccw + idx; struct ccw1 *ccw = chain->ch_ccw + idx;
struct ccwchain *iter; struct ccwchain *iter;
u32 ccw_head, ccw_tail; u32 ccw_head;
list_for_each_entry(iter, &cp->ccwchain_list, next) { list_for_each_entry(iter, &cp->ccwchain_list, next) {
ccw_head = iter->ch_iova; ccw_head = iter->ch_iova;
ccw_tail = ccw_head + (iter->ch_len - 1) * sizeof(struct ccw1); if (is_cpa_within_range(ccw->cda, ccw_head, iter->ch_len)) {
if ((ccw_head <= ccw->cda) && (ccw->cda <= ccw_tail)) {
ccw->cda = (__u32) (addr_t) (((char *)iter->ch_ccw) + ccw->cda = (__u32) (addr_t) (((char *)iter->ch_ccw) +
(ccw->cda - ccw_head)); (ccw->cda - ccw_head));
return 0; return 0;
@ -864,7 +860,7 @@ void cp_update_scsw(struct channel_program *cp, union scsw *scsw)
{ {
struct ccwchain *chain; struct ccwchain *chain;
u32 cpa = scsw->cmd.cpa; u32 cpa = scsw->cmd.cpa;
u32 ccw_head, ccw_tail; u32 ccw_head;
/* /*
* LATER: * LATER:
@ -874,9 +870,7 @@ void cp_update_scsw(struct channel_program *cp, union scsw *scsw)
*/ */
list_for_each_entry(chain, &cp->ccwchain_list, next) { list_for_each_entry(chain, &cp->ccwchain_list, next) {
ccw_head = (u32)(u64)chain->ch_ccw; ccw_head = (u32)(u64)chain->ch_ccw;
ccw_tail = (u32)(u64)(chain->ch_ccw + chain->ch_len - 1); if (is_cpa_within_range(cpa, ccw_head, chain->ch_len)) {
if ((ccw_head <= cpa) && (cpa <= ccw_tail)) {
/* /*
* (cpa - ccw_head) is the offset value of the host * (cpa - ccw_head) is the offset value of the host
* physical ccw to its chain head. * physical ccw to its chain head.