|
 |
902636 |
From 04d4e7eda95316b64ea9dc0f4ca8801d531652e7 Mon Sep 17 00:00:00 2001
|
|
|
902636 |
From: Cornelia Huck <cohuck@redhat.com>
|
|
|
902636 |
Date: Tue, 23 Jun 2020 09:25:41 -0400
|
|
|
902636 |
Subject: [PATCH 07/12] s390x/css: Refactor the css_queue_crw() routine
|
|
|
902636 |
|
|
|
902636 |
RH-Author: Cornelia Huck <cohuck@redhat.com>
|
|
|
902636 |
Message-id: <20200623092543.358315-8-cohuck@redhat.com>
|
|
|
902636 |
Patchwork-id: 97700
|
|
|
902636 |
O-Subject: [RHEL-8.3.0 qemu-kvm PATCH 7/9] s390x/css: Refactor the css_queue_crw() routine
|
|
|
902636 |
Bugzilla: 1660916
|
|
|
902636 |
RH-Acked-by: Claudio Imbrenda <cimbrend@redhat.com>
|
|
|
902636 |
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
|
902636 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
902636 |
|
|
|
902636 |
From: Eric Farman <farman@linux.ibm.com>
|
|
|
902636 |
|
|
|
902636 |
We have a use case (vfio-ccw) where a CRW is already built and
|
|
|
902636 |
ready to use. Rather than teasing out the components just to
|
|
|
902636 |
reassemble it later, let's rework this code so we can queue a
|
|
|
902636 |
fully-qualified CRW directly.
|
|
|
902636 |
|
|
|
902636 |
Signed-off-by: Eric Farman <farman@linux.ibm.com>
|
|
|
902636 |
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
902636 |
Message-Id: <20200505125757.98209-6-farman@linux.ibm.com>
|
|
|
902636 |
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
902636 |
(cherry picked from commit f6dde1b012e678aa64339520ef7519ec04026cf1)
|
|
|
902636 |
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
902636 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
902636 |
---
|
|
|
902636 |
hw/s390x/css.c | 44 ++++++++++++++++++++++++++++--------------
|
|
|
902636 |
include/hw/s390x/css.h | 1 +
|
|
|
902636 |
2 files changed, 30 insertions(+), 15 deletions(-)
|
|
|
902636 |
|
|
|
902636 |
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
|
|
|
902636 |
index 71fd3f9a00..a8de8a0c84 100644
|
|
|
902636 |
--- a/hw/s390x/css.c
|
|
|
902636 |
+++ b/hw/s390x/css.c
|
|
|
902636 |
@@ -2170,30 +2170,23 @@ void css_subch_assign(uint8_t cssid, uint8_t ssid, uint16_t schid,
|
|
|
902636 |
}
|
|
|
902636 |
}
|
|
|
902636 |
|
|
|
902636 |
-void css_queue_crw(uint8_t rsc, uint8_t erc, int solicited,
|
|
|
902636 |
- int chain, uint16_t rsid)
|
|
|
902636 |
+void css_crw_add_to_queue(CRW crw)
|
|
|
902636 |
{
|
|
|
902636 |
CrwContainer *crw_cont;
|
|
|
902636 |
|
|
|
902636 |
- trace_css_crw(rsc, erc, rsid, chain ? "(chained)" : "");
|
|
|
902636 |
+ trace_css_crw((crw.flags & CRW_FLAGS_MASK_RSC) >> 8,
|
|
|
902636 |
+ crw.flags & CRW_FLAGS_MASK_ERC,
|
|
|
902636 |
+ crw.rsid,
|
|
|
902636 |
+ (crw.flags & CRW_FLAGS_MASK_C) ? "(chained)" : "");
|
|
|
902636 |
+
|
|
|
902636 |
/* TODO: Maybe use a static crw pool? */
|
|
|
902636 |
crw_cont = g_try_new0(CrwContainer, 1);
|
|
|
902636 |
if (!crw_cont) {
|
|
|
902636 |
channel_subsys.crws_lost = true;
|
|
|
902636 |
return;
|
|
|
902636 |
}
|
|
|
902636 |
- crw_cont->crw.flags = (rsc << 8) | erc;
|
|
|
902636 |
- if (solicited) {
|
|
|
902636 |
- crw_cont->crw.flags |= CRW_FLAGS_MASK_S;
|
|
|
902636 |
- }
|
|
|
902636 |
- if (chain) {
|
|
|
902636 |
- crw_cont->crw.flags |= CRW_FLAGS_MASK_C;
|
|
|
902636 |
- }
|
|
|
902636 |
- crw_cont->crw.rsid = rsid;
|
|
|
902636 |
- if (channel_subsys.crws_lost) {
|
|
|
902636 |
- crw_cont->crw.flags |= CRW_FLAGS_MASK_R;
|
|
|
902636 |
- channel_subsys.crws_lost = false;
|
|
|
902636 |
- }
|
|
|
902636 |
+
|
|
|
902636 |
+ crw_cont->crw = crw;
|
|
|
902636 |
|
|
|
902636 |
QTAILQ_INSERT_TAIL(&channel_subsys.pending_crws, crw_cont, sibling);
|
|
|
902636 |
|
|
|
902636 |
@@ -2204,6 +2197,27 @@ void css_queue_crw(uint8_t rsc, uint8_t erc, int solicited,
|
|
|
902636 |
}
|
|
|
902636 |
}
|
|
|
902636 |
|
|
|
902636 |
+void css_queue_crw(uint8_t rsc, uint8_t erc, int solicited,
|
|
|
902636 |
+ int chain, uint16_t rsid)
|
|
|
902636 |
+{
|
|
|
902636 |
+ CRW crw;
|
|
|
902636 |
+
|
|
|
902636 |
+ crw.flags = (rsc << 8) | erc;
|
|
|
902636 |
+ if (solicited) {
|
|
|
902636 |
+ crw.flags |= CRW_FLAGS_MASK_S;
|
|
|
902636 |
+ }
|
|
|
902636 |
+ if (chain) {
|
|
|
902636 |
+ crw.flags |= CRW_FLAGS_MASK_C;
|
|
|
902636 |
+ }
|
|
|
902636 |
+ crw.rsid = rsid;
|
|
|
902636 |
+ if (channel_subsys.crws_lost) {
|
|
|
902636 |
+ crw.flags |= CRW_FLAGS_MASK_R;
|
|
|
902636 |
+ channel_subsys.crws_lost = false;
|
|
|
902636 |
+ }
|
|
|
902636 |
+
|
|
|
902636 |
+ css_crw_add_to_queue(crw);
|
|
|
902636 |
+}
|
|
|
902636 |
+
|
|
|
902636 |
void css_generate_sch_crws(uint8_t cssid, uint8_t ssid, uint16_t schid,
|
|
|
902636 |
int hotplugged, int add)
|
|
|
902636 |
{
|
|
|
902636 |
diff --git a/include/hw/s390x/css.h b/include/hw/s390x/css.h
|
|
|
902636 |
index 7e3a5e7433..08c869ab0a 100644
|
|
|
902636 |
--- a/include/hw/s390x/css.h
|
|
|
902636 |
+++ b/include/hw/s390x/css.h
|
|
|
902636 |
@@ -205,6 +205,7 @@ void copy_scsw_to_guest(SCSW *dest, const SCSW *src);
|
|
|
902636 |
void css_inject_io_interrupt(SubchDev *sch);
|
|
|
902636 |
void css_reset(void);
|
|
|
902636 |
void css_reset_sch(SubchDev *sch);
|
|
|
902636 |
+void css_crw_add_to_queue(CRW crw);
|
|
|
902636 |
void css_queue_crw(uint8_t rsc, uint8_t erc, int solicited,
|
|
|
902636 |
int chain, uint16_t rsid);
|
|
|
902636 |
void css_generate_sch_crws(uint8_t cssid, uint8_t ssid, uint16_t schid,
|
|
|
902636 |
--
|
|
|
902636 |
2.27.0
|
|
|
902636 |
|