Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   "Deucher, Alexander" <Alexander.Deucher@amd.com>
To:     Joerg Roedel <joro@8bytes.org>,
        "iommu@lists.linux-foundation.org" <iommu@lists.linux-foundation.org>
CC:     Will Deacon <will@kernel.org>,
        "d1nuc0m@protonmail.com" <d1nuc0m@protonmail.com>,
        "linux-doc@vger.kernel.org" <linux-doc@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Joerg Roedel <jroedel@suse.de>
Subject: RE: [PATCH] iommu/amd: Add amd_iommu=force_enable option
Thread-Topic: [PATCH] iommu/amd: Add amd_iommu=force_enable option
Thread-Index: AQHXN3htvCZhDJs6t0+m8CphP2KfMqrA5afQ
Date:   Thu, 22 Apr 2021 19:05:04 +0000
Message-ID: <MN2PR12MB4488CD47D15A9A291B8A0499F7469@MN2PR12MB4488.namprd12.prod.outlook.com>
References: <20210422130701.29872-1-joro@8bytes.org>
In-Reply-To: <20210422130701.29872-1-joro@8bytes.org>
Accept-Language: en-US
Content-Language: en-US
msip_labels: MSIP_Label_0d814d60-469d-470c-8cb0-58434e2bf457_Enabled=true;
 MSIP_Label_0d814d60-469d-470c-8cb0-58434e2bf457_SetDate=2021-04-22T19:05:01Z;
 MSIP_Label_0d814d60-469d-470c-8cb0-58434e2bf457_Method=Privileged;
 MSIP_Label_0d814d60-469d-470c-8cb0-58434e2bf457_Name=Public_0;
 MSIP_Label_0d814d60-469d-470c-8cb0-58434e2bf457_SiteId=3dd8961f-e488-4e60-8e11-a82d994e183d;
 MSIP_Label_0d814d60-469d-470c-8cb0-58434e2bf457_ActionId=398c6481-6763-457c-8882-38766c755744;
 MSIP_Label_0d814d60-469d-470c-8cb0-58434e2bf457_ContentBits=1
authentication-results: 8bytes.org; dkim=none (message not signed)
 header.d=none;8bytes.org; dmarc=none action=none header.from=amd.com;
x-originating-ip: [192.161.79.245]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: 1edb770a-ddaa-4670-b11b-08d905c189f1
x-ms-traffictypediagnostic: BL0PR12MB4964:
x-microsoft-antispam-prvs: <BL0PR12MB4964783B6ABD7E36F648CA73F7469@BL0PR12MB4964.namprd12.prod.outlook.com>
x-ms-oob-tlc-oobclassifiers: OLM:2803;
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam: BCL:0;
x-microsoft-antispam-message-info: XAQCChiU8T5AUi1AwT4ONvQIrMK+se/AG20UAGcfw1gIRJwiV7kdqzDq/hKv3CSryQwnPZJsJ/m1Eq1uo48Hs4SRZ+5j2Ln9PEdsVMs1bsKPBZvjyswyROW8hiFqTOiVAbjmlkAv/8AQl94w17bJBglL7gjrdpWognrNCKSbFw9mFfGW6mopSMhQB47qvHHfy01HHc5mPYFnHRL6duA4KesWmczxnpqDsQshzz1sb3AdrjrGPlE+IxIWJaj2q/QxQnFvEmaCxtxz1WM0YYxy+G7VrLB4OoZTo2BBgOdVnMT/m06y8WJOx4sGHg+XxJyxdzDUdUAjdQ30hXnhKPyEnSIWM75gTwWmNDAqsrIbCFztuzlf8usfif6nqXI6wptXTSfOo1b4FvESoGLnBjLq5jlMbf/O1pZSVcxV4FE+3N+VRGhkyQyoE3B/C4kFdhGp5ELM/cJwqHJc+X3WlCLIrGvNJk6GbuJwmS+G/ZMTXaJRUix0UJYuUf9vhs4+gBCsR0w7wYGswphxlvu8daqdKNbPuuxBOv81NKs6NphsqwwjFw4rfo05cAONqYZN2wY2zqnoVZm8euJnJqN6VNJt7Xtis3yLlbHlSQE1WjWQD0E=
x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR12MB4488.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(136003)(366004)(39860400002)(396003)(346002)(376002)(8676002)(8936002)(53546011)(52536014)(71200400001)(66946007)(7696005)(66556008)(64756008)(66476007)(66446008)(122000001)(5660300002)(6506007)(478600001)(76116006)(83380400001)(33656002)(55016002)(54906003)(186003)(110136005)(316002)(4326008)(26005)(38100700002)(2906002)(9686003)(86362001);DIR:OUT;SFP:1101;
x-ms-exchange-antispam-messagedata: =?us-ascii?Q?Td4aCbshRFxIqklPdttQIbUiKFdWyQmURO3WyImn310zIaZxuOQRTYqsGu16?=
 =?us-ascii?Q?7LODuZXEURIalyrGJMlX3e12Z7VcOp2DTu7s/6gH+lM/phcPQwZawI6P0ZOi?=
 =?us-ascii?Q?PCjc3JJTHpZUKWPwDcFpoFc6P4PqB4+JhHtloGnxmqvR9vystRIlxHYXv4xZ?=
 =?us-ascii?Q?27H0A1P/MODGI9l3agXriYk8aM564R2xPgZo+w2y6GOdoFSEwJSgq/qbFrrI?=
 =?us-ascii?Q?bbR+HSvMU5FTKJI5rl789KJVOwIYrkqOlRB4f5aeMpaDOPdemnO2MZ7IEHJP?=
 =?us-ascii?Q?5OZVpczK18jzIr0s6x8H5DP7KyCERiyD39kusTtZl1eOwdB32N+IQbfWUcvS?=
 =?us-ascii?Q?M+rPHp7FCXcBhbqpPSwFOZ80/cENaG04QffTG65B3fb04Yd2MNKF191qyxbJ?=
 =?us-ascii?Q?F8A6Bn3Pfa23jKN4xQPD8mUODJRzqsXEGMQfk8wb/dgHK/kkNpWSTlS0vdo8?=
 =?us-ascii?Q?fl5RrMKlJe8YWXKQZr4/dOAQBnHAGzaCFUMdGYN9nFj/4Cdb1397F/Uh3IU3?=
 =?us-ascii?Q?UErTcEmTpSlFD3umg0gt9YrhTwUOcTsgJHbfsaCK4f4/ellgSRFTmHf0RTpM?=
 =?us-ascii?Q?LUO2+e+lWdwPGXx5awWZFk/q44MQp3mO/gmO2ekA1zESNFQEzQnjtAay9dgA?=
 =?us-ascii?Q?QfNAlg/eMpFLolfTF/j7P+y6DMjR22tGclwppO0p/0sH0Vd43qVR2TprSOOG?=
 =?us-ascii?Q?TtOGSgbzEeJjyYFL7OcAysJtlbJmk8bKnfIL3bBVLzW0WlECht81vewSzlPT?=
 =?us-ascii?Q?f5M6n7Yc8FQQYe/X1LJDq/vNgySvcUHiAB1rOq69i6NTl1hn3gzwOsj5J7qY?=
 =?us-ascii?Q?asWe4twCmn0WKi5K175eqkQe7JXRLNDwhPezhe0tC0Kw75+dnecvx5RLRzAu?=
 =?us-ascii?Q?3KtW9Z0oWk0hP49c/EVWHc4jDK7E3WyYH+BgBazgu1mx7EC3XiggPbxp4PLS?=
 =?us-ascii?Q?LPfflGAqoAnr1nZDb7HPOB02doIFMqP/+/h6Cr5WaDy1scPM40Xty1tpa8qs?=
 =?us-ascii?Q?jaqnyrIaAuct3hXIxfu25mmSVbHZ1mwkXuol1xU+AUq2vwzpyFl6x2yWI5Ps?=
 =?us-ascii?Q?/fIIvxzi/oIGq/QhXYHMF762Hm2w8LyTfJQ8pVw3dnWOMLqG7iMlvrp/JxiL?=
 =?us-ascii?Q?U5E2f26iNfEjo42ml8ZykZiX+cJ152opHu9idkyjB8iroSRLrtxwWUn0e/Sn?=
 =?us-ascii?Q?OvicpCeQvGK2AE/I9TZRq3/FXpRrMGnoKCr2sfgnZNam/80lIuVP0I7mcXig?=
 =?us-ascii?Q?AtQOkDltfS0dxYZxNWDQjpu2LXXYWCk4JJ1Sj26xXvfAsBioHnF1e2qrOq8F?=
 =?us-ascii?Q?vo5nD8Zq1r9FN+vin3djpCky?=
x-ms-exchange-transport-forked: True
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB4488.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1edb770a-ddaa-4670-b11b-08d905c189f1
X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Apr 2021 19:05:04.9118
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: uxvWuwYyAPSa2LrVBan2BZI+bFNNjO0suGS4/VhIXps8Sz57G7/YYbQBryxEyqP1sfE04s/eO4VIt5d1plN5BQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB4964
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

[AMD Public Use]

> -----Original Message-----
> From: Joerg Roedel <joro@8bytes.org>
> Sent: Thursday, April 22, 2021 9:07 AM
> To: iommu@lists.linux-foundation.org
> Cc: Joerg Roedel <joro@8bytes.org>; Will Deacon <will@kernel.org>;
> Deucher, Alexander <Alexander.Deucher@amd.com>;
> d1nuc0m@protonmail.com; linux-doc@vger.kernel.org; linux-
> kernel@vger.kernel.org; Joerg Roedel <jroedel@suse.de>
> Subject: [PATCH] iommu/amd: Add amd_iommu=3Dforce_enable option
>=20
> From: Joerg Roedel <jroedel@suse.de>
>=20
> Add this option to enable the IOMMU on platforms like AMD Stoney, where
> the kernel usually disables it because it may cause problems in some
> scenarios.
>=20
> Signed-off-by: Joerg Roedel <jroedel@suse.de>

Acked-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  Documentation/admin-guide/kernel-parameters.txt | 3 +++
>  drivers/iommu/amd/init.c                        | 7 +++++++
>  2 files changed, 10 insertions(+)
>=20
> diff --git a/Documentation/admin-guide/kernel-parameters.txt
> b/Documentation/admin-guide/kernel-parameters.txt
> index 04545725f187..c9573f726707 100644
> --- a/Documentation/admin-guide/kernel-parameters.txt
> +++ b/Documentation/admin-guide/kernel-parameters.txt
> @@ -303,6 +303,9 @@
>  					  allowed anymore to lift isolation
>  					  requirements as needed. This
> option
>  					  does not override iommu=3Dpt
> +			force_enable - Force enable the IOMMU on
> platforms known
> +				       to be buggy with IOMMU enabled. Use
> this
> +				       option with care.
>=20
>  	amd_iommu_dump=3D	[HW,X86-64]
>  			Enable AMD IOMMU driver option to dump the ACPI
> table diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
> index 321f5906e6ed..3e2295d3b3e2 100644
> --- a/drivers/iommu/amd/init.c
> +++ b/drivers/iommu/amd/init.c
> @@ -155,6 +155,7 @@ static int amd_iommu_xt_mode =3D
> IRQ_REMAP_XAPIC_MODE;
>=20
>  static bool amd_iommu_detected;
>  static bool __initdata amd_iommu_disabled;
> +static bool __initdata amd_iommu_force_enable;
>  static int amd_iommu_target_ivhd_type;
>=20
>  u16 amd_iommu_last_bdf;			/* largest PCI device id we
> have
> @@ -2882,6 +2883,9 @@ static bool detect_ivrs(void)
>=20
>  	acpi_put_table(ivrs_base);
>=20
> +	if (amd_iommu_force_enable)
> +		goto out;
> +
>  	/* Don't use IOMMU if there is Stoney Ridge graphics */
>  	for (i =3D 0; i < 32; i++) {
>  		u32 pci_id;
> @@ -2893,6 +2897,7 @@ static bool detect_ivrs(void)
>  		}
>  	}
>=20
> +out:
>  	/* Make sure ACS will be enabled during PCI probe */
>  	pci_request_acs();
>=20
> @@ -3148,6 +3153,8 @@ static int __init parse_amd_iommu_options(char
> *str)
>  	for (; *str; ++str) {
>  		if (strncmp(str, "fullflush", 9) =3D=3D 0)
>  			amd_iommu_unmap_flush =3D true;
> +		if (strncmp(str, "force_enable", 12) =3D=3D 0)
> +			amd_iommu_force_enable =3D true;
>  		if (strncmp(str, "off", 3) =3D=3D 0)
>  			amd_iommu_disabled =3D true;
>  		if (strncmp(str, "force_isolation", 15) =3D=3D 0)
> --
> 2.31.1