From nobody Wed Sep 07 15:10:08 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 4MN5KF1yLSz4bP7t; Wed, 7 Sep 2022 15:10:09 +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 4MN5KF0W2pz3Y01; Wed, 7 Sep 2022 15:10:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662563409; 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=HahUJq44rdxN4IkptnZaCoHGHDVq5f0Cr8gd+uGiVbU=; b=gkBEgbF+Dc2dXSwK3TFyj9vasLHOPSOEQBlTwxofVU6r6sQ9AW/GVdtc6GyIk8u5zTC/tU sY7Z6+33IVqAnpirj9R6QVix5ds3C+4poWc26V/g+/PMEnnekrYBdlUiR8Yg7qDOxmFmeC o9+emSOmcehCG9rmuy8I6sNza0C5v+cVIgGAuE6fCOtLbtzjp+xAeciuaSdw6f6tOZaZUX Ce4zX75ei1FcLiu4SZMgnf9GwBOC0GgSt90DLVPmWuy81GNxNG3genLPGAYXoBaMW2xdhm SKllG2cvh312y59AslqRcf4MQgqArnH+hGcyJz15dyJdtBMM/elnB+XcXTwYIQ== 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 4MN5KD6kK7zZ47; Wed, 7 Sep 2022 15:10:08 +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 287FA8T0020485; Wed, 7 Sep 2022 15:10:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 287FA8Hj020482; Wed, 7 Sep 2022 15:10:08 GMT (envelope-from git) Date: Wed, 7 Sep 2022 15:10:08 GMT Message-Id: <202209071510.287FA8Hj020482@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 96c30348bda0 - stable/13 - linuxkpi: Add io.h 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 96c30348bda027c1438596b624924135538c6f81 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662563409; 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=HahUJq44rdxN4IkptnZaCoHGHDVq5f0Cr8gd+uGiVbU=; b=lFzdoMc2Ty9rR0lyhqT8PWNGmQ7mJdBbFPSrNAu8+12UeRe+kaMJUBhhCiThXGb5rIiQvJ iAO8whvEfIEdXZ30RP/mv4t9eH5xALC8rWMfFZ7WO64hDJIyHC9/HZfLHuaEvbq/szgUOP xiQKZE5Gt/kHQvPg7ZrSSje56o/A+HKXsTYSh8/5/60Ven8Vef0EJV4Ug65ZjZNC8M5gt5 VmXRvOgmWqbfaEfdmguF7buc7rbxTGbjLvxKz4udpS+LQqK9iN+uUfbVhggufHaTm616w7 6aX1f0QS+8R4/HxHfidGM+SHjgfBubW6neLaKPlCt7JtIMLycVK65t9hhwUeyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662563409; a=rsa-sha256; cv=none; b=yim8gtIY628GT+xIqDEwtyxJtO/swCIZxdxKO2/Mn9LacO2vwZJJXEDhlbI3fHjyOrXvOL Uoc7Kp7Ovvyl3D8fuj2m/XCDiJnbZ9/RJh12/KRhSt3zocLQE5MUpLcM30ncTfEtDbZNdx 2SCX6Ll3N0fIv4M7hMqFyFMWGEQwSdpjfksSONKXylECNu/45nognRT4cN7YqfmDmv05Un Y+K0qwFp0amUbrt95gMbt/qpbyFfiBkmC+oMxIJGVf1IGREBTbKUcAI9gdRJJfJpgy4V93 dezKf7p9Gslfmt0S44PloUKBD+XhiE9PulRcTnRRW4akq08MlF83z164f545iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=96c30348bda027c1438596b624924135538c6f81 commit 96c30348bda027c1438596b624924135538c6f81 Author: Emmanuel Vadot AuthorDate: 2022-07-26 08:15:45 +0000 Commit: Emmanuel Vadot CommitDate: 2022-09-07 15:09:03 +0000 linuxkpi: Add io.h out* arguments are different on Linux and the i915 driver uses them. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D35942 (cherry picked from commit 96b917bfcf2c558340f8f6e620e64efededa1daf) --- .../linuxkpi/common/include/asm-generic/io.h | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/asm-generic/io.h b/sys/compat/linuxkpi/common/include/asm-generic/io.h new file mode 100644 index 000000000000..8dc7eb6cf453 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/asm-generic/io.h @@ -0,0 +1,40 @@ +/*- + * Copyright (c) 2022 Beckhoff Automation GmbH & Co. KG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#ifndef _LINUXKPI_ASMGENERIC_IO_H_ +#define _LINUXKPI_ASMGENERIC_IO_H_ + +#if defined(__i386__) || defined(__amd64__) + +#include + +#define outb(a,b) outb(b,a) +#define outw(a,b) outw(b,a) +#define outl(a,b) outl(b,a) + +#endif + +#endif /* _LINUXKPI_ASMGENERIC_IO_H_ */