From nobody Thu Sep 29 17:24:34 2022 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 4MdgGB2MzDz4dlwc; Thu, 29 Sep 2022 17:24:34 +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 4MdgGB1qs9z4DQW; Thu, 29 Sep 2022 17:24:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664472274; 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=/1BEjZENXAW7E0Y/NqdKybpoIhBBcDlDQOdDRPUM8d0=; b=fYMDAE8LSMF46iegUph9g1nYzTeB/5DPVEAuF6rRzuUKtFp5PeVcrBpZJHQoj+GH1LUc1Z WpMdNLmpy9RgxZU7mivb2wtaaGd5eyfbO3R052JHqmA0nvWK4mLF+ovmrymFsHfJpHVMPB 6aSxUAd82fM01CCzIBkLgM0Kd+aaFHjOUbGxV5WbcwcLVdpUbkwRv9JjfkWaddsGVp02KC PLhP6U0IiFWcLOeihN/clJyf+FgAXr3uKGHajcrV2t1zo95jwq5eghkZAV6MWdbefjajyg ox5bk8WSmTsh0w4dSxqCxnmSV5mn+i0yxv0JzbE//YZ0BgUIt/inFEQzCvDJfw== 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 4MdgGB0bFyztRW; Thu, 29 Sep 2022 17:24:34 +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 28THOYX6053215; Thu, 29 Sep 2022 17:24:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28THOY8R053214; Thu, 29 Sep 2022 17:24:34 GMT (envelope-from git) Date: Thu, 29 Sep 2022 17:24:34 GMT Message-Id: <202209291724.28THOY8R053214@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 0cd631ee0693 - main - cam: Provide compatibility for CAMGETPASSTHRU for periph drivers 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: owner-dev-commits-src-main@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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0cd631ee0693dd7337c38b251044e018aad6fbaf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664472274; 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=/1BEjZENXAW7E0Y/NqdKybpoIhBBcDlDQOdDRPUM8d0=; b=V1Wi5YmO/I7gllsSd+RfBUATKM5cDapFNTFcdYzO4ecQaSrooCp13uexhNd4PSDG4HfgGv 4wXKFle/02motwN4D7N8u1KuZKp8Rc95P/YOFsAiXctdiXGrHqW5IvvjhVLVMQQ1Dd7C0y UPRdn5WHll5VtZh0uB2zKAb7VVLZyhwUDz8kwm2vITyIs8SUhfqSXPiOs/4BJh1kC/ilBC rqgpRvfo3p6RWjIRI7OIhxgWemNJBYdFG15l+lUA5Z67ddNdh3fE9FuYWPuBOWffQCzkon ULW2wTT6frFg3zo9bI5RsORECizCtNSTHvYCt47f0q/rfDvyjP4AukHXoDA0/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664472274; a=rsa-sha256; cv=none; b=ssVpb8OxctKvpfZQprAmrJyNulWtdpGiJiE1lhYX0Nc07OSKhH7PSBMJzt+EKYRh9ullxs ix2zT5G9taQbingFelSaCa6aJyLsZYhOBYdbECOcsGIwuWmWpXIY6FLK7Agr4FO2sFYhJ5 KmUynr5FsW4FNo0cQZLsy0p1HfzlY05n+OkOEZsDJ83WsXq2EMdgJjrtzZ4Xk8j5CYD44Q EXoKa2KtnLCp3LhaMZEfuxYU16+9gE/HpPiYHVAjINdHRxTXMGv5vfvQdHBmL9rYszlkcC fhE1JB6zxEoFmDJ8JY8BLWlOdd7vj8O7qECzsBjphmzrYByCV93/3xRn0S9m5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0cd631ee0693dd7337c38b251044e018aad6fbaf commit 0cd631ee0693dd7337c38b251044e018aad6fbaf Author: Mark Johnston AuthorDate: 2022-09-29 17:07:52 +0000 Commit: Mark Johnston CommitDate: 2022-09-29 17:14:57 +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 MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D36389 --- 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 1d49bf277ba1..599eb9e3508a 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 @@ -1132,6 +1133,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,