From patchwork Tue Jan 11 17:10:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 531121 Delivered-To: patch@linaro.org Received: by 2002:ad5:544f:0:0:0:0:0 with SMTP id a15csp3673567imp; Tue, 11 Jan 2022 09:18:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJzFiaYXC6vMMhXRh25sHncJnOBFWYVzOclFxUdAA3U/88p/eldneZjeApgFQhRelMRvNZQw X-Received: by 2002:a05:6602:154a:: with SMTP id h10mr2680116iow.31.1641921537358; Tue, 11 Jan 2022 09:18:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641921537; cv=none; d=google.com; s=arc-20160816; b=ZA179XqhGXghUu3UvDUO41/YjyxL4krfg9+4MaEWS/Gfa2KZsAFkyhr1w6Sak8k2FQ oAGC2sPP/x4rTdJAuASKLHcCOepynDQb5Ahg72fGr0zmJQIuq2v8sMJgkAccbUCIbTo9 jDQZKY1xhS1KgLO9gJEayw3nt34F4sBd7kX9bv7i5G7ksE2X7EqaiXLUJkxJEL5QkQ1i KbJenNIeNMj4/2xVxL1Xth9HCCUSOHUwXw6OQRmnbmDeXWq/Ef/hIb5xUhzeebt5lGyc aNsob43rVmvGEvUORdSQ1AkWpnLC/XpDYf2IMOjC5F6AOsbfka2PlBhIDmiIMi8bvagv yj4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=dMGaDtUlyJEJ3dvWwIKR4xUcpNypUeqgEu0z6OQaSkc=; b=cRlItyw46Zt0WxKxUkb07DXOsrGGXGrCNZd1H2CEyQG96AZS4KzAGHqzvByvdt4cKr A624QpkiPeOiy0GTkQ2WN/djkgy3qkbnX7NJORiym0KMNOccOxCcZ9PxRyJ5Jgo/NrUm XTULHkzYBXTao3XloH1U+iS7MHhLXwjIkA7lsd7xFwsYAl1U0W5ayh3kOqzIV54L+zhK 0t4LGCthQ9uQ/0L5xezCa8dgx3iqRHamuWnz5b2DH4ASDyac23C+RvJUN5iU9dV+UzhP OQIxQtyaVEjVXGao797h1LM77ltKxUGXOHYZ4HRoSnoJPF+8hYCovdoY43aSCuwEUHQ1 AZ4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=F1l2anL8; 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=fail (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 r3si5017244jad.0.2022.01.11.09.18.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Jan 2022 09:18:57 -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=fail header.i=@linaro.org header.s=google header.b=F1l2anL8; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7KnQ-0003KH-9o for patch@linaro.org; Tue, 11 Jan 2022 12:18:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7Kfl-0005CH-L5 for qemu-devel@nongnu.org; Tue, 11 Jan 2022 12:11:03 -0500 Received: from [2a00:1450:4864:20::32f] (port=41492 helo=mail-wm1-x32f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7Kfi-0007Ju-7L for qemu-devel@nongnu.org; Tue, 11 Jan 2022 12:10:59 -0500 Received: by mail-wm1-x32f.google.com with SMTP id q141-20020a1ca793000000b00347b48dfb53so13771wme.0 for ; Tue, 11 Jan 2022 09:10:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dMGaDtUlyJEJ3dvWwIKR4xUcpNypUeqgEu0z6OQaSkc=; b=F1l2anL8f77Vvt7h8eVK7CskwcxalUSFMqfDWrXQosjsMABIWsCe3xh84tk2HjE8qY SIlrlne48Qb4jz5TpxR8L5PbdZFvLQ6Ro2h01DxBTbPMwu+RXgcNx7cxzET/727ome6d gGQCUMb+ih3xNUkuxC9zKiGauScd3Rrvud/byoTLpRKn5b7ouE5QLndtHU0jqce6jaKZ Ng+whuiPwvmQr2R1DQfZcI7CLaC9nIjUY7hseo+bBsm1bB9Zmeq3R3ucgc6DOEWyDZcc rjHBrGJ9bjVwpOs7gCkgvuQy7etUq1KAo2HhIAbq89qr22eixdJ9wCX34u6buEqedzO8 K+cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dMGaDtUlyJEJ3dvWwIKR4xUcpNypUeqgEu0z6OQaSkc=; b=J8C8S1YrVCrp9UMLRCYw/4CGAoex7+o57ztQI4KjSDX8tpbYoZCciGDRrvUIBHFECS x7WgNOlB8vHJDkwK2qMc8EePH4DeP8UzStS3zFw5UL/No1awBZ+lKpKBGS3GV+SvF4EJ B4rS52X68k0gvBt0r9H9HuSqDWLPvzxvw2qhvFxJi/7nxPeZKdm8PNgpi4dYfXcvq2in RNZBf86aPeKeMKuV0vY4qDKVXTLK/aw+7FELazBvbxlqWTwZ12RV1jjXVf7uufj1FnV/ fwAzkRR2PC2yRy78cGuTn6SAiwOSkJskmzXGWFqunsaLA+Z+O/ioV/GT7UGNt4ibBOw9 dwhA== X-Gm-Message-State: AOAM5339X5CQQU3adGPU2UJ+sFqkPWAn4JDgrrsRGtbgnloTmtgTgOzq 0WKwfgnT57lgN+rZ9B9jJ9Yo+Q== X-Received: by 2002:a05:600c:5025:: with SMTP id n37mr3315436wmr.18.1641921056521; Tue, 11 Jan 2022 09:10:56 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id c7sm11157941wri.21.2022.01.11.09.10.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 09:10:56 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v2 08/13] hw/intc/arm_gicv3_its: Fix return codes in process_mapti() Date: Tue, 11 Jan 2022 17:10:43 +0000 Message-Id: <20220111171048.3545974-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220111171048.3545974-1-peter.maydell@linaro.org> References: <20220111171048.3545974-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32f (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Shashi Mallela , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Fix process_mapti() to consistently return CMD_STALL for memory errors and CMD_CONTINUE for parameter errors, as we claim in the comments that we do. Signed-off-by: Peter Maydell Reviewed-by: Alex Bennée Reviewed-by: Richard Henderson --- hw/intc/arm_gicv3_its.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c index 5dc6846fe3f..010779a9fdc 100644 --- a/hw/intc/arm_gicv3_its.c +++ b/hw/intc/arm_gicv3_its.c @@ -357,7 +357,7 @@ static ItsCmdResult process_mapti(GICv3ITSState *s, uint64_t value, MemTxResult res = MEMTX_OK; uint16_t icid = 0; uint64_t dte = 0; - ItsCmdResult result = CMD_STALL; + IteEntry ite = {}; devid = ((value & DEVID_MASK) >> DEVID_SHIFT); offset += NUM_BYTES_IN_DW; @@ -365,7 +365,7 @@ static ItsCmdResult process_mapti(GICv3ITSState *s, uint64_t value, MEMTXATTRS_UNSPECIFIED, &res); if (res != MEMTX_OK) { - return result; + return CMD_STALL; } eventid = (value & EVENTID_MASK); @@ -381,7 +381,7 @@ static ItsCmdResult process_mapti(GICv3ITSState *s, uint64_t value, MEMTXATTRS_UNSPECIFIED, &res); if (res != MEMTX_OK) { - return result; + return CMD_STALL; } icid = value & ICID_MASK; @@ -389,7 +389,7 @@ static ItsCmdResult process_mapti(GICv3ITSState *s, uint64_t value, dte = get_dte(s, devid, &res); if (res != MEMTX_OK) { - return result; + return CMD_STALL; } dte_valid = FIELD_EX64(dte, DTE, VALID); num_eventids = 1ULL << (FIELD_EX64(dte, DTE, SIZE) + 1); @@ -409,19 +409,17 @@ static ItsCmdResult process_mapti(GICv3ITSState *s, uint64_t value, * we ignore this command and move onto the next * command in the queue */ - } else { - /* add ite entry to interrupt translation table */ - IteEntry ite = {}; - ite.itel = FIELD_DP64(ite.itel, ITE_L, VALID, dte_valid); - ite.itel = FIELD_DP64(ite.itel, ITE_L, INTTYPE, ITE_INTTYPE_PHYSICAL); - ite.itel = FIELD_DP64(ite.itel, ITE_L, INTID, pIntid); - ite.itel = FIELD_DP64(ite.itel, ITE_L, DOORBELL, INTID_SPURIOUS); - ite.iteh = FIELD_DP32(ite.iteh, ITE_H, ICID, icid); - - result = update_ite(s, eventid, dte, ite) ? CMD_CONTINUE : CMD_STALL; + return CMD_CONTINUE; } - return result; + /* add ite entry to interrupt translation table */ + ite.itel = FIELD_DP64(ite.itel, ITE_L, VALID, dte_valid); + ite.itel = FIELD_DP64(ite.itel, ITE_L, INTTYPE, ITE_INTTYPE_PHYSICAL); + ite.itel = FIELD_DP64(ite.itel, ITE_L, INTID, pIntid); + ite.itel = FIELD_DP64(ite.itel, ITE_L, DOORBELL, INTID_SPURIOUS); + ite.iteh = FIELD_DP32(ite.iteh, ITE_H, ICID, icid); + + return update_ite(s, eventid, dte, ite) ? CMD_CONTINUE : CMD_STALL; } static bool update_cte(GICv3ITSState *s, uint16_t icid, bool valid,