392ee1e6dd
There are two ways pci_save_state and pci_restore_state are used. As helper functions during suspend/resume, and as helper functions around a hardware reset event. When used as helper functions around a hardware reset event there is no reason to believe the calls will be paired, nor is there a good reason to believe that if we restore the msi state from before the reset that it will match the current msi state. Since arch code may change the msi message without going through the driver, drivers currently do not have enough information to even know when to call pci_save_state to ensure they will have msi state in sync with the other kernel irq reception data structures. It turns out the solution is straight forward, cache the state in the existing msi data structures (not the magic pci saved things) and have the msi code update the cached state each time we write to the hardware. This means we never need to read the hardware to figure out what the hardware state should be. By modifying the caching in this manner we get to remove our save_state routines and only need to provide restore_state routines. The only fields that were at all tricky to regenerate were the msi and msi-x control registers and the way we regenerate them currently is a bit dependent upon assumptions on how we use the allow msi registers to be configured and used making the code a little bit brittle. If we ever change what cases we allow or how we configure the msi bits we can address the fragility then. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Acked-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
47 lines
1.2 KiB
C
47 lines
1.2 KiB
C
#ifndef LINUX_MSI_H
|
|
#define LINUX_MSI_H
|
|
|
|
struct msi_msg {
|
|
u32 address_lo; /* low 32 bits of msi message address */
|
|
u32 address_hi; /* high 32 bits of msi message address */
|
|
u32 data; /* 16 bits of msi message data */
|
|
};
|
|
|
|
/* Helper functions */
|
|
extern void mask_msi_irq(unsigned int irq);
|
|
extern void unmask_msi_irq(unsigned int irq);
|
|
extern void read_msi_msg(unsigned int irq, struct msi_msg *msg);
|
|
extern void write_msi_msg(unsigned int irq, struct msi_msg *msg);
|
|
|
|
struct msi_desc {
|
|
struct {
|
|
__u8 type : 5; /* {0: unused, 5h:MSI, 11h:MSI-X} */
|
|
__u8 maskbit : 1; /* mask-pending bit supported ? */
|
|
__u8 masked : 1;
|
|
__u8 is_64 : 1; /* Address size: 0=32bit 1=64bit */
|
|
__u8 pos; /* Location of the msi capability */
|
|
__u16 entry_nr; /* specific enabled entry */
|
|
unsigned default_irq; /* default pre-assigned irq */
|
|
}msi_attrib;
|
|
|
|
struct {
|
|
__u16 head;
|
|
__u16 tail;
|
|
}link;
|
|
|
|
void __iomem *mask_base;
|
|
struct pci_dev *dev;
|
|
|
|
/* Last set MSI message */
|
|
struct msi_msg msg;
|
|
};
|
|
|
|
/*
|
|
* The arch hook for setup up msi irqs
|
|
*/
|
|
int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc);
|
|
void arch_teardown_msi_irq(unsigned int irq);
|
|
|
|
|
|
#endif /* LINUX_MSI_H */
|