From nobody Wed Apr 10 20:50:32 2024 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 4VFFMr2FkDz5G5lr; Wed, 10 Apr 2024 20:50:32 +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 4VFFMr1kqnz4XMt; Wed, 10 Apr 2024 20:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712782232; 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=hdxlude7mZd3k2rLXSA/s8RdnV37dUsjD5aMpj+blq0=; b=UoPiQchxg0hg9ORoAJkEWc2daxzvLhl4ufHCQCwbsz9eQXeOp5OKKYqggAU7/RWO1MEX7f cAxpYSgSvQDEtrlUrlx3+mfyFsQOMCu0N+vVhw4Q8PpXHHWL9TRe39ViLQr0SdNFozLSjz nZuxUimMsQKNLfqTIAqsyzFi08kg1P+qhhXH7BnQPLGgmay19MnFm9uhiO9xRt11Mipp/a 0Fy3Lp+9K6nFz10TBMglC1/9xKRBlT9FxzGuCVIM6c52u1yROi6APP48CnYGk7VKA2/2Mw YdWqc5lt6LfoctrV+iAsRL525DX1QR6QWm9MNDpFI/OqsMt3w4ShrftGpECx7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712782232; a=rsa-sha256; cv=none; b=ZMZOw9v8cGuuZACB8KIEVMMXhvz3kObiKXw9YP4cehdt7iSHshuwD44iSXAQ37e4tzYJan u9xorJ6KswPXkjn8A2qyYvHVWP+WHLpfvfETYKo3P6DtHadXDGIuIDPabC65bPZm5DMQTy Iy5uW+XUT/4us/6huVgRvpUpjzFSvLtAjW2q40qczvq4E4usjYiB7qgVFUt8KjGCVekno+ RzVfaooefAMYMyKFAZCFeswb+xDix0gzBVMCzLRkaIVOKJqaQ4201Wa//RCiP4WZKfqgBU Y9qpHuVpdRASbHu18rLpqVcwRER7E9JVyyp7Ecm2AKPo1JyRnGaduSLmgZBPQQ== 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=1712782232; 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=hdxlude7mZd3k2rLXSA/s8RdnV37dUsjD5aMpj+blq0=; b=naxIbc/BL+vI4R2cEmqrmHu3BAs1xTkRl6rkDLCaDbtEDii7EHsLCtDqPXO3/aQDhgG8NU IVq9tTWes9dqDxRLMvRKkEIHHxfSKUTyFZH5ptmKl/+FDKuOeOopk/WrBZYjc2LuDbsfNE 7DJlX5MW03M85yXngAfsIpGQbhZCJ8vg+2bKiNNMLt8FB0goXE2CtnioaVphi2tgVidNjt FTWb63VpXgHRYawwC8eYTYRMKyO7mhHo1KPmIlPl7+A8DcvsCb4YPNmRtpxmCpiVg3rR1i PfJp9cUdtUCEQ9sIifIayW0ufD0GuUh+4D9WJk29z9SoyRAGSjb6/YX05wBhcw== 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 4VFFMr1Lctzt5s; Wed, 10 Apr 2024 20:50:32 +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 43AKoWFh061147; Wed, 10 Apr 2024 20:50:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43AKoWhl061144; Wed, 10 Apr 2024 20:50:32 GMT (envelope-from git) Date: Wed, 10 Apr 2024 20:50:32 GMT Message-Id: <202404102050.43AKoWhl061144@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: f1e4c095777d - main - ahc/ahd: Fix target mode operation 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: Sender: dev-commits-src-main+owner@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: f1e4c095777db088645008848b3bfb87146c13ec Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=f1e4c095777db088645008848b3bfb87146c13ec commit f1e4c095777db088645008848b3bfb87146c13ec Author: Alexander Motin AuthorDate: 2024-04-10 20:44:00 +0000 Commit: Alexander Motin CommitDate: 2024-04-10 20:44:00 +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 --- 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); }