Commit f84ecd285f40012f804173110c10f2caaa23b7ee
1 parent
f5322169b4
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
PCI: Drop msi_control_reg() macro and use PCI_MSI_FLAGS directly
Note the error in pci_msix_table_size() -- we used PCI_MSI_FLAGS to locate the PCI_MSIX_FLAGS word. No actual breakage because PCI_MSI_FLAGS and PCI_MSIX_FLAGS happen to be the same. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Showing 2 changed files with 4 additions and 5 deletions Side-by-side Diff
drivers/pci/msi.c
| ... | ... | @@ -299,10 +299,10 @@ |
| 299 | 299 | int pos = dev->msi_cap; |
| 300 | 300 | u16 msgctl; |
| 301 | 301 | |
| 302 | - pci_read_config_word(dev, msi_control_reg(pos), &msgctl); | |
| 302 | + pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &msgctl); | |
| 303 | 303 | msgctl &= ~PCI_MSI_FLAGS_QSIZE; |
| 304 | 304 | msgctl |= entry->msi_attrib.multiple << 4; |
| 305 | - pci_write_config_word(dev, msi_control_reg(pos), msgctl); | |
| 305 | + pci_write_config_word(dev, pos + PCI_MSI_FLAGS, msgctl); | |
| 306 | 306 | |
| 307 | 307 | pci_write_config_dword(dev, msi_lower_address_reg(pos), |
| 308 | 308 | msg->address_lo); |
| ... | ... | @@ -548,7 +548,7 @@ |
| 548 | 548 | |
| 549 | 549 | msi_set_enable(dev, 0); /* Disable MSI during set up */ |
| 550 | 550 | |
| 551 | - pci_read_config_word(dev, msi_control_reg(dev->msi_cap), &control); | |
| 551 | + pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &control); | |
| 552 | 552 | /* MSI Entry Initialization */ |
| 553 | 553 | entry = alloc_msi_entry(dev); |
| 554 | 554 | if (!entry) |
| ... | ... | @@ -903,7 +903,7 @@ |
| 903 | 903 | if (!dev->msix_cap) |
| 904 | 904 | return 0; |
| 905 | 905 | |
| 906 | - pci_read_config_word(dev, msi_control_reg(dev->msix_cap), &control); | |
| 906 | + pci_read_config_word(dev, dev->msix_cap + PCI_MSIX_FLAGS, &control); | |
| 907 | 907 | return multi_msix_capable(control); |
| 908 | 908 | } |
| 909 | 909 |
drivers/pci/msi.h
| ... | ... | @@ -6,7 +6,6 @@ |
| 6 | 6 | #ifndef MSI_H |
| 7 | 7 | #define MSI_H |
| 8 | 8 | |
| 9 | -#define msi_control_reg(base) (base + PCI_MSI_FLAGS) | |
| 10 | 9 | #define msi_lower_address_reg(base) (base + PCI_MSI_ADDRESS_LO) |
| 11 | 10 | #define msi_upper_address_reg(base) (base + PCI_MSI_ADDRESS_HI) |
| 12 | 11 | #define msi_data_reg(base, is64bit) \ |