From patchwork Thu May 21 16:39:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foley X-Patchwork-Id: 187053 Delivered-To: patch@linaro.org Received: by 2002:a92:5b0a:0:0:0:0:0 with SMTP id p10csp1728269ilb; Thu, 21 May 2020 10:05:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXBDqFodh2/FzGcTaSCbkPJL/Wjfg6q5bY8reSDZVa3M1GDWBL3j4K91XG4F1g9aBjBu6C X-Received: by 2002:a05:6214:1449:: with SMTP id b9mr11037820qvy.74.1590080723405; Thu, 21 May 2020 10:05:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590080723; cv=none; d=google.com; s=arc-20160816; b=ty0ywN20nMfcewosHbfYwkWAnb/a5tEt40eIDZtGGC6Vcxg/mvMQOh9CauEFrXfj7E r3+GqHAYTW3OWQUO3C+bFfCO8WJaYvAKujRrHmlvHx/8kWwAT3mN908dfOv5xsd4V5VI yW9pXkQUBBAxuk8/2CyGT9ToQXdUSn+41Jd13vBUW1H3lkVOWLxARim5zBfCqPS7WJua ZX8ON7GOgiESUmvDz08alhjXdCT9kO9GFBaC1z2yjcQCdDbuYElC1IPFfnb5ZK98Jbqq 6pUdbTiHHnneIeyNXd93XgTQ16LBbGI/4qeoBJ/KFF4sZAcmIu+98Pdw/660BaZYlG8B 7Iow== 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:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=tPdNOnecxbiLcmdfOUrNbZfK0O1sIcOj2h20T8/5h6g=; b=uYAaCYi8ydFxWqlJE1TLEQna9Ikc4YmWdZw9O4QlJYGXNDhsJ6k9pP/1a4+xRMv4HH OOk7iUVeCoicm4gsdbPWlesQifuH2JVapZQumYB/3N6hkQuqh08VtfZTO7MtZdMKyGdw hpwvxuIsSQowC8YUeviCyNRiRf9p2/X9pFu52EObJ4paUm/FYZsThPnJU4R4jvHXORy1 EldY6AzYIhhO99AihRTsxT9MSUpGlnIO+sZkcUeGDKTTgwPAlsHnt9kWpux+eLO7XG0G gtL7Euh6UgO0AaR3YZhCxFGur/YR/RQkQ31X6zNo8HcKxnbqJ+CoL34yzhAQlLWjkUI5 MH8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Hv5Mpjgx; 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 a141si3951859qkb.298.2020.05.21.10.05.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 May 2020 10:05:23 -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=Hv5Mpjgx; 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]:35646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jbodG-0004OW-QD for patch@linaro.org; Thu, 21 May 2020 13:05:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jboIr-0003vu-Ur for qemu-devel@nongnu.org; Thu, 21 May 2020 12:44:17 -0400 Received: from mail-qv1-xf30.google.com ([2607:f8b0:4864:20::f30]:46680) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jboIq-0006co-Vn for qemu-devel@nongnu.org; Thu, 21 May 2020 12:44:17 -0400 Received: by mail-qv1-xf30.google.com with SMTP id dh1so3333959qvb.13 for ; Thu, 21 May 2020 09:44:16 -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; bh=tPdNOnecxbiLcmdfOUrNbZfK0O1sIcOj2h20T8/5h6g=; b=Hv5MpjgxKmzxDRaA2DFfvRV5Rpmcj9BGOuOOnjTSIfPpY2jJ91RNqmwDNk7A2I/jlP zsNDkrASEIbTI7bvU3WypoeLEplAnysfLFCSRi8lTzE5S2UkA7rZWvDPXzv9RoBhSF2x DWUYhQZPCqe9x9xfDswkebcHlUD6eTGqyqMe4U9VvHv1Chny9x2smDR+gR+pVAMmcWRy uUPs9gISWWdD3ONjNyaMbNwCvVJO+7g7aMNWX9sji/slNVCm/Y50xpsIiRL5GZI/Z3Kc q4HD/erjV9D4KQXb8mKMMsqduxYjHLVqgs3Ol4gMVQRlwnRnI5uv9GxabShNyYTvIIpx 279w== 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; bh=tPdNOnecxbiLcmdfOUrNbZfK0O1sIcOj2h20T8/5h6g=; b=JnWDBWOmQGazjBOaU6zCZFv5KlhidunuRmGxsejc2SaV83DPSAwpviTakToAcgYZyp O21PidPQKFycvHFzlm/MK+6ibUAEa65TbhT2Dwf78sfbpUSMANdGZVRsJDwnRjbBNA/Y EjwdwiJLgfLy2zfzgOxADQG017SoJ5PdSiRCU8iLLa5ZA8EAh2DUa1WW+QHTR7VnRNla koqZoT9A27e+1gV5L7yKaeJa3lhtnwqxhVu3958uRAKOCpcDW/5CPvw1TdEy3/bg3sZy TwUIYuWBATEJFoNJhnWmrKA+lizKsXJNqTylEEkHpeYcLovRVKs6xibldC0tyacFt076 9fzg== X-Gm-Message-State: AOAM5314ZJhFbEBEoZH1eu9CzaOURtr2SYG0+ok8XyQVW+TkL69o2RY4 YWcqXhzJmQHs920tVSPiybWc0XdGGhTNUg== X-Received: by 2002:a05:6214:6a7:: with SMTP id s7mr11101743qvz.142.1590079455521; Thu, 21 May 2020 09:44:15 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2020 09:44:14 -0700 (PDT) From: Robert Foley To: qemu-devel@nongnu.org Subject: [PATCH v9 45/74] ppc: convert to cpu_interrupt_request Date: Thu, 21 May 2020 12:39:42 -0400 Message-Id: <20200521164011.638-46-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> Received-SPF: pass client-ip=2607:f8b0:4864:20::f30; envelope-from=robert.foley@linaro.org; helo=mail-qv1-xf30.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, qemu-ppc@nongnu.org, peter.puhov@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" Cc: qemu-ppc@nongnu.org Reviewed-by: Richard Henderson Acked-by: David Gibson Signed-off-by: Emilio G. Cota [RF: Minor adjustment for new code in hvf_inject_interrupts] Signed-off-by: Robert Foley --- hw/ppc/ppc.c | 2 +- target/i386/hvf/x86hvf.c | 1 - target/ppc/kvm.c | 2 +- target/ppc/translate_init.inc.c | 14 +++++++------- 4 files changed, 9 insertions(+), 10 deletions(-) -- 2.17.1 diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index 0e7386ff88..89f92c4a88 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -89,7 +89,7 @@ void ppc_set_irq(PowerPCCPU *cpu, int n_IRQ, int level) LOG_IRQ("%s: %p n_IRQ %d level %d => pending %08" PRIx32 "req %08x\n", __func__, env, n_IRQ, level, - env->pending_interrupts, CPU(cpu)->interrupt_request); + env->pending_interrupts, cpu_interrupt_request(CPU(cpu))); if (locked) { qemu_mutex_unlock_iothread(); diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c index 892ae0e99a..68175074e4 100644 --- a/target/i386/hvf/x86hvf.c +++ b/target/i386/hvf/x86hvf.c @@ -352,7 +352,6 @@ bool hvf_inject_interrupts(CPUState *cpu_state) uint8_t vector; uint64_t intr_type; - uint32_t interrupt_request; bool have_event = true; if (env->interrupt_injected != -1) { vector = env->interrupt_injected; diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index aae2ef0ad4..084e158c34 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -1350,7 +1350,7 @@ static int kvmppc_handle_halt(PowerPCCPU *cpu) CPUState *cs = CPU(cpu); CPUPPCState *env = &cpu->env; - if (!(cs->interrupt_request & CPU_INTERRUPT_HARD) && (msr_ee)) { + if (!(cpu_interrupt_request(cs) & CPU_INTERRUPT_HARD) && (msr_ee)) { cpu_halted_set(cs, 1); cs->exception_index = EXCP_HLT; } diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c index 5838b6f7bc..e61ba39982 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.inc.c @@ -8540,7 +8540,7 @@ static bool cpu_has_work_POWER7(CPUState *cs) CPUPPCState *env = &cpu->env; if (cpu_halted(cs)) { - if (!(cs->interrupt_request & CPU_INTERRUPT_HARD)) { + if (!(cpu_interrupt_request(cs) & CPU_INTERRUPT_HARD)) { return false; } if ((env->pending_interrupts & (1u << PPC_INTERRUPT_EXT)) && @@ -8564,7 +8564,7 @@ static bool cpu_has_work_POWER7(CPUState *cs) } return false; } else { - return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); + return msr_ee && (cpu_interrupt_request(cs) & CPU_INTERRUPT_HARD); } } @@ -8702,7 +8702,7 @@ static bool cpu_has_work_POWER8(CPUState *cs) CPUPPCState *env = &cpu->env; if (cpu_halted(cs)) { - if (!(cs->interrupt_request & CPU_INTERRUPT_HARD)) { + if (!(cpu_interrupt_request(cs) & CPU_INTERRUPT_HARD)) { return false; } if ((env->pending_interrupts & (1u << PPC_INTERRUPT_EXT)) && @@ -8734,7 +8734,7 @@ static bool cpu_has_work_POWER8(CPUState *cs) } return false; } else { - return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); + return msr_ee && (cpu_interrupt_request(cs) & CPU_INTERRUPT_HARD); } } @@ -8904,7 +8904,7 @@ static bool cpu_has_work_POWER9(CPUState *cs) if (cpu_halted(cs)) { uint64_t psscr = env->spr[SPR_PSSCR]; - if (!(cs->interrupt_request & CPU_INTERRUPT_HARD)) { + if (!(cpu_interrupt_request(cs) & CPU_INTERRUPT_HARD)) { return false; } @@ -8950,7 +8950,7 @@ static bool cpu_has_work_POWER9(CPUState *cs) } return false; } else { - return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); + return msr_ee && (cpu_interrupt_request(cs) & CPU_INTERRUPT_HARD); } } @@ -10655,7 +10655,7 @@ static bool ppc_cpu_has_work(CPUState *cs) PowerPCCPU *cpu = POWERPC_CPU(cs); CPUPPCState *env = &cpu->env; - return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); + return msr_ee && (cpu_interrupt_request(cs) & CPU_INTERRUPT_HARD); } static void ppc_cpu_reset(DeviceState *dev)