From nobody Mon Aug 17 13:23:24 2026 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 4hNtnS4lB2z6pHDy for ; Mon, 17 Aug 2026 13:23:24 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hNtnS3fGrz3XW4 for ; Mon, 17 Aug 2026 13:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786973004; 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=tqguGfpKXWR0/TmKNmPWCkYlEmHwJr8MmNlJE1FvpD0=; b=QoZnShBCx51lCCl/qx9cS5Yc+PsI1UFvygiycl/HSpwmgNOq0ST10T+s3jegLY5TyRds/G Ejzkqn28EQqGRDbv1HRrGcbHIBeJtBODhnPjgm2D9bn0Gb1fhqdO7olYGReovFpMfj02EN s10HZHaJ9U9+Dhw4LCpJseN0of0ENrnN2L+kjsou8Qpz4tfaOU7fLpQXU0yWL/qvNfStcu eMU6M2s3deWw5Mm/3ik7j/XG6yBo08xRnsLpXWBFh1CykKx6PfKcTqUiaGtiljV0hjtsuB g9V4NueIlf30swQMl1ojRkur8r+AR5fQJ4qzCsMUe4cmdAJ9ZkrYaeUwOckcfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786973004; a=rsa-sha256; cv=none; b=Y7F0tjOWo2RksDX+owp6wYNRi7t0+2HbSwvmfA+nwqPnbyxmFAUX4S3i5RCuqamAd5hQB6 dDOOLnodqIRrv3pnBUzl8zuNZfeeONeN7rb9Jvw5TzBsguYYhhjdWM+BxFRbZYZLND8Eex hKWk4zhUXJuVVLxIJTXCA/fXQvHTwZBjDezE0GxCB+r4j66dSPzjhtJHGrNU/rq7iv5l80 3Nw5br5m72rYpEAg7qMPuVfgjvHXkyPcXghTZpubb/Qas4KOJQrea4ynzCQlfR9XxwxD5r /GFVsZxQEIqnvTRJMgFUbUaJYbCEYkZEbAakAfrLOjFISfHyO0XxJIgBbbxLPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786973004; 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=tqguGfpKXWR0/TmKNmPWCkYlEmHwJr8MmNlJE1FvpD0=; b=QVsJ2NJZol80DIA12R2wFHGsaGsfniVWTo/10ldJTp7x5NrAdOrIKDL0v9cpCI8Q9Q0SXO KVrAvxOfIRxEu2WVfGJ6zNSoldWx6qwWNtDZky5J402oP6qHK/tDWWGYgNhEkqQ6NN7utc /yIJJyQ5OkBJyYmaaZxCLSGlixTgeXtsI+pXOTYQvkDBDxLeF/27XdRokyhFc1KmJpNnuu J6BQM0Hjdu1/XgsfE2vECUlLG4ANfGvbQZalnlon14ElsTSjjY9Am74AxgXoNaKbeboS+L TDURtLkG9X5e+Zar8xpI3BIQsPzcQi1Xws8l5m4jMFARF7Tk0rUv2eLgyJZE6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hNtnS26dfz1FZn for ; Mon, 17 Aug 2026 13:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44280 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 17 Aug 2026 13:23:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ba9aaed01a48 - main - Revert "ciss: Add max physical target" 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: ba9aaed01a484778f1c1f2fb5d7e30dbb1a8f5ad Auto-Submitted: auto-generated Date: Mon, 17 Aug 2026 13:23:24 +0000 Message-Id: <6a830b4c.44280.8505f52@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ba9aaed01a484778f1c1f2fb5d7e30dbb1a8f5ad commit ba9aaed01a484778f1c1f2fb5d7e30dbb1a8f5ad Author: Warner Losh AuthorDate: 2026-08-17 13:11:52 +0000 Commit: Warner Losh CommitDate: 2026-08-17 13:11:52 +0000 Revert "ciss: Add max physical target" This reverts commit 45645518ea19ccb4761aee3a525aab2f323d37d4. Although this changed looks like it should just be a harmless change to bookkeeping, it turns out that it changes the termination condition of the initial device scan, resulting in it never finishing. This causes the boot to hang forever coming up. Since I don't have good access to hardware, I'm reverting until the exact details can be sorted out. Reported by: Edward Scroop Sponsored by: Netflix MFC After: 1 week --- sys/dev/ciss/ciss.c | 11 +---------- sys/dev/ciss/cissvar.h | 1 - 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c index 416f6e86e663..7fa6ef4f5ac3 100644 --- a/sys/dev/ciss/ciss.c +++ b/sys/dev/ciss/ciss.c @@ -1552,9 +1552,6 @@ ciss_init_physical(struct ciss_softc *sc) nphys, (nphys > 1 || nphys == 0) ? "s" : ""); } - /* Per-controller highest target number seen */ - sc->ciss_max_physical_target = 0; - /* * Figure out the bus mapping. * Logical buses include both the local logical bus for local arrays and @@ -1637,8 +1634,6 @@ ciss_init_physical(struct ciss_softc *sc) } ciss_filter_physical(sc, cll); - if (bootverbose || ciss_verbose) - ciss_printf(sc, "max physical target id: %d\n", sc->ciss_max_physical_target); out: if (cll != NULL) @@ -1688,10 +1683,6 @@ ciss_filter_physical(struct ciss_softc *sc, struct ciss_lun_report *cll) target = CISS_EXTRA_TARGET2(ea); sc->ciss_physical[bus][target].cp_address = cll->lun[i]; sc->ciss_physical[bus][target].cp_online = 1; - - if ((target > sc->ciss_max_physical_target) && - (cll->lun[i].physical.mode != CISS_HDR_ADDRESS_MODE_MASK_PERIPHERAL)) - sc->ciss_max_physical_target = target; } return (0); @@ -3079,7 +3070,7 @@ ciss_cam_action(struct cam_sim *sim, union ccb *ccb) cpi->hba_inquiry = PI_TAG_ABLE; /* XXX is this correct? */ cpi->target_sprt = 0; cpi->hba_misc = 0; - cpi->max_target = MAX(sc->ciss_max_physical_target, sc->ciss_cfg->max_logical_supported); + cpi->max_target = sc->ciss_cfg->max_logical_supported; cpi->max_lun = 0; /* 'logical drive' channel only */ if (ciss_initiator_id != CAM_TARGET_WILDCARD) cpi->initiator_id = ciss_initiator_id; diff --git a/sys/dev/ciss/cissvar.h b/sys/dev/ciss/cissvar.h index 58275f83732c..eec11018d279 100644 --- a/sys/dev/ciss/cissvar.h +++ b/sys/dev/ciss/cissvar.h @@ -236,7 +236,6 @@ struct ciss_softc int ciss_max_bus_number; /* maximum bus number */ int ciss_max_logical_bus; int ciss_max_physical_bus; - int ciss_max_physical_target; /* highest physical target number */ struct cam_devq *ciss_cam_devq; struct cam_sim **ciss_cam_sim;