From patchwork Fri Nov 3 15:21:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 740668 Delivered-To: patch@linaro.org Received: by 2002:a5d:538f:0:b0:32d:baff:b0ca with SMTP id d15csp1440481wrv; Fri, 3 Nov 2023 08:21:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEwGKKW5Ymmt/i//9o8irszZX5HFBo6W+A+aCLczNZGiAPmLxholjzPUIFXjhmSmzKdFz2I X-Received: by 2002:a05:6214:19e3:b0:65d:660:25a8 with SMTP id q3-20020a05621419e300b0065d066025a8mr25520952qvc.20.1699024909265; Fri, 03 Nov 2023 08:21:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699024909; cv=none; d=google.com; s=arc-20160816; b=HX+rh9gxMjwZdMrHEtbbNjv+n/Wa1kbePgIQaBis7LC5RrohdyLd/Sfj9GdL1G2YYm iXhqLTCgb5gq8aJ3W7nZjFSO/JEMNpOms77qv2ORzEzXMQEmbrYVmkYllJ6keYYZhN64 1fFtWufvUBAM/9Z/Oif6wFyI/QUVxY3zxWHQL+DOb65bcvZziozyWgyenp4X18qDk7HN 0ft2oUXO2eSfiZFN5EZcbkQMbuvFO/hUnGq7Whh9QbwflcpTZQLlgwairckBYoONLouf Vf1C6X/yZ4f55qS9RZOPvxGtnBuJUjn3QZRMHpVfpORb0aShYsn8vZs33XJImi6iHmFX eL7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=96tTRZzTo5lzHBefnnTujQF6PrCnnI8GATKXvxfKeEQ=; fh=wqfvLaBYopGyGisjq/k8ulPaCl1xshcoDnGh5kvEEbE=; b=pW1p2pEE9iFn/Zxo9j3GgANNNoWxe+lbJiTE+YdoDu3rnkwMyYp0MDwozNCw+55tIM +1ccs422MZRW/Y8BehSsGJnkhjYsbaA5SfUiG0v0GFfTKJGJWhiGMgR8J/H53LtrjEBu 1Erv5/nG5COuoKYB4UZcQthpdm8nacPD0AYtHzkG+JsfUD/wPzOGtVdRFCZsXWkxZ/uy gG/vlQe4fXdXDf6n97XJI6I/o3qezC5azFr7ubtzHZrbXKjRtQ8m6r2FnJUb7MqUnoxX FkdO7KAQEk3X27v+pU+YGGYoh3vZdTmfCzoVLTz2nT9dZ1/vZxi8Wg3MTF2e0r/wafIy vBoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pCYgun4h; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a3-20020a0ccdc3000000b0065b273de9fcsi1645188qvn.243.2023.11.03.08.21.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Nov 2023 08:21:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pCYgun4h; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyvzG-0004oR-W6; Fri, 03 Nov 2023 11:21:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qyvzF-0004nF-Oi for qemu-devel@nongnu.org; Fri, 03 Nov 2023 11:21:29 -0400 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qyvzC-0002nF-JS for qemu-devel@nongnu.org; Fri, 03 Nov 2023 11:21:29 -0400 Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-507a55302e0so2860058e87.0 for ; Fri, 03 Nov 2023 08:21:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699024884; x=1699629684; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=96tTRZzTo5lzHBefnnTujQF6PrCnnI8GATKXvxfKeEQ=; b=pCYgun4hNlZmbDZsTtliI9l/s/3eTZddVliDWLP1Tt3Xa3+sn40Owo+Gx8HItdaYAX Q8atnlqA6N+DjZimAT25mqAN8VUfH21moKBDCofVvTrKSV1iE34E3jr1FdM/fBb0smtN uLmlsV5Ks6usjcSNI1htslnceEgFFmRommh8uqh5JeCJN9XuGFyGhwRIncQ+TrQH+RZ3 /E9qqQ/93VI0gkrv8qlszJmes+VAy4rmnJjv+P62AEuIX1dZsiJcLxxCu/llsJeoakbI 4hdofwoAFiVmKKNfGIwuC+cnhiSIYp/wng0NHUQ6TOgdMIckJEpdFVKhPk9waxQLTIqZ kTLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699024884; x=1699629684; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=96tTRZzTo5lzHBefnnTujQF6PrCnnI8GATKXvxfKeEQ=; b=XOyj9xxf+oEOqo5jXToPvJu6LLgpxQXP99JigO3b+yvOWxGCpHkRUF0aREwM2Wvq0s n/sOdXSEV1Kr2a8rhkHoj0kSUPjCw5tQeCBeOvC12SUgqeryJTI58GTfqs+WOVX93Al+ HWPefzqSZ+M+2C4IhwZU8cKprcmhx2Kwpr00/XKSiGbPxWrjqDINGMQc9aoH5tqaEqzJ XB+FQLjqJF2lE7b3LXni5heAnAnQiq91n2Gx4OWRqv/1d8goL7zgyxSBoVHXJxn9yKWY CpPE7XP7rz5KDThSTf6otfrBFvCiqEZGDI4S8WJS2vQ2nmBECuSWkIdDStq82ZnL9Vif hpUg== X-Gm-Message-State: AOJu0YyLR3RuaSgJHkaMgXS03opQ3gotUU5mztja0DLJscUiK3yA120U 59o4L7bR8FHtCJwYj8VuzNDfeQ== X-Received: by 2002:a05:6512:3a96:b0:509:4e4f:65ac with SMTP id q22-20020a0565123a9600b005094e4f65acmr4155784lfu.63.1699024884322; Fri, 03 Nov 2023 08:21:24 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id f16-20020a7bc8d0000000b0040684abb623sm2712165wml.24.2023.11.03.08.21.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 08:21:22 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Udo Steinberg Subject: [PATCH v3 1/3] tests/qtest/bios-tables-test: Allow changes to virt SPCR and DBG2 Date: Fri, 3 Nov 2023 15:21:18 +0000 Message-Id: <20231103152120.829962-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231103152120.829962-1-peter.maydell@linaro.org> References: <20231103152120.829962-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12e; envelope-from=peter.maydell@linaro.org; helo=mail-lf1-x12e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Allow changes to the virt board SPCR and DBG2 -- we are going to fix an error in the UART descriptions there. Signed-off-by: Peter Maydell --- tests/qtest/bios-tables-test-allowed-diff.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dfb8523c8bf..6673e2c4c13 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,3 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/virt/SPCR", +"tests/data/acpi/virt/DBG2", From patchwork Fri Nov 3 15:21:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 740669 Delivered-To: patch@linaro.org Received: by 2002:a5d:538f:0:b0:32d:baff:b0ca with SMTP id d15csp1440603wrv; Fri, 3 Nov 2023 08:22:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFqQeiI1VD9FDZehzKSuddR91Jx605lZ9zjWVKl1NdzNOu1yI3oePqRfXH3GYNU7zOCoDja X-Received: by 2002:a1f:984f:0:b0:4a4:1575:4e5f with SMTP id a76-20020a1f984f000000b004a415754e5fmr18414488vke.6.1699024923336; Fri, 03 Nov 2023 08:22:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699024923; cv=none; d=google.com; s=arc-20160816; b=KyK+QOmE3rFdYjDAcR1ot+Qd+MSLSG9fRz3DGSHzgTQlHT1UUk5egDuervc6tuuNKQ 9gn9VY8Li52GyCz3CSMsus5ckc6pfEzw61MiVQSEGX6qLF2Ls28luApARcI/mDt6Fkqn FB49YFaF6lfe/HJ8i6YjdCwXANx4HJ5yQItNUH/5Rh3/+oK0qKfP235ifH9+s8W5o/GE xkSw9ms5WlfYfOaTi4ThVDN8eZD8HltCxTQiAuVWnJAHbOl4nPSbsAZ3jFgIEW+sOFa0 6+Hffwi791nKS5oqBSnMqlV42307rZdmlhNZ5MAnFMdb0IH6uxVXDet/JrlwGnJGzXvo lADA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=oOUtQCOKfl8ZTA0KsgLPylscZ7jLKH8nCj7u4SLLwyQ=; fh=wqfvLaBYopGyGisjq/k8ulPaCl1xshcoDnGh5kvEEbE=; b=gktg/iCwstouSWslQby3YAb7w2dVX/mGuMl0IcEWYc4uUNq+u78ITYbxN/MTY3KLpd V9h1zMJqmQwA/nsVbuybGSvxqANMlRReSt4gDac7OlHG59+/Z/6lIBFEoMbizedKiVKv 8baZRBwNvAr0g8YMn7OMtmXYsGnqnFOljFarWM15pXLuNtE6Dj/Chi9bB/OUEBpXqaZB IEGo6WeV798Fomnd6IS1lLMkDIef/lNv519K1o8narCoZ41cU3fGbDD8uL84G+dypEzF P5TuPB6A0Al4RQK8T0dI3Lh309KR2hYjtwQp2fN9nBr+NQ8IoCpeRbkU2qpaIMqrFz76 G5PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="bbkpLZ/y"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bb18-20020a056122221200b004715df821f8si316267vkb.232.2023.11.03.08.22.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Nov 2023 08:22:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="bbkpLZ/y"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyvzG-0004nV-4i; Fri, 03 Nov 2023 11:21:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qyvzE-0004mp-Fj for qemu-devel@nongnu.org; Fri, 03 Nov 2023 11:21:28 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qyvzC-0002nK-Jw for qemu-devel@nongnu.org; Fri, 03 Nov 2023 11:21:28 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40853c639abso16452865e9.0 for ; Fri, 03 Nov 2023 08:21:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699024885; x=1699629685; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oOUtQCOKfl8ZTA0KsgLPylscZ7jLKH8nCj7u4SLLwyQ=; b=bbkpLZ/ywqNNhlrsozY+GUSYt6Ax5UTSdjcCcynki/prVk/rOeXLBsJLWa8/AgGCww uTArE1xWXVIzwGdZ0hXuyZm9I+frkSUSt2kBtGZZmoLKTlGRF32uzlunTS2mO5p2gwYa quGR3RnycPHfRNlNKe38Al+GOyHoAqwqyIrzAj03Cqdsh0cax5qM356saRJgK4eoK4B8 KebwGtZRF49B1v2OPiv88QBEzCxwgDJkxm2UNNSJw+NMra5v08j7KO8wg+ScKSvYAmTx zQ5IhOMcNR7/u6XJuh9d5WUg9jrqjn+cK/iHXcA5bkYd0ftRSE7PxisfZCoenGXcf2Lf dcSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699024885; x=1699629685; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oOUtQCOKfl8ZTA0KsgLPylscZ7jLKH8nCj7u4SLLwyQ=; b=WRNPOetOg9EWwm+Eke3Jo3+vFCqyXfQriJIAC8I+m/aXhx6RHhjTOUx/atghHylPjQ BukF/1xyelwqQOSXx27L2hWtUX47JpdRHsaSpLDE/zado+ZaBRYxW/Z0GFcRYNDvThe4 wGehTIwTf7Gzj2lnR6FeFIgjF283U2ktbHUGr/ItIFKe52J7wZ49m/27mKxWrzpwTIqx qw/nzylZ+ML/oWGVY09kaBTBp0+5Os+l2+q1ys4VhmKL6yCKH622HXnSYn4XKWtmVApc PGOualhT5Cr1vqC4pfoStSr1aHsdAz6rtz2Nko/ifhBePg/TDiH1RAOIR4FnPjGZzIPm CKNA== X-Gm-Message-State: AOJu0YyT2/fs2bI+WFht/tAtWCwfC5HGljq9e5gw0VcmFuLlMlVWsIhz N4ExSVyyz+rRO2WOfSWIHQPGeue4SLRUmGmcQzk= X-Received: by 2002:a05:600c:2206:b0:409:295:9c6e with SMTP id z6-20020a05600c220600b0040902959c6emr18097214wml.30.1699024884805; Fri, 03 Nov 2023 08:21:24 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id f16-20020a7bc8d0000000b0040684abb623sm2712165wml.24.2023.11.03.08.21.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 08:21:24 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Udo Steinberg Subject: [PATCH v3 2/3] hw/arm/virt: Report correct register sizes in ACPI DBG2/SPCR tables. Date: Fri, 3 Nov 2023 15:21:19 +0000 Message-Id: <20231103152120.829962-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231103152120.829962-1-peter.maydell@linaro.org> References: <20231103152120.829962-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Udo Steinberg Documentation for using the GAS in ACPI tables to report debug UART addresses at https://learn.microsoft.com/en-us/windows-hardware/drivers/bringup/acpi-debug-port-table states the following: - The Register Bit Width field contains the register stride and must be a power of 2 that is at least as large as the access size. On 32-bit platforms this value cannot exceed 32. On 64-bit platforms this value cannot exceed 64. - The Access Size field is used to determine whether byte, WORD, DWORD, or QWORD accesses are to be used. QWORD accesses are only valid on 64-bit architectures. Documentation for the ARM PL011 at https://developer.arm.com/documentation/ddi0183/latest/ states that the registers are: - spaced 4 bytes apart (see Table 3-2), so register stride must be 32. - 16 bits in size in some cases (see individual registers), so access size must be at least 2. Linux doesn't seem to care about this error in the table, but it does affect at least the NOVA microhypervisor. In theory we therefore have a choice between reporting the access size as 2 (16 bit accesses) or 3 (32-bit accesses). In practice, Linux does not correctly handle the case where the table reports the access size as 2: as of kernel commit 750b95887e5678, the code in acpi_parse_spcr() tries to tell the serial driver to use 16 bit accesses by passing "mmio16" in the option string, but the PL011 driver code in pl011_console_match() only recognizes "mmio" or "mmio32". The result is that unless the user has enabled 'earlycon' We therefore choose to report the access size as 32 bits; this works for NOVA and also for Linux. It is also what the UEFI firmware on a Raspberry Pi 4 reports, so we're in line with existing real-world practice. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1938 Signed-off-by: Udo Steinberg Reviewed-by: Peter Maydell [PMM: minor commit message tweaks; use 32 bit accesses] Signed-off-by: Peter Maydell --- hw/arm/virt-acpi-build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 9ce136cd88c..8bc35a483c9 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -482,7 +482,7 @@ build_spcr(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) build_append_int_noprefix(table_data, 3, 1); /* ARM PL011 UART */ build_append_int_noprefix(table_data, 0, 3); /* Reserved */ /* Base Address */ - build_append_gas(table_data, AML_AS_SYSTEM_MEMORY, 8, 0, 1, + build_append_gas(table_data, AML_AS_SYSTEM_MEMORY, 32, 0, 3, vms->memmap[VIRT_UART].base); /* Interrupt Type */ build_append_int_noprefix(table_data, @@ -673,7 +673,7 @@ build_dbg2(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) build_append_int_noprefix(table_data, 34, 2); /* BaseAddressRegister[] */ - build_append_gas(table_data, AML_AS_SYSTEM_MEMORY, 8, 0, 1, + build_append_gas(table_data, AML_AS_SYSTEM_MEMORY, 32, 0, 3, vms->memmap[VIRT_UART].base); /* AddressSize[] */ From patchwork Fri Nov 3 15:21:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 740670 Delivered-To: patch@linaro.org Received: by 2002:a5d:538f:0:b0:32d:baff:b0ca with SMTP id d15csp1440677wrv; Fri, 3 Nov 2023 08:22:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFgjarWYwxeT9gZrIOUNAXn/DdDEljx5F3CRqJkHG+YQ7PPonuK8e3U2ayNBFUL1xkFGVqX X-Received: by 2002:a05:6102:46:b0:45d:91b2:f087 with SMTP id k6-20020a056102004600b0045d91b2f087mr2650880vsp.6.1699024931184; Fri, 03 Nov 2023 08:22:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699024931; cv=none; d=google.com; s=arc-20160816; b=SN+UnotwHUIoEt0VPd07Wg06wYs1bG/qBQkWXcIk5CWAetnarfrvaQ3/dTrIbymXiH Dbb9xl850hq3ogwE4DNeHRcsieR5J5Ni5EV2vsxY3NnWitUSpKUR7uMXubmk11JxJRNq xVWoG7oyrg7udURWU9mDcHBRBwfTyaqEAh2P3NrBQp7Z6fvoKHM8bHjHoRt8BQM00dWe pHO0TdEeyb1fcxoVOIKJ9tjuKwHh4uhf4IEKvkwnNYAsjEeeC6Gx8rX7iysllyRfyUgM I4P+YqlzlhyIIM5NJznvFJqJ96c8uznhlZvsPC0g4pqiEpRxtMblNI3A0M/q0+RqdAWU UZbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2rKfc6wYyTa7eaGHPKOB3cQ0P9rjkcJ/4gZBc+bTbwo=; fh=wqfvLaBYopGyGisjq/k8ulPaCl1xshcoDnGh5kvEEbE=; b=zJy6yryrdawCauRKfKC1aTaI6nSV2/V763+NpgmDelNnZW/THYqdmvg1EU4XQxwYYY +0RfWx2pDXd4l9aGjOCdpGFVAcDo0v7CrvY5uArAm+k6XRNrG4XRa2S5FFy/UY0IlRqf dKy7Q5QpSwNzetvs++wwHPSLaoxpQNQ0Ke6u0sNbi3HBodlpU4tVNc4JpDww3k+7b8QB 557QhbaPbgOIi6QOUHc6u2Yys5tgOPqE+67udDn8FDe+jAI/hvCTr4pbEojteJW33SZo h1BPcKUl0jj5qkQ35anHooaT0pnT47mCO/i5Q089u1bepiGuiuf2S0cesGZhsiwsCKbn pbxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DvcmfGCM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g5-20020ab039c5000000b007abbc3228dbsi257646uaw.160.2023.11.03.08.22.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Nov 2023 08:22:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DvcmfGCM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyvzI-0004pk-7m; Fri, 03 Nov 2023 11:21:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qyvzH-0004oU-0T for qemu-devel@nongnu.org; Fri, 03 Nov 2023 11:21:31 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qyvzC-0002nT-Sc for qemu-devel@nongnu.org; Fri, 03 Nov 2023 11:21:30 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4079ed65471so16072115e9.1 for ; Fri, 03 Nov 2023 08:21:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699024885; x=1699629685; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2rKfc6wYyTa7eaGHPKOB3cQ0P9rjkcJ/4gZBc+bTbwo=; b=DvcmfGCMuVFO/S2tW4Dof+okixNL1i9MoBHRkLqiV/7h8Uc3zgF/5hw326HPOd2Tug LIe47kaKGBGlurY8xAG4YW6IbeYSa5Xv6rmo94fudyuNVsoZtoFy9JC/T06RXWDN3xVs MfOI91tExa9b0zNODA5FZVSW/br8SBS7fYDkSFUFpIlaI+QTEktfEa4GBiDm5ZLMoLAI xuKGMa06dMssJjuZa4NHl7iwNjSMl283zeOQScbJ+TKpSvhKjDzRcJ8DCxsagOUVC9xw Mmmd4iq401WKKeGNEjOuhputD9qRGprS++M/YnyXBeSGje+VZ7Kg7XydDRPRNMreKOLa sXdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699024885; x=1699629685; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2rKfc6wYyTa7eaGHPKOB3cQ0P9rjkcJ/4gZBc+bTbwo=; b=QvUupMrSdqESbnfvdZ4vwd/zCzKggZyJO+PZG+UCf2VyNH/E0YTWYfYXPGfI7p4Par jIXF0SyzbZiIB28TfhFiU6TTX14p9hw6dihyD3cV2A4y6WfSDIf181bszFZv/Da7jtde q56hd1OpsHfDG2EQkenU+qvcLkwWheaiV2O9u9a6d2NPMw7EekWCraFI0vELCASMqtbB urqjVuXAB6m9gElX2b7gKGezyFeGezYJRLm9nv0Su5/pr7J4ZykYg6lm7RYIpkfb9YLk IJeXMVFx8UhOKIY21+7rcgY+IehBw5xVebcsdb4XpEqDI6IuJrRZH9dqxVAaJs2zYf0G 1DvQ== X-Gm-Message-State: AOJu0YxqY8fEv0tOJwsfLvIY97PGX1881NHUrJ7/DTtGPw5yrRR5TRpN lALK5TUVoANX8qroLXfD9mnJ0Q== X-Received: by 2002:a05:600c:5204:b0:408:3f61:cb4f with SMTP id fb4-20020a05600c520400b004083f61cb4fmr17106556wmb.23.1699024885300; Fri, 03 Nov 2023 08:21:25 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id f16-20020a7bc8d0000000b0040684abb623sm2712165wml.24.2023.11.03.08.21.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 08:21:25 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Udo Steinberg Subject: [PATCH v3 3/3] tests/qtest/bios-tables-test: Update virt SPCR and DBG2 golden references Date: Fri, 3 Nov 2023 15:21:20 +0000 Message-Id: <20231103152120.829962-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231103152120.829962-1-peter.maydell@linaro.org> References: <20231103152120.829962-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Update the virt SPCR and DBG2 golden reference files to have the fix for the description of the UART. Diffs from iasl: @@ -1,57 +1,57 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20200925 (64-bit version) * Copyright (c) 2000 - 2020 Intel Corporation * - * Disassembly of tests/data/acpi/virt/SPCR, Fri Nov 3 14:12:06 2023 + * Disassembly of /tmp/aml-E6YUD2, Fri Nov 3 14:12:06 2023 * * ACPI Data Table [SPCR] * * Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue */ [000h 0000 4] Signature : "SPCR" [Serial Port Console Redirection table] [004h 0004 4] Table Length : 00000050 [008h 0008 1] Revision : 02 -[009h 0009 1] Checksum : CB +[009h 0009 1] Checksum : B1 [00Ah 0010 6] Oem ID : "BOCHS " [010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001 [024h 0036 1] Interface Type : 03 [025h 0037 3] Reserved : 000000 [028h 0040 12] Serial Port Register : [Generic Address Structure] [028h 0040 1] Space ID : 00 [SystemMemory] -[029h 0041 1] Bit Width : 08 +[029h 0041 1] Bit Width : 20 [02Ah 0042 1] Bit Offset : 00 -[02Bh 0043 1] Encoded Access Width : 01 [Byte Access:8] +[02Bh 0043 1] Encoded Access Width : 03 [DWord Access:32] [02Ch 0044 8] Address : 0000000009000000 [034h 0052 1] Interrupt Type : 08 [035h 0053 1] PCAT-compatible IRQ : 00 [036h 0054 4] Interrupt : 00000021 [03Ah 0058 1] Baud Rate : 03 [03Bh 0059 1] Parity : 00 [03Ch 0060 1] Stop Bits : 01 [03Dh 0061 1] Flow Control : 02 [03Eh 0062 1] Terminal Type : 00 [04Ch 0076 1] Reserved : 00 [040h 0064 2] PCI Device ID : FFFF [042h 0066 2] PCI Vendor ID : FFFF [044h 0068 1] PCI Bus : 00 [045h 0069 1] PCI Device : 00 [046h 0070 1] PCI Function : 00 [047h 0071 4] PCI Flags : 00000000 [04Bh 0075 1] PCI Segment : 00 [04Ch 0076 4] Reserved : 00000000 Raw Table Data: Length 80 (0x50) - 0000: 53 50 43 52 50 00 00 00 02 CB 42 4F 43 48 53 20 // SPCRP.....BOCHS + 0000: 53 50 43 52 50 00 00 00 02 B1 42 4F 43 48 53 20 // SPCRP.....BOCHS 0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....BXPC - 0020: 01 00 00 00 03 00 00 00 00 08 00 01 00 00 00 09 // ................ + 0020: 01 00 00 00 03 00 00 00 00 20 00 03 00 00 00 09 // ......... ...... 0030: 00 00 00 00 08 00 21 00 00 00 03 00 01 02 00 00 // ......!......... 0040: FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 // ................ @@ -1,57 +1,57 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20200925 (64-bit version) * Copyright (c) 2000 - 2020 Intel Corporation * - * Disassembly of tests/data/acpi/virt/DBG2, Fri Nov 3 14:12:06 2023 + * Disassembly of /tmp/aml-V1YUD2, Fri Nov 3 14:12:06 2023 * * ACPI Data Table [DBG2] * * Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue */ [000h 0000 4] Signature : "DBG2" [Debug Port table type 2] [004h 0004 4] Table Length : 00000057 [008h 0008 1] Revision : 00 -[009h 0009 1] Checksum : CF +[009h 0009 1] Checksum : B5 [00Ah 0010 6] Oem ID : "BOCHS " [010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001 [024h 0036 4] Info Offset : 0000002C [028h 0040 4] Info Count : 00000001 [02Ch 0044 1] Revision : 00 [02Dh 0045 2] Length : 002B [02Fh 0047 1] Register Count : 01 [030h 0048 2] Namepath Length : 0005 [032h 0050 2] Namepath Offset : 0026 [034h 0052 2] OEM Data Length : 0000 [Optional field not present] [036h 0054 2] OEM Data Offset : 0000 [Optional field not present] [038h 0056 2] Port Type : 8000 [03Ah 0058 2] Port Subtype : 0003 [03Ch 0060 2] Reserved : 0000 [03Eh 0062 2] Base Address Offset : 0016 [040h 0064 2] Address Size Offset : 0022 [042h 0066 12] Base Address Register : [Generic Address Structure] [042h 0066 1] Space ID : 00 [SystemMemory] -[043h 0067 1] Bit Width : 08 +[043h 0067 1] Bit Width : 20 [044h 0068 1] Bit Offset : 00 -[045h 0069 1] Encoded Access Width : 01 [Byte Access:8] +[045h 0069 1] Encoded Access Width : 03 [DWord Access:32] [046h 0070 8] Address : 0000000009000000 [04Eh 0078 4] Address Size : 00001000 [052h 0082 5] Namepath : "COM0" Raw Table Data: Length 87 (0x57) - 0000: 44 42 47 32 57 00 00 00 00 CF 42 4F 43 48 53 20 // DBG2W.....BOCHS + 0000: 44 42 47 32 57 00 00 00 00 B5 42 4F 43 48 53 20 // DBG2W.....BOCHS 0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....BXPC 0020: 01 00 00 00 2C 00 00 00 01 00 00 00 00 2B 00 01 // ....,........+.. 0030: 05 00 26 00 00 00 00 00 00 80 03 00 00 00 16 00 // ..&............. - 0040: 22 00 00 08 00 01 00 00 00 09 00 00 00 00 00 10 // "............... + 0040: 22 00 00 20 00 03 00 00 00 09 00 00 00 00 00 10 // ".. ............ 0050: 00 00 43 4F 4D 30 00 // ..COM0. Signed-off-by: Peter Maydell --- tests/qtest/bios-tables-test-allowed-diff.h | 2 -- tests/data/acpi/virt/DBG2 | Bin 87 -> 87 bytes tests/data/acpi/virt/SPCR | Bin 80 -> 80 bytes 3 files changed, 2 deletions(-) diff --git a/tests/data/acpi/virt/DBG2 b/tests/data/acpi/virt/DBG2 index 86e6314f7b0235ef8ed3e0221e09f996c41f5e98..0a05e1a47f9c303c6a6c9ca8414c62ec4ac90f98 100644 GIT binary patch delta 37 ncmWF!=W=m!HwtF}f~^y|EJYL;n1M`A5T8MSfx+3|*MI>4b2kL{ delta 37 ncmWF!=W=m!HwtF}g7Xu(EJZjN7=cVq5T8MSfx+3|*MI>4bG-!j diff --git a/tests/data/acpi/virt/SPCR b/tests/data/acpi/virt/SPCR index 24e0a579e7d73f432a614380e29aa95113344186..cf0f2b75226515097c08d2e2016a83a4f08812ba 100644 GIT binary patch delta 23 ecmWFt;0g|K4hmpkU|`xfkxQOgfq{9VjtT%gOa!L@ delta 23 ecmWFt;0g|K4hmpkU|>2ukxQPLgMo3PjtT%g(gddf diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index 6673e2c4c13..dfb8523c8bf 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,3 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/virt/SPCR", -"tests/data/acpi/virt/DBG2",