From patchwork Tue Jul 9 09:34:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 811421 Delivered-To: patch@linaro.org Received: by 2002:adf:ee12:0:b0:367:895a:4699 with SMTP id y18csp200369wrn; Tue, 9 Jul 2024 02:36:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVXItrvcNzvS85hPrVkZqIz13Fk857BNIvtf6N0Ii6yWvf064qG4vN5UC3w4N5pPjlrCNX5FYYoezQFdAwlaAx/ X-Google-Smtp-Source: AGHT+IFMgW02kC1/0keiyk3wNKAwbtPNYrdkNvyv4tSSuN2GAKTUzGX7mpduZziJc2To8iKmrNs9 X-Received: by 2002:a17:906:50e:b0:a77:cc93:ae02 with SMTP id a640c23a62f3a-a780d28c1bcmr123947166b.28.1720517763961; Tue, 09 Jul 2024 02:36:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720517763; cv=none; d=google.com; s=arc-20160816; b=qjJ/5GS10VbuC6uTe8Nx4ehqaZM+/1ED9/7aiQ8VurSCOevzsBdfYHK/qj2iZ8w4IR /u30vMoz0Yv76LwbOStjidrxxhgq3VdY0fZJWXnTUAKqaiWuCMfWiJzfvvWb7LHmKsv8 +BIOklbCdLSr39lDqpY4dEd5ccWjyJvUaH6hI1/dReMdlTDPaNjYfPO9LsZiAkHGO7KL ekvuifkV/YqIN9u6NrM6Ti/Ej7Azy75cYAk+tnBej29BCtJEWNGKB269ELZwl0ztAylg wLMxLQJEK5xxz7zCGus0U3lb0cadeG/K92Zo0f9vUVAQzKeecdIJs8SofkpT+0Vxnpc5 zbvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:cc:to:in-reply-to:references :message-id:content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=JVqOD8ycqWq7Q7oeWryEnvkwn/+zmqbT0+3zsbessWE=; fh=/XivWHF+vo8fEJZkIifbJJS5exQ4Pz1Cdxakj2MFy4s=; b=0OomnjCyFFSq6IHVcxfAYkUd5r55ZPhOH4+sXMRnDRYT9dBs+t+nN87ctu0Z9c07BW eI5ogYN+w/ggHP2XbxS6HRpm6NWdgCNbuyqXwpJYiPmpknz/ZzT4qIgOx6tqi3o3yO/H kb9Lyr9HgihxaUrHMzTHc6xbpRETpD5FrErNgtMjM8aBjivVlqKSFNOif86hspPuPIHQ Gd8Y7kpt9d7W3OkJJH2cl7GHswTHqvNy9DzM6H+TjpveXbbdH84WKgL7S5qvg6qBDD1Z UjT9sae0f2fKYZVy3qMBYn477/g2o/giq5zs946di9BNV0O6OvdajmwAFdyRSDOylp6w 9xPg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vP63pJd3; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id a640c23a62f3a-a780a9c898bsi80615166b.173.2024.07.09.02.36.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 02:36:03 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vP63pJd3; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DE90688579; Tue, 9 Jul 2024 11:34:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="vP63pJd3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2CE6087EBD; Tue, 9 Jul 2024 11:34:56 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 43409885D1 for ; Tue, 9 Jul 2024 11:34:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=caleb.connolly@linaro.org Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-58c2e5e8649so8779568a12.1 for ; Tue, 09 Jul 2024 02:34:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720517693; x=1721122493; darn=lists.denx.de; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=JVqOD8ycqWq7Q7oeWryEnvkwn/+zmqbT0+3zsbessWE=; b=vP63pJd3qotBpFr0Lopxnrh7lkfB2c37fuE1o8LcHeP9+LxvVwz5RDHLdS8qcvSJkM gI6Eflq0Jfj4fEYnhkaC+IMRX2LWHFA0kD5Rd8OTx9xLWsHEjvJdlIlg8gnWp6iTXE/H Fx6/vrgea1SckQ9HlJcjkZvwwnzJX3GeZTaZHOemeZh5cJQUZHIcSbZKgxQtIBnxFiMR fU2grqAvIEs636RNlTWlM6fqZwyj0PJ+Mfz6/JN+qpv9sEl6LOUzXBmXhxau4DH7wXE4 gbH58RdrcjBc7I+1GQ1/P6Y0ZRgLmKcawfMfnDZJdy3Na8PtfWUOlKaIfjb4SRSxfaDm SUNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720517693; x=1721122493; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JVqOD8ycqWq7Q7oeWryEnvkwn/+zmqbT0+3zsbessWE=; b=bjGWwV72T9UGXBhtCkaihqlk6MiHMruOaDp97YxdCCYhqmgykZ59mITYHrJn5hjx7z w3Kg/K7jbEO0ceBl725UmnYLFBUkTU+mLyJMDRxeLauxVNI0SAUQDEWWi6MwFIf6hGUH Y+37jQIhnmLELHFrKw52c0MV5q4UZjX+wZDmmIuBW+uPM49S2zCpKhKKwORpyF9/Y/JF dUmSkgJ7dfPtTveVIV1WPqLtu/OrGRl/k3paUdKzuCPowYqiJSVSYl/kTbXhc18rkwBx anl4AVxggklIeE2up0BRJxpo9S0W9pnvLqYDOjTYCh1X64vp8IIMhg0DXMeOY7g8Vsee J4yg== X-Gm-Message-State: AOJu0YxV7MIxS0jwR2XP9OB9FOfRsvLjg8RLQmARqmvHIJPVIP9I2E9M UEy5wuMYxTz9M/79+/lNhd8SjKA9vQlKuQ6VlyL7ma7lDvlss2c6cmP/OLvPGt4= X-Received: by 2002:a17:906:e207:b0:a77:c051:36a9 with SMTP id a640c23a62f3a-a780d22e23cmr119052966b.9.1720517692772; Tue, 09 Jul 2024 02:34:52 -0700 (PDT) Received: from [192.168.0.113] ([2a02:8109:aa0d:be00::18f8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a7fefaasm62884566b.140.2024.07.09.02.34.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 02:34:52 -0700 (PDT) From: Caleb Connolly Date: Tue, 09 Jul 2024 11:34:34 +0200 Subject: [PATCH v4 06/21] soc: qcom: cmd-db: adjust for U-Boot API MIME-Version: 1.0 Message-Id: <20240709-b4-qcom-rpmh-v4-6-c06d0a26644a@linaro.org> References: <20240709-b4-qcom-rpmh-v4-0-c06d0a26644a@linaro.org> In-Reply-To: <20240709-b4-qcom-rpmh-v4-0-c06d0a26644a@linaro.org> To: Tom Rini , Caleb Connolly , Neil Armstrong , Sumit Garg , Jaehoon Chung Cc: u-boot@lists.denx.de, u-boot-qcom@groups.io X-Mailer: b4 0.14-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=1600; i=caleb.connolly@linaro.org; h=from:subject:message-id; bh=X51XRfiFyoAKRpgKqEsBH4aP1WI04/A+0VKgW+JBMI8=; b=owEBbQKS/ZANAwAIAQWDMSsZX2S2AcsmYgBmjQQzGjQ7vJtexevEwLbE9fXgpjHSARMB5ovNn rHCG6IhOfmJAjMEAAEIAB0WIQS2UaFGPGq+0GkMVc0FgzErGV9ktgUCZo0EMwAKCRAFgzErGV9k tq/zD/9aY/NQHbKeB4v2GBbWLq4zm3UXRUZs3FJL1MTjK7u+JBpVa73qysOipkSa5lqPozw5JX7 WGV+XMRAt6PKFDd4nyUEGWgyOG5t2p/yrnnkoags4gtJy852BbHLB0DbbqV9GAvJCM0JWC7quUG i2MadN/Ri/aSysNRbER5uPwkyHOzur4eABB9YpgyTEJuWrF3A15UhM9UbTBJ3QxS6p91YprkwUd l70CWuU4xDk4N+WeNNOBudnHBgjc4QOq9L4Dt9Cjmhls7G/eF7Sk4Xcu7TdQ7cyYyQLEl5P19Fi vsTjq1KugqlA75BY7LB4fWjHjvgTS8Lp4vmNwbOJ1M+ApAw0HBKkWXLtM1lTrVIkT1cPTEjF6Q/ owmaLYPUsH0Y2NgGXUnVGFGVvmqJF+RRL25E8PJUFLru/LYpqdzkdunvrLtRXeedrB7yFvi/Fl0 Scp2q/TCZmv4Lrpeu6FL4Xk5weeiRgPCMUYPsBaPF3QLa1hfNUTz1+Z0JQyZBRM44xDBxAzKU+L HXnmRmxWfrEOaTU7LVY34ZkHc++kYtRHb4pOYY1lxI1f6XDcp3Xphy5bq7rfB9Fwq0gg0uO2T3X wGgLcA/2TcrJMWO1NxhDuuEEv2Xhtk/bdlwv4ndsq7dZqT28IEuExb3g0Ep0MCjFx5Ha0ujAwNF O6hocsfefn4Svjg== X-Developer-Key: i=caleb.connolly@linaro.org; a=openpgp; fpr=83B24DA7FE145076BC38BB250CD904EB673A7C47 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Keep the header pointer in the .data section so we don't initialize it again after relocation, adjust cmd_db_get_header() to work with the U-Boot API, and skip validating the header since all cmd-db users are children of the rpmh-rsc and those children will only probe if cmd-db initializes successfully. Signed-off-by: Caleb Connolly --- drivers/soc/qcom/cmd-db.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/soc/qcom/cmd-db.c b/drivers/soc/qcom/cmd-db.c index 4d3fd4db8852..b852a269ae12 100644 --- a/drivers/soc/qcom/cmd-db.c +++ b/drivers/soc/qcom/cmd-db.c @@ -104,9 +104,9 @@ static bool cmd_db_magic_matches(const struct cmd_db_header *header) return memcmp(magic, CMD_DB_MAGIC, ARRAY_SIZE(CMD_DB_MAGIC)) == 0; } -static struct cmd_db_header *cmd_db_header; +static struct cmd_db_header *cmd_db_header __section(".data") = NULL; static inline const void *rsc_to_entry_header(const struct rsc_hdr *hdr) { u16 offset = le16_to_cpu(hdr->header_offset); @@ -127,16 +127,12 @@ static int cmd_db_get_header(const char *id, const struct entry_header **eh, const struct rsc_hdr **rh) { const struct rsc_hdr *rsc_hdr; const struct entry_header *ent; - int ret, i, j; + int i, j; u8 query[sizeof(ent->id)] __nonstring; - ret = cmd_db_ready(); - if (ret) - return ret; - - strtomem_pad(query, id, 0); + strncpy(query, id, sizeof(query)); for (i = 0; i < MAX_SLV_ID; i++) { rsc_hdr = &cmd_db_header->header[i]; if (!rsc_hdr->slv_id)