From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Joerg Roedel <joro@8bytes.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Alex Williamson <alex.williamson@redhat.com>,
Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: linux-next: build failure after merge of the iommu tree
Date: Thu, 15 Dec 2011 15:40:51 +1100 [thread overview]
Message-ID: <20111215154051.e8bb4a174259e910a3045f0e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2746 bytes --]
Hi Joerg,
After merging the iommu tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/iommu/amd_iommu.c: In function 'pci_iommuv2_capable':
drivers/iommu/amd_iommu.c:179:3: error: 'PCI_PRI_CAP' undeclared (first use in this function)
drivers/iommu/amd_iommu.c:180:3: error: 'PCI_PASID_CAP' undeclared (first use in this function)
drivers/iommu/amd_iommu.c: In function 'pri_reset_while_enabled':
drivers/iommu/amd_iommu.c:1981:38: error: 'PCI_PRI_CAP' undeclared (first use in this function)
drivers/iommu/amd_iommu.c:1981:2: warning: passing argument 2 of 'pci_find_ext_capability' makes integer from pointer without a cast [enabled by default]
include/linux/pci.h:712:5: note: expected 'int' but argument is of type 'const int *'
drivers/iommu/amd_iommu.c: In function 'pci_pri_tlp_required':
drivers/iommu/amd_iommu.c:2045:38: error: 'PCI_PRI_CAP' undeclared (first use in this function)
drivers/iommu/amd_iommu.c:2045:2: warning: passing argument 2 of 'pci_find_ext_capability' makes integer from pointer without a cast [enabled by default]
include/linux/pci.h:712:5: note: expected 'int' but argument is of type 'const int *'
Caused by commit 56288ab6e949 ("PCI: Fix PRI and PASID consistency") from
the pci tree interacting with various commits from the iommu tree.
I have added the following merge fix patch (and can carry it as
necessary).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 15 Dec 2011 15:35:23 +1100
Subject: [PATCH] iommu: fix for pci identifier changes
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/iommu/amd_iommu.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 32fc99c..b1f155e 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -176,8 +176,8 @@ static bool pci_iommuv2_capable(struct pci_dev *pdev)
{
static const int caps[] = {
PCI_EXT_CAP_ID_ATS,
- PCI_PRI_CAP,
- PCI_PASID_CAP,
+ PCI_EXT_CAP_ID_PRI,
+ PCI_EXT_CAP_ID_PASID,
};
int i, pos;
@@ -1978,7 +1978,7 @@ static int pri_reset_while_enabled(struct pci_dev *pdev)
u16 control;
int pos;
- pos = pci_find_ext_capability(pdev, PCI_PRI_CAP);
+ pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI);
if (!pos)
return -EINVAL;
@@ -2042,7 +2042,7 @@ bool pci_pri_tlp_required(struct pci_dev *pdev)
u16 control;
int pos;
- pos = pci_find_ext_capability(pdev, PCI_PRI_CAP);
+ pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI);
if (!pos)
return false;
--
1.7.7.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2011-12-15 4:41 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-15 4:40 Stephen Rothwell [this message]
2011-12-15 10:09 ` linux-next: build failure after merge of the iommu tree Joerg Roedel
-- strict thread matches above, loose matches on Subject: below --
2021-10-12 3:46 Stephen Rothwell
2021-10-12 8:33 ` Marc Zyngier
2021-10-12 11:21 ` Lorenzo Pieralisi
2021-10-13 1:43 ` Bjorn Helgaas
2020-09-21 4:09 Stephen Rothwell
2020-10-13 7:31 ` Stephen Rothwell
2020-10-15 2:43 ` Stephen Rothwell
2019-09-02 6:39 Stephen Rothwell
2019-09-02 14:03 ` Joerg Roedel
2019-09-02 14:26 ` Lendacky, Thomas
2019-09-03 5:28 ` Stephen Rothwell
2015-11-01 11:42 Stephen Rothwell
2015-11-01 15:14 ` Joerg Roedel
2015-11-02 0:15 ` Magnus Damm
2014-11-05 2:47 Stephen Rothwell
2014-11-05 11:16 ` Joerg Roedel
2014-07-08 4:02 Stephen Rothwell
2014-07-08 4:12 ` Alex Williamson
2014-07-08 11:20 ` Joerg Roedel
2011-08-29 3:32 Stephen Rothwell
2011-08-29 5:11 ` Ohad Ben-Cohen
2011-08-29 10:42 ` Joerg Roedel
2011-08-29 8:36 ` Joerg Roedel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111215154051.e8bb4a174259e910a3045f0e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alex.williamson@redhat.com \
--cc=jbarnes@virtuousgeek.org \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).