From nobody Wed Jan 21 04:37:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwryw75BVz6PdSB for ; Wed, 21 Jan 2026 04:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwryw5KwRz3Sp1 for ; Wed, 21 Jan 2026 04:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768970264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7iinI/k9WhlYokJDOuO09Hf6a5EUp5yPoc4ImjyZHJI=; b=RgP+G3fPlV+xScWbjR12Ag3c3GKBrfhrFz4i5fbx0Ar1/oRigPhyziVc+tUJjVkvRVd3wl 09O7mexucytWU28r6EzLOxRwitq0pela7OSPHW3QfPA94jGdZKg//kZKfWxa/5sWp4nt58 NG0l4TAdy/Te9CIJI/GOkr59bzfXUk71vJd8TXtq+Oh+IWrH/hITKe9wTcj6PYz02NuLgk GRDe6ke6DKVYHxXwCKFwL5f2NmuWGubHgXY7TTn4hBgZ+WEt+rdGJ6ELCK05/EgzjrSE28 b7iirQulz4W8OSEBu9x+aR319qalPgnyl15ZOsig7i045wFjK3dS0Jv/T99fCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768970264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7iinI/k9WhlYokJDOuO09Hf6a5EUp5yPoc4ImjyZHJI=; b=dxySLL06ds+CWGQdVGusEIVXQVwDqXcwL5VZ0SC35B+i39u0UvQr3x2OoBC0RqZFYAeI8l lxlf6zHnPJtSkCWYL+B5UNPcglPKCPagJtmgdQBAJ5HDQl0RNF2rGzUBp+mbMsBtF2c8yt LMEKePLdXheVpCyFkGr8kWd7LslgHv6RX/YcP+4fOr+wgZE8M0BHS3f8vgwbwFFOyjUiOW 4ovUSNkeRSMgl6cgM/R0SXw1kkvl4SC4Yd7CEYNEVjO2xirkEkCl47Q1yvx8lJ8xhjJD4O pyheiH04Zj4ogZY/LmYQRk1DmZTfm8kCLPwC2Qy54Ud90Ol0VaHhcPAfkIH2Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768970264; a=rsa-sha256; cv=none; b=G93LXU9r1gomoIryrZSrDg84+zw/9e6aUX9H09RDobDBa9axKOv8LwuGV7mZ1zCk5KnUC3 nKefvddGdkHCgZ1FzQG0NVUbFw5h1csBfdVgox0h9v93BZyH3NX85voO6H68I6Nhcpo9Ca cFacEUYo8Y6DVa6rlDxxxdY08MAaZXKdH6BwxgM7D0nv6wluqRIv5yoIpNGrwnZoFqanA2 6S1A3ooF6pvsVmE+k3pS+iBzTdBmgK7C2Q6v/ZnAh1XEEfCySquWxC6dkKUGvwinCGDr2h +bvo3lo0PZg850oHCwCN6PgHOU/A9h9BRh7comG6F7o4+k5aeelZ8U4sL1b//g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwryw4fyvzYxg for ; Wed, 21 Jan 2026 04:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39cff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 04:37:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: c611ef5747a5 - main - dpaa: Simplify CPU binding for bman and qman List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c611ef5747a5d2ceb094331d3dd74d5c8b523b9c Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 04:37:44 +0000 Message-Id: <69705818.39cff.240125b2@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=c611ef5747a5d2ceb094331d3dd74d5c8b523b9c commit c611ef5747a5d2ceb094331d3dd74d5c8b523b9c Author: Justin Hibbits AuthorDate: 2026-01-21 04:16:04 +0000 Commit: Justin Hibbits CommitDate: 2026-01-21 04:28:40 +0000 dpaa: Simplify CPU binding for bman and qman If cpu-handle property doesn't exist simply iterate and assign the CPUs in sequence rather than following the convoluted search which may not bear fruit in some cases. If cpu-handle doesn't exist for one portal it probably doesn't exist for any of them. --- sys/dev/dpaa/bman_fdt.c | 39 +++++++++------------------------------ sys/dev/dpaa/qman_fdt.c | 40 +++++++++------------------------------- 2 files changed, 18 insertions(+), 61 deletions(-) diff --git a/sys/dev/dpaa/bman_fdt.c b/sys/dev/dpaa/bman_fdt.c index dffec52d5248..34b29ad6e236 100644 --- a/sys/dev/dpaa/bman_fdt.c +++ b/sys/dev/dpaa/bman_fdt.c @@ -136,25 +136,6 @@ bman_portals_fdt_probe(device_t dev) return (BUS_PROBE_DEFAULT); } -static phandle_t -bman_portal_find_cpu(int cpu) -{ - phandle_t node; - pcell_t reg; - - node = OF_finddevice("/cpus"); - if (node == -1) - return (node); - - for (node = OF_child(node); node != 0; node = OF_peer(node)) { - if (OF_getprop(node, "reg", ®, sizeof(reg)) <= 0) - continue; - if (reg == cpu) - return (node); - } - return (-1); -} - static int bman_portals_fdt_attach(device_t dev) { @@ -185,17 +166,15 @@ bman_portals_fdt_attach(device_t dev) } /* Checkout related cpu */ if (OF_getprop(child, "cpu-handle", (void *)&cpu, - sizeof(cpu)) <= 0) { - cpu = bman_portal_find_cpu(cpus); - if (cpu <= 0) - continue; - } - /* Acquire cpu number */ - cpu_node = OF_instance_to_package(cpu); - if (OF_getencprop(cpu_node, "reg", &cpu_num, sizeof(cpu_num)) <= 0) { - device_printf(dev, "Could not retrieve CPU number.\n"); - return (ENXIO); - } + sizeof(cpu)) > 0) { + cpu_node = OF_instance_to_package(cpu); + /* Acquire cpu number */ + if (OF_getencprop(cpu_node, "reg", &cpu_num, sizeof(cpu_num)) <= 0) { + device_printf(dev, "Could not retrieve CPU number.\n"); + return (ENXIO); + } + } else + cpu_num = cpus; cpus++; diff --git a/sys/dev/dpaa/qman_fdt.c b/sys/dev/dpaa/qman_fdt.c index 3f22ea4d651a..35016073ba0e 100644 --- a/sys/dev/dpaa/qman_fdt.c +++ b/sys/dev/dpaa/qman_fdt.c @@ -136,25 +136,6 @@ qman_portals_fdt_probe(device_t dev) return (BUS_PROBE_DEFAULT); } -static phandle_t -qman_portal_find_cpu(int cpu) -{ - phandle_t node; - pcell_t reg; - - node = OF_finddevice("/cpus"); - if (node == -1) - return (-1); - - for (node = OF_child(node); node != 0; node = OF_peer(node)) { - if (OF_getprop(node, "reg", ®, sizeof(reg)) <= 0) - continue; - if (reg == cpu) - return (node); - } - return (-1); -} - static int qman_portals_fdt_attach(device_t dev) { @@ -213,18 +194,15 @@ qman_portals_fdt_attach(device_t dev) } /* Checkout related cpu */ if (OF_getprop(child, "cpu-handle", (void *)&cpu, - sizeof(cpu)) <= 0) { - cpu = qman_portal_find_cpu(cpus); - if (cpu <= 0) - continue; - } - /* Acquire cpu number */ - cpu_node = OF_instance_to_package(cpu); - if (OF_getencprop(cpu_node, "reg", &cpu_num, sizeof(cpu_num)) <= 0) { - device_printf(dev, "Could not retrieve CPU number.\n"); - return (ENXIO); - } - + sizeof(cpu)) > 0) { + cpu_node = OF_instance_to_package(cpu); + /* Acquire cpu number */ + if (OF_getencprop(cpu_node, "reg", &cpu_num, sizeof(cpu_num)) <= 0) { + device_printf(dev, "Could not retrieve CPU number.\n"); + return (ENXIO); + } + } else + cpu_num = cpus; cpus++; if (ofw_bus_gen_setup_devinfo(&ofw_di, child) != 0) {