[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>

diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h
index 5e9daf5d7f223b744dca0993c1e09f08877fbcf9..af650fb472064a82c09ab508cab7ccd341412c79 100644 (file)
--- a/arch/s390/include/asm/page.h
+++ b/arch/s390/include/asm/page.h
@@ -107,9 +107,6 @@ typedef pte_t *pgtable_t;
 #define __pgd(x)        ((pgd_t) { (x) } )
 #define __pgprot(x)     ((pgprot_t) { (x) } )
 
-/* default storage key used for all pages */
-extern unsigned int default_storage_key;
-
 static inline void
 page_set_storage_key(unsigned long addr, unsigned int skey)
 {

diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index 1ecd3e567648f0cf97dec1b0d63060450aae2037..4038f5b4f144e565bae3a5aac6201bce651b41bb 100644 (file)
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -574,7 +574,7 @@ int __chsc_do_secm(struct channel_subsystem *css, int enable, void *page)
        secm_area->request.length = 0x0050;
        secm_area->request.code = 0x0016;
 
-       secm_area->key = PAGE_DEFAULT_KEY;
+       secm_area->key = PAGE_DEFAULT_KEY >> 4;
        secm_area->cub_addr1 = (u64)(unsigned long)css->cub_addr1;
        secm_area->cub_addr2 = (u64)(unsigned long)css->cub_addr2;
 

diff --git a/drivers/s390/cio/chsc_sch.c b/drivers/s390/cio/chsc_sch.c
index c84ac9443079fb2b616f72c2bc56479528e03aed..df7388e88d314c92b19bbc6f90fdd3c33759e408 100644 (file)
--- a/drivers/s390/cio/chsc_sch.c
+++ b/drivers/s390/cio/chsc_sch.c
@@ -237,7 +237,7 @@ static int chsc_async(struct chsc_async_area *chsc_area,
        int ret = -ENODEV;
        char dbf[10];
 
-       chsc_area->header.key = PAGE_DEFAULT_KEY;
+       chsc_area->header.key = PAGE_DEFAULT_KEY >> 4;
        while ((sch = chsc_get_next_subchannel(sch))) {
                spin_lock(sch->lock);
                private = sch->private;

diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
index 8c2dea5fa2b48b6bd559cc5e77c49c8f26e76956..4464907715a4e46e5b48d948318272b3cf15a9bd 100644 (file)
--- 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);

diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c
index 091d904d3182a566fc059e11fd193adb5d574cbb..9942c1031b25332ba133ff4916907c395e4c0b7b 100644 (file)
--- a/drivers/s390/cio/qdio_thinint.c
+++ b/drivers/s390/cio/qdio_thinint.c
@@ -198,8 +198,8 @@ static int set_subchannel_ind(struct qdio_irq *irq_ptr, int reset)
                .code   = 0x0021,
        };
        scssc_area->operation_code = 0;
-       scssc_area->ks = PAGE_DEFAULT_KEY;
-       scssc_area->kc = PAGE_DEFAULT_KEY;
+       scssc_area->ks = PAGE_DEFAULT_KEY >> 4;
+       scssc_area->kc = PAGE_DEFAULT_KEY >> 4;
        scssc_area->isc = QDIO_AIRQ_ISC;
        scssc_area->schid = irq_ptr->schid;