On Thu, 27 Jul 2017 17:48:42 +0200
Halil Pasic <pa...@linux.vnet.ibm.com> wrote:
> According to the PoP channel command words (CCW) must be doubleword
> aligned and 31 bit addressable for format 1 and 24 bit addressable for
> format 0 CCWs.
>
> If the channel subsystem encounters ccw address which does not satisfy
missing 'a' (fixed up while applying)
> this alignment requirement a program-check condition is recognised.
>
> The situation with 31 bit addressable is a bit more complicated: both the
> ORB and a format 1 CCW TIC hold the address of (the rest of) the channel
> program, that is the address of the next CCW in a word, and the PoP
> mandates that bit 0 of that word shall be zero -- or a program-check
> condition is to be recognized -- and does not belong to the field holding
> the ccw address.
>
> Since in code the corresponding fields span across the whole word (unlike
> in PoP where these are defined as 31 bit wide) we can check this by
> applying a mask. The 24 addressable case isn't affecting TIC because the
> address is composed of a halfword and a byte portion (no additional zero
> bit requirements) and just slightly complicates the ORB case where also
> bits 1-7 need to be zero.
>
> The same requirements (especially n-bit addressability) apply to the
> ccw addresses generated while chaining.
>
> Let's make our CSS implementation follow the AR more closely.
>
> Signed-off-by: Halil Pasic <pa...@linux.vnet.ibm.com>
> ---
>
> This patch used to be a patch used to be a part of the series 'ccw
> interpretation AR compliance improvements' but the other patch was
> already applied.
>
> I would still like this one being in front of '390x/css: fix bits must be
> zero check for TIC' as the commit message of that change relies the
> changes done in this patch.
No worries, I've switched the patches around.
>
> v1 -> v2
> * fixed condition (precedence was wrong -- thanks Dong Jia)
> * check on each iteration when chaining (every ccw of the channel
> program needs to be 31 or 24 bit addressable (if touched), not only
> the addresses in TIC and ORB)
> ---
> hw/s390x/css.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/hw/s390x/css.c b/hw/s390x/css.c
> index 6a42b95cee..177cbfc92d 100644
> --- a/hw/s390x/css.c
> +++ b/hw/s390x/css.c
> @@ -795,6 +795,10 @@ static int css_interpret_ccw(SubchDev *sch, hwaddr
> ccw_addr,
> if (!ccw_addr) {
> return -EIO;
> }
> + /* Check doubleword aligned and 31 or 24 (fmt 0) bit addressable. */
> + if (ccw_addr & (sch->ccw_fmt_1 ? 0x80000007 : 0xff000007)) {
> + return -EINVAL;
> + }
I like that this has now collapsed to that one check :)
>
> /* Translate everything to format-1 ccws - the information is the same.
> */
> ccw = copy_ccw_from_guest(ccw_addr, sch->ccw_fmt_1);
Thanks, applied.
