Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1bf8590 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 0d01bb89

arch/s390/include/asm/page.h

+0 −3
Original line number Diff line number Diff line
@@ -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)

{

drivers/s390/cio/chsc.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/s390/cio/chsc_sch.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/s390/cio/qdio_setup.c

+5 −5
Original line number Diff line number Diff line
@@ -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);

drivers/s390/cio/qdio_thinint.c

+2 −2
Original line number Diff line number Diff line
@@ -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;