From patchwork Tue May 17 10:17:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 9111351 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 74E709F1C1 for ; Tue, 17 May 2016 10:18:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ADA23202EB for ; Tue, 17 May 2016 10:18:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BB592202AE for ; Tue, 17 May 2016 10:18:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752556AbcEQKSo (ORCPT ); Tue, 17 May 2016 06:18:44 -0400 Received: from mx2.suse.de ([195.135.220.15]:38019 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752945AbcEQKSn (ORCPT ); Tue, 17 May 2016 06:18:43 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 2C52BAAEF; Tue, 17 May 2016 10:18:41 +0000 (UTC) Date: Tue, 17 May 2016 12:17:37 +0200 From: Joerg Roedel To: Bjorn Helgaas Cc: "Lawrynowicz, Jacek" , Lukas Wunner , Bjorn Helgaas , Alex Williamson , "linux-pci@vger.kernel.org" Subject: Re: Build breakage for pci-next since v4.6-rc5 Message-ID: <20160517101737.GI9801@suse.de> References: <20160513115642.GA22906@wunner.de> <36D38C1F74839847A52A484C31F3E51A62221FEF@irsmsx105.ger.corp.intel.com> <20160516201000.GB20759@localhost> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20160516201000.GB20759@localhost> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Hi Bjorn, On Mon, May 16, 2016 at 03:10:00PM -0500, Bjorn Helgaas wrote: > I don't want to rebase my "next" branch, but if you could post the > incremental patch to fix up drivers/iommu/amd_iommu.c, I'll ask Linus > to include that when he pulls my branch. Here is the proper fix: From 4b19e8719c47fc8fef7c14410db606d16c9c76e3 Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Tue, 17 May 2016 12:13:57 +0200 Subject: [PATCH] iommu/amd: Use pci_dma_add_alias function The pci_dma_add_alias() function is the new interface and replaces the old direct-access of 'struct pci_dev'. Convert the last use of the old interface to the new one in the AMD IOMMU driver. Signed-off-by: Joerg Roedel --- drivers/iommu/amd_iommu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 5efadad..3839fd2 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -263,8 +263,7 @@ static u16 get_alias(struct device *dev) */ if (pci_alias == devid && PCI_BUS_NUM(ivrs_alias) == pdev->bus->number) { - pdev->dev_flags |= PCI_DEV_FLAGS_DMA_ALIAS_DEVFN; - pdev->dma_alias_devfn = ivrs_alias & 0xff; + pci_add_dma_alias(pdev, ivrs_alias & 0xff); pr_info("AMD-Vi: Added PCI DMA alias %02x.%d for %s\n", PCI_SLOT(ivrs_alias), PCI_FUNC(ivrs_alias), dev_name(dev));