From patchwork Wed Jun 30 05:45:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grzegorz Bernacki X-Patchwork-Id: 1498739 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=fwts-devel-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=semihalf-com.20150623.gappssmtp.com header.i=@semihalf-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=d7l0FKgh; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4GF9Ll6895z9sX3 for ; Wed, 30 Jun 2021 15:46:06 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lyT2w-0003NZ-6h; Wed, 30 Jun 2021 05:46:02 +0000 Received: from mail-lj1-f178.google.com ([209.85.208.178]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lyT2u-0003Mr-AT for fwts-devel@lists.ubuntu.com; Wed, 30 Jun 2021 05:46:00 +0000 Received: by mail-lj1-f178.google.com with SMTP id q4so1524815ljp.13 for ; Tue, 29 Jun 2021 22:46:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s/yUX0nY1FbGSkYcLAgboSgBs/ybC63OxBcP6l/VRK0=; b=d7l0FKgh39Z/0YfsjnENE2T+SA2Ey0r5xp1EErRu08jxR2eJ1+lQNouZDwOvqy3HOh fOmiuavBkI2sGSta/AZNaOhaiCBjT3GEuky+SNzyvRDcNSwPne3ACTfT8qvOOlS+1NDc dJqTq6ZdCbB0nddhfldvcltLF5oz7PPL2TtZQ6ToHLZn5zZjI1C9RikVx4nSpO/pUzKb XKP5qD/GT38UheQ+NMz/H9aevWZ6G1wTw7VOWOira3+n35G6mCPHL/UvOdJuvncN77iy mh69dlH19oyqhtJIkc+OC7CzGvAZoVu4X/+PqS8q2VV0PDHRQwolLvhfANciXj4rDfCc LfhA== 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=s/yUX0nY1FbGSkYcLAgboSgBs/ybC63OxBcP6l/VRK0=; b=k72jkbL+yIcVKSNfDG432+KbY+kt4fOVsl0CdDfHagYKIPxYQzv1wWqUYdYFfv4QXg F6TP1ikZAer99Kxehalhc3X9uRNDJnDFytmrOJNuhACJ50wFVInLOKdxqywsEWi2SwH1 XwMecgjoIa4HKYcpU4nYfB/lyZDHc5EWyPJDpcgt9tQXcUa7cN/qAUCVgJKVPk8VT3VH RMqKkUARAkqqBm8ap8FvfkBIydHvRSbPhN3qljx/GoXsFVc2Ns0Qp2acpGiqpnxW8HRQ JdHsugslf1I0jYhw1RAOtDv7FN7MYcY9OLHexObxWFWqQtH/yoeUlCmtBloJUgcGD4/q QURQ== X-Gm-Message-State: AOAM5310BuO6gUAPAExXOPs6OJXxXhyx5W52aMhKibhmXCOfYD007QFm LSxShpS/cKRjMn/RL5zf38mP1/iDt4ZDRA== X-Google-Smtp-Source: ABdhPJyILUDDkxJrAlXy4WEng309Q+wzv6UINkEPuijbMTO42SITpGvnptWL/ADhXdPaJPxulzCTCg== X-Received: by 2002:a2e:89cd:: with SMTP id c13mr6638330ljk.339.1625031959524; Tue, 29 Jun 2021 22:45:59 -0700 (PDT) Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id d29sm1179946lfv.20.2021.06.29.22.45.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jun 2021 22:45:59 -0700 (PDT) From: Grzegorz Bernacki To: fwts-devel@lists.ubuntu.com Subject: [PATCH v2] acpi: dbg2: Allow 16550 compatible serial port in DBG2 Date: Wed, 30 Jun 2021 07:45:44 +0200 Message-Id: <20210630054545.959797-2-gjb@semihalf.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20210630054545.959797-1-gjb@semihalf.com> References: <20210630054545.959797-1-gjb@semihalf.com> MIME-Version: 1.0 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samer.El-Haj-Mahmoud@arm.com, upstream@semihalf.com Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" BSA 1.0 specification allow the serial port to be either Arm SBSA Generic UART, PL011, or 16550. This patch adds checking for 16550 port type. BugLink: https://bugs.launchpad.net/fwts/+bug/1932567 Signed-off-by: Grzegorz Bernacki Acked-by: Alex Hung Acked-by: Colin Ian King --- src/acpi/dbg2/dbg2.c | 23 ++++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/acpi/dbg2/dbg2.c b/src/acpi/dbg2/dbg2.c index 6004dc61..88936d72 100644 --- a/src/acpi/dbg2/dbg2.c +++ b/src/acpi/dbg2/dbg2.c @@ -28,9 +28,12 @@ #include "fwts_acpi_object_eval.h" -#define SBBR_DBG2_PORT_SERIAL 0x8000 -#define SBBR_DBG2_ARM_SBSA_UART 0x000E -#define SBBR_DBG2_ARM_PL011_UART 0x0003 +#define SBBR_DBG2_PORT_SERIAL 0x8000 +#define SBBR_DBG2_FULLY_16550_COMPAT 0x0000 +#define SBBR_DBG2_16550_SUBSET_COMPAT 0x0001 +#define SBBR_DBG2_ARM_PL011_UART 0x0003 +#define SBBR_DBG2_ARM_SBSA_UART 0x000E +#define SBBR_DBG2_16550_COMPAT_GAS 0x0012 static fwts_acpi_table_info *table; acpi_table_init(DBG2, &table) @@ -53,11 +56,14 @@ static int dbg2_test2(fwts_framework *fw) if (((uint8_t*)info + info->length) >= ((uint8_t*)table + table->length)) break; if (info->port_type == SBBR_DBG2_PORT_SERIAL && - (info->port_subtype == SBBR_DBG2_ARM_SBSA_UART || - info->port_subtype == SBBR_DBG2_ARM_PL011_UART)) { + (info->port_subtype == SBBR_DBG2_FULLY_16550_COMPAT || + info->port_subtype == SBBR_DBG2_16550_SUBSET_COMPAT || + info->port_subtype == SBBR_DBG2_ARM_PL011_UART || + info->port_subtype == SBBR_DBG2_ARM_SBSA_UART || + info->port_subtype == SBBR_DBG2_16550_COMPAT_GAS)) { fwts_passed(fw, "DBG2 provides a standard serial debug " - "port and describes ARM SBSA Generic UART"); + "port and describes ARM BSA compliant UART"); return FWTS_OK; } @@ -188,6 +194,9 @@ static int dbg2_test1(fwts_framework *fw) case 0x0010: subport = "BCM2835"; break; + case 0x0012: + subport = "16550-compatible with parameters in GAS"; + break; default: break; } @@ -359,7 +368,7 @@ done: static fwts_framework_minor_test dbg2_tests[] = { { dbg2_test1, "DBG2 (Debug Port Table 2) test." }, - { dbg2_test2, "DBG2 ARM SBSA Generic UART test," }, + { dbg2_test2, "DBG2 ARM BSA compliant UART test," }, { NULL, NULL } };