From patchwork Tue May 4 05:53:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 430825 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3517995jao; Mon, 3 May 2021 23:50:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2xHR00vPYCY26HrVBQprVhi0A10wY0tnzz9IjGkEoUw4LNU3Ron9iMu/8J3asJVHp+xIG X-Received: by 2002:a5d:9f01:: with SMTP id q1mr18170515iot.7.1620111053306; Mon, 03 May 2021 23:50:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620111053; cv=none; d=google.com; s=arc-20160816; b=XGjtqi00TqfGE+T9m3NTXGItFJKzHGwaC7omXVXoovkfK4CUBioabcGlh9eW+I5Iyy QJyprIW4XO+xIy3bcyCYG02MteTA45bZOTvg/hkMA7EC3CnJIOPA5/2oum0QYfX3lqcH KHgo0HNA4W0U50rNVwQoGhtSUKxGUlVfWE6NVS9xL4X5W6rgldLkm89GfleOcAuR61VU HOIiQjCVvoCKsL26cAeXis08wXURTGq0XBKl8iYtPvZAPVlqu9jxdYbEIuX6176kSMr1 Q8C39pGII+pXvWu7V6o5BAdIaJZk1h/R0wFIooGdPrQwySsCUJpEP4tb1v/4qhHFOy2X txQw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=S3lGhdJpxpv9I/0RKgdISFV15MYVYDD3RJPIsrexMcE=; b=P6qo0NeVYfU2sqfqwwCsCeUImoNN76ON3XUKGC58fx7MpYi4haH7asR3J/1CWIgSZ5 vJIHKxiK06LkuqQjz6ymUDqpbr+eOhWz4kNCup8QjRkoVTOkmp/x37uUF1IVWxoTcdZM 4sSfQxthRgBVkX+5ZD4Y0Aco1QL/DbRFEBkyTLp+615zVzknunG1HP4HYsRIZRkdZbe7 YltZSNbc07UucCmTd8l/NE4iA6LghMHr96gFLY1uCjjMA4vnIZ+TbVUOBbpGnFIXPdra N7YVfcfPWOAmysPeAWgOxKzqSKR7EffLhDS/34p28L8sILQYkABMopILqAs+HQK1rSB/ KKDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gibson.dropbear.id.au header.s=201602 header.b=hq6T6klW; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y23si1459564iot.95.2021.05.03.23.50.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 May 2021 23:50:53 -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=@gibson.dropbear.id.au header.s=201602 header.b=hq6T6klW; 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" Received: from localhost ([::1]:49576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldotQ-0006Jz-OY for patch@linaro.org; Tue, 04 May 2021 02:50:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldo1N-00077A-Ld; Tue, 04 May 2021 01:55:01 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:55873) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldo1L-0005OK-OX; Tue, 04 May 2021 01:55:01 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4FZ8CQ4zFlz9t1s; Tue, 4 May 2021 15:53:22 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1620107602; bh=y9uyQJXG5pCTAYMMEsFQPkAKFM4i1KQ0n02I0GZk4yE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hq6T6klWkS8oHc0yWEps/9mxyicptvOKUyB3lTR75OYa69RMOoQdoO5vp2tzDApCI /jeiPcICKOtZFTi9K2EjllwX9OrdKPI0uW+7plkTtDY9C7UPw7e02UI2FC1BM6ABEb xQSBrr9DAWkS3M3MATWbSUabQHmCIZ8yCxQZ3hKo= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 46/46] hw/ppc/pnv_psi: Use device_cold_reset() instead of device_legacy_reset() Date: Tue, 4 May 2021 15:53:12 +1000 Message-Id: <20210504055312.306823-47-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210504055312.306823-1-david@gibson.dropbear.id.au> References: <20210504055312.306823-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Received-SPF: pass client-ip=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no 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: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell The pnv_psi.c code uses device_legacy_reset() for two purposes: * to reset itself from its qemu_register_reset() handler * to reset a XiveSource object it has Neither it nor the XiveSource have any qbuses, so the new device_cold_reset() function (which resets both the device and its child buses) is equivalent here to device_legacy_reset() and we can just switch to the new API. Signed-off-by: Peter Maydell Message-Id: <20210503151849.8766-4-peter.maydell@linaro.org> Signed-off-by: David Gibson --- hw/ppc/pnv_psi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.31.1 diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c index 3e868c8c8d..292b373f93 100644 --- a/hw/ppc/pnv_psi.c +++ b/hw/ppc/pnv_psi.c @@ -466,7 +466,7 @@ static void pnv_psi_reset(DeviceState *dev) static void pnv_psi_reset_handler(void *dev) { - device_legacy_reset(DEVICE(dev)); + device_cold_reset(DEVICE(dev)); } static void pnv_psi_realize(DeviceState *dev, Error **errp) @@ -710,7 +710,7 @@ static void pnv_psi_p9_mmio_write(void *opaque, hwaddr addr, break; case PSIHB9_INTERRUPT_CONTROL: if (val & PSIHB9_IRQ_RESET) { - device_legacy_reset(DEVICE(&psi9->source)); + device_cold_reset(DEVICE(&psi9->source)); } psi->regs[reg] = val; break;