Commit c63c473f authored by Sven Schnelle's avatar Sven Schnelle Committed by Vasily Gorbik
Browse files

s390/cio: add tpi.h header file 



For future work we need the struct tpi_info declaration in asm/ptrace.h.
Due to circular dependencies it cannot stay in asm/lowcore.h or asm/cio.h,
which would be the preferred location. Therefore add it in its own header
file.

Also fix a typo in the length of a reserved field that did not have a
functional effect beyond an incorrect field value in the s390_cio_tpi
tracepoint.

Fixes: 2ab59de7 ("s390/cio: Consolidate inline assemblies and related data definitions")
Signed-off-by: default avatarSven Schnelle <svens@linux.ibm.com>
Acked-by: default avatarPeter Oberparleiter <oberpar@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 5d3516b3

arch/s390/include/asm/cio.h

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/bitops.h>

#include <linux/genalloc.h>

#include <asm/types.h>

#include <asm/tpi.h>



#define LPM_ANYPATH 0xff

#define __MAX_CSSID 0

arch/s390/include/asm/tpi.h

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef _ASM_S390_TPI_H

#define _ASM_S390_TPI_H



#include <linux/types.h>

#include <uapi/asm/schid.h>



/* I/O-Interruption Code as stored by TEST PENDING INTERRUPTION (TPI). */

struct tpi_info {

	struct subchannel_id schid;

	u32 intparm;

	u32 adapter_IO:1;

	u32 directed_irq:1;

	u32 isc:3;

	u32 :12;

	u32 type:3;

	u32 :12;

} __packed __aligned(4);



#endif /* _ASM_S390_TPI_H */

drivers/s390/cio/cio.h

+1 −12
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <asm/cio.h>

#include <asm/fcx.h>

#include <asm/schid.h>

#include <asm/tpi.h>

#include "chsc.h"



/*
@@ -46,18 +47,6 @@ struct pmcw { 
				/*  ... in an operand exception.       */

} __attribute__ ((packed));



/* I/O-Interruption Code as stored by TEST PENDING INTERRUPTION (TPI). */

struct tpi_info {

	struct subchannel_id schid;

	u32 intparm;

	u32 adapter_IO:1;

	u32 directed_irq:1;

	u32 isc:3;

	u32 :27;

	u32 type:3;

	u32 :12;

} __packed __aligned(4);



/* Target SCHIB configuration. */

struct schib_config {

	u64 mba;