diff options
| author | Jon Mason <jon.mason@intel.com> | 2013-05-31 23:05:53 +0200 |
|---|---|---|
| committer | Jon Mason <jon.mason@intel.com> | 2013-09-03 20:13:14 +0200 |
| commit | b6750cfe0710a14fd147ba27fddbecae8ba88c77 (patch) | |
| tree | 147600a777558f8034a8ac27b76b2604d39c0f72 /drivers/ntb | |
| parent | NTB: Correct Number of Scratch Pad Registers (diff) | |
| download | linux-b6750cfe0710a14fd147ba27fddbecae8ba88c77.tar.xz linux-b6750cfe0710a14fd147ba27fddbecae8ba88c77.zip | |
NTB: Correct USD/DSD Identification
Due to ambiguous documentation, the USD/DSD identification is backward
when compared to the setting in BIOS. Correct the bits to match the
BIOS setting.
Signed-off-by: Jon Mason <jon.mason@intel.com>
Diffstat (limited to 'drivers/ntb')
| -rw-r--r-- | drivers/ntb/ntb_hw.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c index 3b0ab50e2d5c..26b808b4d3a0 100644 --- a/drivers/ntb/ntb_hw.c +++ b/drivers/ntb/ntb_hw.c @@ -531,9 +531,9 @@ static int ntb_xeon_setup(struct ntb_device *ndev) } if (val & SNB_PPD_DEV_TYPE) - ndev->dev_type = NTB_DEV_DSD; - else ndev->dev_type = NTB_DEV_USD; + else + ndev->dev_type = NTB_DEV_DSD; ndev->reg_ofs.pdb = ndev->reg_base + SNB_PDOORBELL_OFFSET; ndev->reg_ofs.pdb_mask = ndev->reg_base + SNB_PDBMSK_OFFSET; @@ -647,6 +647,9 @@ static int ntb_device_setup(struct ntb_device *ndev) if (rc) return rc; + dev_info(&ndev->pdev->dev, "Device Type = %s\n", + ndev->dev_type == NTB_DEV_USD ? "USD/DSP" : "DSD/USP"); + /* Enable Bus Master and Memory Space on the secondary side */ writew(PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER, ndev->reg_ofs.spci_cmd); |