From patchwork Mon Jun 28 08:06:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam McNally X-Patchwork-Id: 12347403 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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 9C7E5C49EAB for ; Mon, 28 Jun 2021 08:07:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5CD78619F1 for ; Mon, 28 Jun 2021 08:07:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5CD78619F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 780B86E2C7; Mon, 28 Jun 2021 08:07:06 +0000 (UTC) Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by gabe.freedesktop.org (Postfix) with ESMTPS id 77DE16E040 for ; Mon, 28 Jun 2021 08:07:04 +0000 (UTC) Received: by mail-pl1-x636.google.com with SMTP id o3so3372602plg.4 for ; Mon, 28 Jun 2021 01:07:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=21k231iYronjuvnyYK5DtKewl+/dujygOQnBwVDhWTo=; b=GcRY6DJYvM5Vx8RVOW3dTPWKBwKunyb6/GRtagXdFQRnV7xVHHUHd4iH6Rs5JETG34 mmkjaFRHCPvtIxzdH5C40gDBSAwgY8cFRS3onpAxkiTZO7lHKFb3OynOZviI/aBPTs4G dgCDgxbUs1b5XodFN3vDxhETgdJdcAuayawEE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=21k231iYronjuvnyYK5DtKewl+/dujygOQnBwVDhWTo=; b=PyKEhUHIvIrnM3I8KIw8aCTzq1MOIqGqIvVZD/HgduK8e/2DPtJmvqPNYchUc2VFTE V/3IeaoVtlFtBcoaIldBueKnfGPChOJDM1/AVVZ5ueGNogWamMHuyzLOXzbOPI/KPpjC B73m6mMRfU/UJebVDNl0srYuw7CX+dMSSyit9LW5iEJZ6t3/l8pDb/aA0MWdpdXIpQ9x ICxqLeFTwvuM16MSAkmZCPTHjGWj5QCID6cj5pX4bNpfxeHRSyE3kNVGsuvGjbCTLOc0 I0AfVM4DRQAYiWExwkANc9F5i1mneIhODddsURjTRL/jnJrCho/x8iDbdXbOGI1ZpK+N 9zZw== X-Gm-Message-State: AOAM533swLBFXe7sw+IDhv1GDi7s2X3CrHwxeoqc/fetOfL0fbQJ3Q+T W52/bvtMv6IbEiznK3563RO7Rg== X-Google-Smtp-Source: ABdhPJycn1QHnN9lWB8XSQa0gWLhdeHEJZMeTqGhjbmwF6ELuljIiY8lWyv9d9/3myknHQv7VOkomA== X-Received: by 2002:a17:902:c9d5:b029:11e:7a87:205 with SMTP id q21-20020a170902c9d5b029011e7a870205mr21448192pld.37.1624867623958; Mon, 28 Jun 2021 01:07:03 -0700 (PDT) Received: from localhost ([2401:fa00:9:14:d9cf:d433:6a82:6f81]) by smtp.gmail.com with UTF8SMTPSA id s31sm8932931pfg.191.2021.06.28.01.06.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 28 Jun 2021 01:07:03 -0700 (PDT) From: Sam McNally To: LKML Subject: [PATCH v6 1/3] drm/dp_mst: Add self-tests for up requests Date: Mon, 28 Jun 2021 18:06:41 +1000 Message-Id: <20210628180604.v6.1.I6f50a7996687318ba298c24a3663c8be7dd432c7@changeid> X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Zimmermann , David Airlie , Hans Verkuil , Sam McNally , Sean Paul , dri-devel@lists.freedesktop.org, Lee Jones Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Up requests are decoded by drm_dp_sideband_parse_req(), which operates on a drm_dp_sideband_msg_rx, unlike down requests. Expand the existing self-test helper sideband_msg_req_encode_decode() to copy the message contents and length from a drm_dp_sideband_msg_tx to drm_dp_sideband_msg_rx and use the parse function under test in place of decode. Add an additional helper for testing clearly-invalid up messages, verifying that parse rejects them. Add support for currently-supported up requests to drm_dp_dump_sideband_msg_req_body(); add support to drm_dp_encode_sideband_req() to allow encoding for the self-tests. Add self-tests for CONNECTION_STATUS_NOTIFY and RESOURCE_STATUS_NOTIFY. Reviewed-by: Lyude Paul Signed-off-by: Sam McNally --- (no changes since v5) Changes in v5: - Set mock device name to more clearly attribute error/debug logging to the self-test, in particular for cases where failures are expected Changes in v4: - New in v4 drivers/gpu/drm/drm_dp_mst_topology.c | 54 ++++++- .../gpu/drm/drm_dp_mst_topology_internal.h | 4 + .../drm/selftests/test-drm_dp_mst_helper.c | 149 ++++++++++++++++-- 3 files changed, 192 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index ad0795afc21c..ee58f6517482 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -445,6 +445,37 @@ drm_dp_encode_sideband_req(const struct drm_dp_sideband_msg_req_body *req, idx++; } break; + case DP_CONNECTION_STATUS_NOTIFY: { + const struct drm_dp_connection_status_notify *msg; + + msg = &req->u.conn_stat; + buf[idx] = (msg->port_number & 0xf) << 4; + idx++; + memcpy(&raw->msg[idx], msg->guid, 16); + idx += 16; + raw->msg[idx] = 0; + raw->msg[idx] |= msg->legacy_device_plug_status ? BIT(6) : 0; + raw->msg[idx] |= msg->displayport_device_plug_status ? BIT(5) : 0; + raw->msg[idx] |= msg->message_capability_status ? BIT(4) : 0; + raw->msg[idx] |= msg->input_port ? BIT(3) : 0; + raw->msg[idx] |= FIELD_PREP(GENMASK(2, 0), msg->peer_device_type); + idx++; + break; + } + case DP_RESOURCE_STATUS_NOTIFY: { + const struct drm_dp_resource_status_notify *msg; + + msg = &req->u.resource_stat; + buf[idx] = (msg->port_number & 0xf) << 4; + idx++; + memcpy(&raw->msg[idx], msg->guid, 16); + idx += 16; + buf[idx] = (msg->available_pbn & 0xff00) >> 8; + idx++; + buf[idx] = (msg->available_pbn & 0xff); + idx++; + break; + } } raw->cur_len = idx; } @@ -675,6 +706,22 @@ drm_dp_dump_sideband_msg_req_body(const struct drm_dp_sideband_msg_req_body *req req->u.enc_status.stream_behavior, req->u.enc_status.valid_stream_behavior); break; + case DP_CONNECTION_STATUS_NOTIFY: + P("port=%d guid=%*ph legacy=%d displayport=%d messaging=%d input=%d peer_type=%d", + req->u.conn_stat.port_number, + (int)ARRAY_SIZE(req->u.conn_stat.guid), req->u.conn_stat.guid, + req->u.conn_stat.legacy_device_plug_status, + req->u.conn_stat.displayport_device_plug_status, + req->u.conn_stat.message_capability_status, + req->u.conn_stat.input_port, + req->u.conn_stat.peer_device_type); + break; + case DP_RESOURCE_STATUS_NOTIFY: + P("port=%d guid=%*ph pbn=%d", + req->u.resource_stat.port_number, + (int)ARRAY_SIZE(req->u.resource_stat.guid), req->u.resource_stat.guid, + req->u.resource_stat.available_pbn); + break; default: P("???\n"); break; @@ -1119,9 +1166,9 @@ static bool drm_dp_sideband_parse_resource_status_notify(const struct drm_dp_mst return false; } -static bool drm_dp_sideband_parse_req(const struct drm_dp_mst_topology_mgr *mgr, - struct drm_dp_sideband_msg_rx *raw, - struct drm_dp_sideband_msg_req_body *msg) +bool drm_dp_sideband_parse_req(const struct drm_dp_mst_topology_mgr *mgr, + struct drm_dp_sideband_msg_rx *raw, + struct drm_dp_sideband_msg_req_body *msg) { memset(msg, 0, sizeof(*msg)); msg->req_type = (raw->msg[0] & 0x7f); @@ -1137,6 +1184,7 @@ static bool drm_dp_sideband_parse_req(const struct drm_dp_mst_topology_mgr *mgr, return false; } } +EXPORT_SYMBOL_FOR_TESTS_ONLY(drm_dp_sideband_parse_req); static void build_dpcd_write(struct drm_dp_sideband_msg_tx *msg, u8 port_num, u32 offset, u8 num_bytes, u8 *bytes) diff --git a/drivers/gpu/drm/drm_dp_mst_topology_internal.h b/drivers/gpu/drm/drm_dp_mst_topology_internal.h index eeda9a61c657..0356a2e0dba1 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology_internal.h +++ b/drivers/gpu/drm/drm_dp_mst_topology_internal.h @@ -21,4 +21,8 @@ void drm_dp_dump_sideband_msg_req_body(const struct drm_dp_sideband_msg_req_body *req, int indent, struct drm_printer *printer); +bool +drm_dp_sideband_parse_req(const struct drm_dp_mst_topology_mgr *mgr, + struct drm_dp_sideband_msg_rx *raw, + struct drm_dp_sideband_msg_req_body *msg); #endif /* !_DRM_DP_MST_HELPER_INTERNAL_H_ */ diff --git a/drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c b/drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c index 6b4759ed6bfd..7bbeb1e5bc97 100644 --- a/drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c +++ b/drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c @@ -13,6 +13,10 @@ #include "../drm_dp_mst_topology_internal.h" #include "test-drm_modeset_common.h" +static void mock_release(struct device *dev) +{ +} + int igt_dp_mst_calc_pbn_mode(void *ignored) { int pbn, i; @@ -120,27 +124,60 @@ sideband_msg_req_equal(const struct drm_dp_sideband_msg_req_body *in, static bool sideband_msg_req_encode_decode(struct drm_dp_sideband_msg_req_body *in) { - struct drm_dp_sideband_msg_req_body *out; + struct drm_dp_sideband_msg_req_body *out = NULL; struct drm_printer p = drm_err_printer(PREFIX_STR); - struct drm_dp_sideband_msg_tx *txmsg; + struct drm_dp_sideband_msg_tx *txmsg = NULL; + struct drm_dp_sideband_msg_rx *rxmsg = NULL; + struct drm_dp_mst_topology_mgr *mgr = NULL; int i, ret; - bool result = true; + bool result = false; out = kzalloc(sizeof(*out), GFP_KERNEL); if (!out) - return false; + goto out; txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL); if (!txmsg) - return false; + goto out; - drm_dp_encode_sideband_req(in, txmsg); - ret = drm_dp_decode_sideband_req(txmsg, out); - if (ret < 0) { - drm_printf(&p, "Failed to decode sideband request: %d\n", - ret); - result = false; + rxmsg = kzalloc(sizeof(*rxmsg), GFP_KERNEL); + if (!rxmsg) goto out; + + mgr = kzalloc(sizeof(*mgr), GFP_KERNEL); + if (!mgr) + goto out; + + mgr->dev = kzalloc(sizeof(*mgr->dev), GFP_KERNEL); + if (!mgr->dev) + goto out; + + mgr->dev->dev = kzalloc(sizeof(*mgr->dev->dev), GFP_KERNEL); + if (!mgr->dev->dev) + goto out; + + mgr->dev->dev->release = mock_release; + mgr->dev->dev->init_name = PREFIX_STR; + device_initialize(mgr->dev->dev); + + drm_dp_encode_sideband_req(in, txmsg); + switch (in->req_type) { + case DP_CONNECTION_STATUS_NOTIFY: + case DP_RESOURCE_STATUS_NOTIFY: + memcpy(&rxmsg->msg, txmsg->msg, ARRAY_SIZE(rxmsg->msg)); + rxmsg->curlen = txmsg->cur_len; + if (!drm_dp_sideband_parse_req(mgr, rxmsg, out)) { + drm_printf(&p, "Failed to decode sideband request\n"); + goto out; + } + break; + default: + ret = drm_dp_decode_sideband_req(txmsg, out); + if (ret < 0) { + drm_printf(&p, "Failed to decode sideband request: %d\n", ret); + goto out; + } + break; } if (!sideband_msg_req_equal(in, out)) { @@ -148,9 +185,9 @@ sideband_msg_req_encode_decode(struct drm_dp_sideband_msg_req_body *in) drm_dp_dump_sideband_msg_req_body(in, 1, &p); drm_printf(&p, "Got:\n"); drm_dp_dump_sideband_msg_req_body(out, 1, &p); - result = false; goto out; } + result = true; switch (in->req_type) { case DP_REMOTE_DPCD_WRITE: @@ -171,6 +208,66 @@ sideband_msg_req_encode_decode(struct drm_dp_sideband_msg_req_body *in) out: kfree(out); kfree(txmsg); + kfree(rxmsg); + if (mgr) { + if (mgr->dev) { + put_device(mgr->dev->dev); + kfree(mgr->dev); + } + kfree(mgr); + } + return result; +} + +static bool +sideband_msg_req_parse(int req_type) +{ + struct drm_dp_sideband_msg_req_body *out = NULL; + struct drm_printer p = drm_err_printer(PREFIX_STR); + struct drm_dp_sideband_msg_rx *rxmsg = NULL; + struct drm_dp_mst_topology_mgr *mgr = NULL; + bool result = false; + + out = kzalloc(sizeof(*out), GFP_KERNEL); + if (!out) + goto out; + + rxmsg = kzalloc(sizeof(*rxmsg), GFP_KERNEL); + if (!rxmsg) + goto out; + + mgr = kzalloc(sizeof(*mgr), GFP_KERNEL); + if (!mgr) + goto out; + + mgr->dev = kzalloc(sizeof(*mgr->dev), GFP_KERNEL); + if (!mgr->dev) + goto out; + + mgr->dev->dev = kzalloc(sizeof(*mgr->dev->dev), GFP_KERNEL); + if (!mgr->dev->dev) + goto out; + + mgr->dev->dev->release = mock_release; + mgr->dev->dev->init_name = PREFIX_STR " expected parse failure"; + device_initialize(mgr->dev->dev); + + rxmsg->curlen = 1; + rxmsg->msg[0] = req_type & 0x7f; + if (drm_dp_sideband_parse_req(mgr, rxmsg, out)) + drm_printf(&p, "Unexpectedly decoded invalid sideband request\n"); + else + result = true; +out: + kfree(out); + kfree(rxmsg); + if (mgr) { + if (mgr->dev) { + put_device(mgr->dev->dev); + kfree(mgr->dev); + } + kfree(mgr); + } return result; } @@ -268,6 +365,34 @@ int igt_dp_mst_sideband_msg_req_decode(void *unused) in.u.enc_status.valid_stream_behavior = 1; DO_TEST(); + in.req_type = DP_CONNECTION_STATUS_NOTIFY; + in.u.conn_stat.port_number = 0xf; + get_random_bytes(in.u.conn_stat.guid, sizeof(in.u.conn_stat.guid)); + in.u.conn_stat.legacy_device_plug_status = 1; + in.u.conn_stat.displayport_device_plug_status = 0; + in.u.conn_stat.message_capability_status = 0; + in.u.conn_stat.input_port = 0; + in.u.conn_stat.peer_device_type = 7; + DO_TEST(); + in.u.conn_stat.displayport_device_plug_status = 1; + DO_TEST(); + in.u.conn_stat.message_capability_status = 1; + DO_TEST(); + in.u.conn_stat.input_port = 1; + DO_TEST(); + + in.req_type = DP_RESOURCE_STATUS_NOTIFY; + in.u.resource_stat.port_number = 0xf; + get_random_bytes(in.u.resource_stat.guid, sizeof(in.u.resource_stat.guid)); + in.u.resource_stat.available_pbn = 0xcdef; + DO_TEST(); + +#undef DO_TEST +#define DO_TEST(req_type) FAIL_ON(!sideband_msg_req_parse(req_type)) + DO_TEST(DP_CONNECTION_STATUS_NOTIFY); + DO_TEST(DP_RESOURCE_STATUS_NOTIFY); + + DO_TEST(DP_REMOTE_I2C_WRITE); #undef DO_TEST return 0; } From patchwork Mon Jun 28 08:06:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam McNally X-Patchwork-Id: 12347405 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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 307E3C2B9F4 for ; Mon, 28 Jun 2021 08:07:21 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E97E3619F1 for ; Mon, 28 Jun 2021 08:07:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E97E3619F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7AA396E2C8; Mon, 28 Jun 2021 08:07:20 +0000 (UTC) Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by gabe.freedesktop.org (Postfix) with ESMTPS id D8CF86E2C8 for ; Mon, 28 Jun 2021 08:07:19 +0000 (UTC) Received: by mail-pj1-x1034.google.com with SMTP id kt19so1659105pjb.2 for ; Mon, 28 Jun 2021 01:07:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Dc4RVK46lJ9dFpM9qqdODpD8RCANfeN3A+EDvdvclNM=; b=NDrZoroGtzddV1pWww3F2gixubaolKg7c1wAS2pNUPWkE4gHVyQ3sCrlRwGAjtBbiP eS0qaxxUUlHpLVKJh9sCj40BqYvpW1TT2ELDElN6T4adJjc5xjqPS0r3blHpdtygSHCm Y+f7HDEM1BOolkKptr+PWuozH57iXhsnI3Dbs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Dc4RVK46lJ9dFpM9qqdODpD8RCANfeN3A+EDvdvclNM=; b=sp49jXMRf4DgsMs36HxB3rtpn81XSauebMcGv7vmVSZTDk0jaFSGuTQSAIDkrrdZhp D+Trzj0dXFRL6eGNihIkTtJB+ZPssd+ZJdli4wWmxsCr6jsnue6KUmDi+//WaglFvD1J VKUuUKZ+yHN36O0z3JHOkGDozdOLXQAilPe4D6dl87mLEDNmTOuHxqoxqlKjMXXuWzMr 4JD3aoelTG0tNUZjmXIp5Av2rEvNbd1HbC2hUiP3yI5yGeZgdg4LRJMs63wFtj/fBS+p 7pPYaA8FUBJBdONSUzkF4Ao1D1dZRK072kE6y+syz2gc2M6IL1VKQd4VMYQTVmALPERW 6kGg== X-Gm-Message-State: AOAM531STtu+AnSP6Vjf3St7n60VCDsb67Qm8OXfUONLdBxILyPkjTB/ wKjK7ob2dmE8bck0m5rhUTxQCg== X-Google-Smtp-Source: ABdhPJwHq7ZU49BhVOQH5lgS534rk8F5F/coMFl4C+FoJ11mxiCsy+jc4fXszpvvxFflGv534cPvLw== X-Received: by 2002:a17:903:1c1:b029:125:b183:7989 with SMTP id e1-20020a17090301c1b0290125b1837989mr21037389plh.57.1624867639385; Mon, 28 Jun 2021 01:07:19 -0700 (PDT) Received: from localhost ([2401:fa00:9:14:d9cf:d433:6a82:6f81]) by smtp.gmail.com with UTF8SMTPSA id o5sm9679527pfg.106.2021.06.28.01.07.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 28 Jun 2021 01:07:19 -0700 (PDT) From: Sam McNally To: LKML Subject: [PATCH v6 2/3] drm/dp_mst: Add support for sink event notify messages Date: Mon, 28 Jun 2021 18:06:42 +1000 Message-Id: <20210628180604.v6.2.I8693156f555875e5c8342e86ab37ce968dfdd277@changeid> X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog In-Reply-To: <20210628180604.v6.1.I6f50a7996687318ba298c24a3663c8be7dd432c7@changeid> References: <20210628180604.v6.1.I6f50a7996687318ba298c24a3663c8be7dd432c7@changeid> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Zimmermann , David Airlie , Hans Verkuil , Sam McNally , Sean Paul , dri-devel@lists.freedesktop.org, Lee Jones Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Sink event notify messages are used for MST CEC IRQs. Add parsing support for sink event notify messages in preparation for handling MST CEC IRQs. Reviewed-by: Lyude Paul Signed-off-by: Sam McNally --- (no changes since v4) Changes in v4: - Changed logging to use drm_dbg_kms() - Added self-test drivers/gpu/drm/drm_dp_mst_topology.c | 57 ++++++++++++++++++- .../drm/selftests/test-drm_dp_mst_helper.c | 8 +++ include/drm/drm_dp_mst_helper.h | 14 +++++ 3 files changed, 78 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index ee58f6517482..1cc1a58cfa8b 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -476,6 +476,20 @@ drm_dp_encode_sideband_req(const struct drm_dp_sideband_msg_req_body *req, idx++; break; } + case DP_SINK_EVENT_NOTIFY: { + const struct drm_dp_sink_event_notify *msg; + + msg = &req->u.sink_event; + buf[idx] = (msg->port_number & 0xf) << 4; + idx++; + memcpy(&raw->msg[idx], msg->guid, 16); + idx += 16; + buf[idx] = (msg->event_id & 0xff00) >> 8; + idx++; + buf[idx] = (msg->event_id & 0xff); + idx++; + break; + } } raw->cur_len = idx; } @@ -722,6 +736,12 @@ drm_dp_dump_sideband_msg_req_body(const struct drm_dp_sideband_msg_req_body *req (int)ARRAY_SIZE(req->u.resource_stat.guid), req->u.resource_stat.guid, req->u.resource_stat.available_pbn); break; + case DP_SINK_EVENT_NOTIFY: + P("port=%d guid=%*ph event=%d", + req->u.sink_event.port_number, + (int)ARRAY_SIZE(req->u.sink_event.guid), req->u.sink_event.guid, + req->u.sink_event.event_id); + break; default: P("???\n"); break; @@ -1166,6 +1186,30 @@ static bool drm_dp_sideband_parse_resource_status_notify(const struct drm_dp_mst return false; } +static bool drm_dp_sideband_parse_sink_event_notify(const struct drm_dp_mst_topology_mgr *mgr, + struct drm_dp_sideband_msg_rx *raw, + struct drm_dp_sideband_msg_req_body *msg) +{ + int idx = 1; + + msg->u.sink_event.port_number = (raw->msg[idx] & 0xf0) >> 4; + idx++; + if (idx > raw->curlen) + goto fail_len; + + memcpy(msg->u.sink_event.guid, &raw->msg[idx], 16); + idx += 16; + if (idx > raw->curlen) + goto fail_len; + + msg->u.sink_event.event_id = (raw->msg[idx] << 8) | (raw->msg[idx + 1]); + idx++; + return true; +fail_len: + drm_dbg_kms(mgr->dev, "sink event notify parse length fail %d %d\n", idx, raw->curlen); + return false; +} + bool drm_dp_sideband_parse_req(const struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_sideband_msg_rx *raw, struct drm_dp_sideband_msg_req_body *msg) @@ -1178,6 +1222,8 @@ bool drm_dp_sideband_parse_req(const struct drm_dp_mst_topology_mgr *mgr, return drm_dp_sideband_parse_connection_status_notify(mgr, raw, msg); case DP_RESOURCE_STATUS_NOTIFY: return drm_dp_sideband_parse_resource_status_notify(mgr, raw, msg); + case DP_SINK_EVENT_NOTIFY: + return drm_dp_sideband_parse_sink_event_notify(mgr, raw, msg); default: drm_err(mgr->dev, "Got unknown request 0x%02x (%s)\n", msg->req_type, drm_dp_mst_req_type_str(msg->req_type)); @@ -4113,6 +4159,8 @@ drm_dp_mst_process_up_req(struct drm_dp_mst_topology_mgr *mgr, guid = msg->u.conn_stat.guid; else if (msg->req_type == DP_RESOURCE_STATUS_NOTIFY) guid = msg->u.resource_stat.guid; + else if (msg->req_type == DP_SINK_EVENT_NOTIFY) + guid = msg->u.sink_event.guid; if (guid) mstb = drm_dp_get_mst_branch_device_by_guid(mgr, guid); @@ -4184,7 +4232,8 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr) drm_dp_sideband_parse_req(mgr, &mgr->up_req_recv, &up_req->msg); if (up_req->msg.req_type != DP_CONNECTION_STATUS_NOTIFY && - up_req->msg.req_type != DP_RESOURCE_STATUS_NOTIFY) { + up_req->msg.req_type != DP_RESOURCE_STATUS_NOTIFY && + up_req->msg.req_type != DP_SINK_EVENT_NOTIFY) { drm_dbg_kms(mgr->dev, "Received unknown up req type, ignoring: %x\n", up_req->msg.req_type); kfree(up_req); @@ -4212,6 +4261,12 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr) drm_dbg_kms(mgr->dev, "Got RSN: pn: %d avail_pbn %d\n", res_stat->port_number, res_stat->available_pbn); + } else if (up_req->msg.req_type == DP_SINK_EVENT_NOTIFY) { + const struct drm_dp_sink_event_notify *sink_event = + &up_req->msg.u.sink_event; + + drm_dbg_kms(mgr->dev, "Got SEN: pn: %d event_id %d\n", + sink_event->port_number, sink_event->event_id); } up_req->hdr = mgr->up_req_recv.initial_hdr; diff --git a/drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c b/drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c index 7bbeb1e5bc97..d49c10d52d88 100644 --- a/drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c +++ b/drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c @@ -164,6 +164,7 @@ sideband_msg_req_encode_decode(struct drm_dp_sideband_msg_req_body *in) switch (in->req_type) { case DP_CONNECTION_STATUS_NOTIFY: case DP_RESOURCE_STATUS_NOTIFY: + case DP_SINK_EVENT_NOTIFY: memcpy(&rxmsg->msg, txmsg->msg, ARRAY_SIZE(rxmsg->msg)); rxmsg->curlen = txmsg->cur_len; if (!drm_dp_sideband_parse_req(mgr, rxmsg, out)) { @@ -387,10 +388,17 @@ int igt_dp_mst_sideband_msg_req_decode(void *unused) in.u.resource_stat.available_pbn = 0xcdef; DO_TEST(); + in.req_type = DP_SINK_EVENT_NOTIFY; + in.u.sink_event.port_number = 0xf; + get_random_bytes(in.u.sink_event.guid, sizeof(in.u.sink_event.guid)); + in.u.sink_event.event_id = 0xcdef; + DO_TEST(); + #undef DO_TEST #define DO_TEST(req_type) FAIL_ON(!sideband_msg_req_parse(req_type)) DO_TEST(DP_CONNECTION_STATUS_NOTIFY); DO_TEST(DP_RESOURCE_STATUS_NOTIFY); + DO_TEST(DP_SINK_EVENT_NOTIFY); DO_TEST(DP_REMOTE_I2C_WRITE); #undef DO_TEST diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h index ddb9231d0309..dd1cac5cdb0f 100644 --- a/include/drm/drm_dp_mst_helper.h +++ b/include/drm/drm_dp_mst_helper.h @@ -439,6 +439,19 @@ struct drm_dp_resource_status_notify { u16 available_pbn; }; +#define DP_SINK_EVENT_PANEL_REPLAY_ACTIVE_FRAME_CRC_ERROR BIT(0) +#define DP_SINK_EVENT_PANEL_REPLAY_RFB_STORAGE_ERROR BIT(1) +#define DP_SINK_EVENT_DSC_RC_BUFFER_UNDER_RUN BIT(2) +#define DP_SINK_EVENT_DSC_RC_BUFFER_OVERFLOW BIT(3) +#define DP_SINK_EVENT_DSC_CHUNK_LENGTH_ERROR BIT(4) +#define DP_SINK_EVENT_CEC_IRQ_EVENT BIT(5) + +struct drm_dp_sink_event_notify { + u8 port_number; + u8 guid[16]; + u16 event_id; +}; + struct drm_dp_query_payload_ack_reply { u8 port_number; u16 allocated_pbn; @@ -450,6 +463,7 @@ struct drm_dp_sideband_msg_req_body { struct drm_dp_connection_status_notify conn_stat; struct drm_dp_port_number_req port_num; struct drm_dp_resource_status_notify resource_stat; + struct drm_dp_sink_event_notify sink_event; struct drm_dp_query_payload query_payload; struct drm_dp_allocate_payload allocate_payload; From patchwork Mon Jun 28 08:06:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam McNally X-Patchwork-Id: 12347407 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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 CC2C3C2B9F4 for ; Mon, 28 Jun 2021 08:07:28 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 93DAA619A9 for ; Mon, 28 Jun 2021 08:07:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 93DAA619A9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 251F16E2D5; Mon, 28 Jun 2021 08:07:28 +0000 (UTC) Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by gabe.freedesktop.org (Postfix) with ESMTPS id 858B06E2D5 for ; Mon, 28 Jun 2021 08:07:26 +0000 (UTC) Received: by mail-pj1-x1035.google.com with SMTP id z3-20020a17090a3983b029016bc232e40bso9890047pjb.4 for ; Mon, 28 Jun 2021 01:07:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7QJLE4fkljxkN37Egfdtln0RvPnuuwHSkXWilmvZ8oc=; b=hD0726oQlaF68LVrCictW5Txlo2BHPXfVq/2V+4Wa2L31DgX6jewp98INIg5RfPQ8s k/rZ0OVg76QhhEjiXnN5xGS0t2LXvXhm7xpFvs6/BNy3wknKkccBF2QEHuvazrxWfDHi a6KA+giXRUs7M/j7+xyUTaYVIfkDswU/8yDpo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7QJLE4fkljxkN37Egfdtln0RvPnuuwHSkXWilmvZ8oc=; b=VnFBIZVy00D6NvS2qrLo25sRxozt5HdVxWm2ntiMDEFXNnCAFY9xMT02GlUf9cP7C2 aEPTIpL9PMXS2mYGa0Qb5OU4g+D2Sk1BnLdKZt6S3nnAG8bzsvSgEdFqhwm7o6Za5ZHd C/b4WV/lcMlqWSoVeG6eec0Yj8OuJCNGpMMa8derIJOZxxyNFFEk6JeNgr/edOt82sBg NsZrq72aoAZwE3f1XGSAJqYLJ1ecZnpQPXmGVDjBcNarHYsc/JpAHXe5ici8pH+x9VGh Pe8UsgvYqbgTThrXpWvEIdhOLiLhY+WwE6SEjptjTYw/w4QkAdOmY7RLCGGd0NLTvpno OOng== X-Gm-Message-State: AOAM530VWDKPylqvlA+c6vJ2XsvX6hlJAfFJ+fsug+we4+ZPIxFvQMru SZ1nhcF4N8u9P3rEgGvr48zagA== X-Google-Smtp-Source: ABdhPJzeI42Np1WjFehbE4amFF2q1Kj0fdaP8LFESNKPVIvylS39XsjtFLQDbt87MaDb77owHSBtIw== X-Received: by 2002:a17:90a:af85:: with SMTP id w5mr36515142pjq.37.1624867646157; Mon, 28 Jun 2021 01:07:26 -0700 (PDT) Received: from localhost ([2401:fa00:9:14:d9cf:d433:6a82:6f81]) by smtp.gmail.com with UTF8SMTPSA id t6sm18892211pjo.4.2021.06.28.01.07.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 28 Jun 2021 01:07:25 -0700 (PDT) From: Sam McNally To: LKML Subject: [PATCH v6 3/3] drm_dp_cec: add MST support Date: Mon, 28 Jun 2021 18:06:43 +1000 Message-Id: <20210628180604.v6.3.If7fc06fd679af0665ada9ff0524291c61dd35d24@changeid> X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog In-Reply-To: <20210628180604.v6.1.I6f50a7996687318ba298c24a3663c8be7dd432c7@changeid> References: <20210628180604.v6.1.I6f50a7996687318ba298c24a3663c8be7dd432c7@changeid> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel test robot , David Airlie , Thomas Zimmermann , Hans Verkuil , Sam McNally , dri-devel@lists.freedesktop.org, Hans Verkuil Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" With DP v2.0 errata E5, CEC tunneling can be supported through an MST topology. When tunneling CEC through an MST port, CEC IRQs are delivered via a sink event notify message; when a sink event notify message is received, trigger CEC IRQ handling - ESI1 is not used for remote CEC IRQs so its value is not checked. Register and unregister for all MST connectors, ensuring their drm_dp_aux_cec struct won't be accessed uninitialized. Reviewed-by: Hans Verkuil Reviewed-by: Lyude Paul Reported-by: kernel test robot Signed-off-by: Sam McNally --- Changes in v6: - Removed superfluous #include - Removed spurious added newlines Changes in v4: - Removed use of work queues - Updated checks of aux.transfer to accept aux.is_remote Changes in v3: - Fixed whitespace in drm_dp_cec_mst_irq_work() - Moved drm_dp_cec_mst_set_edid_work() with the other set_edid functions Changes in v2: - Used aux->is_remote instead of aux->cec.is_mst, removing the need for the previous patch in the series - Added a defensive check for null edid in the deferred set_edid work, in case the edid is no longer valid at that point drivers/gpu/drm/drm_dp_cec.c | 17 +++++++++++++---- drivers/gpu/drm/drm_dp_mst_topology.c | 24 ++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_cec.c b/drivers/gpu/drm/drm_dp_cec.c index 3ab2609f9ec7..61c59e2c4b3e 100644 --- a/drivers/gpu/drm/drm_dp_cec.c +++ b/drivers/gpu/drm/drm_dp_cec.c @@ -245,13 +245,22 @@ void drm_dp_cec_irq(struct drm_dp_aux *aux) int ret; /* No transfer function was set, so not a DP connector */ - if (!aux->transfer) + if (!aux->transfer && !aux->is_remote) return; mutex_lock(&aux->cec.lock); if (!aux->cec.adap) goto unlock; + if (aux->is_remote) { + /* + * For remote connectors, CEC IRQ is triggered by an explicit + * message so ESI1 is not involved. + */ + drm_dp_cec_handle_irq(aux); + goto unlock; + } + ret = drm_dp_dpcd_readb(aux, DP_DEVICE_SERVICE_IRQ_VECTOR_ESI1, &cec_irq); if (ret < 0 || !(cec_irq & DP_CEC_IRQ)) @@ -307,7 +316,7 @@ void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid) u8 cap; /* No transfer function was set, so not a DP connector */ - if (!aux->transfer) + if (!aux->transfer && !aux->is_remote) return; #ifndef CONFIG_MEDIA_CEC_RC @@ -383,7 +392,7 @@ EXPORT_SYMBOL(drm_dp_cec_set_edid); void drm_dp_cec_unset_edid(struct drm_dp_aux *aux) { /* No transfer function was set, so not a DP connector */ - if (!aux->transfer) + if (!aux->transfer && !aux->is_remote) return; cancel_delayed_work_sync(&aux->cec.unregister_work); @@ -428,7 +437,7 @@ void drm_dp_cec_register_connector(struct drm_dp_aux *aux, struct drm_connector *connector) { WARN_ON(aux->cec.adap); - if (WARN_ON(!aux->transfer)) + if (WARN_ON(!aux->transfer && !aux->is_remote)) return; aux->cec.connector = connector; INIT_DELAYED_WORK(&aux->cec.unregister_work, diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 1cc1a58cfa8b..b58c884fe67b 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -2362,6 +2362,8 @@ static void build_mst_prop_path(const struct drm_dp_mst_branch *mstb, int drm_dp_mst_connector_late_register(struct drm_connector *connector, struct drm_dp_mst_port *port) { + drm_dp_cec_register_connector(&port->aux, connector); + drm_dbg_kms(port->mgr->dev, "registering %s remote bus for %s\n", port->aux.name, connector->kdev->kobj.name); @@ -2385,6 +2387,8 @@ void drm_dp_mst_connector_early_unregister(struct drm_connector *connector, drm_dbg_kms(port->mgr->dev, "unregistering %s remote bus for %s\n", port->aux.name, connector->kdev->kobj.name); drm_dp_aux_unregister_devnode(&port->aux); + + drm_dp_cec_unregister_connector(&port->aux); } EXPORT_SYMBOL(drm_dp_mst_connector_early_unregister); @@ -2662,6 +2666,21 @@ drm_dp_mst_handle_conn_stat(struct drm_dp_mst_branch *mstb, queue_work(system_long_wq, &mstb->mgr->work); } +static void +drm_dp_mst_handle_sink_event(struct drm_dp_mst_branch *mstb, + struct drm_dp_sink_event_notify *sink_event) +{ + struct drm_dp_mst_port *port; + + if (sink_event->event_id & DP_SINK_EVENT_CEC_IRQ_EVENT) { + port = drm_dp_get_port(mstb, sink_event->port_number); + if (port) { + drm_dp_cec_irq(&port->aux); + drm_dp_mst_topology_put_port(port); + } + } +} + static struct drm_dp_mst_branch *drm_dp_get_mst_branch_device(struct drm_dp_mst_topology_mgr *mgr, u8 lct, u8 *rad) { @@ -4177,6 +4196,8 @@ drm_dp_mst_process_up_req(struct drm_dp_mst_topology_mgr *mgr, if (msg->req_type == DP_CONNECTION_STATUS_NOTIFY) { drm_dp_mst_handle_conn_stat(mstb, &msg->u.conn_stat); hotplug = true; + } else if (msg->req_type == DP_SINK_EVENT_NOTIFY) { + drm_dp_mst_handle_sink_event(mstb, &msg->u.sink_event); } drm_dp_mst_topology_put_mstb(mstb); @@ -4369,6 +4390,8 @@ drm_dp_mst_detect_port(struct drm_connector *connector, break; } out: + if (ret != connector_status_connected) + drm_dp_cec_unset_edid(&port->aux); drm_dp_mst_topology_put_port(port); return ret; } @@ -4399,6 +4422,7 @@ struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_ edid = drm_get_edid(connector, &port->aux.ddc); } port->has_audio = drm_detect_monitor_audio(edid); + drm_dp_cec_set_edid(&port->aux, edid); drm_dp_mst_topology_put_port(port); return edid; }