From nobody Wed Apr 17 13:40:19 2024 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 4VKMVC6WrPz5Gvvx; Wed, 17 Apr 2024 13:40:19 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VKMVC5hffz4l5r; Wed, 17 Apr 2024 13:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713361219; 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=Lz7Kkq4TXOkxFAI1Otk2HKVLs6CLEP/a+qVUbNN5fyw=; b=D6jFibkHABaGAkEL6PQQ6S2o8YPhaw5UBT/JAD9vaqhqUc+/hJBQeDNoFEeZmff10escPo Tl4ox/Gbrg8YxZBHYnemRpqgM5gwfHh48DbWvg2gidUWWAZ3ovwSyCgt87hJ8XfyLi1zgp JyC0Jw/fMPjUjuM2F31X2K3NeJCtrUdVy+MJP8MAe7kI/44NcHW5HO36AFo+k5jUf9MbgX qChzHuPn6G7w43uTScTEdQIVHGzeAE5DWDloaFsCQgqw6uRS/qBn+mDmy6WCtOug+3V2IO ddK2+HbvvYtKOkRJaBo/rDtMno1oevEB7Ht9+1eHpyyEg9G9w5f2g28o8E5ygA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713361219; a=rsa-sha256; cv=none; b=X9oKhnl5rd0wDl6qzs3ayk0aHoKkJrN8nJ0HtHp0afTks2Hpu8Qf/mz+Igl7+sSOHtq7Ja MAqNYyjZU6Pt49H7MVs+d4Vp3G0As8HXErc2elVIE5pZj7X9XCHtZO6RNRkMh81AKw9bDo wKNSudSzIqjb0i0orBEuFhxiXhyoTLqCnP5KebjAB8R2FMSaSQQze9vEXWatUy+S2rXAYr +a6WpCB67M5c69kNTWG0nCOTacJU7yS76QCVc0MI94HDhND3jt4QyVoD0hSrjurlCGaQzK Y6C+V1jfMe+m209kowNB/fwv9KRpwFrE/oZrfuQxeGZUyXEKsIGg/3hM70kgUw== 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=1713361219; 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=Lz7Kkq4TXOkxFAI1Otk2HKVLs6CLEP/a+qVUbNN5fyw=; b=nGt8NXjK1ItbXk64WGEiyMi1rGma7tXts2/cWy1VEOdd7iHO9DUdM88Iis5tUWJ1Xzk4ad m8b4Op7dps+V/i278nDut1CkkTwtM0YDfIMBwnoQCUcxwfC9NIfWOW8630rAMXB/s0lEYl jHNh6uoF3k/Woq2i2Fp7a/rtvjLIfCJuG9FhhO3MYhc9YLvVAbeq5eNL3dInOeYBYEoaBZ A5PV8BW2nmErH0GQ1/qacQr1cDbbQoTSzt2j1PxA0JEvA8SzonQ2LyG0jtFbvMe2pvh12L CHYqAMEeOonwG4+/PnY6QlvcyHR0HPrf0CBUzyLNWVdpqkWmVkfssYtOdmeA8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VKMVC5HHbzSrT; Wed, 17 Apr 2024 13:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43HDeJUp011109; Wed, 17 Apr 2024 13:40:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43HDeJh5011106; Wed, 17 Apr 2024 13:40:19 GMT (envelope-from git) Date: Wed, 17 Apr 2024 13:40:19 GMT Message-Id: <202404171340.43HDeJh5011106@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 4bb54e8ec3d0 - stable/13 - ahc/ahd: Fix target mode operation 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4bb54e8ec3d002b0bb822b6ca8b5ac44d9ee649d Auto-Submitted: auto-generated The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=4bb54e8ec3d002b0bb822b6ca8b5ac44d9ee649d commit 4bb54e8ec3d002b0bb822b6ca8b5ac44d9ee649d Author: Alexander Motin AuthorDate: 2024-04-10 20:44:00 +0000 Commit: Alexander Motin CommitDate: 2024-04-17 13:40:06 +0000 ahc/ahd: Fix target mode operation After 5e63cdb457f9 the drivers didn't clear CAM_DIS_DISCONNECT in ah*_handle_target_cmd() when needed, only set it. Reported/tested by: HP van Braam MFC after: 1 week (cherry picked from commit f1e4c095777db088645008848b3bfb87146c13ec) --- sys/dev/aic7xxx/aic79xx.c | 3 +++ sys/dev/aic7xxx/aic7xxx.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c index 795cf145c575..533271a4b51a 100644 --- a/sys/dev/aic7xxx/aic79xx.c +++ b/sys/dev/aic7xxx/aic79xx.c @@ -10326,7 +10326,10 @@ ahd_handle_target_cmd(struct ahd_softc *ahd, struct target_cmd *cmd) ahd->pending_device = lstate; ahd_freeze_ccb((union ccb *)atio); atio->ccb_h.flags |= CAM_DIS_DISCONNECT; + } else { + atio->ccb_h.flags &= ~CAM_DIS_DISCONNECT; } + xpt_done((union ccb*)atio); return (0); } diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index 68f189f5dd48..91bc68121067 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -7849,7 +7849,10 @@ ahc_handle_target_cmd(struct ahc_softc *ahc, struct target_cmd *cmd) ahc->pending_device = lstate; aic_freeze_ccb((union ccb *)atio); atio->ccb_h.flags |= CAM_DIS_DISCONNECT; + } else { + atio->ccb_h.flags &= ~CAM_DIS_DISCONNECT; } + xpt_done((union ccb*)atio); return (0); }