Let's check if we can enable/disable interrupts and if all errors are
reported if we specify bad addresses for the notification indication
byte.
Signed-off-by: Janosch Frank <frankja@xxxxxxxxxxxxx>
---
lib/s390x/ap.c | 33 ++++++++++++++++++++++
lib/s390x/ap.h | 11 ++++++++
s390x/ap.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 118 insertions(+), 1 deletion(-)
diff --git a/lib/s390x/ap.c b/lib/s390x/ap.c
index 9ba5a037..23338c2d 100644
--- a/lib/s390x/ap.c
+++ b/lib/s390x/ap.c
@@ -58,6 +58,39 @@ int ap_pqap_tapq(uint8_t ap, uint8_t qn, struct ap_queue_status *apqsw,
return cc;
}
+int ap_pqap_aqic(uint8_t ap, uint8_t qn, struct ap_queue_status *apqsw,
+ struct ap_qirq_ctrl aqic, unsigned long addr)
+{
+ struct pqap_r0 r0 = {};
+ int cc;
+
+ /*
+ * AP-Queue Interruption Control
+ *
+ * Enables/disables interrupts for a APQN
+ *
+ * Inputs: 0,1,2
+ * Outputs: 1 (APQSW)
+ * Synchronous
+ */
+ r0.ap = ap;
+ r0.qn = qn;
+ r0.fc = PQAP_QUEUE_INT_CONTRL;
+ asm volatile(
+ " lgr 0,%[r0]\n"
+ " lgr 1,%[aqic]\n"
+ " lgr 2,%[addr]\n"
+ " .insn rre,0xb2af0000,0,0\n" /* PQAP */
+ " stg 1, %[apqsw]\n"
+ " ipm %[cc]\n"
+ " srl %[cc],28\n"
+ : [apqsw] "=&T" (*apqsw), [cc] "=&d" (cc)
+ : [r0] "d" (r0), [aqic] "d" (aqic), [addr] "d" (addr)
+ : "cc", "memory", "0", "2");
+
+ return cc;
+}
+
int ap_pqap_qci(struct ap_config_info *info)
{
struct pqap_r0 r0 = { .fc = PQAP_QUERY_AP_CONF_INFO };
diff --git a/lib/s390x/ap.h b/lib/s390x/ap.h
index ac9e59d1..7a91881d 100644
--- a/lib/s390x/ap.h
+++ b/lib/s390x/ap.h
@@ -81,6 +81,15 @@ struct pqap_r2 {
} __attribute__((packed)) __attribute__((aligned(8)));
_Static_assert(sizeof(struct pqap_r2) == sizeof(uint64_t), "pqap_r2 size");
+struct ap_qirq_ctrl {
+ uint64_t res0 : 16;
+ uint64_t ir : 1; /* ir flag: enable (1) or disable (0) irq */
+ uint64_t res1 : 44;
+ uint64_t isc : 3; /* irq sub class */
+} __attribute__((packed)) __attribute__((aligned(8)));
+_Static_assert(sizeof(struct ap_qirq_ctrl) == sizeof(uint64_t),
+ "struct ap_qirq_ctrl size");
+
/*
* Maximum number of APQNs that we keep track of.
*
@@ -100,4 +109,6 @@ int ap_setup(uint8_t **ap_array, uint8_t **qn_array, uint8_t *naps, uint8_t *nqn
int ap_pqap_tapq(uint8_t ap, uint8_t qn, struct ap_queue_status *apqsw,
struct pqap_r2 *r2);
int ap_pqap_qci(struct ap_config_info *info);
+int ap_pqap_aqic(uint8_t ap, uint8_t qn, struct ap_queue_status *apqsw,
+ struct ap_qirq_ctrl aqic, unsigned long addr);
#endif
diff --git a/s390x/ap.c b/s390x/ap.c
index 32feb8db..8ea2b52e 100644
--- a/s390x/ap.c
+++ b/s390x/ap.c
@@ -12,10 +12,15 @@
#include <interrupt.h>
#include <bitops.h>
#include <alloc_page.h>
+#include <malloc_io.h>
+#include <asm/page.h>
#include <asm/facility.h>
#include <asm/time.h>
#include <ap.h>
+static uint8_t apn;
+static uint8_t qn;
+
/* For PQAP PGM checks where we need full control over the input */
static void pqap(unsigned long grs[3])
{
@@ -290,9 +295,63 @@ static void test_priv(void)
report_prefix_pop();
}
+static void test_pqap_aqic(void)
+{
+ uint8_t *not_ind_byte = alloc_io_mem(PAGE_SIZE, 0);
+ struct ap_queue_status apqsw = {};
+ struct ap_qirq_ctrl aqic = {};
+ struct pqap_r2 r2 = {};
+ int cc;
+
+ report_prefix_push("aqic");
+ *not_ind_byte = 0;
+
+ aqic.ir = 1;
+ cc = ap_pqap_aqic(apn, qn, &apqsw, aqic, 0);
+ report(cc == 3 && apqsw.rc == 6, "invalid addr 0");
+
+ aqic.ir = 1;
+ cc = ap_pqap_aqic(apn, qn, &apqsw, aqic, -1);
+ report(cc == 3 && apqsw.rc == 6, "invalid addr -1");
+
+ aqic.ir = 0;
+ cc = ap_pqap_aqic(apn, qn, &apqsw, aqic, (uintptr_t)not_ind_byte);
+ report(cc == 3 && apqsw.rc == 7, "disable IRQs while already disabled");
+
+ aqic.ir = 1;
+ cc = ap_pqap_aqic(apn, qn, &apqsw, aqic, (uintptr_t)not_ind_byte);
+ report(cc == 0 && apqsw.rc == 0, "enable IRQs");
+
+ do {
+ mdelay(20);
+ cc = ap_pqap_tapq(apn, qn, &apqsw, &r2);
+ } while (cc == 0 && apqsw.irq_enabled == 0);
+ report(cc == 0 && apqsw.irq_enabled == 1, "enable IRQs tapq data");
+
+ cc = ap_pqap_aqic(apn, qn, &apqsw, aqic, (uintptr_t)not_ind_byte);
+ report(cc == 3 && apqsw.rc == 7, "enable IRQs while already enabled");
+
+ aqic.ir = 0;
+ cc = ap_pqap_aqic(apn, qn, &apqsw, aqic, (uintptr_t)not_ind_byte);
+ report(cc == 0 && apqsw.rc == 0, "disable IRQs");
+
+ do {
+ mdelay(20);
+ cc = ap_pqap_tapq(apn, qn, &apqsw, &r2);
+ } while (cc == 0 && apqsw.irq_enabled == 1);
+ report(cc == 0 && apqsw.irq_enabled == 0, "disable IRQs tapq data");
+
+ report_prefix_pop();
+
+ free_io_mem(not_ind_byte, PAGE_SIZE);
+}
+
int main(void)
{
- int setup_rc = ap_setup(NULL, NULL, NULL, NULL);
+ uint8_t num_ap, num_qn;
+ uint8_t *apns;
+ uint8_t *qns;
+ int setup_rc = ap_setup(&apns, &qns, &num_ap, &num_qn);
report_prefix_push("ap");
if (setup_rc == AP_SETUP_NOINSTR) {
@@ -305,6 +364,20 @@ int main(void)
test_pgms_nqap();
test_pgms_dqap();
+ /* The next tests need queues */
+ if (setup_rc == AP_SETUP_NOAPQN) {
+ report_skip("No APQN available");
+ goto done;
+ }
+ apn = apns[0];
+ qn = qns[0];
+ report_prefix_push("pqap");
+ if (test_facility(65))
+ test_pqap_aqic();
+ else
+ report_skip("no AQIC and reset tests without IRQ support");
+ report_prefix_pop();
+
done:
report_prefix_pop();
return report_summary();
--
2.34.1
