From patchwork Thu Mar 19 12:59:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229137 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 D92BEC4332E for ; Thu, 19 Mar 2020 13:07:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A6BC320A8B for ; Thu, 19 Mar 2020 13:07:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584623265; bh=t8f3wlR5uo7ffuF2P2L6WVawp/qSWEZa3RYcqPbGfh4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PxsyL+80My/khTJKNLHx1GBtOYYZjKKeHuNajGDTpnbOuoRplaM51kD/XJHgOafjk Fl/mxXeop0C+4EldI3UUnuNAVGgYjoHJv4bDb4XjUPWIN7i38wYulHGFyiWW0MUp2K COcLVUETl0FYurG1XtSQWCYe7w+rsoa2jtXL0Ouo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727994AbgCSNHp (ORCPT ); Thu, 19 Mar 2020 09:07:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:51582 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727986AbgCSNHo (ORCPT ); Thu, 19 Mar 2020 09:07:44 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 76FF8208D5; Thu, 19 Mar 2020 13:07:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584623263; bh=t8f3wlR5uo7ffuF2P2L6WVawp/qSWEZa3RYcqPbGfh4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gDKG0MgjBKT5W98QX3BpWscr2Qa4mH+RnKcCaJae0SsvZsvV2mjz0qU+q2zBC2A5F DvUMVrKkqSLJxNkQitp8qt7xkQM9OdhOVBkVfLXu0vszFJBtomYTQYpMpAC/wHzE7g j8gLBuxTQCpHxjDCc9haAm69jfqLaKUPLeNrMDiE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lu Baolu , Zhenzhong Duan , Joerg Roedel Subject: [PATCH 4.4 33/93] iommu/vt-d: Fix the wrong printing in RHSA parsing Date: Thu, 19 Mar 2020 13:59:37 +0100 Message-Id: <20200319123935.425516640@linuxfoundation.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200319123924.795019515@linuxfoundation.org> References: <20200319123924.795019515@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhenzhong Duan commit b0bb0c22c4db623f2e7b1a471596fbf1c22c6dc5 upstream. 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: Greg Kroah-Hartman --- drivers/iommu/dmar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@ -473,7 +473,7 @@ static int dmar_parse_one_rhsa(struct ac pr_warn(FW_BUG "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));