diff options
| author | Daniel Verkamp <daniel.verkamp@intel.com> | 2015-05-14 00:50:04 +0200 |
|---|---|---|
| committer | Jon Mason <jdmason@kudzu.us> | 2015-06-11 15:27:24 +0200 |
| commit | ebaad1322d8080a1a8367ec631b345405d9879e2 (patch) | |
| tree | f56f5d44895bbf3819ad4ee83ee8f819a7fd9139 /drivers/ntb | |
| parent | ntb: iounmap MW reg and vbase in error path (diff) | |
| download | linux-ebaad1322d8080a1a8367ec631b345405d9879e2.tar.xz linux-ebaad1322d8080a1a8367ec631b345405d9879e2.zip | |
ntb: initialize max_mw for Atom before using it
Commit ab760a0 (ntb: Adding split BAR support for Haswell platforms)
changed ntb_device's mw from a fixed-size array into a pointer that is
allocated based on limits.max_mw; however, on Atom platforms, max_mw
is not initialized until ntb_device_setup(), which happens after the
allocation.
Fill out max_mw in ntb_atom_detect() to match ntb_xeon_detect(); this
happens before the use of max_mw in the ndev->mw allocation.
Fixes a null pointer dereference on Atom platforms with ntb hardware.
v2: fix typo (mw_max should be max_mw)
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Acked-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Diffstat (limited to 'drivers/ntb')
| -rw-r--r-- | drivers/ntb/ntb_hw.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c index b5c8707f4ac7..15f9b7c9e4d3 100644 --- a/drivers/ntb/ntb_hw.c +++ b/drivers/ntb/ntb_hw.c @@ -1660,6 +1660,7 @@ static int ntb_atom_detect(struct ntb_device *ndev) u32 ppd; ndev->hw_type = BWD_HW; + ndev->limits.max_mw = BWD_MAX_MW; rc = pci_read_config_dword(ndev->pdev, NTB_PPD_OFFSET, &ppd); if (rc) |