From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:21314 "EHLO mx0b-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729494AbgFVPh3 (ORCPT ); Mon, 22 Jun 2020 11:37:29 -0400 Subject: Re: [PATCH v8 1/2] s390/setup: diag 318: refactor struct References: <20200618222222.23175-1-walling@linux.ibm.com> <20200618222222.23175-2-walling@linux.ibm.com> From: Collin Walling Message-ID: Date: Mon, 22 Jun 2020 11:37:21 -0400 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-s390-owner@vger.kernel.org List-ID: To: Christian Borntraeger , kvm@vger.kernel.org, linux-s390@vger.kernel.org Cc: pbonzini@redhat.com, frankja@linux.ibm.com, david@redhat.com, cohuck@redhat.com, imbrenda@linux.ibm.com, heiko.carstens@de.ibm.com, gor@linux.ibm.com, thuth@redhat.com On 6/22/20 10:56 AM, Christian Borntraeger wrote: > > On 19.06.20 00:22, Collin Walling wrote: >> The diag 318 struct introduced in include/asm/diag.h can be >> reused in KVM, so let's condense the version code fields in the >> diag318_info struct for easier usage and simplify it until we >> can determine how the data should be formatted. >> >> Signed-off-by: Collin Walling >> Reviewed-by: David Hildenbrand >> Reviewed-by: Cornelia Huck >> Reviewed-by: Thomas Huth >> Reviewed-by: Janosch Frank > > Series looks good to me. Can you respin the 2nd patch regarding the VSIE things > and I can then apply it. > > Will do. Thanks. >> --- >> arch/s390/include/asm/diag.h | 6 ++---- >> arch/s390/kernel/setup.c | 3 +-- >> 2 files changed, 3 insertions(+), 6 deletions(-) >> >> diff --git a/arch/s390/include/asm/diag.h b/arch/s390/include/asm/diag.h >> index 0036eab14391..ca8f85b53a90 100644 >> --- a/arch/s390/include/asm/diag.h >> +++ b/arch/s390/include/asm/diag.h >> @@ -298,10 +298,8 @@ struct diag26c_mac_resp { >> union diag318_info { >> unsigned long val; >> struct { >> - unsigned int cpnc : 8; >> - unsigned int cpvc_linux : 24; >> - unsigned char cpvc_distro[3]; >> - unsigned char zero; >> + unsigned long cpnc : 8; >> + unsigned long cpvc : 56; >> }; >> }; >> >> diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c >> index 5853c9872dfe..878cacfc9c3e 100644 >> --- a/arch/s390/kernel/setup.c >> +++ b/arch/s390/kernel/setup.c >> @@ -1021,8 +1021,7 @@ static void __init setup_control_program_code(void) >> { >> union diag318_info diag318_info = { >> .cpnc = CPNC_LINUX, >> - .cpvc_linux = 0, >> - .cpvc_distro = {0}, >> + .cpvc = 0, >> }; >> >> if (!sclp.has_diag318) >> -- Regards, Collin Stay safe and stay healthy