Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/ce4100: Fix PCI configuration register access for devices without interrupts

Some CE4100 devices such as the:

- DFX module (01:0b.7)
- entertainment encryption device (01:10.0)
- multimedia controller (01:12.0)

do not have a device interrupt at all.

This patch fixes the PCI controller code to declare the missing
PCI configuration register space, as well as a fixup method for
forcing the interrupt pin to be 0 for these devices. This is
required to ensure that pci drivers matching on these devices
will be able to honor the various PCI subsystem calls touching
the configuration space.

Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
Signed-off-by: Florian Fainelli <ffainelli@freebox.fr>
Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: rui.zhang@intel.com
Cc: alan@linux.intel.com
Link: http://lkml.kernel.org/r/1351518020-25556-4-git-send-email-ffainelli@freebox.fr
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Maxime Bizon and committed by
Ingo Molnar
37aeec36 d7959916

+13
+13
arch/x86/pci/ce4100.c
··· 115 115 reg_read(reg, value); 116 116 } 117 117 118 + static void reg_noirq_read(struct sim_dev_reg *reg, u32 *value) 119 + { 120 + unsigned long flags; 121 + 122 + raw_spin_lock_irqsave(&pci_config_lock, flags); 123 + /* force interrupt pin value to 0 */ 124 + *value = reg->sim_reg.value & 0xfff00ff; 125 + raw_spin_unlock_irqrestore(&pci_config_lock, flags); 126 + } 127 + 118 128 static struct sim_dev_reg bus1_fixups[] = { 119 129 DEFINE_REG(2, 0, 0x10, (16*MB), reg_init, reg_read, reg_write) 120 130 DEFINE_REG(2, 0, 0x14, (256), reg_init, reg_read, reg_write) ··· 154 144 DEFINE_REG(11, 5, 0x10, (64*KB), reg_init, reg_read, reg_write) 155 145 DEFINE_REG(11, 6, 0x10, (256), reg_init, reg_read, reg_write) 156 146 DEFINE_REG(11, 7, 0x10, (64*KB), reg_init, reg_read, reg_write) 147 + DEFINE_REG(11, 7, 0x3c, 256, reg_init, reg_noirq_read, reg_write) 157 148 DEFINE_REG(12, 0, 0x10, (128*KB), reg_init, reg_read, reg_write) 158 149 DEFINE_REG(12, 0, 0x14, (256), reg_init, reg_read, reg_write) 159 150 DEFINE_REG(12, 1, 0x10, (1024), reg_init, reg_read, reg_write) ··· 172 161 DEFINE_REG(16, 0, 0x10, (64*KB), reg_init, reg_read, reg_write) 173 162 DEFINE_REG(16, 0, 0x14, (64*MB), reg_init, reg_read, reg_write) 174 163 DEFINE_REG(16, 0, 0x18, (64*MB), reg_init, reg_read, reg_write) 164 + DEFINE_REG(16, 0, 0x3c, 256, reg_init, reg_noirq_read, reg_write) 175 165 DEFINE_REG(17, 0, 0x10, (128*KB), reg_init, reg_read, reg_write) 176 166 DEFINE_REG(18, 0, 0x10, (1*KB), reg_init, reg_read, reg_write) 167 + DEFINE_REG(18, 0, 0x3c, 256, reg_init, reg_noirq_read, reg_write) 177 168 }; 178 169 179 170 static void __init init_sim_regs(void)