From patchwork Wed Feb 26 18:34:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1245273 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48SPhl0M9bz9sPR for ; Thu, 27 Feb 2020 05:39:03 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=dYmffRtL; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 48SPhk4QF2zDqkR for ; Thu, 27 Feb 2020 05:39:02 +1100 (AEDT) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::641; helo=mail-pl1-x641.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=dYmffRtL; dkim-atps=neutral Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 48SPhY0fn9zDqdk for ; Thu, 27 Feb 2020 05:38:52 +1100 (AEDT) Received: by mail-pl1-x641.google.com with SMTP id q4so42670pls.4 for ; Wed, 26 Feb 2020 10:38:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PwilITxO4sYvAmB0T57N3hLIUxUvoQLqpuK/UsfGc3Y=; b=dYmffRtLMY/D6fJKmhjHrqTm0XrYw+VaDioqRPXyRELiW/cKvuoTRJkmpd4HMBwvWC 94J8jnltPTWfUPMItBJAsicsNh0DtTJt8GcG0bGMzJv7yOeNrMwCbeDzGSo6Ot7Iiy/e BiKqQUCADA8Bo+cDhwx2p28MtLsoj9KwQ9V7GDXC9pGmkrbvqqUMVgH7KK9lR51nL+G4 33nZ4a621vDfL5cx3vQz9kObQ7/FjiVdMJWp6M0R3OmutXR41M8XXtbsopovWigdsCVs BhzsvvpQVFmEK/JdTJV1ATk/seWiGosbP5SqAm75GA3T00n3DP8vo1IFQbXraHpGWk+0 tSKA== 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=PwilITxO4sYvAmB0T57N3hLIUxUvoQLqpuK/UsfGc3Y=; b=RwZq2ZNPNy+uc0dUkLKd6x35EowwhcVa65Dy+ezdP3COz1UUZ09GvojqELbOkvZO/8 IFuPR5jy2EyA3Sb4kLyRYWyzqukF4VKatjJ3EmgxwGg3yFdrrrf4wYh4V/KKXrFAuE7f yF1b272EVSNRGNVIZfjUDiJsjE1vk++Z7vm1xZGLyCzxABTMAKxuaTQEg/TMkwXhfLE0 SYWoCKQC8wRnrVpHATUuDc7GtIvqvmkLim36pXow9MrY9nJihurxFkX9uKd6Nn3bDsXQ P7FaRDuKMkfvWz1RLfJTO1Ikcfkd9XbhrgZ3alq3ZdXErkVOhHT2qzNry3lWl3IUBc6f NSpQ== X-Gm-Message-State: APjAAAWRumNcUGogBUzSRj1Kg3QwOOSiHGSCkRVoEv9xSjxYtR2fkDMl ItV+EhM9uiDNviuJalYAaUWpys0b X-Google-Smtp-Source: APXvYqx3ePgnXSV2nHIcJBEgAn/6cm3kTjVcIEwtxqm+0gTQnFui2W2ncgckz8gnbLY76Z0enaxZaw== X-Received: by 2002:a17:90a:26ec:: with SMTP id m99mr469507pje.130.1582742329577; Wed, 26 Feb 2020 10:38:49 -0800 (PST) Received: from bobo.ibm.com ([61.68.187.74]) by smtp.gmail.com with ESMTPSA id v8sm3715247pfn.172.2020.02.26.10.38.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2020 10:38:48 -0800 (PST) From: Nicholas Piggin To: skiboot@lists.ozlabs.org Date: Thu, 27 Feb 2020 04:34:00 +1000 Message-Id: <20200226183408.1626737-2-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200226183408.1626737-1-npiggin@gmail.com> References: <20200226183408.1626737-1-npiggin@gmail.com> MIME-Version: 1.0 Subject: [Skiboot] [PATCH 1/9] asm/head.S: QUIESCE_REJECT fix X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" This was returning to the wrong point and loading some garbage that had not been set up yet. Signed-off-by: Nicholas Piggin --- asm/head.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/asm/head.S b/asm/head.S index b565f6c9c..0b4b1a5f0 100644 --- a/asm/head.S +++ b/asm/head.S @@ -881,7 +881,7 @@ opal_entry: cmpwi %cr0,%r11,QUIESCE_REJECT bne 2f li %r3,OPAL_BUSY - b .Lreturn /* reject */ + b .Lreject 2: /* hold */ lwz %r11,CPUTHREAD_IN_OPAL_CALL(%r12) subi %r11,%r11,1 @@ -984,6 +984,7 @@ opal_entry: mr %r12,%r13 ld %r13,STACK_GPR13(%r1) ld %r1,STACK_GPR1(%r1) +.Lreject: sync /* release barrier vs quiescing */ lwz %r11,CPUTHREAD_IN_OPAL_CALL(%r12) subi %r11,%r11,1