From patchwork Thu May 21 16:39:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Robert Foley X-Patchwork-Id: 187068 Delivered-To: patch@linaro.org Received: by 2002:a92:5b0a:0:0:0:0:0 with SMTP id p10csp1734590ilb; Thu, 21 May 2020 10:13:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzosc192rECCfrPW0DfUieWWGcUM8+u4OlK/qH4MQhcAAPAtX3xtwgJ1gf9YH6nAghJqBLX X-Received: by 2002:ac8:65d1:: with SMTP id t17mr3928209qto.46.1590081185154; Thu, 21 May 2020 10:13:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590081185; cv=none; d=google.com; s=arc-20160816; b=vAxNfUwa4l/e5NsAG1bHqIplVYkNop72Ij+3dJmQqgAno58/Fzq3/uzqEuaXV5jfjW Oi1Eso79z2kaaWTNCfsc/qfRIh96QeI/5YOJbLhVLPRoAHBLgZ22flgayhTfdS+Ls50G yNuavgUETHmrtgE8keFjAjEeRb+4PVBU7SNKlhOf1Hy7F99Auh04zKIt5J5R+G1qQiqZ u3rJW0/9qcLB2RMVWUi3IiI1UlbhGRPPUAs8h854bHdSpFD9P9de9BQrJzlAmMb8+cWT rcKSQaalqYB8skUdaO7XTezO1csqtte/2bgkTMGeMCL8iamTphTtzMu52CdHIyqAKW8u KlcA== 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=1b+dD7RxLqaUPVVNgXTFGKKstOqQ+qP/ZFHAKJHyCiE=; b=dIfMl4sjwnO1/Kwwk/M5+NgoTbsEUlc9ctoS6cufPE1bVPDPpEr17t6av07mNh0cA4 Foa41L9qX+b9CLRhdZcM6sYEOXy4rM15a1lQtCrtmaKcOOWCecSc6teIImA2ongniGeb H6ql2++AopwoylMxknL8upz4KNpGgFotcIJxPRGTjwV98lfPUYTmcM/xE1a2tB2z5jX8 pl/C5B/ip2mJLtMXwGC6uVZ4thv8iySLV1O6liCRCZL6l32apn3UPUijj+EnYG+0Qcjl uhnuFMLN/i54IbZkMvE6lf0k1m20/+UOyEw75u/dgLB5r+1o9mie1bAlTuppKlrdLl/y k26A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AYshm8sm; 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 dg4si3593206qvb.205.2020.05.21.10.13.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 May 2020 10:13:05 -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=fail header.i=@linaro.org header.s=google header.b=AYshm8sm; 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]:41818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jboki-0005IC-Kw for patch@linaro.org; Thu, 21 May 2020 13:13:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jboJ8-0004LX-E4 for qemu-devel@nongnu.org; Thu, 21 May 2020 12:44:34 -0400 Received: from mail-qv1-xf43.google.com ([2607:f8b0:4864:20::f43]:41364) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jboJ6-0006iM-Bz for qemu-devel@nongnu.org; Thu, 21 May 2020 12:44:34 -0400 Received: by mail-qv1-xf43.google.com with SMTP id v15so3358620qvr.8 for ; Thu, 21 May 2020 09:44:32 -0700 (PDT) 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=1b+dD7RxLqaUPVVNgXTFGKKstOqQ+qP/ZFHAKJHyCiE=; b=AYshm8smL28Oeb1t6aqqiZYVQrMvEjRj6sVGSTq6eTH3Ez6KB0obAZIVm/dJrRO77O Z7cgyObMfKdmGt2IgDNnfLnGh6GYZWJHEyuxIqCIBoMYp2LhrUuDBksisUygP0jFIyWf btH/LCjZ8sDGZ+m6miMpOnekuCJFLAcOOYpTxNxCsH9guXwaENK24qiNbJMQXtItblRF qgmWllJH5K88LHXcer/LJWjgs7HnlyILmJpCZBudyqfXkCZSp1Ok+UMQM0fSgV7fwChx D2oumm7Z72Qnv+/tknijNfTXswVssZWw6R6fvCQxui7CKshDxbONJhboyavuAbyFFoyA VVQQ== 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=1b+dD7RxLqaUPVVNgXTFGKKstOqQ+qP/ZFHAKJHyCiE=; b=a5EfG+uO+qHKfVCHOie9v4l6duSWCB7rkns6Lu88cKHq/yJ4MJFhRuLDnJxq91R/tC EfZm97nFmtImWyEOIMcSYTepyxqr27L4zOsezJ2LUnZifMQKbjTPEg/S8gGyXMGsONya 6rljbqcf5EbAJDbr9wHNXTt++e1xnMb2gsORKezpf2paXogj14SNW7DnTKFZBUvlUwzY ZFApwdrntMiAau6WkqTkpcwQv1IsUr3baoDEOtuxPDk3gDyp6aHRubvbPtqitx1AlC9T Coeoad2wUMz+bVTmvY19PVQ6RRPou+Tk1Sb7hzKkfS9OQ12zYV/i2TYgaYD8TYLb3UUV 3Xtg== X-Gm-Message-State: AOAM531Mh5ywzKaHnFECZ3s/Dj0y59YzIpncFRHnf5BR3hq8k6KhNXJQ FMAqguGFfSGmNEuEw0DBdu1kW30TNVrCvQ== X-Received: by 2002:ad4:4b01:: with SMTP id r1mr10604609qvw.38.1590079471367; Thu, 21 May 2020 09:44:31 -0700 (PDT) Received: from Rfoley-MA01.hsd1.ma.comcast.net ([2601:199:4480:60c0:1944:c530:655c:5583]) by smtp.gmail.com with ESMTPSA id x24sm5923829qth.57.2020.05.21.09.44.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2020 09:44:30 -0700 (PDT) From: Robert Foley To: qemu-devel@nongnu.org Subject: [PATCH v9 57/74] openrisc: convert to cpu_interrupt_request Date: Thu, 21 May 2020 12:39:54 -0400 Message-Id: <20200521164011.638-58-robert.foley@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200521164011.638-1-robert.foley@linaro.org> References: <20200521164011.638-1-robert.foley@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::f43; envelope-from=robert.foley@linaro.org; helo=mail-qv1-xf43.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: robert.foley@linaro.org, richard.henderson@linaro.org, cota@braap.org, peter.puhov@linaro.org, Stafford Horne , alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" Cc: Stafford Horne Reviewed-by: Richard Henderson Reviewed-by: Alex Bennée Signed-off-by: Emilio G. Cota Signed-off-by: Robert Foley --- hw/openrisc/cputimer.c | 2 +- target/openrisc/cpu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/hw/openrisc/cputimer.c b/hw/openrisc/cputimer.c index 93268815d8..9475b77d0a 100644 --- a/hw/openrisc/cputimer.c +++ b/hw/openrisc/cputimer.c @@ -102,7 +102,7 @@ static void openrisc_timer_cb(void *opaque) CPUState *cs = CPU(cpu); cpu->env.ttmr |= TTMR_IP; - cs->interrupt_request |= CPU_INTERRUPT_TIMER; + cpu_interrupt_request_or(cs, CPU_INTERRUPT_TIMER); } switch (cpu->env.ttmr & TTMR_M) { diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c index 5528c0918f..fd2da39124 100644 --- a/target/openrisc/cpu.c +++ b/target/openrisc/cpu.c @@ -32,8 +32,8 @@ static void openrisc_cpu_set_pc(CPUState *cs, vaddr value) static bool openrisc_cpu_has_work(CPUState *cs) { - return cs->interrupt_request & (CPU_INTERRUPT_HARD | - CPU_INTERRUPT_TIMER); + return cpu_interrupt_request(cs) & (CPU_INTERRUPT_HARD | + CPU_INTERRUPT_TIMER); } static void openrisc_disas_set_info(CPUState *cpu, disassemble_info *info)