From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA60DC4332D for ; Wed, 18 Mar 2020 20:59:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 87B44208E4 for ; Wed, 18 Mar 2020 20:59:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584565175; bh=+gcwa6UDdPL83YLFEWcz7sgnSrRd427fX6aCwkeNxDc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZnwmyH+szo1GfD5c/RUHbRY1Uo0lT9LVhyQsR+BO4IgMB4cR7hLwGKMnmqVBW0Het jb+ZJmolJ8YykJN1Mo55XtnSxkm68uo4106zdHbPfiB10t7qpQH4fzekzlMi1aQQoR jl69rAo4xqIQgKrC059tW8xEUTrbICnFt7JIWY38= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727250AbgCRU7e (ORCPT ); Wed, 18 Mar 2020 16:59:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:58106 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728691AbgCRU4r (ORCPT ); Wed, 18 Mar 2020 16:56:47 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B388920A8B; Wed, 18 Mar 2020 20:56:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584565007; bh=+gcwa6UDdPL83YLFEWcz7sgnSrRd427fX6aCwkeNxDc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yeBlUHDMtfMoZIXWHX/TPyOHw9cT+q4t4Q2SGYRRkcAzm6X9TVQmcQ9nKLID+FyBN TippJyLy7mIf6qnOU2im1tPHXmDDKpXamgd3hlVTpnNW+E8QggRfyfNaTKgSrclR6D TTkSRhVDSnEceSgzzapxFW6SiS4eYbJJ+85iOaso= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhenzhong Duan , Lu Baolu , Joerg Roedel , Sasha Levin , iommu@lists.linux-foundation.org Subject: [PATCH AUTOSEL 4.9 15/15] iommu/vt-d: Fix the wrong printing in RHSA parsing Date: Wed, 18 Mar 2020 16:56:29 -0400 Message-Id: <20200318205629.17750-15-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200318205629.17750-1-sashal@kernel.org> References: <20200318205629.17750-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhenzhong Duan [ Upstream commit b0bb0c22c4db623f2e7b1a471596fbf1c22c6dc5 ] When base address in RHSA structure doesn't match base address in each DRHD structure, the base address in last DRHD is printed out. This doesn't make sense when there are multiple DRHD units, fix it by printing the buggy RHSA's base address. Signed-off-by: Lu Baolu Signed-off-by: Zhenzhong Duan Fixes: fd0c8894893cb ("intel-iommu: Set a more specific taint flag for invalid BIOS DMAR tables") Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/dmar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index d51734e0c3504..6e3ab76f29f1a 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@ -485,7 +485,7 @@ static int dmar_parse_one_rhsa(struct acpi_dmar_header *header, void *arg) 1, TAINT_FIRMWARE_WORKAROUND, "Your BIOS is broken; RHSA refers to non-existent DMAR unit at %llx\n" "BIOS vendor: %s; Ver: %s; Product Version: %s\n", - drhd->reg_base_addr, + rhsa->base_address, dmi_get_system_info(DMI_BIOS_VENDOR), dmi_get_system_info(DMI_BIOS_VERSION), dmi_get_system_info(DMI_PRODUCT_VERSION)); -- 2.20.1