From nobody Sun Feb 8 04:23:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647625016671901.5621043587581; Fri, 18 Mar 2022 10:36:56 -0700 (PDT) Received: from localhost ([::1]:47196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVGX1-0001tc-KF for importer@patchew.org; Fri, 18 Mar 2022 13:36:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVGTl-0004Rs-Nw; Fri, 18 Mar 2022 13:33:33 -0400 Received: from [2607:f8b0:4864:20::22a] (port=35658 helo=mail-oi1-x22a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVGTk-0002A4-6a; Fri, 18 Mar 2022 13:33:33 -0400 Received: by mail-oi1-x22a.google.com with SMTP id e4so6424661oif.2; Fri, 18 Mar 2022 10:33:31 -0700 (PDT) Received: from rekt.ibmmodules.com ([2804:431:c7c6:daa8:d948:1d15:1451:398f]) by smtp.gmail.com with ESMTPSA id d2-20020a05683025c200b005c93d78e1f6sm4324662otu.29.2022.03.18.10.33.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 10:33:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PjBudQVNMTSjgOEdtYkX7WxblOTeQuNDOTsgp3296vo=; b=DoHolSe12gIpWc0L6rxb79auLX7c4U6u2W/zV8IXpOsdyeEydO+Y1OfarBxDi9CfbA vqfB0+YEuxgO5j91JXfegMRFxJOXjLKEVwpJzHKKrtwXo/fug06MlhXlcNpGBREpKbST 9iP8oS30yq42n+dSd3Td0lC/y5/UUoFQpYN0ADht6u/i/EEG3lLPXo1LBsKt/GnlvK/A tX0sOC5xSw9XokMlDkOXF169LiCyXade1E6tJ2rCr0b4AeCmKPsi1D3Gcn5wBuKLtxTJ MfzoSlfJbg6h1Y5bRtBrssrqJogj9+62dnikYyS5bxcEQPK/fK3ndAU553dWnGL1F9f9 dcXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PjBudQVNMTSjgOEdtYkX7WxblOTeQuNDOTsgp3296vo=; b=2lBR6YMYVWSfwPSsp+W4/RB+i9vnoWVYcvhzz+qE0o9rJiq186iAIYYi/lHdN909ZO ewUKMrEQSMqfuu2SjPIO6P+4eOnLR3aKHaL+8u8ifwMMbdUdmcMRacHQC+391EGUXjBz JX1GiGURJVhTdtgO3wmHMFR7z/ImAFmVZBv1NlnTAPucYCRQ61GOB+nNk5yEGhLqohGb WzWI23a5Nlz0jzDTiZFpmwv5Z571unwVkgSqECBrhabiJ9QQdv19uZrWDR9nJqaKnblM lfRyTrfAel56+Dw3Ae7xm2iBJ7jqc7LaZpCaTbaZkF1T2yfu2ey3Dmt1OB8+wPhYIviJ P2vA== X-Gm-Message-State: AOAM533V1lkHUah6LLV5yqc1Z41+9lMcVJlvheei6ju8r14gQ8CPfmQs GlW41pLR/BsRnWYRKKbBtVshpfEPXXo= X-Google-Smtp-Source: ABdhPJwAOf+Qc0CbLd5+G1/JprBdCM4RMi1BslFy/VWdOKcJdn0ozxAupbQMZxBXChEeKxRAVmmSIQ== X-Received: by 2002:a54:4104:0:b0:2ec:b263:9979 with SMTP id l4-20020a544104000000b002ecb2639979mr8352575oic.66.1647624810614; Fri, 18 Mar 2022 10:33:30 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH for-7.1 1/9] hw/ppc/spapr_drc.c: add drc->index Date: Fri, 18 Mar 2022 14:33:12 -0300 Message-Id: <20220318173320.320541-2-danielhb413@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220318173320.320541-1-danielhb413@gmail.com> References: <20220318173320.320541-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::22a (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::22a; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x22a.google.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Henrique Barboza , qemu-ppc@nongnu.org, clg@kaod.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1647625017278100001 Content-Type: text/plain; charset="utf-8" The DRC index is an unique identifier that is used across all spapr code. Its value is given by spapr_drc_index() as follows: return (drck->typeshift << DRC_INDEX_TYPE_SHIFT) | (drc->id & DRC_INDEX_ID_MASK); We see that there is nothing that varies with the machine/device state on spapr_drc_index(). drc->id is defined in spapr_dr_connector_new() and it's read only, drck->typeshift relies on the DRC class type and it doesn't change as well and the two macros. Nevertheless, spapr_drc_index() is called multiple times across spapr files, meaning that we're always recalculating this value. This patch adds a new SpaprDrc attribute called 'index'. drc->index will be initialized with spapr_drc_index() and it's going to be a replacement for the repetitive spapr_drc_index() usage we have today. Signed-off-by: Daniel Henrique Barboza --- hw/ppc/spapr_drc.c | 1 + include/hw/ppc/spapr_drc.h | 1 + 2 files changed, 2 insertions(+) diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 76bc5d42a0..1b8c797192 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -561,6 +561,7 @@ SpaprDrc *spapr_dr_connector_new(Object *owner, const c= har *type, =20 drc->id =3D id; drc->owner =3D owner; + drc->index =3D spapr_drc_index(drc); prop_name =3D g_strdup_printf("dr-connector[%"PRIu32"]", spapr_drc_index(drc)); object_property_add_child(owner, prop_name, OBJECT(drc)); diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h index 02a63b3666..93825e47a6 100644 --- a/include/hw/ppc/spapr_drc.h +++ b/include/hw/ppc/spapr_drc.h @@ -173,6 +173,7 @@ typedef struct SpaprDrc { DeviceState parent; =20 uint32_t id; + uint32_t index; Object *owner; =20 uint32_t state; --=20 2.35.1 From nobody Sun Feb 8 04:23:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647624962388674.1051003902015; Fri, 18 Mar 2022 10:36:02 -0700 (PDT) Received: from localhost ([::1]:43708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVGW9-0007pi-9O for importer@patchew.org; Fri, 18 Mar 2022 13:36:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVGTo-0004Wo-0O; Fri, 18 Mar 2022 13:33:36 -0400 Received: from [2607:f8b0:4864:20::c2a] (port=44818 helo=mail-oo1-xc2a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVGTm-0002AX-G7; Fri, 18 Mar 2022 13:33:35 -0400 Received: by mail-oo1-xc2a.google.com with SMTP id j7-20020a4ad6c7000000b0031c690e4123so10921800oot.11; Fri, 18 Mar 2022 10:33:33 -0700 (PDT) Received: from rekt.ibmmodules.com ([2804:431:c7c6:daa8:d948:1d15:1451:398f]) by smtp.gmail.com with ESMTPSA id d2-20020a05683025c200b005c93d78e1f6sm4324662otu.29.2022.03.18.10.33.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 10:33:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WicwrvEJOoYrd1fFE86yccnEjSgRWVX8GsAPL07xOkA=; b=J0iqlPbh/Qm2f/zHeK2pEumvZttodvmekazpM+i2cARJelq7FSfZl1QGKJItwFk0uE 3QvNQeq6ehcVkohvAC27Ci2OwH0tu3X2s1XdT2SGgST91u8WWNwcfEXcAteyxQ/GWYuV wILvWEJC0zNPWzr5GRGoc1kP84Y1m9deyx3xj1FnH6Is88oJvYll2YXRZ37Y42K3egYU XgmR0BbGYeU4d3yDB5qqT9crv8mqvK8TH6ArZIhV8SrFKaik2KYwNQzBCVhLd2e/MGar aGNtDUoeietMsRrLaq9VpMZibqAyV7C05zujHJGhHB4k0u5rmYoVOqtNZX5FItoiDf8Z 3/eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WicwrvEJOoYrd1fFE86yccnEjSgRWVX8GsAPL07xOkA=; b=TGFDCprhKlD1Qw6nst/lzkllFNTxiZAFmTptW1pVpujsbFRl+yGgNwxf0c70/v2Lny JwNSNqH3tGi9EmRlkgS3024DRe5gNqo9lLDQ7z1mZM6VQ6Nl96TGZEkwUIuqkWFaK5UT 7GnfXQ628Vzm+ecRUik0esvavmnDaVu246Hi7ggF+FDaSKFnlYZOkb4XMHRxOxpM7izv fXrvQ9pXmCLYtUs8J1njE5DM3D876vd6ZdmJj2NglUFjEDuj0iaShAQb5Mbz+PJ14zQI Jx25Lvn2yh6HnQvVM9ifvyd3nnqGrudDP7zEz+RIy0BYaWVNVq3CDi175/OoWwhsxf+9 tqmw== X-Gm-Message-State: AOAM5317Na4zxq12SoxNu50HU75YnCF4aLuhpaj06wvk2d6AWHw6YcoJ zL3fHFyGwzIqQ2E7YEQAn+z2VJbR0g8= X-Google-Smtp-Source: ABdhPJxOCCQAY2sYGsIfTDp0IABSiuIrCdDLthiiyVc340gu6rHPBHYm51xkEQe5gkZCnTHdQ2+rLQ== X-Received: by 2002:a4a:1784:0:b0:324:5b06:dd0d with SMTP id 126-20020a4a1784000000b003245b06dd0dmr3108389ooe.77.1647624813038; Fri, 18 Mar 2022 10:33:33 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH for-7.1 2/9] hw/ppc/spapr_drc.c: redefine 'index' SpaprDRC property Date: Fri, 18 Mar 2022 14:33:13 -0300 Message-Id: <20220318173320.320541-3-danielhb413@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220318173320.320541-1-danielhb413@gmail.com> References: <20220318173320.320541-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::c2a (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::c2a; envelope-from=danielhb413@gmail.com; helo=mail-oo1-xc2a.google.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Henrique Barboza , qemu-ppc@nongnu.org, clg@kaod.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1647624962798100001 Content-Type: text/plain; charset="utf-8" 'index' is defined as an uint32 retrieved by prop_get_index(). Change it to instead return the value of drc->index the same way it's done with the 'id' property that returns drc->id. Signed-off-by: Daniel Henrique Barboza --- hw/ppc/spapr_drc.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 1b8c797192..1a5e9003b2 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -316,14 +316,6 @@ static SpaprDREntitySense logical_entity_sense(SpaprDr= c *drc) } } =20 -static void prop_get_index(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) -{ - SpaprDrc *drc =3D SPAPR_DR_CONNECTOR(obj); - uint32_t value =3D spapr_drc_index(drc); - visit_type_uint32(v, name, &value, errp); -} - static void prop_get_fdt(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { @@ -577,8 +569,8 @@ static void spapr_dr_connector_instance_init(Object *ob= j) SpaprDrcClass *drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); =20 object_property_add_uint32_ptr(obj, "id", &drc->id, OBJ_PROP_FLAG_READ= ); - object_property_add(obj, "index", "uint32", prop_get_index, - NULL, NULL, NULL); + object_property_add_uint32_ptr(obj, "index", &drc->index, + OBJ_PROP_FLAG_READ); object_property_add(obj, "fdt", "struct", prop_get_fdt, NULL, NULL, NULL); drc->state =3D drck->empty_state; --=20 2.35.1 From nobody Sun Feb 8 04:23:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647625316383545.8269735246912; Fri, 18 Mar 2022 10:41:56 -0700 (PDT) Received: from localhost ([::1]:52500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVGbq-0005Wr-ET for importer@patchew.org; Fri, 18 Mar 2022 13:41:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVGTq-0004ZF-FY; Fri, 18 Mar 2022 13:33:38 -0400 Received: from [2607:f8b0:4864:20::229] (port=41934 helo=mail-oi1-x229.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVGTo-0002Ap-RI; Fri, 18 Mar 2022 13:33:38 -0400 Received: by mail-oi1-x229.google.com with SMTP id ay7so9468206oib.8; Fri, 18 Mar 2022 10:33:36 -0700 (PDT) Received: from rekt.ibmmodules.com ([2804:431:c7c6:daa8:d948:1d15:1451:398f]) by smtp.gmail.com with ESMTPSA id d2-20020a05683025c200b005c93d78e1f6sm4324662otu.29.2022.03.18.10.33.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 10:33:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pLr94F80vlg7jBC5R1EZ1+88tkM4nknZ3NiBmzW5C7M=; b=FOXg3gX9qKhMWnKYfndIM2UqQhFMX332HSAWXuNz2ZeuWIbQFBISnlDEaKoh12NeAK INGevyWLyQqEjJgX153OX2B04FucA8AlT1n2mS6uaJTICfjbedQOSgZIzDB3Czi0uJ3M Y3Z4NF0otVHeZflI3eD1fK3Ne6RiQn0tieMa+H9z97jyxv45fI9hfLuijf+KnTqYMA2N Hu9Q5D63sm3aIYvpHOnXEvKnucyQsjtMTVFHdCShYGUozTdHKoI1ALhBqtuz+OYTuGIw ZkPxLKmYfD2h4EPOuatwifyNNYZPKN953P8As45hgzFP/Le9DF9ekZzf8OZN5NxAhyBZ ne9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pLr94F80vlg7jBC5R1EZ1+88tkM4nknZ3NiBmzW5C7M=; b=u9VeZMlgDUAPCmLECZsY3AX1PqUX6nHUp0pG1VnoRb7rZW0Ru83qPqJOuIjqbO9Q8t SiC5gPahyuowhLm7sAHWKcEI7cIUOlbw+N0bqV5zZTCGi0SkFie4vNcYNtwuyANvHT5G zp6/K3UA6WRSibP/r1dp5KMdavWM1uynGdQxqRakc4VOGdiDd5Me/vnQzgCyA0gl8Tr+ fpzamTZMv9I0sErAVhyPIXQq5gFtm7wnyYH0oQs7x7t6nI64xeBYlSblzUIIGZx+6ygi nI/TzU59FJTLusOD30WS5sRl7q5QmI5vNriwE1MTWxfLs5vopR/vrF05WOyVwXTs0GH2 vemg== X-Gm-Message-State: AOAM530oJrmpauRzf8hQnYNkwp/5s4FbUOm/YQkspKpjfutVj0+WjQS5 YbcXQF7fTNLjcq6N8vwQx3P5hgA8eQc= X-Google-Smtp-Source: ABdhPJzfAh6u2gbDGulHOxFQXpBAsQW0TS2pJP0PJfD+6lRxzjsZCOMCYnPx2pKkMeFIXrW7WO/YMg== X-Received: by 2002:aca:2410:0:b0:2ec:9f04:52b1 with SMTP id n16-20020aca2410000000b002ec9f0452b1mr8522520oic.277.1647624815292; Fri, 18 Mar 2022 10:33:35 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH for-7.1 3/9] hw/ppc/spapr_drc.c: use drc->index in trace functions Date: Fri, 18 Mar 2022 14:33:14 -0300 Message-Id: <20220318173320.320541-4-danielhb413@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220318173320.320541-1-danielhb413@gmail.com> References: <20220318173320.320541-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::229 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::229; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x229.google.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_FILL_THIS_FORM_SHORT=0.01, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Henrique Barboza , qemu-ppc@nongnu.org, clg@kaod.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1647625318440100001 Content-Type: text/plain; charset="utf-8" All the trace calls in the file are using spapr_drc_index(). Let's convert them to use drc->index. Signed-off-by: Daniel Henrique Barboza --- hw/ppc/spapr_drc.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 1a5e9003b2..1d751fe9cc 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -81,8 +81,7 @@ static uint32_t drc_isolate_physical(SpaprDrc *drc) drc->state =3D SPAPR_DRC_STATE_PHYSICAL_POWERON; =20 if (drc->unplug_requested) { - uint32_t drc_index =3D spapr_drc_index(drc); - trace_spapr_drc_set_isolation_state_finalizing(drc_index); + trace_spapr_drc_set_isolation_state_finalizing(drc->index); spapr_drc_release(drc); } =20 @@ -247,8 +246,7 @@ static uint32_t drc_set_unusable(SpaprDrc *drc) =20 drc->state =3D SPAPR_DRC_STATE_LOGICAL_UNUSABLE; if (drc->unplug_requested) { - uint32_t drc_index =3D spapr_drc_index(drc); - trace_spapr_drc_set_allocation_state_finalizing(drc_index); + trace_spapr_drc_set_allocation_state_finalizing(drc->index); spapr_drc_release(drc); } =20 @@ -390,7 +388,7 @@ static void prop_get_fdt(Object *obj, Visitor *v, const= char *name, =20 void spapr_drc_attach(SpaprDrc *drc, DeviceState *d) { - trace_spapr_drc_attach(spapr_drc_index(drc)); + trace_spapr_drc_attach(drc->index); =20 g_assert(!drc->dev); g_assert((drc->state =3D=3D SPAPR_DRC_STATE_LOGICAL_UNUSABLE) @@ -408,14 +406,14 @@ void spapr_drc_unplug_request(SpaprDrc *drc) { SpaprDrcClass *drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); =20 - trace_spapr_drc_unplug_request(spapr_drc_index(drc)); + trace_spapr_drc_unplug_request(drc->index); =20 g_assert(drc->dev); =20 drc->unplug_requested =3D true; =20 if (drc->state !=3D drck->empty_state) { - trace_spapr_drc_awaiting_quiesce(spapr_drc_index(drc)); + trace_spapr_drc_awaiting_quiesce(drc->index); return; } =20 @@ -427,7 +425,7 @@ bool spapr_drc_reset(SpaprDrc *drc) SpaprDrcClass *drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); bool unplug_completed =3D false; =20 - trace_spapr_drc_reset(spapr_drc_index(drc)); + trace_spapr_drc_reset(drc->index); =20 /* immediately upon reset we can safely assume DRCs whose devices * are pending removal can be safely removed. @@ -515,7 +513,7 @@ static void drc_realize(DeviceState *d, Error **errp) Object *root_container; const char *child_name; =20 - trace_spapr_drc_realize(spapr_drc_index(drc)); + trace_spapr_drc_realize(drc->index); /* NOTE: we do this as part of realize/unrealize due to the fact * that the guest will communicate with the DRC via RTAS calls * referencing the global DRC index. By unlinking the DRC @@ -525,12 +523,12 @@ static void drc_realize(DeviceState *d, Error **errp) */ root_container =3D container_get(object_get_root(), DRC_CONTAINER_PATH= ); child_name =3D object_get_canonical_path_component(OBJECT(drc)); - trace_spapr_drc_realize_child(spapr_drc_index(drc), child_name); + trace_spapr_drc_realize_child(drc->index, child_name); object_property_add_alias(root_container, link_name, drc->owner, child_name); vmstate_register(VMSTATE_IF(drc), spapr_drc_index(drc), &vmstate_spapr= _drc, drc); - trace_spapr_drc_realize_complete(spapr_drc_index(drc)); + trace_spapr_drc_realize_complete(drc->index); } =20 static void drc_unrealize(DeviceState *d) @@ -539,7 +537,7 @@ static void drc_unrealize(DeviceState *d) g_autofree gchar *name =3D g_strdup_printf("%x", spapr_drc_index(drc)); Object *root_container; =20 - trace_spapr_drc_unrealize(spapr_drc_index(drc)); + trace_spapr_drc_unrealize(drc->index); vmstate_unregister(VMSTATE_IF(drc), &vmstate_spapr_drc, drc); root_container =3D container_get(object_get_root(), DRC_CONTAINER_PATH= ); object_property_del(root_container, name); @@ -986,7 +984,7 @@ static uint32_t rtas_set_isolation_state(uint32_t idx, = uint32_t state) return RTAS_OUT_NO_SUCH_INDICATOR; } =20 - trace_spapr_drc_set_isolation_state(spapr_drc_index(drc), state); + trace_spapr_drc_set_isolation_state(drc->index, state); =20 drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); =20 @@ -1010,7 +1008,7 @@ static uint32_t rtas_set_allocation_state(uint32_t id= x, uint32_t state) return RTAS_OUT_NO_SUCH_INDICATOR; } =20 - trace_spapr_drc_set_allocation_state(spapr_drc_index(drc), state); + trace_spapr_drc_set_allocation_state(drc->index, state); =20 switch (state) { case SPAPR_DR_ALLOCATION_STATE_USABLE: @@ -1232,10 +1230,8 @@ static void rtas_ibm_configure_connector(PowerPCCPU = *cpu, case FDT_END_NODE: drc->ccs_depth--; if (drc->ccs_depth =3D=3D 0) { - uint32_t drc_index =3D spapr_drc_index(drc); - /* done sending the device tree, move to configured state = */ - trace_spapr_drc_set_configured(drc_index); + trace_spapr_drc_set_configured(drc->index); drc->state =3D drck->ready_state; /* * Ensure that we are able to send the FDT fragment --=20 2.35.1 From nobody Sun Feb 8 04:23:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647625556976895.2678715118443; Fri, 18 Mar 2022 10:45:56 -0700 (PDT) Received: from localhost ([::1]:56710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVGfi-0000JW-Sv for importer@patchew.org; Fri, 18 Mar 2022 13:45:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVGTs-0004bi-DY; Fri, 18 Mar 2022 13:33:41 -0400 Received: from [2607:f8b0:4864:20::330] (port=45960 helo=mail-ot1-x330.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVGTq-0002Ay-Ua; Fri, 18 Mar 2022 13:33:40 -0400 Received: by mail-ot1-x330.google.com with SMTP id g6-20020a9d6486000000b005acf9a0b644so5987948otl.12; Fri, 18 Mar 2022 10:33:38 -0700 (PDT) Received: from rekt.ibmmodules.com ([2804:431:c7c6:daa8:d948:1d15:1451:398f]) by smtp.gmail.com with ESMTPSA id d2-20020a05683025c200b005c93d78e1f6sm4324662otu.29.2022.03.18.10.33.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 10:33:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/zSkqJudAShGrnJ6MfxVuMIYXjQTFUxnVA7QMwg6Xn8=; b=HHhNGzDoItx/P680vam4NNvYZhF+7oFY5FFrxq5oarIgeXsalJH7WVSUvjgHLAVXhC vrKOaAIWqb3orm8dETl82SgcIgtE94+wB4XkxfhjrEvjJcj6yG8F5t/l40ACHncA9rU4 l7hv5fcwZ6qSs0SaOkqMJ3qHcTrhmiWY8aTsJQw1xXGIqyT11xly/LnGJlzg7944sYxP 4+upBRFucqDD2aNg+H9mERAsnMIsNodenErkz9bGGlmNvxu07oSdVqovN1mXwXlBwMJ9 IQpqAMv7mMo0eIN2kqdbx5dsmC1Oo2gEyfcS8IL2IayvFwiIWkrr8+QAr3Uki1xzRjMk SCYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/zSkqJudAShGrnJ6MfxVuMIYXjQTFUxnVA7QMwg6Xn8=; b=CNhxS98YQYz8cwQA+tqDBJGnXAqazYoYoPmYqT+1x1A3PcW4EQBPVxCtuDoDSc603W NdOIcY9uJbFB2x5qzl8/6qdNXnmdO/cKYHnLZuV3scj1cBMyf8f3cFPB4tei2XDFP0dK ywHYcU+DhewPfsMLB75uyry/+UrJfijpX4euFuska6mWjezpRY1aY2+s88zdCP5TmwYQ PMSXK+/yeskHxKdzIveI6tyDV/kCkbeIvoLu1D6Yyg+sfjwQQG5V2oLhc+BD1Na2XnoZ VX429/7sVPv+muTeIXiHLTpV/jUtpXyk4EqzqNcXyAvuTBuhZtBDLlvdWogkayCsWmvu QpxA== X-Gm-Message-State: AOAM532FX/nmio/I4JPC6WM8oIfoLYXMUxtDazsnHig4OdxW8xsmyYVX doM5KAFR4fMSQywaSgWWJxZnAUutHcw= X-Google-Smtp-Source: ABdhPJyGgD/jRXus0w8kAAQuDz5z3th7F/4b71emdCf5t3Z4TOBF6QN2KY8/lTmnGqa3NP0DOHGLbA== X-Received: by 2002:a05:6830:905:b0:5c9:35c1:2351 with SMTP id v5-20020a056830090500b005c935c12351mr3684023ott.358.1647624817491; Fri, 18 Mar 2022 10:33:37 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH for-7.1 4/9] hw/ppc/spapr_drc.c: use drc->index Date: Fri, 18 Mar 2022 14:33:15 -0300 Message-Id: <20220318173320.320541-5-danielhb413@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220318173320.320541-1-danielhb413@gmail.com> References: <20220318173320.320541-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::330 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::330; envelope-from=danielhb413@gmail.com; helo=mail-ot1-x330.google.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Henrique Barboza , qemu-ppc@nongnu.org, clg@kaod.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1647625557919100001 Content-Type: text/plain; charset="utf-8" After this patch, the only place where spapr_drc_index() is still being used in this file is in the drc->index initialization. We can't get rid of spapr_drc_index() yet because of external callers. We'll handle them next. Signed-off-by: Daniel Henrique Barboza --- hw/ppc/spapr_drc.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 1d751fe9cc..11a49620c8 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -509,7 +509,7 @@ static const VMStateDescription vmstate_spapr_drc =3D { static void drc_realize(DeviceState *d, Error **errp) { SpaprDrc *drc =3D SPAPR_DR_CONNECTOR(d); - g_autofree gchar *link_name =3D g_strdup_printf("%x", spapr_drc_index(= drc)); + g_autofree gchar *link_name =3D g_strdup_printf("%x", drc->index); Object *root_container; const char *child_name; =20 @@ -526,15 +526,14 @@ static void drc_realize(DeviceState *d, Error **errp) trace_spapr_drc_realize_child(drc->index, child_name); object_property_add_alias(root_container, link_name, drc->owner, child_name); - vmstate_register(VMSTATE_IF(drc), spapr_drc_index(drc), &vmstate_spapr= _drc, - drc); + vmstate_register(VMSTATE_IF(drc), drc->index, &vmstate_spapr_drc, drc); trace_spapr_drc_realize_complete(drc->index); } =20 static void drc_unrealize(DeviceState *d) { SpaprDrc *drc =3D SPAPR_DR_CONNECTOR(d); - g_autofree gchar *name =3D g_strdup_printf("%x", spapr_drc_index(drc)); + g_autofree gchar *name =3D g_strdup_printf("%x", drc->index); Object *root_container; =20 trace_spapr_drc_unrealize(drc->index); @@ -552,8 +551,7 @@ SpaprDrc *spapr_dr_connector_new(Object *owner, const c= har *type, drc->id =3D id; drc->owner =3D owner; drc->index =3D spapr_drc_index(drc); - prop_name =3D g_strdup_printf("dr-connector[%"PRIu32"]", - spapr_drc_index(drc)); + prop_name =3D g_strdup_printf("dr-connector[%"PRIu32"]", drc->index); object_property_add_child(owner, prop_name, OBJECT(drc)); object_unref(OBJECT(drc)); qdev_realize(DEVICE(drc), NULL, NULL); @@ -633,8 +631,7 @@ static void realize_physical(DeviceState *d, Error **er= rp) return; } =20 - vmstate_register(VMSTATE_IF(drcp), - spapr_drc_index(SPAPR_DR_CONNECTOR(drcp)), + vmstate_register(VMSTATE_IF(drcp), SPAPR_DR_CONNECTOR(drcp)->index, &vmstate_spapr_drc_physical, drcp); qemu_register_reset(drc_physical_reset, drcp); } @@ -883,7 +880,7 @@ int spapr_dt_drc(void *fdt, int offset, Object *owner, = uint32_t drc_type_mask) drc_count++; =20 /* ibm,drc-indexes */ - drc_index =3D cpu_to_be32(spapr_drc_index(drc)); + drc_index =3D cpu_to_be32(drc->index); g_array_append_val(drc_indexes, drc_index); =20 /* ibm,drc-power-domains */ --=20 2.35.1 From nobody Sun Feb 8 04:23:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647625731650680.4733715595661; Fri, 18 Mar 2022 10:48:51 -0700 (PDT) Received: from localhost ([::1]:60902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVGiY-0003vt-EG for importer@patchew.org; Fri, 18 Mar 2022 13:48:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVGTu-0004dA-AQ; Fri, 18 Mar 2022 13:33:43 -0400 Received: from [2607:f8b0:4864:20::22c] (port=37401 helo=mail-oi1-x22c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVGTs-0002BK-Qc; Fri, 18 Mar 2022 13:33:42 -0400 Received: by mail-oi1-x22c.google.com with SMTP id q129so7471992oif.4; Fri, 18 Mar 2022 10:33:40 -0700 (PDT) Received: from rekt.ibmmodules.com ([2804:431:c7c6:daa8:d948:1d15:1451:398f]) by smtp.gmail.com with ESMTPSA id d2-20020a05683025c200b005c93d78e1f6sm4324662otu.29.2022.03.18.10.33.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 10:33:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XCEnkdrJV8hdZcD8pw6LWVdLrXvE4UKd1LTtyFJHg7k=; b=AIprN1mUuFya2fEzSQXUwNX9JdnrtVI0gcjVE9WOy+v60lD7jf2Ir0lZU87n/XDZVw 52SBVxv05rsGVLniN+ghLyd30fEFfgmPwMZR/6PhGIDxyEvr8W7uNdQYK4jKxpPp3FTC h8zFrJ21PT9CUqv0qBjcTYAIu4dDh3D1iLlE+VOHN2F53wTGENUPfXtV6HzH/niVE7e4 0SpJHMKrEEjNu1HdgGUvJU+oAz/PUlOeTnSAwcafPyeFdG87i6uBaFn8hnqMqLNZ3ZY8 ZeyscsPtS4d6y9FK/2Dbg37w6XCJn7YFyrNDePgqqwZalNaxp7tQTuw+t6BZp30P6cj3 KG4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XCEnkdrJV8hdZcD8pw6LWVdLrXvE4UKd1LTtyFJHg7k=; b=XYHNiyBl/pDI/LTJmDNC7X66BVXd7d1YrviYl20Lmvf8/BKpxaAwe4wYx0CzPCE8h+ lh3FhApbUdMsKlsWaorSAvEdn+Miu/0hwpgqerBniV24TjkddiAIv+J8v2fkYp60hEED 5dsNVtlAK/1p1ijBs1kiD5EnNk4SOo3yn3GzDVpNupDY9BdR3+ky5qzz3ECcsMMDSLMv ErQSUazziqYZbBZOsLTh6nvEs6hW8q8zSIU277Hvc/baxupjhPY8pw9fViSIFpervRS1 QFdibiMPADwfyGOmHmCk3OennNNxUdajbWAe7ugRGnT3bnucwGj3bsWcbLjV+Du6hno9 p3zA== X-Gm-Message-State: AOAM531Sgfe7bf9Jot7//PS8m7KnR61BQf3/ZMh4Er6bfNhrG15f4w64 7WnQDuDOKkqMiqo1V0WMckBqoo/rGLc= X-Google-Smtp-Source: ABdhPJxdLbx6VQSwy0VF9N7kk0gmUtXrBP/PIyv0BaiwGmdKKKKi90pAF2649GCyBn/pxTbaQ9TuLw== X-Received: by 2002:a05:6808:1a10:b0:2da:5a40:36f0 with SMTP id bk16-20020a0568081a1000b002da5a4036f0mr8314998oib.41.1647624819495; Fri, 18 Mar 2022 10:33:39 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH for-7.1 5/9] hw/ppc/spapr.c: use drc->index Date: Fri, 18 Mar 2022 14:33:16 -0300 Message-Id: <20220318173320.320541-6-danielhb413@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220318173320.320541-1-danielhb413@gmail.com> References: <20220318173320.320541-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::22c (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::22c; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x22c.google.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Henrique Barboza , qemu-ppc@nongnu.org, clg@kaod.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1647625733163100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza --- hw/ppc/spapr.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 953fc65fa8..6aab04787d 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -419,7 +419,7 @@ static int spapr_dt_dynamic_memory_v2(SpaprMachineState= *spapr, void *fdt, drc =3D spapr_drc_by_id(TYPE_SPAPR_DRC_LMB, cur_addr / lmb_siz= e); g_assert(drc); elem =3D spapr_get_drconf_cell((addr - cur_addr) / lmb_size, - cur_addr, spapr_drc_index(drc), -= 1, 0); + cur_addr, drc->index, -1, 0); QSIMPLEQ_INSERT_TAIL(&drconf_queue, elem, entry); nr_entries++; } @@ -428,7 +428,7 @@ static int spapr_dt_dynamic_memory_v2(SpaprMachineState= *spapr, void *fdt, drc =3D spapr_drc_by_id(TYPE_SPAPR_DRC_LMB, addr / lmb_size); g_assert(drc); elem =3D spapr_get_drconf_cell(size / lmb_size, addr, - spapr_drc_index(drc), node, + drc->index, node, (SPAPR_LMB_FLAGS_ASSIGNED | SPAPR_LMB_FLAGS_HOTREMOVABLE)); QSIMPLEQ_INSERT_TAIL(&drconf_queue, elem, entry); @@ -441,7 +441,7 @@ static int spapr_dt_dynamic_memory_v2(SpaprMachineState= *spapr, void *fdt, drc =3D spapr_drc_by_id(TYPE_SPAPR_DRC_LMB, cur_addr / lmb_size); g_assert(drc); elem =3D spapr_get_drconf_cell((mem_end - cur_addr) / lmb_size, - cur_addr, spapr_drc_index(drc), -1, 0= ); + cur_addr, drc->index, -1, 0); QSIMPLEQ_INSERT_TAIL(&drconf_queue, elem, entry); nr_entries++; } @@ -497,7 +497,7 @@ static int spapr_dt_dynamic_memory(SpaprMachineState *s= papr, void *fdt, =20 dynamic_memory[0] =3D cpu_to_be32(addr >> 32); dynamic_memory[1] =3D cpu_to_be32(addr & 0xffffffff); - dynamic_memory[2] =3D cpu_to_be32(spapr_drc_index(drc)); + dynamic_memory[2] =3D cpu_to_be32(drc->index); dynamic_memory[3] =3D cpu_to_be32(0); /* reserved */ dynamic_memory[4] =3D cpu_to_be32(spapr_pc_dimm_node(dimms, ad= dr)); if (memory_region_present(get_system_memory(), addr)) { @@ -663,14 +663,12 @@ static void spapr_dt_cpu(CPUState *cs, void *fdt, int= offset, uint32_t pft_size_prop[] =3D {0, cpu_to_be32(spapr->htab_shift)}; int compat_smt =3D MIN(smp_threads, ppc_compat_max_vthreads(cpu)); SpaprDrc *drc; - int drc_index; uint32_t radix_AP_encodings[PPC_PAGE_SIZES_MAX_SZ]; int i; =20 drc =3D spapr_drc_by_id(TYPE_SPAPR_DRC_CPU, index); if (drc) { - drc_index =3D spapr_drc_index(drc); - _FDT((fdt_setprop_cell(fdt, offset, "ibm,my-drc-index", drc_index)= )); + _FDT((fdt_setprop_cell(fdt, offset, "ibm,my-drc-index", drc->index= ))); } =20 _FDT((fdt_setprop_cell(fdt, offset, "reg", index))); @@ -3448,7 +3446,7 @@ int spapr_lmb_dt_populate(SpaprDrc *drc, SpaprMachine= State *spapr, uint64_t addr; uint32_t node; =20 - addr =3D spapr_drc_index(drc) * SPAPR_MEMORY_BLOCK_SIZE; + addr =3D drc->index * SPAPR_MEMORY_BLOCK_SIZE; node =3D object_property_get_uint(OBJECT(drc->dev), PC_DIMM_NODE_PROP, &error_abort); *fdt_start_offset =3D spapr_dt_memory_node(spapr, fdt, node, addr, @@ -3491,7 +3489,7 @@ static void spapr_add_lmbs(DeviceState *dev, uint64_t= addr_start, uint64_t size, g_assert(drc); spapr_hotplug_req_add_by_count_indexed(SPAPR_DR_CONNECTOR_TYPE= _LMB, nr_lmbs, - spapr_drc_index(drc)); + drc->index); } else { spapr_hotplug_req_add_by_count(SPAPR_DR_CONNECTOR_TYPE_LMB, nr_lmbs); @@ -3791,7 +3789,7 @@ static void spapr_memory_unplug_request(HotplugHandle= r *hotplug_dev, drc =3D spapr_drc_by_id(TYPE_SPAPR_DRC_LMB, addr_start / SPAPR_MEMORY_BLOCK_SIZE); spapr_hotplug_req_remove_by_count_indexed(SPAPR_DR_CONNECTOR_TYPE_LMB, - nr_lmbs, spapr_drc_index(drc= )); + nr_lmbs, drc->index); } =20 /* Callback to be called during DRC release. */ --=20 2.35.1 From nobody Sun Feb 8 04:23:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647626011293566.7571585436805; Fri, 18 Mar 2022 10:53:31 -0700 (PDT) Received: from localhost ([::1]:39970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVGn4-0000bN-9P for importer@patchew.org; Fri, 18 Mar 2022 13:53:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVGTx-0004fW-RT; Fri, 18 Mar 2022 13:33:47 -0400 Received: from [2607:f8b0:4864:20::330] (port=34775 helo=mail-ot1-x330.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVGTw-0002Bb-H4; Fri, 18 Mar 2022 13:33:45 -0400 Received: by mail-ot1-x330.google.com with SMTP id d15-20020a05683018ef00b005b2304fdeecso6017510otf.1; Fri, 18 Mar 2022 10:33:43 -0700 (PDT) Received: from rekt.ibmmodules.com ([2804:431:c7c6:daa8:d948:1d15:1451:398f]) by smtp.gmail.com with ESMTPSA id d2-20020a05683025c200b005c93d78e1f6sm4324662otu.29.2022.03.18.10.33.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 10:33:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EbL8lofNnOCjN+HkifQAQb7v8T80tAELaV+tNf2GBzM=; b=P/leGutps3L9n5qxHYHi8wGVL6KdFxgJFkGXIfp8i5bE1J9R3L/Uf7ywUfkToMDNeR cjRmna8klUXQF/w9ovs+03hp0iCcl70oA4dBEoaiALhghtl9+qh/EKBL+/R6HRxBuCMn Ccp8wem5ysOCK7PXlzo9ptVWxn405WbdRAl9Mf8p3CXlZJbkgxMXYdm/ADBOpNfHQAd7 HvnU8F3TA2BiaTYH3N9bzqzbelzbmJZWG6LGJ1cqRxfkxgMXA7PaulO/Zdn6oMu2JBSK osJIwg/59gR9n8KcIKVHxtM7JxoleRY4bilkKZHMZuJbIDuBLIm1aPjoAepkiXlGdWNN Up5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EbL8lofNnOCjN+HkifQAQb7v8T80tAELaV+tNf2GBzM=; b=3D6gJF5tE3cEBUCyVDuasxojm3CceWzpWmMpQE4tznSdlRImOTj2LTZ0Fl60ctPMsh Wih4ZxUAki0G+i9GhIgPRBfX/y9cP4K7BCHaOfTcodSEHf0+cAhq5U8DN3A5NWV4xHr5 yFa6J0wHyr8C+7RSO732koj6efY55F5rw//cXMUlhIUJ6Rd3wa4Ou5nHegAhsJPURwTk 6JKeaQvyEHG+NpwHAzhTcNrIPEVJ5pHgOA9IaDu2wj0mB9tSTQx8VcyMICD2T+Hx13Gi /5c1dCVVsDHijVeLSIqDT3+mmZfojCXKjloYN/VTZ0jYND/p8qsk2p8t3iM9BtKa3d6b HIyQ== X-Gm-Message-State: AOAM5333YvgSc/PiGFbGbY4KImQ1j98ucymZcct8WPCsGAsuE2iTjnDX RoqFBXF/7gfreximGvKpyg3+zQN9UvI= X-Google-Smtp-Source: ABdhPJwQeY02wRDVIjy2SCF945BFPypR5UWeCygOgc5BNqv+woXadu13pPJDDh7V6DVzoTO6p04W8A== X-Received: by 2002:a05:6830:2099:b0:5c9:4715:2c80 with SMTP id y25-20020a056830209900b005c947152c80mr3835766otq.244.1647624821634; Fri, 18 Mar 2022 10:33:41 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH for-7.1 6/9] hw/ppc/spapr_events.c: use drc->index Date: Fri, 18 Mar 2022 14:33:17 -0300 Message-Id: <20220318173320.320541-7-danielhb413@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220318173320.320541-1-danielhb413@gmail.com> References: <20220318173320.320541-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::330 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::330; envelope-from=danielhb413@gmail.com; helo=mail-ot1-x330.google.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Henrique Barboza , qemu-ppc@nongnu.org, clg@kaod.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1647626013013100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza --- hw/ppc/spapr_events.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index 630e86282c..d41f4e47c0 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -675,7 +675,7 @@ void spapr_hotplug_req_add_by_index(SpaprDrc *drc) SpaprDrcType drc_type =3D spapr_drc_type(drc); union drc_identifier drc_id; =20 - drc_id.index =3D spapr_drc_index(drc); + drc_id.index =3D drc->index; spapr_hotplug_req_event(RTAS_LOG_V6_HP_ID_DRC_INDEX, RTAS_LOG_V6_HP_ACTION_ADD, drc_type, &drc_id); } @@ -685,7 +685,7 @@ void spapr_hotplug_req_remove_by_index(SpaprDrc *drc) SpaprDrcType drc_type =3D spapr_drc_type(drc); union drc_identifier drc_id; =20 - drc_id.index =3D spapr_drc_index(drc); + drc_id.index =3D drc->index; spapr_hotplug_req_event(RTAS_LOG_V6_HP_ID_DRC_INDEX, RTAS_LOG_V6_HP_ACTION_REMOVE, drc_type, &drc_i= d); } --=20 2.35.1 From nobody Sun Feb 8 04:23:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647625281090516.5990323084259; Fri, 18 Mar 2022 10:41:21 -0700 (PDT) Received: from localhost ([::1]:51690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVGbH-0004uj-Hv for importer@patchew.org; Fri, 18 Mar 2022 13:41:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVGTy-0004fj-FJ; Fri, 18 Mar 2022 13:33:47 -0400 Received: from [2607:f8b0:4864:20::229] (port=40873 helo=mail-oi1-x229.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVGTx-0002Bh-21; Fri, 18 Mar 2022 13:33:46 -0400 Received: by mail-oi1-x229.google.com with SMTP id o64so9480234oib.7; Fri, 18 Mar 2022 10:33:44 -0700 (PDT) Received: from rekt.ibmmodules.com ([2804:431:c7c6:daa8:d948:1d15:1451:398f]) by smtp.gmail.com with ESMTPSA id d2-20020a05683025c200b005c93d78e1f6sm4324662otu.29.2022.03.18.10.33.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 10:33:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M+8fcL1dInKUgC2JVqFgjFIbgNVK0mYXJ7UOW5IVgkc=; b=QMDYYOwOcXtyPs5KB1QRTnD52aiAHKPvsRY76Jmb6Rggcjxzlr0qua7g33zgE0Jprb ZUB+jxkIR1N7UHdG3l2JNj8Hq34jtCu2+B4zYi5RS9f0YXCDBDOtTNpRJioZzuuril3Z 5NCBCdn9L3cDFbDl70g1AskDVo49Z8TKP3qiRSmS03y8nL8aiCqRCZQfVBMovs1DL3/z UxVVIFEFLbddOWqZCBzIl6IwH79H7r0WQ3+PLl8xBr84nkhCK2PARLx6U6Wgko759zzO uuEhCqDrgQUAT8TbPoHQHlFbuY35YYLhoaCYpHZyheFhMwX9HpbSqlmuc0YIt7JGzWzE G2aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M+8fcL1dInKUgC2JVqFgjFIbgNVK0mYXJ7UOW5IVgkc=; b=klOPoXLU55f2HUD2k9KPibSo8nlfPB/FGKmCfA5EmtH9QuO6d0cggbjqUh2DZE7Zuf mVfOPUTpXk4X3isEmirOYVVSh9wd/bJdZAUULZpGaF1bl8bk1YYMFw56iRBZvIqniBS5 R/TrDhuq31k88waKKV0DemvqbtTTCxFvOgnkwvAjbghAi76UswJXYciRo+TxrIQm7dPZ TKU7/eAr/GNkAS41XWiIwRdevNTi0jyUeh9b0KXBhKvcNoOauUYaEKZj1ToJ3zSc2LHc W0/9/qohhwdOM8dBsXroTYx5grGRg5DujmDj4tgiMEI2ikR+ySd+ZidF5HKob0tE6QXx mTew== X-Gm-Message-State: AOAM531Ghe6JXhG5YMNr5DCRcpQYNHXlMatJU2IlsYAJmrhFMM3150fg FZXOLrfbw72cQP3gP6WTsT6I3pelb8M= X-Google-Smtp-Source: ABdhPJx6MLLM6+5xrrW327g0ofogC015S1n+fEVTFiFaUouVxu03syPTiSelwKKFhs2Q4qnQrbJ8XA== X-Received: by 2002:aca:f185:0:b0:2ef:1fa6:3dca with SMTP id p127-20020acaf185000000b002ef1fa63dcamr3119279oih.140.1647624823766; Fri, 18 Mar 2022 10:33:43 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH for-7.1 7/9] hw/ppc/spapr_nvdimm.c: use drc->index Date: Fri, 18 Mar 2022 14:33:18 -0300 Message-Id: <20220318173320.320541-8-danielhb413@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220318173320.320541-1-danielhb413@gmail.com> References: <20220318173320.320541-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::229 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::229; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x229.google.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Henrique Barboza , qemu-ppc@nongnu.org, clg@kaod.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1647625282565100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza --- hw/ppc/spapr_nvdimm.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/ppc/spapr_nvdimm.c b/hw/ppc/spapr_nvdimm.c index c4c97da5de..5acb761220 100644 --- a/hw/ppc/spapr_nvdimm.c +++ b/hw/ppc/spapr_nvdimm.c @@ -145,7 +145,6 @@ static int spapr_dt_nvdimm(SpaprMachineState *spapr, vo= id *fdt, int child_offset; char *buf; SpaprDrc *drc; - uint32_t drc_idx; uint32_t node =3D object_property_get_uint(OBJECT(nvdimm), PC_DIMM_NOD= E_PROP, &error_abort); uint64_t slot =3D object_property_get_uint(OBJECT(nvdimm), PC_DIMM_SLO= T_PROP, @@ -157,15 +156,13 @@ static int spapr_dt_nvdimm(SpaprMachineState *spapr, = void *fdt, drc =3D spapr_drc_by_id(TYPE_SPAPR_DRC_PMEM, slot); g_assert(drc); =20 - drc_idx =3D spapr_drc_index(drc); - - buf =3D g_strdup_printf("ibm,pmemory@%x", drc_idx); + buf =3D g_strdup_printf("ibm,pmemory@%x", drc->index); child_offset =3D fdt_add_subnode(fdt, parent_offset, buf); g_free(buf); =20 _FDT(child_offset); =20 - _FDT((fdt_setprop_cell(fdt, child_offset, "reg", drc_idx))); + _FDT((fdt_setprop_cell(fdt, child_offset, "reg", drc->index))); _FDT((fdt_setprop_string(fdt, child_offset, "compatible", "ibm,pmemory= "))); _FDT((fdt_setprop_string(fdt, child_offset, "device_type", "ibm,pmemor= y"))); =20 @@ -175,7 +172,8 @@ static int spapr_dt_nvdimm(SpaprMachineState *spapr, vo= id *fdt, _FDT((fdt_setprop_string(fdt, child_offset, "ibm,unit-guid", buf))); g_free(buf); =20 - _FDT((fdt_setprop_cell(fdt, child_offset, "ibm,my-drc-index", drc_idx)= )); + _FDT((fdt_setprop_cell(fdt, child_offset, "ibm,my-drc-index", + drc->index))); =20 _FDT((fdt_setprop_u64(fdt, child_offset, "ibm,block-size", SPAPR_MINIMUM_SCM_BLOCK_SIZE))); --=20 2.35.1 From nobody Sun Feb 8 04:23:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647625700403639.82125954006; Fri, 18 Mar 2022 10:48:20 -0700 (PDT) Received: from localhost ([::1]:60348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVGi2-0003Yc-Rl for importer@patchew.org; Fri, 18 Mar 2022 13:48:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVGU0-0004h3-H6; Fri, 18 Mar 2022 13:33:49 -0400 Received: from [2607:f8b0:4864:20::22b] (port=37401 helo=mail-oi1-x22b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVGTz-0002Bz-3i; Fri, 18 Mar 2022 13:33:48 -0400 Received: by mail-oi1-x22b.google.com with SMTP id q129so7472313oif.4; Fri, 18 Mar 2022 10:33:46 -0700 (PDT) Received: from rekt.ibmmodules.com ([2804:431:c7c6:daa8:d948:1d15:1451:398f]) by smtp.gmail.com with ESMTPSA id d2-20020a05683025c200b005c93d78e1f6sm4324662otu.29.2022.03.18.10.33.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 10:33:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yVb5c++t288vr7BV98pG2n6JbwWwcLnK2P7v8qIUDaY=; b=j9aJgLbW9f+P4gMXd2XQby2giIqAcgsZXXGJhapLeoOfZYiXcfrQ6+sE8psax5cnoT /260QnQnFSA/o6ftZ5iyxxhnY58aFJxMta2cvorztAM+Z0OTt4WRQWYkE2rnewTdUUhc 0NzA31vHNKG6uw64qGnHHodotevboaQjOaYA/r43LcTVUA6p0ucXcb+4PxmT7hSaN3YI 45oXq1FQlsJtSMt/pH6KRCUnsYVc5qH4WRhC0qZwJDHS9oo3HoDW0QZ0zGlS1pfK6y7q nFutg3JBN7n8rYYuTvBaTzXF2RA3wsGHRfpb4oL6QxlYiWD6dLWOi8oQq7miOsCzlwiN FqTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yVb5c++t288vr7BV98pG2n6JbwWwcLnK2P7v8qIUDaY=; b=dz+/xPrG8971dQlCSR6sBlLhDYhFh3JCV4+iJtZZJ6IOX0m/gliHbEH/+TiAj3AelQ FxMAkW161wC5ghVPGvywnLMp96z86jMpy3eUp4vYXCz7KaW5SBG6tqde/CIYyU/SULF9 tTHNM3/m/UtQTTScHYcjYvTK2ldpOrXr9ajljRfI+auvRBni09UF4c3GE1xGdKv7DqlO Nck311wZo+rdpyfO7mI0v8ooOvMpWqrcQt33wCFUrbI7QODszGuqicF3ZEAO8wVFm9ck Iv5OQnGysbebY0xKfP38byMUKG7+hkwBUHcbaw1Ze2QQfNNJA+JBIYw0g25u8MR/x7ZI tnvA== X-Gm-Message-State: AOAM532LaMh2IzaNk92RJU4bfMWh/Ek+vcUAJsU3nSkr3o6f5l7r0TUA L3fsWAxOH+DIGaOUpspMHaoOvo8fNtA= X-Google-Smtp-Source: ABdhPJw0YRE6lxVzks4OoqPlHpGJtPkyvLc+bsco41TiIa2jCV8i2YZrnReL8hAz0erhb72wCWOf4g== X-Received: by 2002:a54:488d:0:b0:2ec:f566:db6c with SMTP id r13-20020a54488d000000b002ecf566db6cmr4766623oic.109.1647624825763; Fri, 18 Mar 2022 10:33:45 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH for-7.1 8/9] hw/ppc/spapr_pci.c: use drc->index Date: Fri, 18 Mar 2022 14:33:19 -0300 Message-Id: <20220318173320.320541-9-danielhb413@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220318173320.320541-1-danielhb413@gmail.com> References: <20220318173320.320541-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::22b (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::22b; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x22b.google.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Henrique Barboza , qemu-ppc@nongnu.org, clg@kaod.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1647625701192100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza --- hw/ppc/spapr_pci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 5bfd4aa9e5..f9338af071 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -1419,8 +1419,7 @@ static int spapr_dt_pci_device(SpaprPhbState *sphb, P= CIDevice *dev, g_free(loc_code); =20 if (drc) { - _FDT(fdt_setprop_cell(fdt, offset, "ibm,my-drc-index", - spapr_drc_index(drc))); + _FDT(fdt_setprop_cell(fdt, offset, "ibm,my-drc-index", drc->index)= ); } =20 if (msi_present(dev)) { @@ -2429,7 +2428,7 @@ int spapr_dt_phb(SpaprMachineState *spapr, SpaprPhbSt= ate *phb, =20 drc =3D spapr_drc_by_id(TYPE_SPAPR_DRC_PHB, phb->index); if (drc) { - uint32_t drc_index =3D cpu_to_be32(spapr_drc_index(drc)); + uint32_t drc_index =3D cpu_to_be32(drc->index); =20 _FDT(fdt_setprop(fdt, bus_off, "ibm,my-drc-index", &drc_index, sizeof(drc_index))); --=20 2.35.1 From nobody Sun Feb 8 04:23:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647625980059789.7831403396035; Fri, 18 Mar 2022 10:53:00 -0700 (PDT) Received: from localhost ([::1]:39146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVGmY-0008Th-Qw for importer@patchew.org; Fri, 18 Mar 2022 13:52:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49730) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVGU3-0004ii-A9; Fri, 18 Mar 2022 13:33:51 -0400 Received: from [2607:f8b0:4864:20::333] (port=34779 helo=mail-ot1-x333.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVGU1-0002CE-3J; Fri, 18 Mar 2022 13:33:50 -0400 Received: by mail-ot1-x333.google.com with SMTP id d15-20020a05683018ef00b005b2304fdeecso6017683otf.1; Fri, 18 Mar 2022 10:33:48 -0700 (PDT) Received: from rekt.ibmmodules.com ([2804:431:c7c6:daa8:d948:1d15:1451:398f]) by smtp.gmail.com with ESMTPSA id d2-20020a05683025c200b005c93d78e1f6sm4324662otu.29.2022.03.18.10.33.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 10:33:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4D2wEpyeuKiVeib0JY059TwLtfK5N95kWu6UXkH8AGI=; b=Hi5BlDilLLlosC5fiNbxf3nOTNqVL3Fxb7FESCDRaqMz/JNqYkEMB9ar4OAbFtJKIv 6AJNahpNm4+L6Sl8Mxs4vK/79FPKhltRJqEVdH1yeUoo8cx1bb7t0QXlJYd+RyUr+znX xCOkfNd0Z+vAZ4fE8rPgUWIc93qcftqJfsv2RX6O6Tz+LjFhqzP/RkpSPCQIIU34wJ9x lLR29YOIIHYOZJFB4ldedYgRRspBXcLgR3cpuSOh05QzSi9Tk53Ss5fBaNtbSgSWs514 pkkqr6ydTnH2RbTXTGkXV3yelvgfyTEkDFL8jh8U1lixnqSZc8g9mYN3WFZHRFn60sU/ l6Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4D2wEpyeuKiVeib0JY059TwLtfK5N95kWu6UXkH8AGI=; b=H2SDxpCLaQ80wF57kqGWzH0TntxuBwDwzdR7AHozUd/dNuARsrljtSjAqNlVfGH6L1 nguBuX2dHetj4yX5Np4W6qS9bqnkD/0OvATEuaBZ4Nkm/8t+6Tq8wNUfEYTNeJtqr2dz C9rB2YtQAEm+um/2/CWKnXwyHPqmjOHLSp+I4IyMpaVWsK+EflKFE8wwlDfzWxwO0s/D GwsiQUdBeW5eiWfC+rOrtyTiTl/7rmOCADiBxNKfC394+gH+LiBX1OTtledOPhakE2Ec OAyI7I/6TtkzNbBxqfai96hcDTzGWppUyl+zPk/mvYI2/b4/tnk494wyZA2aRqksAPDb SscA== X-Gm-Message-State: AOAM532yXrLOUaPgNNLlZSw17d0de9RZKddCS2t9S4AGDf/n3KYUgqzm lKbIVGqrvZS8U2HQ4s/kJQ7WTigBZ/M= X-Google-Smtp-Source: ABdhPJwJTvurk2LrDwdvWQcUF+Jnye1/3pzEktGaCtMahJT9jT8RBPk3G6EimkqODPYAmvsR3GOeHA== X-Received: by 2002:a05:6830:1e32:b0:5b2:2dcd:653d with SMTP id t18-20020a0568301e3200b005b22dcd653dmr3558508otr.256.1647624827695; Fri, 18 Mar 2022 10:33:47 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH for-7.1 9/9] hw/ppc/spapr_drc.c: remove spapr_drc_index() Date: Fri, 18 Mar 2022 14:33:20 -0300 Message-Id: <20220318173320.320541-10-danielhb413@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220318173320.320541-1-danielhb413@gmail.com> References: <20220318173320.320541-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::333 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::333; envelope-from=danielhb413@gmail.com; helo=mail-ot1-x333.google.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Henrique Barboza , qemu-ppc@nongnu.org, clg@kaod.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1647625981212100001 Content-Type: text/plain; charset="utf-8" The only remaining caller of this function is the initialization of drc->index in spapr_dr_connector_new(). Open code the body of the function inside spapr_dr_connector_new() and remove spapr_drc_index(). Signed-off-by: Daniel Henrique Barboza --- hw/ppc/spapr_drc.c | 23 ++++++++++------------- include/hw/ppc/spapr_drc.h | 1 - 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 11a49620c8..8c8654121c 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -39,18 +39,6 @@ SpaprDrcType spapr_drc_type(SpaprDrc *drc) return 1 << drck->typeshift; } =20 -uint32_t spapr_drc_index(SpaprDrc *drc) -{ - SpaprDrcClass *drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); - - /* no set format for a drc index: it only needs to be globally - * unique. this is how we encode the DRC type on bare-metal - * however, so might as well do that here - */ - return (drck->typeshift << DRC_INDEX_TYPE_SHIFT) - | (drc->id & DRC_INDEX_ID_MASK); -} - static void spapr_drc_release(SpaprDrc *drc) { SpaprDrcClass *drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); @@ -546,11 +534,20 @@ SpaprDrc *spapr_dr_connector_new(Object *owner, const= char *type, uint32_t id) { SpaprDrc *drc =3D SPAPR_DR_CONNECTOR(object_new(type)); + SpaprDrcClass *drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); g_autofree char *prop_name =3D NULL; =20 drc->id =3D id; drc->owner =3D owner; - drc->index =3D spapr_drc_index(drc); + + /* + * No set format for a drc index: it only needs to be globally + * unique. This is how we encode the DRC type on bare-metal + * however, so might as well do that here. + */ + drc->index =3D (drck->typeshift << DRC_INDEX_TYPE_SHIFT) | + (drc->id & DRC_INDEX_ID_MASK); + prop_name =3D g_strdup_printf("dr-connector[%"PRIu32"]", drc->index); object_property_add_child(owner, prop_name, OBJECT(drc)); object_unref(OBJECT(drc)); diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h index 93825e47a6..33cdb3cc20 100644 --- a/include/hw/ppc/spapr_drc.h +++ b/include/hw/ppc/spapr_drc.h @@ -228,7 +228,6 @@ static inline bool spapr_drc_hotplugged(DeviceState *de= v) /* Returns true if an unplug request completed */ bool spapr_drc_reset(SpaprDrc *drc); =20 -uint32_t spapr_drc_index(SpaprDrc *drc); SpaprDrcType spapr_drc_type(SpaprDrc *drc); =20 SpaprDrc *spapr_dr_connector_new(Object *owner, const char *type, --=20 2.35.1