PCI: dwc: fix inverted condition of DMA mask setup warning
PATCH 1/1 PCI: dwc: fix inverted condition of DMA mask setup warning
Commit 660c486590aa ("PCI: dwc: Set 32-bit DMA mask for MSI target address allocation") added dma_mask_set() call to explicitly set 32-bit DMA mask for MSI message mapping, but for now it throws a warning on ret == 0, while dma_set_mask() returns 0 in case of success.
Fix this by inverting the condition.
Misc: remove redundant braces around single statement.
--- drivers/pci/controller/dwc/pcie-designware-host.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/pci/controller/dwc/pcie-designware-host.c +1 -2
@@ -397,12 +397,11 @@ int dw_pcie_host_init(struct pcie_port *pp) pp); ret =dma_set_mask (pci->dev,DMA_BIT_MASK (32 )); -if (!ret) { +if (ret)dev_warn (pci->dev,"Failed to set DMA mask to 32-bit. " "Devices with only 32-bit MSI support" " may not work properly\n" ); - } pp->msi_data = dma_map_single_attrs(pci->dev, &pp->msi_msg, sizeof(pp->msi_msg),
Signature · 1 line
2.29.2
Quoted 11 lines · Alexander Lobakin
Commit
660c486590aa("PCI: dwc: Set 32-bit DMA mask for MSI target address allocation") addeddma_mask_set()call to explicitly set 32-bit DMA mask for MSI message mapping, but for now it throws a warning on ret == 0, whiledma_set_mask()returns 0 in case of success.
Fix this by inverting the condition.Misc: remove redundant braces around single statement.
Fixes 660c486590aa ("PCI: dwc: Set 32-bit DMA mask for MSI target address allocation")Signed-off-by Alexander Lobakin <[email protected]>
I joined the string to make it greppable and applied to for-linus for v5.11, thanks!
Vidya, speak up if this isn't right. I assume you should have seen this spurious warning while testing 660c486590aa.
Quoted 26 lines
--- drivers/pci/controller/dwc/pcie-designware-host.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/pci/controller/dwc/pcie-designware-host.c +1
-2@@ -397,12 +397,11 @@ int dw_pcie_host_init(struct pcie_port *pp) pp); ret =dma_set_mask (pci->dev,DMA_BIT_MASK (32 )); -if (!ret) { +if (ret)dev_warn (pci->dev,"Failed to set DMA mask to 32-bit. " "Devices with only 32-bit MSI support" " may not work properly\n" ); - } pp->msi_data = dma_map_single_attrs(pci->dev, &pp->msi_msg, sizeof(pp->msi_msg),Signature · 1 line
2.29.2