From patchwork Fri Jun 5 14:10:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 6554261 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E521A9F326 for ; Fri, 5 Jun 2015 14:11:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 22116206FD for ; Fri, 5 Jun 2015 14:11:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2206120712 for ; Fri, 5 Jun 2015 14:11:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754785AbbFEOLW (ORCPT ); Fri, 5 Jun 2015 10:11:22 -0400 Received: from 8bytes.org ([81.169.241.247]:59194 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423037AbbFEOLR (ORCPT ); Fri, 5 Jun 2015 10:11:17 -0400 Received: by theia.8bytes.org (Postfix, from userid 1000) id 6F3A15BD; Fri, 5 Jun 2015 16:11:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1433513471; bh=4KhUuBNF7SxjrV+5/eyVAWfJXYb4Wy7/GX+1eKKNws4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LLTN89pI7wOJlGHbu8maVSrVi90+/OwEatgfh0Etc3wrAPLXoTb2lSQS89OBiGKPy zRGvtTGz7pUsfF/jHXNxTT+RuStX9r89xw/oo4fxD6lPE2HGU9CYaCNvUYVLontAUF c0OMmRNE/O633B6xBTy9NKp58JTDuIvWUGu5h4K2sbSADeDE7q94LhWcqyvgmHuGTX DLL2686o3vL0a/o8/ddKo6Pn4Q/dtteNzzJmRb4JANb+VMXadtvGxl7a95I39vxxQ2 sNNSScVOpKwa8Ywo5dA4ghdWxx2Wxi3rxfd1PDlJVc0lvBgOaAfXnuE5UKl+nOZn6u KKob5/b5jEPqQ== From: Joerg Roedel To: iommu@lists.linux-foundation.org Cc: zhen-hual@hp.com, bhe@redhat.com, dwmw2@infradead.org, vgoyal@redhat.com, dyoung@redhat.com, alex.williamson@redhat.com, ddutile@redhat.com, ishii.hironobu@jp.fujitsu.com, indou.takao@jp.fujitsu.com, bhelgaas@google.com, doug.hatch@hp.com, jerry.hoemann@hp.com, tom.vaden@hp.com, li.zhang6@hp.com, lisa.mitchell@hp.com, billsumnerlinux@gmail.com, rwright@hp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, kexec@lists.infradead.org, joro@8bytes.org, jroedel@suse.de Subject: [PATCH 05/17] iommu/vt-d: Mark root-entry present in set_root_entry Date: Fri, 5 Jun 2015 16:10:51 +0200 Message-Id: <1433513463-19128-6-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1433513463-19128-1-git-send-email-joro@8bytes.org> References: <1433513463-19128-1-git-send-email-joro@8bytes.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Joerg Roedel When we do no memcpy from the old to the new kernel for the root entry table, we have to set the present bit ourself. Tested-by: Baoquan He Signed-off-by: Joerg Roedel --- drivers/iommu/intel-iommu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index d66bec6..cda0901 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -198,8 +198,7 @@ static inline bool root_present(struct root_entry *root) static inline void set_root_value(struct root_entry *root, unsigned long value) { - root->lo &= ~VTD_PAGE_MASK; - root->lo |= value & VTD_PAGE_MASK; + root->lo = (value & VTD_PAGE_MASK) | 1; } static inline struct context_entry *