From patchwork Sat Jun 26 02:38:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1497538 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=2404:9400:2:0:216:3eff:fee1:b9f1; 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=MuoEC9KN; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (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 4GBdNw0b5qz9sW8 for ; Sat, 26 Jun 2021 12:39:12 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4GBdNw5y36z3bvC for ; Sat, 26 Jun 2021 12:39:12 +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=MuoEC9KN; 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=MuoEC9KN; 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 4GBdNT3mR4z3bxx for ; Sat, 26 Jun 2021 12:38:49 +1000 (AEST) Received: by mail-pj1-x1029.google.com with SMTP id t19-20020a17090ae513b029016f66a73701so9061257pjy.3 for ; Fri, 25 Jun 2021 19:38:48 -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=GCjZOic91dbsw+BWgNgi7t2zSRHsL8FW/B9YzVrZpcU=; b=MuoEC9KNXuI9JhNboRPfh2W9TsA1Ne4s6JQAWtldpGz2g1HyjrrsYPpHMO8IrjkYKM J1ShmITLRTKdQZ0Ik+KTtgMXm5ih4LiZuuyBRmRTtAI8MBpB8iVpYVk5FS50B9KIL5gx J5sCaWlTRRdFZBG+kroIN8k6I/kSVc3vMAeutxkXRCL4UAdz7wSE7+i4oge+N9Lsu8ZX MzY6ccZAd3RCVSiORq1W+EWNVDtnStbqc3Tfkr+crioV8lblEbh1VrSzoH9PV4n+AFdk jjf+8PlewV8ZgPoJ/+EPabAVHoXym1WTuvcbszMWl2tKn0SfIvEWOKv16XPr744r8Y9A Es+A== 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=GCjZOic91dbsw+BWgNgi7t2zSRHsL8FW/B9YzVrZpcU=; b=ox/Nn6bZrIByB9enmPPl7/McHeOipsoCuB5q07YBKpTfoYfarus0w2X5RJRAyF0Gnz ld41rJzjygtNyzIPfLbIzO2ikJxkuilW7lPT1CSyWGYXyPqVvcXXpqLD+ZY6dPikVrBg bO1IhEbae/qGnpT2sMJ/cdWqe3meRtvIsg3rcu27FET5LnFKJIQqaKQehlF6poLcefaj /5f6oCq+EfiAZLVyn5pKHqny6hWK0BOP7EBdbFrGAFSF2XLBvpGqJkDvaYhGFxFNlGIl QVbKaqWsr9euc4ePBABjaOEt2P+VhBGWyJw3U53TKWj6GX8TOuTk/9YkVPn+9EFi8u05 c4vQ== X-Gm-Message-State: AOAM533iG2UP6SUQc2JTrssltjgVrKBXMLz57VonifAk6ulGtDsLj/ug H7EpBEjBNrhEWUMs0LFrwPa1VgXkplc= X-Google-Smtp-Source: ABdhPJygl8+7HFWf5yji+bu7R7kMbGXOxQC7UfZSiW6Ari/Ee3OPDeXU3r148GDnbDob3hYTc/5DJA== X-Received: by 2002:a17:90a:5202:: with SMTP id v2mr8117979pjh.169.1624675126338; Fri, 25 Jun 2021 19:38:46 -0700 (PDT) Received: from bobo.ozlabs.ibm.com (60-242-147-73.tpgi.com.au. [60.242.147.73]) by smtp.gmail.com with ESMTPSA id u10sm7010014pfh.123.2021.06.25.19.38.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 19:38:46 -0700 (PDT) From: Nicholas Piggin To: skiboot@lists.ozlabs.org Date: Sat, 26 Jun 2021 12:38:20 +1000 Message-Id: <20210626023824.1124164-7-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210626023824.1124164-1-npiggin@gmail.com> References: <20210626023824.1124164-1-npiggin@gmail.com> MIME-Version: 1.0 Subject: [Skiboot] [PATCH 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 3d190e4ff..a3601d0c8 100644 --- a/core/init.c +++ b/core/init.c @@ -1316,12 +1316,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 122048087..f001d7a2f 100644 --- a/hw/nx.c +++ b/hw/nx.c @@ -121,3 +121,5 @@ void nx_init(void) if (proc_gen == proc_gen_p9) p9_darn_init(); } + +DEFINE_HWPROBE_DEPS(nx, nx_init, "vas"); diff --git a/hw/vas.c b/hw/vas.c index c70094b7d..8759fffb2 100644 --- a/hw/vas.c +++ b/hw/vas.c @@ -519,3 +519,5 @@ out: vas_err("Disabled (failed initialization)\n"); return; } + +DEFINE_HWPROBE(vas, vas_init);