From patchwork Mon Feb 27 10:30:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 1748596 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=KmDzEkMA; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=AuBMU01y; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PQGyC6SrVz1yWw for ; Mon, 27 Feb 2023 21:31:47 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2CQDYvGWCBqqSMC4rtVgXJ51/cfTzxM94w5iFQcLwSs=; b=KmDzEkMAopnHFE 8PEfftCBjy3JcHVDI5KhT6PL2/DBpALZFs8UuAcaIgZOFB0PhoTqFlTASx+7G/X0uP2sgKNBWjoru U6TEYO8G6jeQ8OIpcG14yvnOg2Wz+A4IQT6lYpId2pWSj5kdAvhVc9Oc03hzzwOTSz39kJOpsdnw6 KkklzChUjsTGML4zqLqnla4SCbbxPrUbTTozrHHfTQKMhPylqsJCuR7oUGGwurQoTJaW3DwDKt6JG BrRlK1W6LBPexsrkBoZNqXfUT45pXXsJUCKS+f/F2KcRJIgGVpjBeyJ2B+4y1gZi1iZhK47b9E270 cDXBHLE7/uBhDzI+mKvw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pWan6-009EZz-8n; Mon, 27 Feb 2023 10:31:33 +0000 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pWamy-009ETe-8V for opensbi@lists.infradead.org; Mon, 27 Feb 2023 10:31:28 +0000 Received: by mail-wr1-x42b.google.com with SMTP id v16so2842013wrn.0 for ; Mon, 27 Feb 2023 02:31:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OX2TPXCHfeJ+nwhVtY/+me8cjItUMBpf05HV24+LlI8=; b=AuBMU01yeP+VGTom/EMInpnz4E0RRFB8azJRQd53Ew+0XG5f5MXRVPZGQSnFhxl9LM DsVHufTbjydv361nnNjO2MjpD2UeLnrnZDmZVaL9h468cPUNWnUkdprHCypcwsyEEZuw kmvyW3P3auaUBQ+2bkcsGHM96XYoxr7G9FY7Q4sU26nYXK70p7hGYAIVQVGPfzjQxZ/T ZNYGoHHky/NMCTx3Q3nr+5umhajHpHxI4ObNcoLJj4MPWoPqyIfGYh48pCla2/h/f2PD jGasxw0M6kOaTVC8uyFsXEGHfr+0wqSU+tar9KGtvN+Hmp7VwMiZLt/TZMjDhTLFjDeO RZKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OX2TPXCHfeJ+nwhVtY/+me8cjItUMBpf05HV24+LlI8=; b=0FQpT9gOBM7GDr4GqxRnewQ9rZ8qC8BReYeFmzGQcRfaR5GD6xir2yW2KFchuHe3MY z3MyiwGrFSL21F5oEmcPaey9SZII/rTsun36ZZAkiG3KVmrb8s7lPrO+fuI4Xz1JAQu8 TmKVPMB54ZQFO4u7povlviMejQo01AQfxb2SZwLh9HVcB7NFLl0lpAsmkhvrrnnXCSil cJQ9S+jLLHVfqF+pqkoOzmOHzWv1/gvFwFFrxOK5/mK8gOBVwVWeHOP48utX15MRjY4i kjJJDrm5hFiNCx9HQb/hygevf8fv/llW3mBclwE+wIU2cxTg0hQRJHC57hPQ6Mzd6lh9 q9gw== X-Gm-Message-State: AO0yUKW5AwdnxuVFYwGShjmhSyRA7uTaxhnohttYR2MV+71rmb8P5Hca MA/Yd/HMZ7b5mAsKFBozWEJaHhZYtbWvSzng X-Google-Smtp-Source: AK7set+Ze1HlTy0yS5ogm07w9jWVmbQ1ut0FfRkyI0MXQFBiNEv15vaD35e4jnWH8RfBsktVQdsOlQ== X-Received: by 2002:a05:6000:146:b0:2c9:a800:7d08 with SMTP id r6-20020a056000014600b002c9a8007d08mr6977935wrx.43.1677493878589; Mon, 27 Feb 2023 02:31:18 -0800 (PST) Received: from localhost (cst2-173-16.cust.vodafone.cz. [31.30.173.16]) by smtp.gmail.com with ESMTPSA id b15-20020a5d45cf000000b002c703d59fa7sm6654030wrs.12.2023.02.27.02.31.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Feb 2023 02:31:18 -0800 (PST) From: Andrew Jones To: opensbi@lists.infradead.org Cc: 'Ley Foon Tan ' , 'Atish Patra ' , 'Anup Patel ' , 'Sia Jee Heng ' , Anup Patel Subject: [PATCH v2 03/11] lib: sbi_hsm: Ensure errors are consistent with spec Date: Mon, 27 Feb 2023 11:30:58 +0100 Message-Id: <20230227103106.137995-4-ajones@ventanamicro.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230227103106.137995-1-ajones@ventanamicro.com> References: <20230227103106.137995-1-ajones@ventanamicro.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230227_023124_317730_754838FF X-CRM114-Status: GOOD ( 11.92 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: HSM functions define when SBI_ERR_INVALID_PARAM should be returned. Ensure it's not used for reasons that don't meet the definitions by using the catch-all code, SBI_ERR_FAILED, for those reasons inst [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:42b listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org HSM functions define when SBI_ERR_INVALID_PARAM should be returned. Ensure it's not used for reasons that don't meet the definitions by using the catch-all code, SBI_ERR_FAILED, for those reasons instead. Also, in one case sbi_hart_suspend() may have returned SBI_ERR_DENIED, which isn't defined for that function at all. Use SBI_ERR_FAILED for that case too. Signed-off-by: Andrew Jones Reviewed-by: Anup Patel --- lib/sbi/sbi_hsm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/sbi/sbi_hsm.c b/lib/sbi/sbi_hsm.c index 7ee4159256be..3455520b8a94 100644 --- a/lib/sbi/sbi_hsm.c +++ b/lib/sbi/sbi_hsm.c @@ -402,7 +402,7 @@ int sbi_hsm_hart_suspend(struct sbi_scratch *scratch, u32 suspend_type, /* Sanity check on domain assigned to current HART */ if (!dom) - return SBI_EINVAL; + return SBI_EFAIL; /* Sanity check on suspend type */ if (SBI_HSM_SUSPEND_RET_DEFAULT < suspend_type && @@ -415,7 +415,7 @@ int sbi_hsm_hart_suspend(struct sbi_scratch *scratch, u32 suspend_type, /* Additional sanity check for non-retentive suspend */ if (suspend_type & SBI_HSM_SUSP_NON_RET_BIT) { if (rmode != PRV_S && rmode != PRV_U) - return SBI_EINVAL; + return SBI_EFAIL; if (dom && !sbi_domain_check_addr(dom, raddr, rmode, SBI_DOMAIN_EXECUTE)) return SBI_EINVALID_ADDR; @@ -429,7 +429,7 @@ int sbi_hsm_hart_suspend(struct sbi_scratch *scratch, u32 suspend_type, /* Directly move from STARTED to SUSPENDED state */ if (!__sbi_hsm_hart_change_state(hdata, SBI_HSM_STATE_STARTED, SBI_HSM_STATE_SUSPENDED)) - return SBI_EDENIED; + return SBI_EFAIL; /* Save the suspend type */ hdata->suspend_type = suspend_type;