From patchwork Thu May 21 16:40:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foley X-Patchwork-Id: 187078 Delivered-To: patch@linaro.org Received: by 2002:a92:5b0a:0:0:0:0:0 with SMTP id p10csp1740485ilb; Thu, 21 May 2020 10:20:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFjzGZvMmRrlvRvTvmRh/R012pzNhTcZaWUoE4stJcw4YYi3d1C4Vw4fQWTvtrSEiCUh3J X-Received: by 2002:a25:9709:: with SMTP id d9mr16467867ybo.85.1590081648860; Thu, 21 May 2020 10:20:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590081648; cv=none; d=google.com; s=arc-20160816; b=knpNDg9Zw+fdkhPCWVddckfx3hRNkZsqP6CvS/KH1HuXik7fPbtIQmBgN7pNLjhLoi N4K67BY3T1RYRtLuaCyB0G8pOCk4o9KuBq1P1DZ6u0YJhzZw+/wIOASdZRoFL2vs1fNF +btUDF3fu02ic5AStb6uisx0LYjSCiJ+XUTQiVGPhoQyLC1gGtZGQsceAItdiUfu3nUT ae3Yptdp5iNsOX+3T7k82gpcQ9igN/i6RamO8W1NYH/Fd0Yusyjh60nslRQbSziYq9wT LAh+3fewu59KHKgQ7Wo3gJEYn2UZEPH7eMyPIn0KwkfJy3tl1+cwp/pWtmvubsGkwPHJ BT2g== 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=FcchR0Kiy3cS07PsythDlOBOqbmqT9MEDX8/TYIcoYY=; b=hXrShJR+Dgd/X8NGDH4LXgSiU1YJGB4lxp2i1T5Ndg8xhR0fo2xZWbGb1D6Wjbn6te DPtK3X1KgWsEdeh0m6MEnoGcqoCxPIB88ELxM1dmM0tdblvbSiOkQjzHqa17emjvBuwW syN5FHomC+o6a7jehzLf36lEOAU+KoFWs/eEyQphZI8M7E2pJImWtHzOBWHWX9uUP95v l4D1CzuT10pJbxSk/GGuOFgymmZnZ45IvcTmhdBKiS0QeS4t7HrT4+3IZ2vi8YAEkmkV Zu2Vp/etNe2Tjo/UISlttmL4eF7lv9LWOl6FGCIuJ33zSonFfBuL6SKMGw4XMVHT7E1X ZP8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ssOVXhEK; 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 a94si5792050ybi.171.2020.05.21.10.20.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 May 2020 10:20:48 -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=ssOVXhEK; 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]:49474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jbosC-0005C3-BA for patch@linaro.org; Thu, 21 May 2020 13:20:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jboJN-0004pe-3n for qemu-devel@nongnu.org; Thu, 21 May 2020 12:44:49 -0400 Received: from mail-qk1-x731.google.com ([2607:f8b0:4864:20::731]:46885) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jboJM-0006wx-5H for qemu-devel@nongnu.org; Thu, 21 May 2020 12:44:48 -0400 Received: by mail-qk1-x731.google.com with SMTP id f83so7783071qke.13 for ; Thu, 21 May 2020 09:44:47 -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=FcchR0Kiy3cS07PsythDlOBOqbmqT9MEDX8/TYIcoYY=; b=ssOVXhEK6Z62VXfIfsH/COP+Fd77hFrjpA8KjOFhyLqtpHqSG3Oyh0sIOHsjrjPUSL nyjYyXPxfHs8Wo/8OP+sUkzB+j25EH09I7m4C+pGWfjuSaVl6NDVULdvZu31A0q1lPgE 44HIUcYV0ahm96G5y7TrfLwcOjOK3HrJjZoOuZWtqYuXtaVfnsUSBPr26kzJzeREt65C D/pCe+2bEuT7uZg1ecmRLZ6kuzKdiMwKpANF4Wm5ZxmliBx4Go69ALhBnSGfrt+LD5J1 /yzUsOnFotN9/mdgRdiecSHFFPtQCIV+oXh86YMXJf1hSs9odlX0c4V+MpUGB3FLupl3 9g2A== 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=FcchR0Kiy3cS07PsythDlOBOqbmqT9MEDX8/TYIcoYY=; b=O5Alz5hgoAkwdHfElxmgqpcO6xakJR/8w6S3PqYQYHfR5++CX9ukp4of1hhbTYfq0y ug536XbHYRJYFcrVzRq8CxGucVNXStUS8CLMBKhilMd1nNBAjKdG4w09W9LnqD8NE5Wu wik5gHX50fQyXzme0v5wD530BQUWy/teNiaG94TH6anQdjwIJILxfqNUs6yiPDqV3hBx 0clN0gYkw5qXDkOMJKrxEdKRWjL1Sp8FKU6c+WTNMbvW+X8AUtL3T7l7m7QqaNeCFzbQ 3yCl+xrO7r9Gq7z7JDakhys6fvjwB9wdtrq+/Kr+544cNoZ0iELdyH3H6HdDmN0T7bcu E7fA== X-Gm-Message-State: AOAM53122MVUxav4yPPJ/Pq8IAD62GMTdsCZPrn0VyBq6tlgnrMIRn29 cJO1NW5XaMeTkz2GxPnpqTbkzNc2SvCCrw== X-Received: by 2002:a37:46c9:: with SMTP id t192mr7541261qka.3.1590079486957; Thu, 21 May 2020 09:44:46 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2020 09:44:46 -0700 (PDT) From: Robert Foley To: qemu-devel@nongnu.org Subject: [PATCH v9 69/74] xtensa: convert to cpu_has_work_with_iothread_lock Date: Thu, 21 May 2020 12:40:06 -0400 Message-Id: <20200521164011.638-70-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::731; envelope-from=robert.foley@linaro.org; helo=mail-qk1-x731.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, Max Filippov , cota@braap.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" Soon we will call cpu_has_work without the BQL. Cc: Max Filippov Reviewed-by: Richard Henderson Signed-off-by: Emilio G. Cota Signed-off-by: Robert Foley --- target/xtensa/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index fda4a73722..0f96483563 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -47,6 +47,8 @@ static bool xtensa_cpu_has_work(CPUState *cs) #ifndef CONFIG_USER_ONLY XtensaCPU *cpu = XTENSA_CPU(cs); + g_assert(qemu_mutex_iothread_locked()); + return !cpu->env.runstall && cpu->env.pending_irq_level; #else return true; @@ -187,7 +189,7 @@ static void xtensa_cpu_class_init(ObjectClass *oc, void *data) device_class_set_parent_reset(dc, xtensa_cpu_reset, &xcc->parent_reset); cc->class_by_name = xtensa_cpu_class_by_name; - cc->has_work = xtensa_cpu_has_work; + cc->has_work_with_iothread_lock = xtensa_cpu_has_work; cc->do_interrupt = xtensa_cpu_do_interrupt; cc->cpu_exec_interrupt = xtensa_cpu_exec_interrupt; cc->dump_state = xtensa_cpu_dump_state;