From patchwork Sat Jun 26 02:38:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1497535 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=G7eU79JE; 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 4GBdNd4dDKz9sW8 for ; Sat, 26 Jun 2021 12:38:57 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4GBdNf2yLcz3bvg for ; Sat, 26 Jun 2021 12:38:58 +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=G7eU79JE; 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::1036; helo=mail-pj1-x1036.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=G7eU79JE; dkim-atps=neutral Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) (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 4GBdNL34TCz305r for ; Sat, 26 Jun 2021 12:38:42 +1000 (AEST) Received: by mail-pj1-x1036.google.com with SMTP id 13-20020a17090a08cdb029016eed209ca4so6639312pjn.1 for ; Fri, 25 Jun 2021 19:38:41 -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=EfilAOwhlHcEIMgGkWzbDAcoUt0rebyYLHXYG9V5Hn4=; b=G7eU79JEJdelmAh4Llyv6ivMzQznsBDPM29cTw2G4O0rwjB/XdeCZa+2RgzS+gSeOC +1bAqjc1kO9CaJzEshvbK9P7VzGZsFuNOWAtan+iIUD258Fv9jG/UbzU+TnDh8HzYG38 ClrI9dtET8pCub9uLL1Z7E3OX/dgs1GzaONMk0/7i82cEDZbSzDU5psxdfSbP7u22NYm 1v3hFY+SXlvJ/ekCW64bh329DFLfOgTjoHVp4v0ui4EudWaW9bhMpSqgrVBq8BJWZ+z/ PZ13Eu5YLqTSmTzVOINkGxLTwLh68s1uAiF1+01jXA0ZV2gzFurpfqL0J89ERlXUN67o Lv2w== 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=EfilAOwhlHcEIMgGkWzbDAcoUt0rebyYLHXYG9V5Hn4=; b=rgX4gTZP0l4vfRD8Pr0DeKLl0d+osG0fWeONPJvEDm/txsHdyAjl74p373IHfl9rw3 tDeCCxWYoqPqOBnOSpZHXIqIAGIM5mHHv3jCfwc1ETBtgX5dVo0GDVOf3xTeopp9FFQ/ SzQdUi6frCxZnnZnYSAupJAhyg0FrRKYTz9n1BzbxGk9AReGh16qrBOhp6KReo4nrzD1 q23KG8+CCddhubzi3qFc2TxG1oSjQZMjDs5dUDhSx7bKIHYCHs8CJASoKzjAkQIsOv8g qydPNcHfYIVaoTjUskM4zyPMtRxKLnPvqV3cIfws0Q3Me27tfpD4LAfewynBtjgnSKRC MtuA== X-Gm-Message-State: AOAM531VUzzQsnT8lvXUvrw9ht2cVDZas9RJPOef0enZZGbzEyJMh7xA kvkaBrT0CbnDTufkMxKAA13izk7y+5A= X-Google-Smtp-Source: ABdhPJw8FuBGbUDNVgEpR41G5dfy4P2zvVFVxb2/Ao84Fh1u44rVW4j6Ve/+FJSnBQCS6sZUj2iF8g== X-Received: by 2002:a17:90a:7d06:: with SMTP id g6mr14265742pjl.91.1624675119102; Fri, 25 Jun 2021 19:38:39 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 19:38:38 -0700 (PDT) From: Nicholas Piggin To: skiboot@lists.ozlabs.org Date: Sat, 26 Jun 2021 12:38:17 +1000 Message-Id: <20210626023824.1124164-4-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 03/10] hwprobe: convert PHB, NPU subsystems to hwprobe 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: split out from initial hwprobe pach] Signed-off-by: Stewart Smith --- core/init.c | 11 ----------- hw/npu.c | 2 ++ hw/npu2-common.c | 2 ++ hw/npu3.c | 2 ++ hw/phb3.c | 2 +- hw/phb4.c | 2 ++ 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/core/init.c b/core/init.c index ed3229172..3d190e4ff 100644 --- a/core/init.c +++ b/core/init.c @@ -1322,17 +1322,6 @@ void __noreturn __nomcount main_cpu_entry(const void *fdt) /* NX init */ nx_init(); - /* Probe PHB3 on P8 */ - probe_phb3(); - - /* Probe PHB4 on P9 */ - probe_phb4(); - - /* Probe NPUs */ - probe_npu(); - probe_npu2(); - probe_npu3(); - /* Probe all HWPROBE hardware we have code linked for*/ probe_hardware(); diff --git a/hw/npu.c b/hw/npu.c index dba7ee50f..2b5364c33 100644 --- a/hw/npu.c +++ b/hw/npu.c @@ -1691,3 +1691,5 @@ void probe_npu(void) dt_for_each_compatible(dt_root, np, "ibm,power8-npu-pciex") npu_create_phb(np); } + +DEFINE_HWPROBE_DEPS(npu, probe_npu, "phb3"); diff --git a/hw/npu2-common.c b/hw/npu2-common.c index 3bc9bcee6..87ebf8232 100644 --- a/hw/npu2-common.c +++ b/hw/npu2-common.c @@ -679,3 +679,5 @@ void probe_npu2(void) setup_devices(npu); } } + +DEFINE_HWPROBE_DEPS(npu2, probe_npu2, "phb4"); diff --git a/hw/npu3.c b/hw/npu3.c index 03461373e..92af96b23 100644 --- a/hw/npu3.c +++ b/hw/npu3.c @@ -547,3 +547,5 @@ void probe_npu3(void) npu3_init(npu); } } + +DEFINE_HWPROBE_DEPS(npu3, probe_npu3, "phb4"); diff --git a/hw/phb3.c b/hw/phb3.c index 8af6b6164..320023e57 100644 --- a/hw/phb3.c +++ b/hw/phb3.c @@ -5049,4 +5049,4 @@ void probe_phb3(void) phb3_create(np); } - +DEFINE_HWPROBE(phb3, probe_phb3); diff --git a/hw/phb4.c b/hw/phb4.c index 31f9fa250..7c7ba994e 100644 --- a/hw/phb4.c +++ b/hw/phb4.c @@ -6087,3 +6087,5 @@ void probe_phb4(void) dt_for_each_compatible(dt_root, np, "ibm,power9-pciex") phb4_create(np); } + +DEFINE_HWPROBE(phb4, probe_phb4);