diff options
Diffstat (limited to 'drivers/misc/mei/hw-me.c')
-rw-r--r-- | drivers/misc/mei/hw-me.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c index 25b1997a62cb..e2fb44cc5c37 100644 --- a/drivers/misc/mei/hw-me.c +++ b/drivers/misc/mei/hw-me.c | |||
@@ -189,8 +189,11 @@ static int mei_me_fw_status(struct mei_device *dev, | |||
189 | 189 | ||
190 | fw_status->count = fw_src->count; | 190 | fw_status->count = fw_src->count; |
191 | for (i = 0; i < fw_src->count && i < MEI_FW_STATUS_MAX; i++) { | 191 | for (i = 0; i < fw_src->count && i < MEI_FW_STATUS_MAX; i++) { |
192 | ret = pci_read_config_dword(pdev, | 192 | ret = pci_read_config_dword(pdev, fw_src->status[i], |
193 | fw_src->status[i], &fw_status->status[i]); | 193 | &fw_status->status[i]); |
194 | trace_mei_pci_cfg_read(dev->dev, "PCI_CFG_HSF_X", | ||
195 | fw_src->status[i], | ||
196 | fw_status->status[i]); | ||
194 | if (ret) | 197 | if (ret) |
195 | return ret; | 198 | return ret; |
196 | } | 199 | } |
@@ -215,6 +218,7 @@ static void mei_me_hw_config(struct mei_device *dev) | |||
215 | 218 | ||
216 | reg = 0; | 219 | reg = 0; |
217 | pci_read_config_dword(pdev, PCI_CFG_HFS_1, ®); | 220 | pci_read_config_dword(pdev, PCI_CFG_HFS_1, ®); |
221 | trace_mei_pci_cfg_read(dev->dev, "PCI_CFG_HFS_1", PCI_CFG_HFS_1, reg); | ||
218 | hw->d0i3_supported = | 222 | hw->d0i3_supported = |
219 | ((reg & PCI_CFG_HFS_1_D0I3_MSK) == PCI_CFG_HFS_1_D0I3_MSK); | 223 | ((reg & PCI_CFG_HFS_1_D0I3_MSK) == PCI_CFG_HFS_1_D0I3_MSK); |
220 | 224 | ||
@@ -1248,6 +1252,7 @@ static bool mei_me_fw_type_nm(struct pci_dev *pdev) | |||
1248 | u32 reg; | 1252 | u32 reg; |
1249 | 1253 | ||
1250 | pci_read_config_dword(pdev, PCI_CFG_HFS_2, ®); | 1254 | pci_read_config_dword(pdev, PCI_CFG_HFS_2, ®); |
1255 | trace_mei_pci_cfg_read(&pdev->dev, "PCI_CFG_HFS_2", PCI_CFG_HFS_2, reg); | ||
1251 | /* make sure that bit 9 (NM) is up and bit 10 (DM) is down */ | 1256 | /* make sure that bit 9 (NM) is up and bit 10 (DM) is down */ |
1252 | return (reg & 0x600) == 0x200; | 1257 | return (reg & 0x600) == 0x200; |
1253 | } | 1258 | } |
@@ -1260,6 +1265,7 @@ static bool mei_me_fw_type_sps(struct pci_dev *pdev) | |||
1260 | u32 reg; | 1265 | u32 reg; |
1261 | /* Read ME FW Status check for SPS Firmware */ | 1266 | /* Read ME FW Status check for SPS Firmware */ |
1262 | pci_read_config_dword(pdev, PCI_CFG_HFS_1, ®); | 1267 | pci_read_config_dword(pdev, PCI_CFG_HFS_1, ®); |
1268 | trace_mei_pci_cfg_read(&pdev->dev, "PCI_CFG_HFS_1", PCI_CFG_HFS_1, reg); | ||
1263 | /* if bits [19:16] = 15, running SPS Firmware */ | 1269 | /* if bits [19:16] = 15, running SPS Firmware */ |
1264 | return (reg & 0xf0000) == 0xf0000; | 1270 | return (reg & 0xf0000) == 0xf0000; |
1265 | } | 1271 | } |