From patchwork Wed Aug 11 05:46:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1515581 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) 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=gYH4YEO+; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GkzPX4Sk0z9sWc for ; Wed, 11 Aug 2021 15:48:00 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4GkzPX3JzZz30Qn for ; Wed, 11 Aug 2021 15:48:00 +1000 (AEST) Authentication-Results: lists.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=gYH4YEO+; dkim-atps=neutral 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::1029; helo=mail-pj1-x1029.google.com; envelope-from=npiggin@gmail.com; receiver=) 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=gYH4YEO+; dkim-atps=neutral Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) (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 4GkzNt1yYpz30JP for ; Wed, 11 Aug 2021 15:47:26 +1000 (AEST) Received: by mail-pj1-x1029.google.com with SMTP id hv22-20020a17090ae416b0290178c579e424so2886244pjb.3 for ; Tue, 10 Aug 2021 22:47:26 -0700 (PDT) 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=1W5YwRFpLr7QGeU4yin1RQKjYmQgSRsuto3lg8/9DVY=; b=gYH4YEO+w572HxjSZEj/a+lVGXz2i+ynoA/cE6yccD6lMZkDrqu3qPedpywqQRF7RT 4uQM4JiCsyHFh7qegdDVdPqOc6CPCShpQ0jLEvdKD8BuWgIIY9T0CCoorvlzFcDq0DGz uakXZHA1xphyxWSspg1XWkK/R3BG9XJmXdDJkHZrRE9Js18UcthXDH0dreyC6ggljPla +Pl+FXEUlFrZX7OZ8T059HWxTBXwZTsPYX0fK8KLMtmxQwUktTgWBeNB6Wa15DD7P6Hv lVGh6nzxHjWw6U67RvqPqUfSKoqKw/oGeePEUrZ3clVYS1WE09ybCKXIGLULb94OiOrv 6SeA== 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=1W5YwRFpLr7QGeU4yin1RQKjYmQgSRsuto3lg8/9DVY=; b=joS9lmSEhPSvPUr4zy/wvPzEUfiHyP5JxS+3K1fmWSBHHGlbUMD4OH5iJ/99DkLm6a fuqlYR3FdHFlCCTvY0e9ACCYCFTEajkEVAO4aShvgCJi9MdMwt9MrpCAUmhZxYfSMqPg AOKMuiEU6d8N/7bq0okDh7K4iq/+nmhN5inbOwQ898hX2LngUa6qCIGQdUygxo2/18Or 4HqnXZ+eAmVdkz87ND5iQ/FILnSgzY3uk2ZucZzzBx6NY4YxAg1HF0sfq1CJnO6ywhmw EghQO/Le1xsDXUymywq60Hr66BgLVIJIxlw5HxX9cqUTgg3DShhJqASMnrP7p1KNFf46 b8zA== X-Gm-Message-State: AOAM532K3YWbnBMSFnhmmz2RWmudPP26j6KoCrwsPHGB2J+/1ZeT2y0E eDvGB1+7pGCmUIjlla8pM/UGqpDzyUA= X-Google-Smtp-Source: ABdhPJxwGoJ6QiGhexshdxjV+ZKlxuyYcW/BAuz7Px2STjYcIwo9cFp819k9EsO2KbpXQohtHZFbCg== X-Received: by 2002:a63:542:: with SMTP id 63mr60883pgf.359.1628660843671; Tue, 10 Aug 2021 22:47:23 -0700 (PDT) Received: from bobo.ibm.com ([118.210.97.79]) by smtp.gmail.com with ESMTPSA id fu10sm14248050pjb.8.2021.08.10.22.47.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 22:47:23 -0700 (PDT) From: Nicholas Piggin To: skiboot@lists.ozlabs.org Date: Wed, 11 Aug 2021 15:46:57 +1000 Message-Id: <20210811054701.861123-7-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210811054701.861123-1-npiggin@gmail.com> References: <20210811054701.861123-1-npiggin@gmail.com> MIME-Version: 1.0 Subject: [Skiboot] [PATCH v3 06/10] hwprobe: convert vas_init(), nx_init() 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" From: Stewart Smith [npiggin: remove imc_init because it moved later in boot (fbcbd4e47c)] Signed-off-by: Stewart Smith --- core/init.c | 6 ------ hw/nx.c | 2 ++ hw/vas.c | 2 ++ 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/core/init.c b/core/init.c index 5e2b18d85..0ec5d6ac3 100644 --- a/core/init.c +++ b/core/init.c @@ -1355,12 +1355,6 @@ void __noreturn __nomcount main_cpu_entry(const void *fdt) /* Catalog decompression routine */ imc_decompress_catalog(); - /* Virtual Accelerator Switchboard */ - vas_init(); - - /* NX init */ - nx_init(); - /* Probe all HWPROBE hardware we have code linked for */ probe_hardware(); diff --git a/hw/nx.c b/hw/nx.c index fdadf53c7..b1cab5774 100644 --- a/hw/nx.c +++ b/hw/nx.c @@ -136,3 +136,5 @@ void nx_init(void) if (proc_gen >= proc_gen_p9) darn_init(); } + +DEFINE_HWPROBE_DEPS(nx, nx_init, "vas"); diff --git a/hw/vas.c b/hw/vas.c index 0dbe0bcda..96ca055cc 100644 --- a/hw/vas.c +++ b/hw/vas.c @@ -637,3 +637,5 @@ out: vas_err("Disabled (failed initialization)\n"); return; } + +DEFINE_HWPROBE(vas, vas_init);