From nobody Wed Dec 10 21:12:53 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 4dRT2f73rPz6JgVM for ; Wed, 10 Dec 2025 21:12:58 +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 4dRT2f6ZKlz4HTV for ; Wed, 10 Dec 2025 21:12:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765401178; 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=NIPivklYgagSmRxzXYeh+YU/caaHykUYmDFzwTjVyHg=; b=ZBoaYNvV+YS9uU4JOn3+i/bNNz7j2ygpd0FHjkL3vdkrnWOUQGGaNhnjEq5V53nty4h5Oc GkZpchFzF3WVin81GjeQJIHq8/pbHWb0ykjLE/gjYg3O/m8tSZLUzplYekz23sMIoTG2C3 7zSWxq2Lp4MawnH2QxaERIF5jyBNGchO07s1/a84bsWWkF+dBGvREq1dZkU/lYUggquj8X oEX6854anP8o1Kv7MThT6H30ybMLP6+RUPQ0EZ+ji7NTC95KL0116YJQ4qL5QI3J+ReBPJ 30ibBGGNPYthcDTn+JbzgSeYpPAOXOfFGBsLQ0I+UHXyiNn28a7NGiRtnpeWfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765401178; 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=NIPivklYgagSmRxzXYeh+YU/caaHykUYmDFzwTjVyHg=; b=yq5ELzNWPpvIE0jJ0cri1AOplO7HurGfRh5Qa46hkDmW2fEoo/QoZjm4DbHwQJY401zBe1 ZdTQO5INFMLz/aU55u6fs7tpO/7XuYAS516MS/bxAAbEpHOL5z3m8rOcrUGunqiW2HkMCj Scq4R+x1qo5cpUbXOiaE83tEUFmXYcjj74w6rPVebfXS8tsMr01BJmuycohHjJxDfe2MA3 okFZrO+JOuMS3bAT0vncAmZdlC4eODku8F54hdMTKRJtlWbuUOPZEgvCppgdt/sovLFCYt G8S9Nlv78JJnhhkKsiWI1eSfdXS4jy0m4eA0+K6ubqw3ELwAmNkUiGKSSIiNvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765401178; a=rsa-sha256; cv=none; b=BYJHDty+PVzIr4ASkG+8IrUlVdq5Pf5r0ZAZlmE+xmHuU1L8GueuXnTUycof984h6S4AtX YkMl6JVjYNAsS5scrJMKO+VIUtMbYMR731Jg0xYunyeEEb6WUumhqE7aJUeJJmoYcRQkTT 8Jzkt73f9WYpf4qEo/g73Rdrauj3/0QpHvCLNWCXnsFpLHB+cc7ALGRvrPNmJWC2NzOVEy sUj/jpE321AacwH/Iz6FelwyJIYKDgins1gbXhfVWvAfDPsZJhLMlsrA08fR0kjNqBDRIq 9hInbtE9J0d9sdYOioWxhRB0LOijZlh0XceignF1xZQPR2Ldvzt7aIEOE63WDg== 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 4dRT2f6B0mz12Qp for ; Wed, 10 Dec 2025 21:12:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31ae1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Dec 2025 21:12:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 84d198e137a5 - main - mpr: Partially revert 332096ebb638 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84d198e137a59a17c08896333eaa9b318f4b1e1f Auto-Submitted: auto-generated Date: Wed, 10 Dec 2025 21:12:53 +0000 Message-Id: <6939e255.31ae1.2dfe0287@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=84d198e137a59a17c08896333eaa9b318f4b1e1f commit 84d198e137a59a17c08896333eaa9b318f4b1e1f Author: Warner Losh AuthorDate: 2025-12-10 21:06:50 +0000 Commit: Warner Losh CommitDate: 2025-12-10 21:09:07 +0000 mpr: Partially revert 332096ebb638 These were a doodle that escaped into my staging tree. Remove them. Sponsored by: Netflix --- sys/dev/mpr/mpr_sas.c | 31 ++----------------------------- sys/dev/mpr/mpr_sas.h | 3 --- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/sys/dev/mpr/mpr_sas.c b/sys/dev/mpr/mpr_sas.c index a48593b1e6ee..5f3a27a468b0 100644 --- a/sys/dev/mpr/mpr_sas.c +++ b/sys/dev/mpr/mpr_sas.c @@ -152,25 +152,6 @@ mprsas_find_target_by_handle(struct mprsas_softc *sassc, int start, return (NULL); } -static void -mprsas_startup_timeout(void *_sassc) -{ - struct mprsas_softc *sassc = _sassc; - - /* - * Things have taken far too long. We have to get on with it. However, - * we're still processing events. We'll release the boot here only. - * We're called with the mpr lock held, which the rest of these - * functions take. This may cause mountroot to fail, but we'll at least - * proceed with the boot if this isn't holding up the system disk. - */ - callout_stop(&sassc->startup_timeout); - sassc->flags &= ~MPRSAS_STARTUP_ARMED; - xpt_release_boot(); - printf("Gave up all the devices...\n"); -}; - - /* we need to freeze the simq during attach and diag reset, to avoid failing * commands before device handles have been found by discovery. Since * discovery involves reading config pages and possibly sending commands, @@ -190,10 +171,6 @@ mprsas_startup_increment(struct mprsas_softc *sassc) "%s freezing simq\n", __func__); xpt_hold_boot(); xpt_freeze_simq(sassc->sim, 1); - callout_init_mtx(&sassc->startup_timeout, - &sassc->sc->mpr_mtx, 0); - callout_reset(&sassc->startup_timeout, 60 * hz, - mprsas_startup_timeout, sassc); } mpr_dprint(sassc->sc, MPR_INIT, "%s refcount %u\n", __func__, sassc->startup_refcount); @@ -220,15 +197,11 @@ mprsas_startup_decrement(struct mprsas_softc *sassc) /* finished all discovery-related actions, release * the simq and rescan for the latest topology. */ - bool need_release = sassc->flags & MPRSAS_STARTUP_ARMED; mpr_dprint(sassc->sc, MPR_INIT, "%s releasing simq\n", __func__); - if (need_release) /* stop to prevent deadlock */ - callout_stop(&sassc->startup_timeout); - sassc->flags &= ~(MPRSAS_IN_STARTUP | MPRSAS_STARTUP_ARMED); + sassc->flags &= ~MPRSAS_IN_STARTUP; xpt_release_simq(sassc->sim, 1); - if (need_release) - xpt_release_boot(); + xpt_release_boot(); } mpr_dprint(sassc->sc, MPR_INIT, "%s refcount %u\n", __func__, sassc->startup_refcount); diff --git a/sys/dev/mpr/mpr_sas.h b/sys/dev/mpr/mpr_sas.h index 24250cf50d14..4f1be3cd4214 100644 --- a/sys/dev/mpr/mpr_sas.h +++ b/sys/dev/mpr/mpr_sas.h @@ -91,7 +91,6 @@ struct mprsas_softc { #define MPRSAS_IN_STARTUP (1 << 1) #define MPRSAS_QUEUE_FROZEN (1 << 3) #define MPRSAS_TOREMOVE (1 << 5) -#define MPRSAS_STARTUP_ARMED (1 << 6) u_int maxtargets; struct mprsas_target *targets; struct cam_devq *devq; @@ -103,8 +102,6 @@ struct mprsas_softc { u_int startup_refcount; struct proc *sysctl_proc; - struct callout startup_timeout; - struct taskqueue *ev_tq; struct task ev_task; TAILQ_HEAD(, mpr_fw_event_work) ev_queue;