Skip to content

L
linux
Commit 85d559af authored by Roland Dreier's avatar Roland Dreier Committed by Linus Torvalds
Browse files
Options

[PATCH] MSI: stop using dev->bus->ops directly in msi.c 

First half of the MSI rewrite: pure cleanup.  Use proper
pci_read_config_xxx() and pci_write_config_xxx() functions instead of
accessing raw dev->bus->ops.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 460afa83
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 58 deletions
drivers/pci/msi.c
View file @ 85d559af
...@@ -64,15 +64,13 @@ static void msi_set_mask_bit(unsigned int vector, int flag) ...@@ -64,15 +64,13 @@ static void msi_set_mask_bit(unsigned int vector, int flag)
case PCI_CAP_ID_MSI: case PCI_CAP_ID_MSI:
{ {
int pos; int pos;
unsigned int mask_bits; u32 mask_bits;
pos = entry->mask_base; pos = entry->mask_base;
entry->dev->bus->ops->read(entry->dev->bus, entry->dev->devfn, pci_read_config_dword(entry->dev, pos, &mask_bits);
pos, 4, &mask_bits);
mask_bits &= ~(1); mask_bits &= ~(1);
mask_bits |= flag; mask_bits |= flag;
entry->dev->bus->ops->write(entry->dev->bus, entry->dev->devfn, pci_write_config_dword(entry->dev, pos, mask_bits);
pos, 4, mask_bits);
break; break;
} }
case PCI_CAP_ID_MSIX: case PCI_CAP_ID_MSIX:
...@@ -105,15 +103,13 @@ static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask) ...@@ -105,15 +103,13 @@ static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask)
if (!(pos = pci_find_capability(entry->dev, PCI_CAP_ID_MSI))) if (!(pos = pci_find_capability(entry->dev, PCI_CAP_ID_MSI)))
return; return;
entry->dev->bus->ops->read(entry->dev->bus, entry->dev->devfn, pci_read_config_dword(entry->dev, msi_lower_address_reg(pos),
msi_lower_address_reg(pos), 4,
&address.lo_address.value); &address.lo_address.value);
address.lo_address.value &= MSI_ADDRESS_DEST_ID_MASK; address.lo_address.value &= MSI_ADDRESS_DEST_ID_MASK;
address.lo_address.value |= (cpu_mask_to_apicid(cpu_mask) << address.lo_address.value |= (cpu_mask_to_apicid(cpu_mask) <<
MSI_TARGET_CPU_SHIFT); MSI_TARGET_CPU_SHIFT);
entry->msi_attrib.current_cpu = cpu_mask_to_apicid(cpu_mask); entry->msi_attrib.current_cpu = cpu_mask_to_apicid(cpu_mask);
entry->dev->bus->ops->write(entry->dev->bus, entry->dev->devfn, pci_write_config_dword(entry->dev, msi_lower_address_reg(pos),
msi_lower_address_reg(pos), 4,
address.lo_address.value); address.lo_address.value);
break; break;
} }
...@@ -383,51 +379,45 @@ static void irq_handler_init(int cap_id, int pos, int mask) ...@@ -383,51 +379,45 @@ static void irq_handler_init(int cap_id, int pos, int mask)
static void enable_msi_mode(struct pci_dev *dev, int pos, int type) static void enable_msi_mode(struct pci_dev *dev, int pos, int type)
{ {
u32 control; u16 control;
dev->bus->ops->read(dev->bus, dev->devfn, pci_read_config_word(dev, msi_control_reg(pos), &control);
msi_control_reg(pos), 2, &control);
if (type == PCI_CAP_ID_MSI) { if (type == PCI_CAP_ID_MSI) {
/* Set enabled bits to single MSI & enable MSI_enable bit */ /* Set enabled bits to single MSI & enable MSI_enable bit */
msi_enable(control, 1); msi_enable(control, 1);
dev->bus->ops->write(dev->bus, dev->devfn, pci_write_config_word(dev, msi_control_reg(pos), control);
msi_control_reg(pos), 2, control);
} else { } else {
msix_enable(control); msix_enable(control);
dev->bus->ops->write(dev->bus, dev->devfn, pci_write_config_word(dev, msi_control_reg(pos), control);
msi_control_reg(pos), 2, control);
} }
if (pci_find_capability(dev, PCI_CAP_ID_EXP)) { if (pci_find_capability(dev, PCI_CAP_ID_EXP)) {
/* PCI Express Endpoint device detected */ /* PCI Express Endpoint device detected */
u32 cmd; u16 cmd;
dev->bus->ops->read(dev->bus, dev->devfn, PCI_COMMAND, 2, &cmd); pci_read_config_word(dev, PCI_COMMAND, &cmd);
cmd |= PCI_COMMAND_INTX_DISABLE; cmd |= PCI_COMMAND_INTX_DISABLE;
dev->bus->ops->write(dev->bus, dev->devfn, PCI_COMMAND, 2, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd);
} }
} }
static void disable_msi_mode(struct pci_dev *dev, int pos, int type) static void disable_msi_mode(struct pci_dev *dev, int pos, int type)
{ {
u32 control; u16 control;
dev->bus->ops->read(dev->bus, dev->devfn, pci_read_config_word(dev, msi_control_reg(pos), &control);
msi_control_reg(pos), 2, &control);
if (type == PCI_CAP_ID_MSI) { if (type == PCI_CAP_ID_MSI) {
/* Set enabled bits to single MSI & enable MSI_enable bit */ /* Set enabled bits to single MSI & enable MSI_enable bit */
msi_disable(control); msi_disable(control);
dev->bus->ops->write(dev->bus, dev->devfn, pci_write_config_word(dev, msi_control_reg(pos), control);
msi_control_reg(pos), 2, control);
} else { } else {
msix_disable(control); msix_disable(control);
dev->bus->ops->write(dev->bus, dev->devfn, pci_write_config_word(dev, msi_control_reg(pos), control);
msi_control_reg(pos), 2, control);
} }
if (pci_find_capability(dev, PCI_CAP_ID_EXP)) { if (pci_find_capability(dev, PCI_CAP_ID_EXP)) {
/* PCI Express Endpoint device detected */ /* PCI Express Endpoint device detected */
u32 cmd; u16 cmd;
dev->bus->ops->read(dev->bus, dev->devfn, PCI_COMMAND, 2, &cmd); pci_read_config_word(dev, PCI_COMMAND, &cmd);
cmd &= ~PCI_COMMAND_INTX_DISABLE; cmd &= ~PCI_COMMAND_INTX_DISABLE;
dev->bus->ops->write(dev->bus, dev->devfn, PCI_COMMAND, 2, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd);
} }
} }
...@@ -480,14 +470,13 @@ static int msi_capability_init(struct pci_dev *dev) ...@@ -480,14 +470,13 @@ static int msi_capability_init(struct pci_dev *dev)
struct msg_address address; struct msg_address address;
struct msg_data data; struct msg_data data;
int pos, vector; int pos, vector;
u32 control; u16 control;
pos = pci_find_capability(dev, PCI_CAP_ID_MSI); pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
if (!pos) if (!pos)
return -EINVAL; return -EINVAL;
dev->bus->ops->read(dev->bus, dev->devfn, msi_control_reg(pos), pci_read_config_word(dev, msi_control_reg(pos), &control);
2, &control);
if (control & PCI_MSI_FLAGS_ENABLE) if (control & PCI_MSI_FLAGS_ENABLE)
return 0; return 0;
...@@ -521,27 +510,27 @@ static int msi_capability_init(struct pci_dev *dev) ...@@ -521,27 +510,27 @@ static int msi_capability_init(struct pci_dev *dev)
msi_data_init(&data, vector); msi_data_init(&data, vector);
entry->msi_attrib.current_cpu = ((address.lo_address.u.dest_id >> entry->msi_attrib.current_cpu = ((address.lo_address.u.dest_id >>
MSI_TARGET_CPU_SHIFT) & MSI_TARGET_CPU_MASK); MSI_TARGET_CPU_SHIFT) & MSI_TARGET_CPU_MASK);
dev->bus->ops->write(dev->bus, dev->devfn, msi_lower_address_reg(pos), pci_write_config_dword(dev, msi_lower_address_reg(pos),
4, address.lo_address.value); address.lo_address.value);
if (is_64bit_address(control)) { if (is_64bit_address(control)) {
dev->bus->ops->write(dev->bus, dev->devfn, pci_write_config_dword(dev,
msi_upper_address_reg(pos), 4, address.hi_address); msi_upper_address_reg(pos), address.hi_address);
dev->bus->ops->write(dev->bus, dev->devfn, pci_write_config_word(dev,
msi_data_reg(pos, 1), 2, *((u32*)&data)); msi_data_reg(pos, 1), *((u32*)&data));
} else } else
dev->bus->ops->write(dev->bus, dev->devfn, pci_write_config_word(dev,
msi_data_reg(pos, 0), 2, *((u32*)&data)); msi_data_reg(pos, 0), *((u32*)&data));
if (entry->msi_attrib.maskbit) { if (entry->msi_attrib.maskbit) {
unsigned int maskbits, temp; unsigned int maskbits, temp;
/* All MSIs are unmasked by default, Mask them all */ /* All MSIs are unmasked by default, Mask them all */
dev->bus->ops->read(dev->bus, dev->devfn, pci_read_config_dword(dev,
msi_mask_bits_reg(pos, is_64bit_address(control)), 4, msi_mask_bits_reg(pos, is_64bit_address(control)),
&maskbits); &maskbits);
temp = (1 << multi_msi_capable(control)); temp = (1 << multi_msi_capable(control));
temp = ((temp - 1) & ~temp); temp = ((temp - 1) & ~temp);
maskbits |= temp; maskbits |= temp;
dev->bus->ops->write(dev->bus, dev->devfn, pci_write_config_dword(dev,
msi_mask_bits_reg(pos, is_64bit_address(control)), 4, msi_mask_bits_reg(pos, is_64bit_address(control)),
maskbits); maskbits);
} }
attach_msi_entry(entry, vector); attach_msi_entry(entry, vector);
...@@ -571,7 +560,7 @@ static int msix_capability_init(struct pci_dev *dev) ...@@ -571,7 +560,7 @@ static int msix_capability_init(struct pci_dev *dev)
struct msg_data data; struct msg_data data;
int vector = 0, pos, dev_msi_cap, i; int vector = 0, pos, dev_msi_cap, i;
u32 phys_addr, table_offset; u32 phys_addr, table_offset;
u32 control; u16 control;
u8 bir; u8 bir;
void *base; void *base;
...@@ -580,8 +569,7 @@ static int msix_capability_init(struct pci_dev *dev) ...@@ -580,8 +569,7 @@ static int msix_capability_init(struct pci_dev *dev)
return -EINVAL; return -EINVAL;
/* Request & Map MSI-X table region */ /* Request & Map MSI-X table region */
dev->bus->ops->read(dev->bus, dev->devfn, msi_control_reg(pos), 2, pci_read_config_word(dev, msi_control_reg(pos), &control);
&control);
if (control & PCI_MSIX_FLAGS_ENABLE) if (control & PCI_MSIX_FLAGS_ENABLE)
return 0; return 0;
...@@ -592,8 +580,8 @@ static int msix_capability_init(struct pci_dev *dev) ...@@ -592,8 +580,8 @@ static int msix_capability_init(struct pci_dev *dev)
} }
dev_msi_cap = multi_msix_capable(control); dev_msi_cap = multi_msix_capable(control);
dev->bus->ops->read(dev->bus, dev->devfn, pci_read_config_dword(dev, msix_table_offset_reg(pos),
msix_table_offset_reg(pos), 4, &table_offset); &table_offset);
bir = (u8)(table_offset & PCI_MSIX_FLAGS_BIRMASK); bir = (u8)(table_offset & PCI_MSIX_FLAGS_BIRMASK);
phys_addr = pci_resource_start (dev, bir); phys_addr = pci_resource_start (dev, bir);
phys_addr += (u32)(table_offset & ~PCI_MSIX_FLAGS_BIRMASK); phys_addr += (u32)(table_offset & ~PCI_MSIX_FLAGS_BIRMASK);
...@@ -728,7 +716,8 @@ static int msi_alloc_vector(struct pci_dev* dev, int head) ...@@ -728,7 +716,8 @@ static int msi_alloc_vector(struct pci_dev* dev, int head)
struct msg_address address; struct msg_address address;
struct msg_data data; struct msg_data data;
int i, offset, pos, dev_msi_cap, vector; int i, offset, pos, dev_msi_cap, vector;
u32 low_address, control; u32 low_address;
u16 control;
unsigned long base = 0L; unsigned long base = 0L;
unsigned long flags; unsigned long flags;
...@@ -742,8 +731,7 @@ static int msi_alloc_vector(struct pci_dev* dev, int head) ...@@ -742,8 +731,7 @@ static int msi_alloc_vector(struct pci_dev* dev, int head)
spin_unlock_irqrestore(&msi_lock, flags); spin_unlock_irqrestore(&msi_lock, flags);
pos = pci_find_capability(dev, PCI_CAP_ID_MSIX); pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
dev->bus->ops->read(dev->bus, dev->devfn, msi_control_reg(pos), pci_read_config_word(dev, msi_control_reg(pos), &control);
2, &control);
dev_msi_cap = multi_msix_capable(control); dev_msi_cap = multi_msix_capable(control);
for (i = 1; i < dev_msi_cap; i++) { for (i = 1; i < dev_msi_cap; i++) {
if (!(low_address = readl(base + i * PCI_MSIX_ENTRY_SIZE))) if (!(low_address = readl(base + i * PCI_MSIX_ENTRY_SIZE)))
...@@ -838,7 +826,7 @@ int msi_alloc_vectors(struct pci_dev* dev, int *vector, int nvec) ...@@ -838,7 +826,7 @@ int msi_alloc_vectors(struct pci_dev* dev, int *vector, int nvec)
struct msi_desc *entry; struct msi_desc *entry;
int i, head, pos, vec, free_vectors, alloc_vectors; int i, head, pos, vec, free_vectors, alloc_vectors;
int *vectors = (int *)vector; int *vectors = (int *)vector;
u32 control; u16 control;
unsigned long flags; unsigned long flags;
if (!pci_msi_enable || !dev) if (!pci_msi_enable || !dev)
...@@ -847,7 +835,7 @@ int msi_alloc_vectors(struct pci_dev* dev, int *vector, int nvec) ...@@ -847,7 +835,7 @@ int msi_alloc_vectors(struct pci_dev* dev, int *vector, int nvec)
if (!(pos = pci_find_capability(dev, PCI_CAP_ID_MSIX))) if (!(pos = pci_find_capability(dev, PCI_CAP_ID_MSIX)))
return -EINVAL; return -EINVAL;
dev->bus->ops->read(dev->bus, dev->devfn, msi_control_reg(pos), 2, &control); pci_read_config_word(dev, msi_control_reg(pos), &control);
if (nvec > multi_msix_capable(control)) if (nvec > multi_msix_capable(control))
return -EINVAL; return -EINVAL;
...@@ -980,14 +968,13 @@ void msi_remove_pci_irq_vectors(struct pci_dev* dev) ...@@ -980,14 +968,13 @@ void msi_remove_pci_irq_vectors(struct pci_dev* dev)
if (type == PCI_CAP_ID_MSIX) { if (type == PCI_CAP_ID_MSIX) {
int i, pos, dev_msi_cap; int i, pos, dev_msi_cap;
u32 phys_addr, table_offset; u32 phys_addr, table_offset;
u32 control; u16 control;
u8 bir; u8 bir;
pos = pci_find_capability(dev, PCI_CAP_ID_MSIX); pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
dev->bus->ops->read(dev->bus, dev->devfn, msi_control_reg(pos), 2, &control); pci_read_config_word(dev, msi_control_reg(pos), &control);
dev_msi_cap = multi_msix_capable(control); dev_msi_cap = multi_msix_capable(control);
dev->bus->ops->read(dev->bus, dev->devfn, pci_read_config_dword(dev, msix_table_offset_reg(pos), &table_offset);
msix_table_offset_reg(pos), 4, &table_offset);
bir = (u8)(table_offset & PCI_MSIX_FLAGS_BIRMASK); bir = (u8)(table_offset & PCI_MSIX_FLAGS_BIRMASK);
phys_addr = pci_resource_start (dev, bir); phys_addr = pci_resource_start (dev, bir);
phys_addr += (u32)(table_offset & ~PCI_MSIX_FLAGS_BIRMASK); phys_addr += (u32)(table_offset & ~PCI_MSIX_FLAGS_BIRMASK);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7