From nobody Thu Oct 13 00:51:21 2022 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 4MnrYj5KWDz4fVb0; Thu, 13 Oct 2022 00:51:21 +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 4MnrYj4qPPz3FNd; Thu, 13 Oct 2022 00:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665622281; 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=Rt8n+g7QXAqZ7zHq6kEegCGCm5rN7aROtXPb9yR+YNI=; b=E0O8+rFdNsCKZzS/DydGYSGJH8entOiiHhSI8OZlDvy/Ri6beAjhEkrmNQxmfAsxU4SkVX H9GzofLNQ3DN5JISO9mII6MT7aX2uSTtO1WtaqwICjQxfT6HmcqYdRJQ4IpcmMiB/TCv3y 9q47bVu3JbPotnZfEFSgULbfxnp/LX1mHt3OXOELB0iIC8QM7AvyJH75nC351crxnGvbeu bjZWqT9WXxnLzyg5wQEfanf8vVhKPM0tkrOWpl1dZei/JNfU4qrUBCaPgu1/1Uj6BrOhJX 15FywTe8EacD7AQSKvL5Fml7oGDFSZKJ9f3CnrJAFXX7Iz7hAwodQiRs8E0tZg== 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 4MnrYj3j6zzFvW; Thu, 13 Oct 2022 00:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29D0pL8q015073; Thu, 13 Oct 2022 00:51:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29D0pLxm015072; Thu, 13 Oct 2022 00:51:21 GMT (envelope-from git) Date: Thu, 13 Oct 2022 00:51:21 GMT Message-Id: <202210130051.29D0pLxm015072@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 16d4c1de7b40 - stable/13 - cam: Provide compatibility for CAMGETPASSTHRU for periph drivers 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 16d4c1de7b40f1cc0d323b9ecc5a38afb7a42f8a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665622281; 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=Rt8n+g7QXAqZ7zHq6kEegCGCm5rN7aROtXPb9yR+YNI=; b=NzTcdFTQJr73n9Z3tl6HyXgVgH6lZnAkjrit8ECO4prq9M1wb6YQb54VXKhhFIJK30Nbtm Tt4VJWYEtMyOnpqZm7rLfPJ0NYFxTaDdHEN69XS4aPL7cX1ZNasjHZikZ8b/o4xMwcMOuz vCEiB6vfOuBZiIqgM9iMYU7vbhbWqEpNqpysacVCHELvtK+n5RidR72zcEX9SilgWCNmmD KrmyiWFoOhqsSo8vpeV4iPhvpPYXyD1eAfow8QbwFjp467081DXXBlHoTqtNBvtZiAsAbw uBQ26l5L6zSb2/pOzF6Cd6TSxHvmtS4XA86LI7tSKp2Nv0wkzj6q4WxEGAImxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665622281; a=rsa-sha256; cv=none; b=AdDTTd0mzn1qTvlIkf8lBgOUP0QZKbNNTuMt2gmzUTXs2RLxeE2go5+6Wz710rKzYLd55f cxuRia3HnSCfwZoHYqKS43KxBuF2EG36zZt+fO4j8d082scz+krw++G8ivwU8JTEIciTG/ Qdz/bqyfaMkLf1oj3w/b2jqpuQJy60L2atY8aYTAED5zzDChxtznAzs6Y5aFDmMfe2ZxnH +jVY1rwSNYxjE8zgwZaTh3jjhtrFPVOyivEHOxvlZjP0dBJGrihlKaqqWLP0qGuAWp5nwT iKmWpzbL96tBa2VQakBRHfFhU2H4IbBHDtR5/xPwAFiq75aAFV4MusthiZMWQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=16d4c1de7b40f1cc0d323b9ecc5a38afb7a42f8a commit 16d4c1de7b40f1cc0d323b9ecc5a38afb7a42f8a Author: Mark Johnston AuthorDate: 2022-09-29 17:07:52 +0000 Commit: Mark Johnston CommitDate: 2022-10-13 00:44:16 +0000 cam: Provide compatibility for CAMGETPASSTHRU for periph drivers The CAM version bump 0x19 -> 0x1a changed the CAMGETPASSTHRU definition, so applications using the old ioctl are broken. However, that version change did not affect anything relating to the ioctl implementation for periphs. Fixes: 8f9be1eed11c ("cam(4): Improve XPT_DEV_MATCH") PR: 264709 Tested by: andreas.mahling@googlemail.com Reviewed by: imp (cherry picked from commit 0cd631ee0693dd7337c38b251044e018aad6fbaf) --- sys/cam/cam_periph.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c index ff90968800a0..e7fbc8c41c0a 100644 --- a/sys/cam/cam_periph.c +++ b/sys/cam/cam_periph.c @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -1120,6 +1121,7 @@ cam_periph_ioctl(struct cam_periph *periph, u_long cmd, caddr_t addr, error = found = 0; switch(cmd){ + case CAMGETPASSTHRU_0x19: case CAMGETPASSTHRU: ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL); xpt_setup_ccb(&ccb->ccb_h,