From patchwork Thu Feb 18 17:26:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Morel X-Patchwork-Id: 12093857 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BDA7EC433E0 for ; Thu, 18 Feb 2021 18:31:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6BD0A64E2F for ; Thu, 18 Feb 2021 18:31:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230218AbhBRSbd (ORCPT ); Thu, 18 Feb 2021 13:31:33 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:2954 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233160AbhBRR1w (ORCPT ); Thu, 18 Feb 2021 12:27:52 -0500 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 11IHKcdR029242 for ; Thu, 18 Feb 2021 12:26:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=pp1; bh=VtrUzpFFWn58R6s39JdNagmRhLdyoxu/DuWKOSH3op8=; b=Z4YNJqDwmvLA1p/LiwmSuygElbojbQtySQ3v+2ahWc6SBeWD1yQGGLqR7eVUOTW3M4sD 5buEHREFJdvW6NvTPqJg0cU5QgUyniVF263pPfeLKcItiG/sebgs2NdGmzkiERsmm98D 5nIqKjtgQsg1wKx8GeQgWf2UDrszeBpVs5RGBIdn3Sr05ppc4Gec6VAihdD9I5O2EmqR CfXxqNzyk+pRzMYLtOquTma0CfLIyw2CnPEct1a2RoydI2K9HVdAmT8KIGTnontRGe9k 5dm7eSttWD1tZElyQnmicJjL3ilpdY0xOMW7yNG9eWlP0nQZvd/KjLZS8Ml+RRYZ0pGk yg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 36stphvxmm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 18 Feb 2021 12:26:52 -0500 Received: from m0098410.ppops.net (m0098410.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 11IHLQNV034221 for ; Thu, 18 Feb 2021 12:26:51 -0500 Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com with ESMTP id 36stphvxkp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 Feb 2021 12:26:51 -0500 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 11IHNvuv025810; Thu, 18 Feb 2021 17:26:49 GMT Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by ppma06ams.nl.ibm.com with ESMTP id 36p61hcv5e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 Feb 2021 17:26:49 +0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 11IHQkgr44433826 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 Feb 2021 17:26:46 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7BED8A4040; Thu, 18 Feb 2021 17:26:46 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 233CBA404D; Thu, 18 Feb 2021 17:26:46 +0000 (GMT) Received: from oc3016276355.ibm.com (unknown [9.145.94.58]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 18 Feb 2021 17:26:46 +0000 (GMT) From: Pierre Morel To: kvm@vger.kernel.org Cc: frankja@linux.ibm.com, david@redhat.com, thuth@redhat.com, cohuck@redhat.com, imbrenda@linux.ibm.com Subject: [kvm-unit-tests PATCH v3 1/5] s390x: css: Store CSS Characteristics Date: Thu, 18 Feb 2021 18:26:40 +0100 Message-Id: <1613669204-6464-2-git-send-email-pmorel@linux.ibm.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1613669204-6464-1-git-send-email-pmorel@linux.ibm.com> References: <1613669204-6464-1-git-send-email-pmorel@linux.ibm.com> X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369,18.0.761 definitions=2021-02-18_08:2021-02-18,2021-02-18 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 spamscore=0 clxscore=1015 suspectscore=0 bulkscore=0 mlxscore=0 malwarescore=0 mlxlogscore=999 priorityscore=1501 adultscore=0 phishscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2102180144 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org CSS characteristics exposes the features of the Channel SubSystem. Let's use Store Channel Subsystem Characteristics to retrieve the features of the CSS. Signed-off-by: Pierre Morel Reviewed-by: Cornelia Huck --- lib/s390x/css.h | 67 +++++++++++++++++++++++++++ lib/s390x/css_lib.c | 110 +++++++++++++++++++++++++++++++++++++++++++- s390x/css.c | 12 +++++ 3 files changed, 188 insertions(+), 1 deletion(-) diff --git a/lib/s390x/css.h b/lib/s390x/css.h index 3e57445..49daecd 100644 --- a/lib/s390x/css.h +++ b/lib/s390x/css.h @@ -288,4 +288,71 @@ int css_residual_count(unsigned int schid); void enable_io_isc(uint8_t isc); int wait_and_check_io_completion(int schid); +/* + * CHSC definitions + */ +struct chsc_header { + u16 len; + u16 code; +}; + +/* Store Channel Subsystem Characteristics */ +struct chsc_scsc { + struct chsc_header req; + u16 req_fmt; + u8 cssid; + u8 res_03; + u32 res_04[2]; + struct chsc_header res; + u32 res_fmt; + u64 general_char[255]; + u64 chsc_char[254]; +}; + +extern struct chsc_scsc *chsc_scsc; +#define CHSC_SCSC 0x0010 +#define CHSC_SCSC_LEN 0x0010 + +int get_chsc_scsc(void); + +#define CSS_GENERAL_FEAT_BITLEN (255 * 64) +#define CSS_CHSC_FEAT_BITLEN (254 * 64) + +#define CHSC_SCSC 0x0010 +#define CHSC_SCSC_LEN 0x0010 + +#define CHSC_ERROR 0x0000 +#define CHSC_RSP_OK 0x0001 +#define CHSC_RSP_INVAL 0x0002 +#define CHSC_RSP_REQERR 0x0003 +#define CHSC_RSP_ENOCMD 0x0004 +#define CHSC_RSP_NODATA 0x0005 +#define CHSC_RSP_SUP31B 0x0006 +#define CHSC_RSP_EFRMT 0x0007 +#define CHSC_RSP_ECSSID 0x0008 +#define CHSC_RSP_ERFRMT 0x0009 +#define CHSC_RSP_ESSID 0x000A +#define CHSC_RSP_EBUSY 0x000B +#define CHSC_RSP_MAX 0x000B + +static inline int _chsc(void *p) +{ + int cc; + + asm volatile(" .insn rre,0xb25f0000,%2,0\n" + " ipm %0\n" + " srl %0,28\n" + : "=d" (cc), "=m" (p) + : "d" (p), "m" (p) + : "cc"); + + return cc; +} + +int chsc(void *p, uint16_t code, uint16_t len); + +#include +#define css_general_feature(bit) test_bit_inv(bit, chsc_scsc->general_char) +#define css_chsc_feature(bit) test_bit_inv(bit, chsc_scsc->chsc_char) + #endif diff --git a/lib/s390x/css_lib.c b/lib/s390x/css_lib.c index 3c24480..64560a2 100644 --- a/lib/s390x/css_lib.c +++ b/lib/s390x/css_lib.c @@ -15,11 +15,119 @@ #include #include #include - +#include #include #include static struct schib schib; +struct chsc_scsc *chsc_scsc; + +static const char * const chsc_rsp_description[] = { + "CHSC unknown error", + "Command executed", + "Invalid command", + "Request-block error", + "Command not installed", + "Data not available", + "Absolute address of channel-subsystem communication block exceeds 2G - 1.", + "Invalid command format", + "Invalid channel-subsystem identification (CSSID)", + "The command-request block specified an invalid format for the command response block.", + "Invalid subchannel-set identification (SSID)", + "A busy condition precludes execution.", +}; + +static int check_response(void *p) +{ + struct chsc_header *h = p; + + if (h->code == CHSC_RSP_OK) { + report(1, "CHSC command completed."); + return 0; + } + if (h->code > CHSC_RSP_MAX) + h->code = 0; + report(0, "Response code %04x: %s", h->code, chsc_rsp_description[h->code]); + return -1; +} + +int chsc(void *p, uint16_t code, uint16_t len) +{ + struct chsc_header *h = p; + int cc; + + report_prefix_push("Channel Subsystem Call"); + h->code = code; + h->len = len; + cc = _chsc(p); + switch (cc) { + case 3: + report(0, "Subchannel invalid or not enabled."); + break; + case 2: + report(0, "CHSC subchannel busy."); + break; + case 1: + report(0, "Subchannel invalid or not enabled."); + break; + case 0: + cc = check_response(p + len); + break; + } + + report_prefix_pop(); + return cc; +} + +int get_chsc_scsc(void) +{ + int i, n; + int ret = 0; + char buffer[510]; + char *p; + + report_prefix_push("Channel Subsystem Call"); + + if (chsc_scsc) { + report_info("chsc_scsc already initialized"); + goto end; + } + + chsc_scsc = alloc_page(); + report_info("scsc_scsc at: %016lx", (u64)chsc_scsc); + if (!chsc_scsc) { + ret = -1; + report(0, "could not allocate chsc_scsc page!"); + goto end; + } + + report_info("scsc format %x\n", chsc_scsc->req_fmt); + ret = chsc(chsc_scsc, CHSC_SCSC, CHSC_SCSC_LEN); + if (ret) { + report(0, "chsc: CC %d", ret); + goto end; + } + + for (i = 0, p = buffer; i < CSS_GENERAL_FEAT_BITLEN; i++) { + if (css_general_feature(i)) { + n = snprintf(p, sizeof(buffer) - ret, "%d,", i); + p += n; + } + } + report_info("General features: %s", buffer); + + for (i = 0, p = buffer, ret = 0; i < CSS_CHSC_FEAT_BITLEN; i++) { + if (css_chsc_feature(i)) { + n = snprintf(p, sizeof(buffer) - ret, "%d,", i); + p += n; + } + } + report_info("CHSC features: %s", buffer); + +end: + report_prefix_pop(); + return ret; +} /* * css_enumerate: diff --git a/s390x/css.c b/s390x/css.c index 1a61a5c..18dbf01 100644 --- a/s390x/css.c +++ b/s390x/css.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -140,10 +141,21 @@ error_senseid: unregister_io_int_func(css_irq_io); } +static void css_init(void) +{ + int ret; + + ret = get_chsc_scsc(); + if (!ret) + report(1, " "); +} + static struct { const char *name; void (*func)(void); } tests[] = { + /* The css_init test is needed to initialize the CSS Characteristics */ + { "initialize CSS (chsc)", css_init }, { "enumerate (stsch)", test_enumerate }, { "enable (msch)", test_enable }, { "sense (ssch/tsch)", test_sense },