From patchwork Tue Dec 7 20:38:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Heimes X-Patchwork-Id: 1564870 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=h5ED6jCr; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J7sbM2K74z9sRR for ; Wed, 8 Dec 2021 07:39:09 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1muhEm-0003gy-Sl; Tue, 07 Dec 2021 20:38:56 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1muhEl-0003gO-6b for kernel-team@lists.ubuntu.com; Tue, 07 Dec 2021 20:38:55 +0000 Received: from T570.fritz.box (p54abb5f9.dip0.t-ipconnect.de [84.171.181.249]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id EE38740E8E for ; Tue, 7 Dec 2021 20:38:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638909535; bh=9Qw1qtlTObry8fXfvGmFJVRop4ydpd2a5LiZ96m3z9s=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=h5ED6jCrnw5WBYB+KJs1bAM+uXjcPv3AoSOKZq1cXKFV3WqqUiEC99A9cmCQCGOoj GR9znJY0KNCfHAfmD8tFC51UNhxa5B3xZJ4MQYc0Ccjt7wVSxfpE6yA101BikF90ug 7nkEmFWDwtjIp2xWhB60jT/iWYjmuvuNeQHjfkoD1T2S9eXTdt9F1os3rlLkQBl0+0 LlJHk4ruBhnm9cD01NdGm9xsgpTD2qiDkpwVrkqLtCnZagyU/CtYjYbllDgmJIs0xE 3K5LVZ9JBfovU44yvC12JgCgjWqzuAZ8dFRK8RSQr0SYfXAK4m13554DR6WkEuk71v eiKjTo+DM+51w== From: frank.heimes@canonical.com To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 1/4] s390/setup: diag 318: refactor struct Date: Tue, 7 Dec 2021 21:38:45 +0100 Message-Id: <20211207203850.3212728-2-frank.heimes@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211207203850.3212728-1-frank.heimes@canonical.com> References: <20211207203850.3212728-1-frank.heimes@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Collin Walling BugLink: https://bugs.launchpad.net/bugs/1953334 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 Link: https://lore.kernel.org/r/20200622154636.5499-2-walling@linux.ibm.com Signed-off-by: Christian Borntraeger (backported from commit a23816f3cdcbffe5dc6e8c331914b3f51b87c2f3) Signed-off-by: Frank Heimes --- 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 303377a53b0d..507efc910865 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -1036,8 +1036,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)