From patchwork Wed Jan 18 09:57:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 643682 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp1661703pvb; Wed, 18 Jan 2023 01:58:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXspi+MGCWY3Si0PMUkUkXZ5HJKpB4531UD+q3Y8rTiOT56s262yQKafHnhI5h1v9u1Fr8oQ X-Received: by 2002:ac8:4c8e:0:b0:3b6:4998:67a1 with SMTP id j14-20020ac84c8e000000b003b6499867a1mr3282572qtv.37.1674035902481; Wed, 18 Jan 2023 01:58:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674035902; cv=none; d=google.com; s=arc-20160816; b=Ptdr6icAyirXmfVje+RGDFI3zFlR4jkzqcWT1GQego+fj3HoRli85a3ntguxHMWmzQ kCegjBUAuhDD0ahXA54D/laK+9kXxBVfXASZOK9vHNmgWQYy2TX8Gc3b12bbXP5ipxwX vLfKTOTu655wN6usK+qD41jFkxPYUqGQ5NKhYRKfBqaBSWZnHTfZM5wu9qBrGqdx8VHX 7dwMdD98w2+Na/Fur6Uos3Khu1wsAXa7CbUbylZdxlsbayABr8q408Tdl/4NC/VO6tO2 FOWo8k8cdHl4ibK6Hh/RpuelVAAhLydC07HcZ2wx4n/7YXL6NB9sSuwYgieS80kldpOg YZUg== 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=QwOa/3lHPIEIlOYRqb+bMt9BbbFurvxLhJ3zRVokkDk=; b=wEHUJoJOy1Bi1ik56wlVfFekZq01+3/2yGrFdPy+Ea1pehbMBYp+AhKDwa/Wf7m71P JLScJ889m8EISb4nW7LYMlRtJ1gGsfVLXlB22OkxpkKFoev9gPwdsSHPQofli5TbeR+G AmRyLGR0b5ja/BD+oB0zqefihMx6a1eBWUh0/cid3VbFvFytzzasvd6ct+LYMHqu99m4 xtnZUbazMlZlXxyOqlfOyCudnHHMI+tP4c3RobpdWyX/xC3gdBno3t+/3F/spdBLIYy6 YzRUzP9s1DwiyJ3P5kl3N3ImberFzE3pN54WBkRQJeoeIRwXCdjGK9m04bRRXvXfGkWz rRYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lD+acpnK; 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 i5-20020ac813c5000000b003a8287c8bf8si4452163qtj.481.2023.01.18.01.58.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Jan 2023 01:58:22 -0800 (PST) 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=lD+acpnK; 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 1pI5Cp-00027L-Us; Wed, 18 Jan 2023 04:58:07 -0500 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 1pI5Cm-00026Y-GR for qemu-devel@nongnu.org; Wed, 18 Jan 2023 04:58:04 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pI5Ci-00061K-Vz for qemu-devel@nongnu.org; Wed, 18 Jan 2023 04:58:03 -0500 Received: by mail-wm1-x32e.google.com with SMTP id f25-20020a1c6a19000000b003da221fbf48so1076094wmc.1 for ; Wed, 18 Jan 2023 01:58:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=QwOa/3lHPIEIlOYRqb+bMt9BbbFurvxLhJ3zRVokkDk=; b=lD+acpnKxIg8VZQ+jFXRIp8nhocG1nPt2N/VR/SO3KP/FmqRrx+vL5iDTQYgMVehje db3NIzHsGH41axWn7oZgS6bpNYGTN1he3eG79HtY11aLQ45vR7WR3XGANi9Gc56Wg/jQ hZW59WvYmSdmkLiCyLQ1LQGEvOSE1FC1fEKSvT7GMxlcLtZDfROMSDO/aOFGKu3RHMZW L0x0nS4Bdyg9VBh+K7IPLycnp3iSrCd0XpmTfBea2b5OGqYt3loGY3J1jGAvyMfmjy27 f8sjBvdGHa20kekYP6oglBqE2w94/3YAnzRFt1KCmZiT0tKEet/iGxEz/kZo7qECU2LN c6CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=QwOa/3lHPIEIlOYRqb+bMt9BbbFurvxLhJ3zRVokkDk=; b=TSatDCcQAB5OExdRuDCLSK0hzo341HPCh/recFB9b8o7zeUy1xa2mZm+jZ3H52gj1a Uwf6F34RuBvVUbcrbbBOU4BnBDFRLtcsixdnylxCgwM42hoUhQfcDg3/RbCJlYg19s3S nzckhT08DhtMnpQ3AKgxgQU9mY68lDeAKaxT/xDT829FMj3uUn93LwVITLcauhQNpnXG g1qAXsw60q4NCLEQYnMydYpD1lHh+XXR4kYr24JQ7qHfu6/nkUNzxYIkiv5zHCx+OT7c TAmKdPNsL3UnPu0a0zpYXNiT7F0bVxrt+SspYt+n4vEpHeP58r2+DD06LEdYFx/yUxTV xEww== X-Gm-Message-State: AFqh2koqWBWwbHKx4MLe5TlD4RNgZuZcoYPR3fDiXk7u1i81FNAb6vPS +7ED29dV+eZpGPgc1W6yXQ6PWLkN7xazqTx4 X-Received: by 2002:a05:600c:4910:b0:3d3:4406:8a3a with SMTP id f16-20020a05600c491000b003d344068a3amr6229251wmp.30.1674035878815; Wed, 18 Jan 2023 01:57:58 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id m16-20020a05600c3b1000b003dafadd2f77sm1674815wms.1.2023.01.18.01.57.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 18 Jan 2023 01:57:58 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jiaxun Yang , Klaus Jensen , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Beraldo Leal , Wainer dos Santos Moschetta , Cleber Rosa , Klaus Jensen Subject: [PATCH v2 1/2] hw/pci-host/gt64120: Fix PCI I/O config register endianness Date: Wed, 18 Jan 2023 10:57:50 +0100 Message-Id: <20230118095751.49728-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230118095751.49728-1-philmd@linaro.org> References: <20230118095751.49728-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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 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 The MByteSwap bit only affects the data register endianness, not the config register. Map the config register once in the gt64120_realize() handler, and only remap the data register when the mapping is updated. Fixes: 145e2198d7 ("gt64xxx: Endian-swap using PCI_HOST_BRIDGE MemoryRegionOps") Reported-by: Klaus Jensen Tested-by: Klaus Jensen Signed-off-by: Philippe Mathieu-Daudé --- hw/pci-host/gt64120.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/hw/pci-host/gt64120.c b/hw/pci-host/gt64120.c index f226d03420..36ed01c615 100644 --- a/hw/pci-host/gt64120.c +++ b/hw/pci-host/gt64120.c @@ -320,13 +320,6 @@ static void gt64120_isd_mapping(GT64120State *s) static void gt64120_update_pci_cfgdata_mapping(GT64120State *s) { - /* Indexed on MByteSwap bit, see Table 158: PCI_0 Command, Offset: 0xc00 */ - static const MemoryRegionOps *pci_host_conf_ops[] = { - &pci_host_conf_be_ops, &pci_host_conf_le_ops - }; - static const MemoryRegionOps *pci_host_data_ops[] = { - &pci_host_data_be_ops, &pci_host_data_le_ops - }; PCIHostState *phb = PCI_HOST_BRIDGE(s); memory_region_transaction_begin(); @@ -339,22 +332,13 @@ static void gt64120_update_pci_cfgdata_mapping(GT64120State *s) * - Table 16: 32-bit PCI Transaction Endianess * - Table 158: PCI_0 Command, Offset: 0xc00 */ - if (memory_region_is_mapped(&phb->conf_mem)) { - memory_region_del_subregion(&s->ISD_mem, &phb->conf_mem); - object_unparent(OBJECT(&phb->conf_mem)); - } - memory_region_init_io(&phb->conf_mem, OBJECT(phb), - pci_host_conf_ops[s->regs[GT_PCI0_CMD] & 1], - s, "pci-conf-idx", 4); - memory_region_add_subregion_overlap(&s->ISD_mem, GT_PCI0_CFGADDR << 2, - &phb->conf_mem, 1); - if (memory_region_is_mapped(&phb->data_mem)) { memory_region_del_subregion(&s->ISD_mem, &phb->data_mem); object_unparent(OBJECT(&phb->data_mem)); } memory_region_init_io(&phb->data_mem, OBJECT(phb), - pci_host_data_ops[s->regs[GT_PCI0_CMD] & 1], + (s->regs[GT_PCI0_CMD] & 1) ? &pci_host_data_le_ops + : &pci_host_data_be_ops, s, "pci-conf-data", 4); memory_region_add_subregion_overlap(&s->ISD_mem, GT_PCI0_CFGDATA << 2, &phb->data_mem, 1); @@ -1207,6 +1191,11 @@ static void gt64120_realize(DeviceState *dev, Error **errp) get_system_io(), PCI_DEVFN(18, 0), TYPE_PCI_BUS); + memory_region_init_io(&phb->conf_mem, OBJECT(phb), &pci_host_conf_le_ops, + s, "pci-conf-idx", 4); + memory_region_add_subregion_overlap(&s->ISD_mem, GT_PCI0_CFGADDR << 2, + &phb->conf_mem, 1); + pci_create_simple(phb->bus, PCI_DEVFN(0, 0), "gt64120_pci"); /* From patchwork Wed Jan 18 09:57:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 643684 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp1661872pvb; Wed, 18 Jan 2023 01:58:38 -0800 (PST) X-Google-Smtp-Source: AMrXdXvmKJhARcVA4F3/277ItfU35UHF7BBxpJwnAbFwkbcLmxti8KaB5jdNFJNk+67ETS2TP6TX X-Received: by 2002:ad4:42a3:0:b0:4c6:f77b:e7ad with SMTP id e3-20020ad442a3000000b004c6f77be7admr34397198qvr.21.1674035918821; Wed, 18 Jan 2023 01:58:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674035918; cv=none; d=google.com; s=arc-20160816; b=pt2b2vWKGWhgRMHvdrzZdFfHG8aPTYClSlmDEmoNP+X6rKx/xYzAUq1VWtrPs6znph cyFeVMQ4NqtiMcWaiY3veaSRueVcz3YutNUUxT45cf4kD4gpgFYMBX4H9csNpMud/GOQ 4Z9Lw26ZO5SUD2kgLdylDUzk6ef27T4rM4wEguOqJyM9g5CbmB44WyTf19eVzk/CAllL 2PW72Xs/HpwBobUpDKLK8sNP10GlDtRl5vF82APQXTNtNK4DfuUBN3TtOnz2XTvR8gu9 3/Ahnk+6wBlEkgW/4ZNfbOjD0TMzY4Uc6NffajIJQgJAzyg1DwO83AejZLOYzhzYo144 1cmw== 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=oaRo0GU0CDZsZLHw/XFQ9FNLJtHubTjXB+uAlLi3+pE=; b=KW8e280FKoDPbKTCi8LL7Y8xUBEFd+DEkpUSaAM7JuWiOmOmMEiQJhIhi5W9FRP1Si 1wOopXTZnD+wFdz+WZG/pcGmEre+af5Fzc+Grts6U3PtpAYD+zK+I86Uo9ti0sx/VquF 8CYnPmOI+5h/nS8gWppry0KNaHXxvXJgB0nv2AwTNR8Z0mDhH1gRorsaqKxfMU2DGxcX EclepIVqpnL3M62KPg4MzDLBtpYf2b0uFqqA7+Bz/NCDFwEGa34l7+r/Z8UAUH4Idn01 3FVPypZpfwzFZmqvUBuSVdTXktvuJnmS3sAE0+VmF7YrZiHJWkhhTrC0B28WVXTvALsT PzPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vkaqV3pr; 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 kk27-20020a056214509b00b00535182acf77si4505613qvb.466.2023.01.18.01.58.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Jan 2023 01:58:38 -0800 (PST) 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=vkaqV3pr; 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 1pI5Cr-000295-Gw; Wed, 18 Jan 2023 04:58:09 -0500 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 1pI5Cp-00027O-W3 for qemu-devel@nongnu.org; Wed, 18 Jan 2023 04:58:08 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pI5Co-00061r-1G for qemu-devel@nongnu.org; Wed, 18 Jan 2023 04:58:07 -0500 Received: by mail-wr1-x433.google.com with SMTP id b5so12175746wrn.0 for ; Wed, 18 Jan 2023 01:58:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=oaRo0GU0CDZsZLHw/XFQ9FNLJtHubTjXB+uAlLi3+pE=; b=vkaqV3prQ62srRNEwW6iAbQUyoKaesap+TeKhhjSkxRNadLWVskerWWMVFncsxqj5J e41cyWKrHSqmrrcHO6/q4f3ZXcIN72Oq0ixFTsJewODRuB5JV2DJ18GUb9o59kzTM1qo 5lKNaORSJVl35GxFQf0+lk9VWE8HRO93IDk+wAYd3piAOOr+ygBS10bqiq+jhpd0MGq0 ZCPLG2K9FXRX89rcUhLnxSOagGu79/O/ZsleffTcZ/tVKvF5A2r+PvEWKKaxQk2g8zGk SE55PHmGxhxGoXMI9+F98No6MA0ThXVxcQkk96j5PcC6AsuBIGvLsmaePyxFPYoSBL8B dU0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=oaRo0GU0CDZsZLHw/XFQ9FNLJtHubTjXB+uAlLi3+pE=; b=YnQMxV5/87qeEIWH63Brp4IQKYAnWLsYDUAWQm5+w4uwq1RXjdMcimsAUztY9jVrrZ wd85GMXzQe41tlT62mIKVh3WD9j0DhuozSUp33WFIPQzgdy9W56UweA7yp6MkZuasGDy F1MEZ3fTLm5emfjydpJvHEb50NFxoibuOtftTKkSR6zY9DVFMH6M9JGxfOJ+xwUEhYY1 AksOiiF6mEMtOZbgzfUNtXGa89TWFrACw3JW9jFU7rEQvn5vf4QRQb45Fa2v5gPoA1Gx yNUfqNSw36Cqxds3Ie5lpWXomFPuj7WJz02MlyohSQUnu95nHJBkz2XyvjvzvUWfYShj /Ivg== X-Gm-Message-State: AFqh2kpjtHzkJ+8aCClxutcEKmEk3pa8Z3QeL/tjqE6PmyA2WwfpLoma KBTIZ3msFl1472ULiG0Oc2a/exdl/H0ZPMhq X-Received: by 2002:a05:6000:98d:b0:25f:8ead:96cc with SMTP id by13-20020a056000098d00b0025f8ead96ccmr5701460wrb.70.1674035883720; Wed, 18 Jan 2023 01:58:03 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id c6-20020adffb06000000b002423620d356sm10761161wrr.35.2023.01.18.01.58.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 18 Jan 2023 01:58:03 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jiaxun Yang , Klaus Jensen , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Beraldo Leal , Wainer dos Santos Moschetta , Cleber Rosa Subject: [PATCH v2 2/2] tests/avocado: Add test accessing NVMe on big-endian MIPS target Date: Wed, 18 Jan 2023 10:57:51 +0100 Message-Id: <20230118095751.49728-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230118095751.49728-1-philmd@linaro.org> References: <20230118095751.49728-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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 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 Add a Linux-boot test accessing PCI NVMe drive on big-endian MIPS: $ avocado --show=app,console run -t device:nvme tests/avocado/ (1/1) tests/avocado/boot_linux_console.py:BootLinuxConsole.test_mips64_malta_I6400_nvme: console: Linux version 6.2.0-rc4 (kbj@butter) (mips64-buildroot-linux-gnu-gcc.br_real (Buildroot 2022.11) 11.3.0, GNU ld (GNU Binutils) 2.38) #6 Tue Jan 17 18:48:25 CET 2023 console: CPU0 revision is: 0001a900 (MIPS I6400) console: FPU revision is: 20f30300 console: MIPS: machine is mti,malta ... console: PCI host bridge to bus 0000:00 console: pci_bus 0000:00: root bus resource [mem 0x10000000-0x17ffffff] console: pci_bus 0000:00: root bus resource [io 0x1000-0x1fffff] console: pci_bus 0000:00: No busn resource found for root bus, will use [bus 00-ff] console: pci 0000:00:0a.0: [8086:7110] type 00 class 0x060100 console: pci 0000:00:0a.1: [8086:7111] type 00 class 0x010180 console: pci 0000:00:0a.1: reg 0x20: [io 0x0000-0x000f] console: pci 0000:00:0a.1: legacy IDE quirk: reg 0x10: [io 0x01f0-0x01f7] console: pci 0000:00:0a.1: legacy IDE quirk: reg 0x14: [io 0x03f6] console: pci 0000:00:0a.1: legacy IDE quirk: reg 0x18: [io 0x0170-0x0177] console: pci 0000:00:0a.1: legacy IDE quirk: reg 0x1c: [io 0x0376] console: pci 0000:00:0a.2: [8086:7112] type 00 class 0x0c0300 console: pci 0000:00:12.0: [1b36:0010] type 00 class 0x010802 console: pci 0000:00:12.0: reg 0x10: [mem 0x00000000-0x00003fff 64bit] console: pci_bus 0000:00: busn_res: [bus 00-ff] end is updated to 00 console: pci 0000:00:12.0: BAR 0: assigned [mem 0x10040000-0x10043fff 64bit] console: pci 0000:00:0a.1: BAR 4: assigned [io 0x1080-0x108f] ... console: ata_piix 0000:00:0a.1: enabling device (0000 -> 0001) console: nvme nvme0: pci function 0000:00:12.0 console: nvme 0000:00:12.0: enabling device (0000 -> 0002) console: nvme nvme0: 1/0/0 default/read/poll queues console: nvme nvme0: Ignoring bogus Namespace Identifiers ... console: Run /sbin/init as init process console: EXT4-fs (nvme0n1): re-mounted bf659b11-5a77-4ab5-a337-3d71ced26114. Quota mode: disabled. ... console: Welcome to Buildroot console: buildroot login: root ... console: # reboot ... console: umount: devtmpfs busy - remounted read-only console: EXT4-fs (nvme0n1): re-mounted bf659b11-5a77-4ab5-a337-3d71ced26114. Quota mode: disabled. console: The system is going down NOW! console: Requesting system reboot console: reboot: Restarting system PASS (11.17 s) JOB TIME : 11.91 s Signed-off-by: Philippe Mathieu-Daudé --- tests/avocado/boot_linux_console.py | 44 +++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py index 8c1d981586..176793482e 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -12,6 +12,7 @@ import lzma import gzip import shutil +import time from avocado import skip from avocado import skipUnless @@ -269,6 +270,49 @@ def test_mips64el_malta_5KEc_cpio(self): # Wait for VM to shut down gracefully self.vm.wait() + @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code') + def test_mips64_malta_I6400_nvme(self): + """ + :avocado: tags=arch:mips64 + :avocado: tags=machine:malta + :avocado: tags=endian:big + :avocado: tags=cpu:I6400 + :avocado: tags=device:nvme + """ + kernel_url = ('https://github.com/birkelund/qemu-nvme-boot/' + 'raw/main/mips64/images/vmlinux') + kernel_hash = '665662d7f7b17dc261ffb0e0ff4a1a7da91de948' + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) + rootfs_url = ('https://github.com/birkelund/qemu-nvme-boot/' + 'raw/main/mips64/images/rootfs.ext2.gz') + rootfs_hash = '66f5ca4ef20ab983ec424c3ed8462bab305bbb73' + rootfs_path_gz = self.fetch_asset(rootfs_url, asset_hash=rootfs_hash) + rootfs_path = os.path.join(self.workdir, "rootfs.ext2") + archive.gzip_uncompress(rootfs_path_gz, rootfs_path) + + self.vm.set_console() + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + + 'console=ttyS0,115200 ' + + 'root=/dev/nvme0n1 ' + + 'rdinit=/sbin/init noreboot') + self.vm.add_args('-kernel', kernel_path, + '-append', kernel_command_line, + '-drive', + f'file={rootfs_path},format=raw,if=none,id=d0', + '-device', 'nvme,serial=default,drive=d0', + '-nic', 'user,model=pcnet', + '-no-reboot', '-snapshot', '-nodefaults') + self.vm.launch() + wait_for_console_pattern(self, 'Welcome to Buildroot') + time.sleep(0.1) + exec_command(self, 'root') + time.sleep(0.1) + + exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', + 'MIPS I6400') + exec_command_and_wait_for_pattern(self, 'reboot', + 'reboot: Restarting system') + def do_test_mips_malta32el_nanomips(self, kernel_url, kernel_hash): kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash) kernel_path = self.workdir + "kernel"