| Message ID | 20200515221935.18775-3-walling@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Use DIAG318 to set Control Program Name & Version Codes | expand |
On 16/05/2020 00.19, Collin Walling wrote: > Rename diag318 to diag_318 and byte_134 to fac134 in order to keep > naming schemes consistent with other diags and the read info struct > and make grepping easier. > > Signed-off-by: Collin Walling <walling@linux.ibm.com> > --- > arch/s390/include/asm/diag.h | 2 +- > arch/s390/include/asm/sclp.h | 2 +- > arch/s390/kernel/setup.c | 6 +++--- > drivers/s390/char/sclp.h | 2 +- > drivers/s390/char/sclp_early.c | 2 +- > 5 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/arch/s390/include/asm/diag.h b/arch/s390/include/asm/diag.h > index ca8f85b53a90..19da822e494c 100644 > --- a/arch/s390/include/asm/diag.h > +++ b/arch/s390/include/asm/diag.h > @@ -295,7 +295,7 @@ struct diag26c_mac_resp { > } __aligned(8); > > #define CPNC_LINUX 0x4 > -union diag318_info { > +union diag_318_info { $ grep -r diag.*info arch/s390/include/asm/diag.h struct diag204_info_blk_hdr { struct diag204_x_info_blk_hdr { struct diag204_cpu_info { struct diag204_x_cpu_info { struct diag204_x_cpu_info cpus[]; union diag318_info { ... none of these seem to use an underscore between the "diag" and the number ... so this seems unnecessary to me ... or what do I miss? Thomas
On 5/18/20 2:30 AM, Thomas Huth wrote: > On 16/05/2020 00.19, Collin Walling wrote: >> Rename diag318 to diag_318 and byte_134 to fac134 in order to keep >> naming schemes consistent with other diags and the read info struct >> and make grepping easier. >> >> Signed-off-by: Collin Walling <walling@linux.ibm.com> >> --- >> arch/s390/include/asm/diag.h | 2 +- >> arch/s390/include/asm/sclp.h | 2 +- >> arch/s390/kernel/setup.c | 6 +++--- >> drivers/s390/char/sclp.h | 2 +- >> drivers/s390/char/sclp_early.c | 2 +- >> 5 files changed, 7 insertions(+), 7 deletions(-) >> >> diff --git a/arch/s390/include/asm/diag.h b/arch/s390/include/asm/diag.h >> index ca8f85b53a90..19da822e494c 100644 >> --- a/arch/s390/include/asm/diag.h >> +++ b/arch/s390/include/asm/diag.h >> @@ -295,7 +295,7 @@ struct diag26c_mac_resp { >> } __aligned(8); >> >> #define CPNC_LINUX 0x4 >> -union diag318_info { >> +union diag_318_info { > > $ grep -r diag.*info arch/s390/include/asm/diag.h > struct diag204_info_blk_hdr { > struct diag204_x_info_blk_hdr { > struct diag204_cpu_info { > struct diag204_x_cpu_info { > struct diag204_x_cpu_info cpus[]; > union diag318_info { > > ... none of these seem to use an underscore between the "diag" and the > number ... so this seems unnecessary to me ... or what do I miss? > > Thomas > I could have sworn I saw more cases with the underscore. I think I was honing-in on a few cases in QEMU for whatever reason. Let's just forget this patch was posted :)
diff --git a/arch/s390/include/asm/diag.h b/arch/s390/include/asm/diag.h index ca8f85b53a90..19da822e494c 100644 --- a/arch/s390/include/asm/diag.h +++ b/arch/s390/include/asm/diag.h @@ -295,7 +295,7 @@ struct diag26c_mac_resp { } __aligned(8); #define CPNC_LINUX 0x4 -union diag318_info { +union diag_318_info { unsigned long val; struct { unsigned long cpnc : 8; diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h index c563f8368b19..a45967cfc1ae 100644 --- a/arch/s390/include/asm/sclp.h +++ b/arch/s390/include/asm/sclp.h @@ -78,7 +78,7 @@ struct sclp_info { unsigned char has_skey : 1; unsigned char has_kss : 1; unsigned char has_gisaf : 1; - unsigned char has_diag318 : 1; + unsigned char has_diag_318 : 1; unsigned char has_sipl : 1; unsigned char has_dirq : 1; unsigned int ibc; diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 1aaaf11acc6b..8925a1ac14c9 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -1026,16 +1026,16 @@ static void __init setup_task_size(void) */ static void __init setup_control_program_code(void) { - union diag318_info diag318_info = { + union diag_318_info diag_318_info = { .cpnc = CPNC_LINUX, .cpvc = 0, }; - if (!sclp.has_diag318) + if (!sclp.has_diag_318) return; diag_stat_inc(DIAG_STAT_X318); - asm volatile("diag %0,0,0x318\n" : : "d" (diag318_info.val)); + asm volatile("diag %0,0,0x318\n" : : "d" (diag_318_info.val)); } /* diff --git a/drivers/s390/char/sclp.h b/drivers/s390/char/sclp.h index 196333013e54..d6a91f3b8e2b 100644 --- a/drivers/s390/char/sclp.h +++ b/drivers/s390/char/sclp.h @@ -196,7 +196,7 @@ struct read_info_sccb { u8 _pad_122[124 - 122]; /* 122-123 */ u32 hmfai; /* 124-127 */ u8 _pad_128[134 - 128]; /* 128-133 */ - u8 byte_134; /* 134 */ + u8 fac134; /* 134 */ u8 cpudirq; /* 135 */ u16 cbl; /* 136-137 */ u8 _pad_138[4096 - 138]; /* 138-4095 */ diff --git a/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c index cc5e84b80c69..388d24c65e74 100644 --- a/drivers/s390/char/sclp_early.c +++ b/drivers/s390/char/sclp_early.c @@ -46,7 +46,7 @@ static void __init sclp_early_facilities_detect(struct read_info_sccb *sccb) if (sccb->fac91 & 0x40) S390_lowcore.machine_flags |= MACHINE_FLAG_TLB_GUEST; if (sccb->cpuoff > 134) - sclp.has_diag318 = !!(sccb->byte_134 & 0x80); + sclp.has_diag_318 = !!(sccb->fac134 & 0x80); sclp.rnmax = sccb->rnmax ? sccb->rnmax : sccb->rnmax2; sclp.rzm = sccb->rnsize ? sccb->rnsize : sccb->rnsize2; sclp.rzm <<= 20;
Rename diag318 to diag_318 and byte_134 to fac134 in order to keep naming schemes consistent with other diags and the read info struct and make grepping easier. Signed-off-by: Collin Walling <walling@linux.ibm.com> --- arch/s390/include/asm/diag.h | 2 +- arch/s390/include/asm/sclp.h | 2 +- arch/s390/kernel/setup.c | 6 +++--- drivers/s390/char/sclp.h | 2 +- drivers/s390/char/sclp_early.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)