[S390] cio: fix storage key handling

Some parts of cio do not shift PAGE_DEFAULT_KEY correctly and end up
with an incorrect key in their data structures.
Since the default key is zero this doesn't really matter. However if
somebody would use key-controlled protection for debugging purposes
it would be quite helpful if all of this would work as expected.

Also remove a stale declaration.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
index 8c2dea5fa2b4..4464907715a4 100644
--- a/drivers/s390/cio/qdio_setup.c
+++ b/drivers/s390/cio/qdio_setup.c
@@ -333,10 +333,10 @@ static void __qdio_allocate_fill_qdr(struct qdio_irq *irq_ptr,
         irq_ptr->qdr->qdf0[i + nr].slsba =
                 (unsigned long)&irq_ptr_qs[i]->slsb.val[0];
 
-        irq_ptr->qdr->qdf0[i + nr].akey = PAGE_DEFAULT_KEY;
-        irq_ptr->qdr->qdf0[i + nr].bkey = PAGE_DEFAULT_KEY;
-        irq_ptr->qdr->qdf0[i + nr].ckey = PAGE_DEFAULT_KEY;
-        irq_ptr->qdr->qdf0[i + nr].dkey = PAGE_DEFAULT_KEY;
+        irq_ptr->qdr->qdf0[i + nr].akey = PAGE_DEFAULT_KEY >> 4;
+        irq_ptr->qdr->qdf0[i + nr].bkey = PAGE_DEFAULT_KEY >> 4;
+        irq_ptr->qdr->qdf0[i + nr].ckey = PAGE_DEFAULT_KEY >> 4;
+        irq_ptr->qdr->qdf0[i + nr].dkey = PAGE_DEFAULT_KEY >> 4;
 }
 
 static void setup_qdr(struct qdio_irq *irq_ptr,
@@ -350,7 +350,7 @@ static void setup_qdr(struct qdio_irq *irq_ptr,
         irq_ptr->qdr->iqdsz = sizeof(struct qdesfmt0) / 4; /* size in words */
         irq_ptr->qdr->oqdsz = sizeof(struct qdesfmt0) / 4;
         irq_ptr->qdr->qiba = (unsigned long)&irq_ptr->qib;
-        irq_ptr->qdr->qkey = PAGE_DEFAULT_KEY;
+        irq_ptr->qdr->qkey = PAGE_DEFAULT_KEY >> 4;
 
         for (i = 0; i < qdio_init->no_input_qs; i++)
                 __qdio_allocate_fill_qdr(irq_ptr, irq_ptr->input_qs, i, 0);