diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-23 06:30:19 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-23 06:30:19 -0400 |
| commit | dda93b45389f025fd3422d22cc31cc1ea6040305 (patch) | |
| tree | 44a856744843e24ed1baf6ca4edb1be04809a606 /drivers/net/ethernet/cadence/macb_main.c | |
| parent | 2e62024c265aa69315ed02835623740030435380 (diff) | |
| parent | b61b8bba18fe2b63d38fdaf9b83de25e2d787dfe (diff) | |
Merge branch 'x86/cache' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/cadence/macb_main.c')
| -rw-r--r-- | drivers/net/ethernet/cadence/macb_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index f1a86b422617..58b9744c4058 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c | |||
| @@ -2160,6 +2160,7 @@ static void macb_configure_dma(struct macb *bp) | |||
| 2160 | else | 2160 | else |
| 2161 | dmacfg &= ~GEM_BIT(TXCOEN); | 2161 | dmacfg &= ~GEM_BIT(TXCOEN); |
| 2162 | 2162 | ||
| 2163 | dmacfg &= ~GEM_BIT(ADDR64); | ||
| 2163 | #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT | 2164 | #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT |
| 2164 | if (bp->hw_dma_cap & HW_DMA_CAP_64B) | 2165 | if (bp->hw_dma_cap & HW_DMA_CAP_64B) |
| 2165 | dmacfg |= GEM_BIT(ADDR64); | 2166 | dmacfg |= GEM_BIT(ADDR64); |