iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/pseries/ddw: simplify enable_ddw()

Browse Source 
This drops rather useless ddw_enabled flag as direct_mapping implies
it anyway.

While at this, fix indents in enable_ddw().

This should not cause any behavioral change.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20211108040320.3857636-3-aik@ozlabs.ru
This commit is contained in:
Alexey Kardashevskiy 2021-11-08 15:03:18 +11:00 committed by Michael Ellerman
parent 2d33f55044
commit fb4ee2b30c
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/powerpc/platforms/pseries/iommu.c
View File

@ -1229,7 +1229,6 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn)
u32 ddw_avail[DDW_APPLICABLE_SIZE]; u32 ddw_avail[DDW_APPLICABLE_SIZE];
struct dma_win *window; struct dma_win *window;
struct property *win64; struct property *win64;
bool ddw_enabled = false;
struct failed_ddw_pdn *fpdn; struct failed_ddw_pdn *fpdn;
bool default_win_removed = false, direct_mapping = false; bool default_win_removed = false, direct_mapping = false;
bool pmem_present; bool pmem_present;
@ -1244,7 +1243,6 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn)
if (find_existing_ddw(pdn, &dev->dev.archdata.dma_offset, &len)) { if (find_existing_ddw(pdn, &dev->dev.archdata.dma_offset, &len)) {
direct_mapping = (len >= max_ram_len); direct_mapping = (len >= max_ram_len);
ddw_enabled = true;
goto out_unlock; goto out_unlock;
} }
@ -1445,7 +1443,6 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn)
spin_unlock(&dma_win_list_lock); spin_unlock(&dma_win_list_lock);
dev->dev.archdata.dma_offset = win_addr; dev->dev.archdata.dma_offset = win_addr;
ddw_enabled = true;
goto out_unlock; goto out_unlock;
out_del_list: out_del_list:
@ -1481,10 +1478,10 @@ out_unlock:
* as RAM, then we failed to create a window to cover persistent * as RAM, then we failed to create a window to cover persistent
* memory and need to set the DMA limit. * memory and need to set the DMA limit.
*/ */
if (pmem_present && ddw_enabled && direct_mapping && len == max_ram_len) if (pmem_present && direct_mapping && len == max_ram_len)
dev->dev.bus_dma_limit = dev->dev.archdata.dma_offset + (1ULL << len); dev->dev.bus_dma_limit = dev->dev.archdata.dma_offset + (1ULL << len);
return ddw_enabled && direct_mapping; return direct_mapping;
} }
static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev) static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev)