From nobody Tue Dec 9 20:12:37 2025 X-Original-To: dev-commits-src-main@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 4dQqlV3Sbwz6JkY5 for ; Tue, 09 Dec 2025 20:12:38 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dQqlV1GYBz3wLW for ; Tue, 09 Dec 2025 20:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765311158; 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=EtfUucct5mEYKQS6+r5CWCCk4RIVwLJUZEQRCSKd9JA=; b=ffX3aGmj6LOIz3rysOrZK9UJ0RoFlrBbZLzjmw4iap7lWtd8Q/6FjdvysOqO0wgVokVkmh WujQU4bhJoF5Ll6SouEfOh7qorG+QoZFNA7occf3LwWc1QNzU8DPHfCbGG+b7r6bXfknbV KKy/RzQ3wXooS05twnSHw81LpvK01ujaaTMjbromDiOqg4EIuMig2iuRnSM/bO8tz2cIFV oFrZuLbXQ8O9+eIZXq/4Ou4kpzV8TiEzw23I2rv5tmTySduaQ5bXMM6tcyTS0s2wfRgwLZ Bc6u5Mzm9I5AX2gGRu54x8w76yYOPNKbP5SUUDCO5zS3fhbedXAhvEij3nbrPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765311158; 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=EtfUucct5mEYKQS6+r5CWCCk4RIVwLJUZEQRCSKd9JA=; b=kL29VfkzBIAxTN89BAdnKLhuBT3Jb5siDxpFU6zhJ6JfafcRdZDiDxXFZuj8s8mrtzNkLc ZuF3IarBG4vPNaPuszb6uuoJIcrMnk6Wtgh+inI2D4lzdw1qrETF3WkIGWA3cXqB6m3VP4 iSPRDKC4IXJXhxJg08vusvUcQx4+CS5/yTlm4RDxxU1H+hYhj1pqrKmT0UljQLCT/97MoR Zicjw6hM/FqM6Ed3mQGnoeTUZbA/KYCf1160L1vNcLaib7t0ruWQ5WvvQtPRX5i7X0sBnh LuKyJNDOUugwr6PuI0BDIqYQsbmFeoFLNxgFk2AnvIDHfzARtaG6YAwaNE4Oug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765311158; a=rsa-sha256; cv=none; b=U+ZUxkEhYcTjmgOSGKDMsAM063+HCnU7l0wURwNdJH+pcp107LH7TdTjeBojvD4sdr93tL btm5YhTOpWcsBSfDAcAzCHrVOYSALvu4/DjUyLloI+S/NZE2nv9XAM1ibWE2luJk6VBT2e Ip2MfoQv9mqxM24fWHzhnGhLd5jL267frsJgtLpVNdnOj76lYzn0+0G3w7m4Fo8wpGxGDf 8ZWpmPVFeMgWAIz3u0biOIsDMFEJQJdDZLQXR4EPOPVW8jmizkSuGMBM+tIdzWWeoHMSYg RFjEV5O1viJhR4o6N97cHq0hgJrx6O5LlM9srqgUYZdv9l0mLvxEem+b088LDQ== 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 4dQqlT6w5pz2j for ; Tue, 09 Dec 2025 20:12:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e9e3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Dec 2025 20:12:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d08fac086f7c - main - dpaa2_rc_add_res: Pass rid by value List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d08fac086f7cc6d300e037ba3f959365315c2967 Auto-Submitted: auto-generated Date: Tue, 09 Dec 2025 20:12:37 +0000 Message-Id: <693882b5.2e9e3.768a8c67@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d08fac086f7cc6d300e037ba3f959365315c2967 commit d08fac086f7cc6d300e037ba3f959365315c2967 Author: John Baldwin AuthorDate: 2025-12-09 20:03:15 +0000 Commit: John Baldwin CommitDate: 2025-12-09 20:03:15 +0000 dpaa2_rc_add_res: Pass rid by value Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D53408 --- sys/dev/dpaa2/dpaa2_rc.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/sys/dev/dpaa2/dpaa2_rc.c b/sys/dev/dpaa2/dpaa2_rc.c index 36cacd1daa4b..5e4346ad6969 100644 --- a/sys/dev/dpaa2/dpaa2_rc.c +++ b/sys/dev/dpaa2/dpaa2_rc.c @@ -79,7 +79,7 @@ static int dpaa2_rc_add_managed_child(struct dpaa2_rc_softc *, static int dpaa2_rc_enable_irq(struct dpaa2_mcp *, struct dpaa2_cmd *, uint8_t, bool, uint16_t); static int dpaa2_rc_configure_irq(device_t, device_t, int, uint64_t, uint32_t); -static int dpaa2_rc_add_res(device_t, device_t, enum dpaa2_dev_type, int *, int); +static int dpaa2_rc_add_res(device_t, device_t, enum dpaa2_dev_type, int, int); static int dpaa2_rc_print_type(struct resource_list *, enum dpaa2_dev_type); static struct dpaa2_mcp *dpaa2_rc_select_portal(device_t, device_t); @@ -2890,7 +2890,7 @@ dpaa2_rc_add_child(struct dpaa2_rc_softc *sc, struct dpaa2_cmd *cmd, const char *devclass; int dpio_n = 0; /* to limit DPIOs by # of CPUs */ int dpcon_n = 0; /* to limit DPCONs by # of CPUs */ - int rid, error; + int error; rcdev = sc->dev; rcinfo = device_get_ivars(rcdev); @@ -2944,7 +2944,6 @@ dpaa2_rc_add_child(struct dpaa2_rc_softc *sc, struct dpaa2_cmd *cmd, for (; res_spec && res_spec->type != -1; res_spec++) { if (res_spec->type < DPAA2_DEV_MC) continue; /* Skip non-DPAA2 resource. */ - rid = res_spec->rid; /* Limit DPIOs and DPCONs by number of CPUs. */ if (res_spec->type == DPAA2_DEV_IO && dpio_n >= mp_ncpus) { @@ -2956,8 +2955,8 @@ dpaa2_rc_add_child(struct dpaa2_rc_softc *sc, struct dpaa2_cmd *cmd, continue; } - error = dpaa2_rc_add_res(rcdev, dev, res_spec->type, &rid, - res_spec->flags); + error = dpaa2_rc_add_res(rcdev, dev, res_spec->type, + res_spec->rid, res_spec->flags); if (error) device_printf(rcdev, "%s: dpaa2_rc_add_res() failed: " "error=%d\n", __func__, error); @@ -2993,7 +2992,7 @@ dpaa2_rc_add_managed_child(struct dpaa2_rc_softc *sc, struct dpaa2_cmd *cmd, const char *devclass; uint64_t start, end, count; uint32_t flags = 0; - int rid, error; + int error; rcdev = sc->dev; child = sc->dev; @@ -3088,10 +3087,9 @@ dpaa2_rc_add_managed_child(struct dpaa2_rc_softc *sc, struct dpaa2_cmd *cmd, for (; res_spec && res_spec->type != -1; res_spec++) { if (res_spec->type < DPAA2_DEV_MC) continue; /* Skip non-DPAA2 resource. */ - rid = res_spec->rid; - error = dpaa2_rc_add_res(rcdev, dev, res_spec->type, &rid, - res_spec->flags); + error = dpaa2_rc_add_res(rcdev, dev, res_spec->type, + res_spec->rid, res_spec->flags); if (error) device_printf(rcdev, "%s: dpaa2_rc_add_res() failed: " "error=%d\n", __func__, error); @@ -3285,7 +3283,7 @@ dpaa2_rc_wait_for_cmd(struct dpaa2_mcp *mcp, struct dpaa2_cmd *cmd) */ static int dpaa2_rc_add_res(device_t rcdev, device_t child, enum dpaa2_dev_type devtype, - int *rid, int flags) + int rid, int flags) { device_t dpaa2_dev; struct dpaa2_devinfo *dinfo = device_get_ivars(child); @@ -3297,7 +3295,7 @@ dpaa2_rc_add_res(device_t rcdev, device_t child, enum dpaa2_dev_type devtype, error = DPAA2_MC_GET_FREE_DEV(rcdev, &dpaa2_dev, devtype); if (error && !(flags & RF_SHAREABLE)) { device_printf(rcdev, "%s: failed to obtain a free %s (rid=%d) " - "for: %s (id=%u)\n", __func__, dpaa2_ttos(devtype), *rid, + "for: %s (id=%u)\n", __func__, dpaa2_ttos(devtype), rid, dpaa2_ttos(dinfo->dtype), dinfo->id); return (error); } @@ -3308,7 +3306,7 @@ dpaa2_rc_add_res(device_t rcdev, device_t child, enum dpaa2_dev_type devtype, if (error) { device_printf(rcdev, "%s: failed to obtain a shared " "%s (rid=%d) for: %s (id=%u)\n", __func__, - dpaa2_ttos(devtype), *rid, dpaa2_ttos(dinfo->dtype), + dpaa2_ttos(devtype), rid, dpaa2_ttos(dinfo->dtype), dinfo->id); return (error); } @@ -3316,16 +3314,16 @@ dpaa2_rc_add_res(device_t rcdev, device_t child, enum dpaa2_dev_type devtype, } /* Add DPAA2 device to the resource list of the child device. */ - resource_list_add(&dinfo->resources, devtype, *rid, + resource_list_add(&dinfo->resources, devtype, rid, (rman_res_t) dpaa2_dev, (rman_res_t) dpaa2_dev, 1); /* Reserve a newly added DPAA2 resource. */ res = resource_list_reserve(&dinfo->resources, rcdev, child, devtype, - *rid, (rman_res_t) dpaa2_dev, (rman_res_t) dpaa2_dev, 1, + rid, (rman_res_t) dpaa2_dev, (rman_res_t) dpaa2_dev, 1, flags & ~RF_ACTIVE); if (!res) { device_printf(rcdev, "%s: failed to reserve %s (rid=%d) for: %s " - "(id=%u)\n", __func__, dpaa2_ttos(devtype), *rid, + "(id=%u)\n", __func__, dpaa2_ttos(devtype), rid, dpaa2_ttos(dinfo->dtype), dinfo->id); return (EBUSY); } @@ -3336,7 +3334,7 @@ dpaa2_rc_add_res(device_t rcdev, device_t child, enum dpaa2_dev_type devtype, if (error) { device_printf(rcdev, "%s: failed to reserve a shared " "%s (rid=%d) for: %s (id=%u)\n", __func__, - dpaa2_ttos(devtype), *rid, dpaa2_ttos(dinfo->dtype), + dpaa2_ttos(devtype), rid, dpaa2_ttos(dinfo->dtype), dinfo->id); return (error); }