From: David S. Miller Date: Mon, 14 Nov 2016 21:20:54 +0000 (-0500) Subject: Merge branch 'bnx2-kdump-fix' X-Git-Tag: v4.9-rc6~27^2~3 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=193f5122878c5d4d30dbfc9128affe58bdd18206;p=uclinux-h8%2Flinux.git Merge branch 'bnx2-kdump-fix' Baoquan He says: ==================== bnx2: Wait for in-flight DMA to complete at probe stage This is v2 post. In commit 3e1be7a ("bnx2: Reset device during driver initialization"), firmware requesting code was moved from open stage to probe stage. The reason is in kdump kernel hardware iommu need device be reset in driver probe stage, otherwise those in-flight DMA from 1st kernel will continue going and look up into the newly created io-page tables. However bnx2 chip resetting involves firmware requesting issue, that need be done in open stage. Michale Chan suggested we can just wait for the old in-flight DMA to complete at probe stage, then though without device resetting, we don't need to worry the old in-flight DMA could continue looking up the newly created io-page tables. v1->v2: Michael suggested to wait for the in-flight DMA to complete at probe stage. So give up the old method of trying to reset chip at probe stage, take the new way accordingly. ==================== Signed-off-by: David S. Miller --- 193f5122878c5d4d30dbfc9128affe58bdd18206