From nobody Wed Apr 17 13:39:43 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 4VKMTW5YSXz5Gvn9; Wed, 17 Apr 2024 13:39:43 +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 4VKMTW4ljDz4kpB; Wed, 17 Apr 2024 13:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713361183; 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=CcpqgmJYqCezuoNB+goGl6cbhzcVUWPaEUoZhczllg4=; b=xEhcbNSNnyUVEfwhV0mKcudxizx3GsvMZCZ3+OrD786GtH9YKirGWhkwux6VYVYbMsSLpP V5GO1i88ufvXfE3MbvmkmD/QF3CLsDG5EO9XMcVDizr5aiNRB49cOF5JQu8j7jOz9j8zl8 wtcwv1FJBEG/s1gNSLoJPQ6eg+XqzKJQA5oHd2LQnmlPteQ1t6Az1SDYPxceB4ugscF1Kc U9yz3ibiP/BEh62N+9sn9/bsD1rXUDnJTmtX5FLrynJQ/VCCCJRhhz7UrO7ANhvKR+Z/kg 5BUhFzK6/cSf9kptBrdBxdpi01MFJQOjGsbOW2pm64LMQ+hDD4Fr2GwF4s9MUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713361183; a=rsa-sha256; cv=none; b=WHu0EToFvZ+34QZJqSYjZvc43bc2c5nB5YTOhGJ27c1ZtB8iDCotq7fhEtvHZlSoVA1Uea WRudV1aZPj6ZZ7xZmVXp1eAB0tx6Xm7MaViviIhgP+sVS06fDjvKXNJ2g3BGTHrH259odt FMnNEcUhEybSTX6OdmTMNo1q/ZfV0o9OhgIk3Pu5PmIa1nhlX9hGuuU7LgxCTWxRdZJ1At M5vyZLrroqGYczLgOILI7Hk3uJKviCLbJxc2D2K81NWBStjaCsTbT2kpb9lBp8G9x83at/ GQ8HhoNYuobH7WR07sUrFSmUWglYuSDXSqyUgRUtyWcOfJCmmmiQXzV1vr22DQ== 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=1713361183; 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=CcpqgmJYqCezuoNB+goGl6cbhzcVUWPaEUoZhczllg4=; b=LLD7IUTQqzC/F69sXOKbAW/M5JbM09z5RgqtJZrsdw661GfSXovoF3H2quIDGV5ZwtB32b X4ub7ZgmIzjh3iQRtv1aEsbJZ0Nep5bPquB9ZMEvIoWD+613ykF1sHA/hortZzezjbCODJ GAMZt/KUJAvUK07xCOhNGagRAoehSAc0vukl6Cx1wgwVQb0Y3F1jaAQySan1eTBM0KtWQl jxrb98niKLHiOvwiubL35pwtVkg6BGQ3OWGh73Ghjg5OWijZ56B6oAauXxDbE42Wg8q4Nk X00j1iVbN0fV6byvb3Rb81OSfiZvPVkIN6H3xo7cqFDCYvp5L+cSpkjmPSWvtA== 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 4VKMTW4LBszT9b; Wed, 17 Apr 2024 13:39:43 +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 43HDdhuV002341; Wed, 17 Apr 2024 13:39:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43HDdhxQ002338; Wed, 17 Apr 2024 13:39:43 GMT (envelope-from git) Date: Wed, 17 Apr 2024 13:39:43 GMT Message-Id: <202404171339.43HDdhxQ002338@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: e48f7ff6a12c - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: e48f7ff6a12c591b9b1d83abfcd46934b73c90fb Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=e48f7ff6a12c591b9b1d83abfcd46934b73c90fb commit e48f7ff6a12c591b9b1d83abfcd46934b73c90fb Author: Alexander Motin AuthorDate: 2024-04-10 20:44:00 +0000 Commit: Alexander Motin CommitDate: 2024-04-17 13:39:37 +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 116418dda25f..58b795a9d4ce 100644 --- a/sys/dev/aic7xxx/aic79xx.c +++ b/sys/dev/aic7xxx/aic79xx.c @@ -10317,7 +10317,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 4b62f76b9cf8..9934fbcc41bb 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -7843,7 +7843,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); }