PCI: dwc: clean up computing of msix_tbl
PATCH 1/1 PCI: dwc: clean up computing of msix_tbl
Commit 6f5e193bfb55 ("PCI: dwc: Fix dw_pcie_ep_raise_msix_irq() to get correct MSI-X table address") overcomplicated the computation of the msix_tbl address. Simplify it as it's simply the addr + offset. Provided addr is (void *) already.
objdump -d shows no difference after this patch.
Signed-off-by Jiri Slaby <[email protected]>
Cc Kishon Vijay Abraham I <[email protected]>
Cc Lorenzo Pieralisi <[email protected]>
--- drivers/pci/controller/dwc/pcie-designware-ep.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/pci/controller/dwc/pcie-designware-ep.c +1 -5
@@ -433,7 +433,6 @@ int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no,struct dw_pcie *pci =to_dw_pcie_from_ep (ep);struct pci_epf_msix_tbl *msix_tbl;struct pci_epc *epc = ep->epc; -struct pci_epf_bar *epf_bar;u32 reg, msg_data, vec_ctrl;unsigned int aligned_offset;u32 tbl_offset;
@@ -446,10 +445,7 @@ int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no, bir = (tbl_offset &PCI_MSIX_TABLE_BIR ); tbl_offset &=PCI_MSIX_TABLE_OFFSET ; - epf_bar = ep->epf_bar[bir]; - msix_tbl = epf_bar->addr; - msix_tbl = (struct pci_epf_msix_tbl *)((char *)msix_tbl + tbl_offset); - + msix_tbl = ep->epf_bar[bir]->addr + tbl_offset; msg_addr = msix_tbl[(interrupt_num -1 )].msg_addr; msg_data = msix_tbl[(interrupt_num -1 )].msg_data; vec_ctrl = msix_tbl[(interrupt_num -1 )].vector_ctrl;
Signature · 1 line
2.26.1
Lorenzo Pieralisi
AppliedQuoted 5 lines · Jiri Slaby
Commit
6f5e193bfb55("PCI: dwc: Fixdw_pcie_ep_raise_msix_irq()to get correct MSI-X table address") overcomplicated the computation of themsix_tbladdress. Simplify it as it's simply the addr + offset. Provided addr is (void *) already.
Quoted 8 lines
objdump -d shows no difference after this patch.
Signed-off-by Jiri Slaby <[email protected]>Cc Kishon Vijay Abraham I <[email protected]>Cc Lorenzo Pieralisi <[email protected]>--- drivers/pci/controller/dwc/pcie-designware-ep.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
Applied to pci/dwc, thanks !
Lorenzo
Quoted 27 lines
drivers/pci/controller/dwc/pcie-designware-ep.c +1
-5@@ -433,7 +433,6 @@ int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no,struct dw_pcie *pci =to_dw_pcie_from_ep (ep);struct pci_epf_msix_tbl *msix_tbl;struct pci_epc *epc = ep->epc; -struct pci_epf_bar *epf_bar;u32 reg, msg_data, vec_ctrl;unsigned int aligned_offset;u32 tbl_offset;@@ -446,10 +445,7 @@ int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no, bir = (tbl_offset &PCI_MSIX_TABLE_BIR ); tbl_offset &=PCI_MSIX_TABLE_OFFSET ; - epf_bar = ep->epf_bar[bir]; - msix_tbl = epf_bar->addr; - msix_tbl = (struct pci_epf_msix_tbl *)((char *)msix_tbl + tbl_offset); - + msix_tbl = ep->epf_bar[bir]->addr + tbl_offset; msg_addr = msix_tbl[(interrupt_num -1 )].msg_addr; msg_data = msix_tbl[(interrupt_num -1 )].msg_data; vec_ctrl = msix_tbl[(interrupt_num -1 )].vector_ctrl;Signature · 1 line
2.26.1