From patchwork Wed Aug 12 09:33:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 506532 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6AEAD1401AF for ; Wed, 12 Aug 2015 19:34:12 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932265AbbHLJeF (ORCPT ); Wed, 12 Aug 2015 05:34:05 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:43637 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754936AbbHLJd6 (ORCPT ); Wed, 12 Aug 2015 05:33:58 -0400 Received: from dude.hi.4.pengutronix.de ([10.1.0.7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1ZPSQ1-0005X5-Gx; Wed, 12 Aug 2015 11:33:57 +0200 From: Lucas Stach To: Bjorn Helgaas , linux-pci@vger.kernel.org Cc: Jingoo Han , Pratyush Anand , patchwork-lst@pengutronix.de, kernel@pengutronix.de Subject: [PATCH v3 5/5] PCI: designware: set up high part of MSI target address Date: Wed, 12 Aug 2015 11:33:56 +0200 Message-Id: <1439372036-15303-6-git-send-email-l.stach@pengutronix.de> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1439372036-15303-1-git-send-email-l.stach@pengutronix.de> References: <1439372036-15303-1-git-send-email-l.stach@pengutronix.de> X-SA-Exim-Connect-IP: 10.1.0.7 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-pci@vger.kernel.org Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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 --- 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);