From: Niklas Cassel <niklas.cassel@axis.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Cyrille Pitchen <cyrille.pitchen@free-electrons.com>
Subject: Re: linux-next: build failure after merge of the pci tree
Date: Thu, 1 Feb 2018 09:56:09 +0100 [thread overview]
Message-ID: <20180201085608.GA22568@axis.com> (raw)
In-Reply-To: <20180201105114.562aef46@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1478 bytes --]
On Thu, Feb 01, 2018 at 10:51:14AM +1100, Stephen Rothwell wrote:
> Hi Bjorn,
>
> After merging the pci tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/pci/dwc/pcie-designware-ep.c: In function 'dw_pcie_ep_raise_msi_irq':
> drivers/pci/dwc/pcie-designware-ep.c:293:8: error: too few arguments to function 'dw_pcie_ep_map_addr'
> ret = dw_pcie_ep_map_addr(epc, ep->msi_mem_phys, msg_addr,
> ^~~~~~~~~~~~~~~~~~~
> drivers/pci/dwc/pcie-designware-ep.c:177:12: note: declared here
> static int dw_pcie_ep_map_addr(struct pci_epc *epc, u8 func_no,
> ^~~~~~~~~~~~~~~~~~~
> drivers/pci/dwc/pcie-designware-ep.c:300:2: error: too few arguments to function 'dw_pcie_ep_unmap_addr'
> dw_pcie_ep_unmap_addr(epc, ep->msi_mem_phys);
> ^~~~~~~~~~~~~~~~~~~~~
> drivers/pci/dwc/pcie-designware-ep.c:161:13: note: declared here
> static void dw_pcie_ep_unmap_addr(struct pci_epc *epc, u8 func_no,
> ^~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> 4494738de0d9 ("PCI: endpoint: Add the function number as argument to EPC ops")
>
> interacting with commit
>
> 6f6d7873711c ("PCI: designware-ep: Add generic function for raising MSI irq")
>
> This should have been fixed up in commit
>
> 26b259ab4fe8 ("Merge remote-tracking branch 'lorenzo/pci/dwc' into next")
>
> I have used the pci tree from next-20180131 for today.
Hello,
A suggested merge resolution included as an attachment.
Regards,
Niklas
[-- Attachment #2: dwc-ep.patch --]
[-- Type: text/x-diff, Size: 4180 bytes --]
diff --git a/drivers/pci/dwc/pci-dra7xx.c b/drivers/pci/dwc/pci-dra7xx.c
index 39e4a9744863..ed8558d638e5 100644
--- a/drivers/pci/dwc/pci-dra7xx.c
+++ b/drivers/pci/dwc/pci-dra7xx.c
@@ -368,7 +368,7 @@ static void dra7xx_pcie_raise_msi_irq(struct dra7xx_pcie *dra7xx,
dra7xx_pcie_writel(dra7xx, PCIECTRL_TI_CONF_MSI_XMT, reg);
}
-static int dra7xx_pcie_raise_irq(struct dw_pcie_ep *ep,
+static int dra7xx_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
enum pci_epc_irq_type type, u8 interrupt_num)
{
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
diff --git a/drivers/pci/dwc/pcie-artpec6.c b/drivers/pci/dwc/pcie-artpec6.c
index 34ae163603ee..93b3df9ed1b5 100644
--- a/drivers/pci/dwc/pcie-artpec6.c
+++ b/drivers/pci/dwc/pcie-artpec6.c
@@ -445,7 +445,7 @@ static void artpec6_pcie_ep_init(struct dw_pcie_ep *ep)
dw_pcie_ep_reset_bar(pci, bar);
}
-static int artpec6_pcie_raise_irq(struct dw_pcie_ep *ep,
+static int artpec6_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
enum pci_epc_irq_type type, u8 interrupt_num)
{
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
@@ -455,7 +455,7 @@ static int artpec6_pcie_raise_irq(struct dw_pcie_ep *ep,
dev_err(pci->dev, "EP cannot trigger legacy IRQs\n");
return -EINVAL;
case PCI_EPC_IRQ_MSI:
- return dw_pcie_ep_raise_msi_irq(ep, interrupt_num);
+ return dw_pcie_ep_raise_msi_irq(ep, func_no, interrupt_num);
default:
dev_err(pci->dev, "UNKNOWN IRQ type\n");
}
diff --git a/drivers/pci/dwc/pcie-designware-ep.c b/drivers/pci/dwc/pcie-designware-ep.c
index c0395e1f470a..3a6feeff5f5b 100644
--- a/drivers/pci/dwc/pcie-designware-ep.c
+++ b/drivers/pci/dwc/pcie-designware-ep.c
@@ -229,7 +229,7 @@ static int dw_pcie_ep_raise_irq(struct pci_epc *epc, u8 func_no,
if (!ep->ops->raise_irq)
return -EINVAL;
- return ep->ops->raise_irq(ep, type, interrupt_num);
+ return ep->ops->raise_irq(ep, func_no, type, interrupt_num);
}
static void dw_pcie_ep_stop(struct pci_epc *epc)
@@ -267,7 +267,7 @@ static const struct pci_epc_ops epc_ops = {
.stop = dw_pcie_ep_stop,
};
-int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep,
+int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
u8 interrupt_num)
{
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
@@ -290,14 +290,14 @@ int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep,
msg_data = dw_pcie_readw_dbi(pci, MSI_MESSAGE_DATA_32);
}
msg_addr = ((u64) msg_addr_upper) << 32 | msg_addr_lower;
- ret = dw_pcie_ep_map_addr(epc, ep->msi_mem_phys, msg_addr,
+ ret = dw_pcie_ep_map_addr(epc, func_no, ep->msi_mem_phys, msg_addr,
epc->mem->page_size);
if (ret)
return ret;
writel(msg_data | (interrupt_num - 1), ep->msi_mem);
- dw_pcie_ep_unmap_addr(epc, ep->msi_mem_phys);
+ dw_pcie_ep_unmap_addr(epc, func_no, ep->msi_mem_phys);
return 0;
}
diff --git a/drivers/pci/dwc/pcie-designware.h b/drivers/pci/dwc/pcie-designware.h
index 7e52119f0e96..11b13864a406 100644
--- a/drivers/pci/dwc/pcie-designware.h
+++ b/drivers/pci/dwc/pcie-designware.h
@@ -186,8 +186,8 @@ enum dw_pcie_as_type {
struct dw_pcie_ep_ops {
void (*ep_init)(struct dw_pcie_ep *ep);
- int (*raise_irq)(struct dw_pcie_ep *ep, enum pci_epc_irq_type type,
- u8 interrupt_num);
+ int (*raise_irq)(struct dw_pcie_ep *ep, u8 func_no,
+ enum pci_epc_irq_type type, u8 interrupt_num);
};
struct dw_pcie_ep {
@@ -342,7 +342,8 @@ static inline int dw_pcie_host_init(struct pcie_port *pp)
void dw_pcie_ep_linkup(struct dw_pcie_ep *ep);
int dw_pcie_ep_init(struct dw_pcie_ep *ep);
void dw_pcie_ep_exit(struct dw_pcie_ep *ep);
-int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 interrupt_num);
+int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
+ u8 interrupt_num);
void dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar);
#else
static inline void dw_pcie_ep_linkup(struct dw_pcie_ep *ep)
@@ -358,7 +359,7 @@ static inline void dw_pcie_ep_exit(struct dw_pcie_ep *ep)
{
}
-static inline int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep,
+static inline int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
u8 interrupt_num)
{
return 0;
next prev parent reply other threads:[~2018-02-01 8:56 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-31 23:51 linux-next: build failure after merge of the pci tree Stephen Rothwell
2018-02-01 8:56 ` Niklas Cassel [this message]
2018-02-01 11:10 ` Lorenzo Pieralisi
2018-02-01 11:16 ` Niklas Cassel
2018-02-01 11:22 ` Kishon Vijay Abraham I
2018-02-01 11:29 ` Niklas Cassel
2018-02-01 19:00 ` Bjorn Helgaas
2018-02-01 21:13 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-10-24 5:14 Stephen Rothwell
2023-10-24 11:01 ` Ilpo Järvinen
2023-10-23 0:05 Stephen Rothwell
2023-10-23 7:30 ` Yoshihiro Shimoda
2023-10-23 7:34 ` Krzysztof Wilczyński
2023-10-23 9:36 ` Yoshihiro Shimoda
2023-10-23 12:56 ` Krzysztof Wilczyński
2023-10-06 0:56 Stephen Rothwell
2023-10-06 1:23 ` Mario Limonciello
2023-10-06 14:11 ` Bjorn Helgaas
2023-01-15 22:53 Stephen Rothwell
2023-01-18 21:34 ` Bjorn Helgaas
2021-11-04 22:56 Stephen Rothwell
2021-10-17 22:55 Stephen Rothwell
2021-10-18 14:26 ` Bjorn Helgaas
2021-10-10 23:12 Stephen Rothwell
2021-10-11 5:37 ` Manivannan Sadhasivam
2021-10-11 11:22 ` Lorenzo Pieralisi
2020-08-03 1:36 Stephen Rothwell
2020-07-22 1:39 Stephen Rothwell
2020-03-13 1:54 Stephen Rothwell
2020-03-09 23:07 Stephen Rothwell
2020-03-10 19:10 ` Bjorn Helgaas
2019-08-30 3:23 Stephen Rothwell
2019-08-30 12:30 ` Bjorn Helgaas
2019-08-31 4:21 ` Vidya Sagar
2019-08-31 8:49 ` Lorenzo Pieralisi
2019-08-31 14:40 ` Bjorn Helgaas
2019-08-31 16:49 ` Vidya Sagar
2018-09-26 5:00 Stephen Rothwell
2018-09-26 14:25 ` Keith Busch
2018-09-26 14:58 ` Keith Busch
2018-09-26 19:48 ` Bjorn Helgaas
2018-09-26 21:27 ` Stephen Rothwell
2018-03-26 1:31 Stephen Rothwell
2018-03-26 19:53 ` Bjorn Helgaas
2018-03-27 16:53 ` Rob Herring
2018-01-25 5:49 Stephen Rothwell
2018-01-25 13:55 ` Rob Herring
2018-01-25 14:58 ` Bjorn Helgaas
2018-01-29 4:41 ` Michael Ellerman
2016-04-26 1:13 Stephen Rothwell
2016-04-26 10:05 ` Joerg Roedel
2016-04-22 0:48 Stephen Rothwell
2016-01-11 1:42 Stephen Rothwell
2016-01-11 6:34 ` Bjorn Helgaas
2015-11-01 15:23 Stephen Rothwell
2015-11-02 0:00 ` Ley Foon Tan
2015-11-02 18:12 ` Bjorn Helgaas
2015-11-03 8:02 ` Ley Foon Tan
2015-11-02 0:09 ` Ley Foon Tan
2014-06-11 2:02 Stephen Rothwell
2014-06-11 2:23 ` Bjorn Helgaas
2014-05-22 4:09 Stephen Rothwell
2014-05-22 6:49 ` Sebastian Ott
2014-05-22 16:58 ` Bjorn Helgaas
2012-11-06 0:27 Stephen Rothwell
2012-11-06 1:55 ` Greg Kroah-Hartman
2012-11-06 2:09 ` Stephen Rothwell
2012-11-06 22:01 ` Bjorn Helgaas
2012-09-11 1:29 Stephen Rothwell
2012-09-11 14:28 ` Bjorn Helgaas
2012-02-13 2:21 Stephen Rothwell
2012-02-14 16:45 ` Jesse Barnes
2011-12-06 0:18 Stephen Rothwell
2011-12-06 3:16 ` Bjorn Helgaas
2011-12-06 17:28 ` Jesse Barnes
2011-10-25 13:44 Stephen Rothwell
2011-10-25 17:14 ` Myron Stowe
2011-10-25 19:58 ` Stephen Rothwell
[not found] <20110110125411.2f45fd2f.sfr@canb.auug.org.au>
2011-01-11 15:18 ` Narendra_K
2011-01-11 23:12 ` Stephen Rothwell
2010-10-18 2:20 Stephen Rothwell
2010-10-18 3:02 ` Jesse Barnes
2010-02-09 0:54 Stephen Rothwell
2010-02-09 16:27 ` Bjorn Helgaas
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=20180201085608.GA22568@axis.com \
--to=niklas.cassel@axis.com \
--cc=bhelgaas@google.com \
--cc=cyrille.pitchen@free-electrons.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=sfr@canb.auug.org.au \
/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).