From patchwork Fri Dec 17 02:36:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1569693 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=20210112 header.b=AqP6GcxJ; dkim-atps=neutral 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4JFY6s2n4Yz9t2p for ; Fri, 17 Dec 2021 13:37:41 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4JFY6s1C97z3c92 for ; Fri, 17 Dec 2021 13:37:41 +1100 (AEDT) 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=20210112 header.b=AqP6GcxJ; 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::632; helo=mail-pl1-x632.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=20210112 header.b=AqP6GcxJ; dkim-atps=neutral Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) (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 4JFY6J2HDFz3c9G for ; Fri, 17 Dec 2021 13:37:12 +1100 (AEDT) Received: by mail-pl1-x632.google.com with SMTP id m24so599083pls.10 for ; Thu, 16 Dec 2021 18:37:12 -0800 (PST) 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=HH3m1JOsSi2ojHdLVid+kMZn2OQAaqyFjGi0pbnx7/c=; b=AqP6GcxJKf+cCyRM5x7N0w5rYTo/wrfduUKSqTjMkQvePBBmbn/FjFzI8M/dPP1Avo IZxzEUvPIR4V+YJJvRKi95NjRnGy+tsPZzsNxUm/6CLGw8TTAl8UPORO4pwQimvhtiP/ mPXvEmXiAzFOG49m/I8hGcAEwqke0XFwxQTKRAtZeqg+7a8pbCe4SQDW7av293wsLlc2 JmjbjLFX0Fmdg2AVYbQyLe0GKJNpgy9O9SD4rKd9brYQQVI0iEcTi7agUkA0/QwAPfjq Nu/yZLb+ptJKrtFv2movZGIAsLTo8AhGba9/XtvtQGU/9hxI9Qz1kCL9+DawoB4s913M o5cA== 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=HH3m1JOsSi2ojHdLVid+kMZn2OQAaqyFjGi0pbnx7/c=; b=ZMnyZ9wWiN82DY6NVXCQfHkdJdOVQmKRpMUunE2YCVnbIieVIIaHnZ06f5pRDDWG2U 5R1HRGjKjraN3SascnOQc+0iKAjM00bEcE4CMxVsIzvTTZQdemED8jwlEyT4MZiX4zHr +8taMvbrYq4AmDUE9DVzmvuIzpjEJZMzBxZzdSXPIdXDjwBU9ViLZyuSg0KmhB/P5MjO bwrEAMwpceHJUfS4a+7ddp9xdpT6GwbBBmMiRq4BB8qaFZJAftrgI0bwII1MilkKZOCp 87AkmcWBNqHw+Bypm1SVKpUzpvzmuPYZD7+iNd5oSr7olHvYp/1JIA3VNVuQ7Q9h0CTn AaMw== X-Gm-Message-State: AOAM533T3qsFG4vaO2yn8J+rtKL5AuShuZ+0dYQE9vuewuQaa4rqkLz2 DQBfUdaEm/L6gV4A0aa7ngZ+m5RaDCM= X-Google-Smtp-Source: ABdhPJyoCVbSdgoldsesryGHWO62CTrimAHgpc4YlsHUMWscCpuEgMohrlpkT32vz3ZxD4PyEMTXOw== X-Received: by 2002:a17:902:8e85:b0:142:7621:e3b3 with SMTP id bg5-20020a1709028e8500b001427621e3b3mr899759plb.84.1639708630151; Thu, 16 Dec 2021 18:37:10 -0800 (PST) Received: from bobo.ozlabs.ibm.com (203-219-139-206.static.tpgi.com.au. [203.219.139.206]) by smtp.gmail.com with ESMTPSA id z13sm7835249pfj.160.2021.12.16.18.37.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 18:37:09 -0800 (PST) From: Nicholas Piggin To: skiboot@lists.ozlabs.org Date: Fri, 17 Dec 2021 12:36:43 +1000 Message-Id: <20211217023647.715283-6-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20211217023647.715283-1-npiggin@gmail.com> References: <20211217023647.715283-1-npiggin@gmail.com> MIME-Version: 1.0 Subject: [Skiboot] [PATCH v4 5/9] 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 Reviewed-by: Dan Horák [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 c3e0c494d..6a1c3f034 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);