| Message ID | 1439372036-15303-6-git-send-email-l.stach@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Wed, Aug 12, 2015 at 3:03 PM, Lucas Stach <l.stach@pengutronix.de> wrote: > Set up the high part of the MSI target address in order to allow the > MSI target to reside above the 4GB mark on 64bit and PAE systems. > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > --- > drivers/pci/host/pcie-designware.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c > index 74034395cf2a..fcb798e47c30 100644 > --- a/drivers/pci/host/pcie-designware.c > +++ b/drivers/pci/host/pcie-designware.c > @@ -299,12 +299,15 @@ no_valid_irq: > static void dw_msi_setup_msg(struct pcie_port *pp, unsigned int irq, u32 pos) > { > struct msi_msg msg; > + u64 msi_target; > > if (pp->ops->get_msi_addr) > - msg.address_lo = pp->ops->get_msi_addr(pp); > + msi_target = pp->ops->get_msi_addr(pp); > else > - msg.address_lo = virt_to_phys((void *)pp->msi_data); > - msg.address_hi = 0x0; > + msi_target = virt_to_phys((void *)pp->msi_data); > + > + msg.address_lo = (u32)(msi_target & 0xffffffff); > + msg.address_hi = (u32)(msi_target >> 32 & 0xffffffff); > > if (pp->ops->get_msi_data) > msg.data = pp->ops->get_msi_data(pp, pos); Other than above, dw_pcie_msi_init also need to be fixed for PCIE_MSI_ADDR_HI. -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Bjorn, I'm going to respin this patch to fix it regarding Pratyushs comment. In such a situation do you prefer a repost of the whole series or rather just have the single fixed patch reposted? Regards, Lucas Am Mittwoch, den 12.08.2015, 21:05 +0530 schrieb Pratyush Anand: > On Wed, Aug 12, 2015 at 3:03 PM, Lucas Stach <l.stach@pengutronix.de> wrote: > > Set up the high part of the MSI target address in order to allow the > > MSI target to reside above the 4GB mark on 64bit and PAE systems. > > > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > > --- > > drivers/pci/host/pcie-designware.c | 9 ++++++--- > > 1 file changed, 6 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c > > index 74034395cf2a..fcb798e47c30 100644 > > --- a/drivers/pci/host/pcie-designware.c > > +++ b/drivers/pci/host/pcie-designware.c > > @@ -299,12 +299,15 @@ no_valid_irq: > > static void dw_msi_setup_msg(struct pcie_port *pp, unsigned int irq, u32 pos) > > { > > struct msi_msg msg; > > + u64 msi_target; > > > > if (pp->ops->get_msi_addr) > > - msg.address_lo = pp->ops->get_msi_addr(pp); > > + msi_target = pp->ops->get_msi_addr(pp); > > else > > - msg.address_lo = virt_to_phys((void *)pp->msi_data); > > - msg.address_hi = 0x0; > > + msi_target = virt_to_phys((void *)pp->msi_data); > > + > > + msg.address_lo = (u32)(msi_target & 0xffffffff); > > + msg.address_hi = (u32)(msi_target >> 32 & 0xffffffff); > > > > if (pp->ops->get_msi_data) > > msg.data = pp->ops->get_msi_data(pp, pos); > > Other than above, dw_pcie_msi_init also need to be fixed > for PCIE_MSI_ADDR_HI.
On Thu, Aug 13, 2015 at 04:16:32PM +0200, Lucas Stach wrote: > Hi Bjorn, > > I'm going to respin this patch to fix it regarding Pratyushs comment. > > In such a situation do you prefer a repost of the whole series or rather > just have the single fixed patch reposted? The easiest thing for me is a new v4 series. It's easy for me to make a mistake when assembling from pieces. > Am Mittwoch, den 12.08.2015, 21:05 +0530 schrieb Pratyush Anand: > > On Wed, Aug 12, 2015 at 3:03 PM, Lucas Stach <l.stach@pengutronix.de> wrote: > > > Set up the high part of the MSI target address in order to allow the > > > MSI target to reside above the 4GB mark on 64bit and PAE systems. > > > > > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > > > --- > > > drivers/pci/host/pcie-designware.c | 9 ++++++--- > > > 1 file changed, 6 insertions(+), 3 deletions(-) > > > > > > diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c > > > index 74034395cf2a..fcb798e47c30 100644 > > > --- a/drivers/pci/host/pcie-designware.c > > > +++ b/drivers/pci/host/pcie-designware.c > > > @@ -299,12 +299,15 @@ no_valid_irq: > > > static void dw_msi_setup_msg(struct pcie_port *pp, unsigned int irq, u32 pos) > > > { > > > struct msi_msg msg; > > > + u64 msi_target; > > > > > > if (pp->ops->get_msi_addr) > > > - msg.address_lo = pp->ops->get_msi_addr(pp); > > > + msi_target = pp->ops->get_msi_addr(pp); > > > else > > > - msg.address_lo = virt_to_phys((void *)pp->msi_data); > > > - msg.address_hi = 0x0; > > > + msi_target = virt_to_phys((void *)pp->msi_data); > > > + > > > + msg.address_lo = (u32)(msi_target & 0xffffffff); > > > + msg.address_hi = (u32)(msi_target >> 32 & 0xffffffff); > > > > > > if (pp->ops->get_msi_data) > > > msg.data = pp->ops->get_msi_data(pp, pos); > > > > Other than above, dw_pcie_msi_init also need to be fixed > > for PCIE_MSI_ADDR_HI. > > -- > Pengutronix e.K. | Lucas Stach | > Industrial Linux Solutions | http://www.pengutronix.de/ | > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c index 74034395cf2a..fcb798e47c30 100644 --- a/drivers/pci/host/pcie-designware.c +++ b/drivers/pci/host/pcie-designware.c @@ -299,12 +299,15 @@ no_valid_irq: static void dw_msi_setup_msg(struct pcie_port *pp, unsigned int irq, u32 pos) { struct msi_msg msg; + u64 msi_target; if (pp->ops->get_msi_addr) - msg.address_lo = pp->ops->get_msi_addr(pp); + msi_target = pp->ops->get_msi_addr(pp); else - msg.address_lo = virt_to_phys((void *)pp->msi_data); - msg.address_hi = 0x0; + msi_target = virt_to_phys((void *)pp->msi_data); + + msg.address_lo = (u32)(msi_target & 0xffffffff); + msg.address_hi = (u32)(msi_target >> 32 & 0xffffffff); if (pp->ops->get_msi_data) msg.data = pp->ops->get_msi_data(pp, pos);
Set up the high part of the MSI target address in order to allow the MSI target to reside above the 4GB mark on 64bit and PAE systems. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> --- drivers/pci/host/pcie-designware.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)