Patchwork [v2] PCI: dwc: Fix MSI-X EP framework address calculation bug

login
register
mail settings
Submitter Gustavo Pimentel
Date Nov. 23, 2018, 5 p.m.
Message ID <7d7ec9c537b5aa6cac918b0201572efb14dc89c3.1542992421.git.gustavo.pimentel@synopsys.com>
Download mbox | patch
Permalink /patch/663955/
State New
Headers show

Comments

Gustavo Pimentel - Nov. 23, 2018, 5 p.m.
Fixes an error caused by 3-bit right rotation on offset address
calculation of MSI-X table in dw_pcie_ep_raise_msix_irq().

During the development time, by default the offset address of MSI-X
table was set to zero, so that even with a 3-bit right rotation the
computed result would still be zero and valid, therefore not being
noticed this bug.

Fixes: beb4641a787d ("PCI: dwc: Add MSI-X callbacks handler")
Signed-off-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
Cc: stable@vger.kernel.org
---
 drivers/pci/controller/dwc/pcie-designware-ep.c | 1 -
 1 file changed, 1 deletion(-)
Lorenzo Pieralisi - Nov. 27, 2018, 11:36 a.m.
On Fri, Nov 23, 2018 at 06:00:21PM +0100, Gustavo Pimentel wrote:
> Fixes an error caused by 3-bit right rotation on offset address
> calculation of MSI-X table in dw_pcie_ep_raise_msix_irq().
> 
> During the development time, by default the offset address of MSI-X
> table was set to zero, so that even with a 3-bit right rotation the
> computed result would still be zero and valid, therefore not being
> noticed this bug.
> 
> Fixes: beb4641a787d ("PCI: dwc: Add MSI-X callbacks handler")
> Signed-off-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
> Cc: stable@vger.kernel.org
> ---
>  drivers/pci/controller/dwc/pcie-designware-ep.c | 1 -
>  1 file changed, 1 deletion(-)

Applied to pci/controller-fixes for the upcoming rc, thanks.

Lorenzo

> diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c
> index 1e7b022..de8635a 100644
> --- a/drivers/pci/controller/dwc/pcie-designware-ep.c
> +++ b/drivers/pci/controller/dwc/pcie-designware-ep.c
> @@ -440,7 +440,6 @@ int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no,
>  	tbl_offset = dw_pcie_readl_dbi(pci, reg);
>  	bir = (tbl_offset & PCI_MSIX_TABLE_BIR);
>  	tbl_offset &= PCI_MSIX_TABLE_OFFSET;
> -	tbl_offset >>= 3;
>  
>  	reg = PCI_BASE_ADDRESS_0 + (4 * bir);
>  	bar_addr_upper = 0;
> -- 
> 2.7.4
>

Patch

diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c
index 1e7b022..de8635a 100644
--- a/drivers/pci/controller/dwc/pcie-designware-ep.c
+++ b/drivers/pci/controller/dwc/pcie-designware-ep.c
@@ -440,7 +440,6 @@  int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no,
 	tbl_offset = dw_pcie_readl_dbi(pci, reg);
 	bir = (tbl_offset & PCI_MSIX_TABLE_BIR);
 	tbl_offset &= PCI_MSIX_TABLE_OFFSET;
-	tbl_offset >>= 3;
 
 	reg = PCI_BASE_ADDRESS_0 + (4 * bir);
 	bar_addr_upper = 0;