From patchwork Tue Jan 11 17:10:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 531132 Delivered-To: patch@linaro.org Received: by 2002:ad5:544f:0:0:0:0:0 with SMTP id a15csp3696762imp; Tue, 11 Jan 2022 09:50:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJzK3nzIpYHPNmZbP7mXdHYk1bOnX7veNcy4k/psV3KTJjTUoy7Adbbrc1SW24Niz3KqyEk2 X-Received: by 2002:a05:6638:35a4:: with SMTP id v36mr3261802jal.112.1641923428140; Tue, 11 Jan 2022 09:50:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641923428; cv=none; d=google.com; s=arc-20160816; b=sT0jz8VilZWpv/LIDgY/RqhW86EZI3lp9CBpM6TJ0n2cmE00pSCF4mW4aekWaQEsNu /Qep7oV0HlgDyP6s48qoFu5RScJm+PLITkY0S3shKnP1+e/FOG9BeuNqvCWM2p67Gims UKuU1z8ZHeo79GYIH3K0i1d+/uf0pxejR4FOQ2uTQhibrsfIiPJsK8Z45yBMAwhVmM7W aAurJh6t2UrkXhQ3ewEK6w9s1jWcUMUUydd3svvIXBm7bX0Py5jH2WyNbnuXZ/n3BPgb U1ek/UzGjy3XdRvSPo9QL7TcOkPaENMVleHh0otG3SpnF5G4ZVKSe2qMwprz48M+oXc1 Qx1w== 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=K3C/kFYJ4QIEIUS4ZNsrIp8SeCMyQxIhNuKfg2+o/Ik=; b=Ya7AwHJACPhi8LpOA1YynLpVk2oxpM0RkzjPCNlhhfJA693kY2SGugKA7EUnj+4LlE wDW472XLDtsOH7Wfe+AZB24zL+La8/ZKbmj5x6ZbHcrDPiXVHSRyUedezK6Fy0ZvdFg/ jiUum/DAkQyiffpxS0lb7gP1k5ATy8rKbCtuSvo7gZy5SLBERHs89NISVADpTOFhGLOk wl7S05w0l3FdQWoIEiE59E06BZzjK0KoC1VJ4pOQ0F6ZMruzjumCsHPuHCGsjZtUUL9m 4/QWzL4Q5aAv9wwKg0sdCWnQWnwqnd4WOJMrWEnibZHwWhdMCdny4Lmv7h3x7bFcp74k PfRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=y7VCa6wd; 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 m19si5068041jam.94.2022.01.11.09.50.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Jan 2022 09:50:28 -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=y7VCa6wd; 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]:54506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7LHv-0007HW-Mm for patch@linaro.org; Tue, 11 Jan 2022 12:50:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7Kfq-0005DA-4i for qemu-devel@nongnu.org; Tue, 11 Jan 2022 12:11:11 -0500 Received: from [2a00:1450:4864:20::42c] (port=41772 helo=mail-wr1-x42c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7Kfl-0007KQ-FV for qemu-devel@nongnu.org; Tue, 11 Jan 2022 12:11:05 -0500 Received: by mail-wr1-x42c.google.com with SMTP id v6so34158293wra.8 for ; Tue, 11 Jan 2022 09:10:58 -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=K3C/kFYJ4QIEIUS4ZNsrIp8SeCMyQxIhNuKfg2+o/Ik=; b=y7VCa6wd0XAg2p685ZFaOrkrHBL0lZ16qiWl1hmgnpFEuNl0OfJW5cxFaIyZaQ8J0H 7yMZsZAJfA/XiIZ9N3WQwjvyhKB518gffWz7yl5FqXEYvBZWwoYcRW77PPc1a8ZJW0eF FO4niUwbqAvz8aDWnxV+Q6wSZIhdx5yCPNI0p5R1742lxLsyHAYaD9gWcB6fxqUeKFDB JNmfhJEuHatpWiWxbd31RCPTLwOkbdAPp27b32PRRjYy8++DRQ7ETECsGW7r7gFfJCJk mL9u2bdD3iGbCVy8kUsoHIYjeK/+kIPvKeSyht7THnEq5oF/ULBEwspguus/GBoMBdnb 7LNQ== 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=K3C/kFYJ4QIEIUS4ZNsrIp8SeCMyQxIhNuKfg2+o/Ik=; b=aOkktgYeitm/PODQFPY6kNypsj/4u/Yt+bGm3XFnBuEMZBHwltv745OBq6VC+mlQPj U6WJCQ6+kUWKwv6Pdtef9HN1WLwjeTUIPYexChQ1H4Eed14QP03nH6dOOF1M2vlm7Nz3 wlxcUurGFoWRC6JgltUVLTEnNutwjiVaI4b9GeJDVeS4lv+DMwSlrizmzjFnuNdbMmpN RihkPxKr7hV7t7k7tYRyRjtUhLGXVvHUCK/V2A4OyHoJdBeWJFIddPasMINh5Dg0iQz0 FAsG0vDfNuD/PP5Rhp5WLfCxiRfz7a0k2pw8yozzLCgbDXHlU2393Wmi10S7H5wo2XHn n3iw== X-Gm-Message-State: AOAM532LpCtTCnkes6lEbKDfYtUxxnM9tmqmXjeBC5cD1bUwNlVlr0PB v5jv5K/SzlJAUZ0f+CWnUYG20w== X-Received: by 2002:a05:6000:1d89:: with SMTP id bk9mr4525198wrb.561.1641921057733; Tue, 11 Jan 2022 09:10:57 -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.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 09:10:57 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v2 10/13] hw/intc/arm_gicv3_its: Fix return codes in process_mapd() Date: Tue, 11 Jan 2022 17:10:45 +0000 Message-Id: <20220111171048.3545974-11-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::42c (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.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_mapd() 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 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c index 80ef4dbcadf..917201c148f 100644 --- a/hw/intc/arm_gicv3_its.c +++ b/hw/intc/arm_gicv3_its.c @@ -597,7 +597,6 @@ static ItsCmdResult process_mapd(GICv3ITSState *s, uint64_t value, uint64_t itt_addr; bool valid; MemTxResult res = MEMTX_OK; - ItsCmdResult result = CMD_STALL; devid = ((value & DEVID_MASK) >> DEVID_SHIFT); @@ -606,7 +605,7 @@ static ItsCmdResult process_mapd(GICv3ITSState *s, uint64_t value, MEMTXATTRS_UNSPECIFIED, &res); if (res != MEMTX_OK) { - return result; + return CMD_STALL; } size = (value & SIZE_MASK); @@ -616,7 +615,7 @@ static ItsCmdResult process_mapd(GICv3ITSState *s, uint64_t value, MEMTXATTRS_UNSPECIFIED, &res); if (res != MEMTX_OK) { - return result; + return CMD_STALL; } itt_addr = (value & ITTADDR_MASK) >> ITTADDR_SHIFT; @@ -633,11 +632,10 @@ static ItsCmdResult process_mapd(GICv3ITSState *s, uint64_t value, * we ignore this command and move onto the next * command in the queue */ - } else { - result = update_dte(s, devid, valid, size, itt_addr) ? CMD_CONTINUE : CMD_STALL; + return CMD_CONTINUE; } - return result; + return update_dte(s, devid, valid, size, itt_addr) ? CMD_CONTINUE : CMD_STALL; } /*