Commit 5ee56135 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'for-linus-5.9b-rc8-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen fix from Juergen Gross:
 "Fix a regression introduced in 5.9-rc3 which caused a system running
  as fully virtualized guest under Xen to crash when using legacy
  devices like a floppy"

* tag 'for-linus-5.9b-rc8-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/events: don't use chip_data for legacy IRQs
parents 5f056638 0891fb39
...@@ -92,6 +92,8 @@ static bool (*pirq_needs_eoi)(unsigned irq); ...@@ -92,6 +92,8 @@ static bool (*pirq_needs_eoi)(unsigned irq);
/* Xen will never allocate port zero for any purpose. */ /* Xen will never allocate port zero for any purpose. */
#define VALID_EVTCHN(chn) ((chn) != 0) #define VALID_EVTCHN(chn) ((chn) != 0)
static struct irq_info *legacy_info_ptrs[NR_IRQS_LEGACY];
static struct irq_chip xen_dynamic_chip; static struct irq_chip xen_dynamic_chip;
static struct irq_chip xen_percpu_chip; static struct irq_chip xen_percpu_chip;
static struct irq_chip xen_pirq_chip; static struct irq_chip xen_pirq_chip;
...@@ -156,9 +158,20 @@ int get_evtchn_to_irq(evtchn_port_t evtchn) ...@@ -156,9 +158,20 @@ int get_evtchn_to_irq(evtchn_port_t evtchn)
/* Get info for IRQ */ /* Get info for IRQ */
struct irq_info *info_for_irq(unsigned irq) struct irq_info *info_for_irq(unsigned irq)
{ {
if (irq < nr_legacy_irqs())
return legacy_info_ptrs[irq];
else
return irq_get_chip_data(irq); return irq_get_chip_data(irq);
} }
static void set_info_for_irq(unsigned int irq, struct irq_info *info)
{
if (irq < nr_legacy_irqs())
legacy_info_ptrs[irq] = info;
else
irq_set_chip_data(irq, info);
}
/* Constructors for packed IRQ information. */ /* Constructors for packed IRQ information. */
static int xen_irq_info_common_setup(struct irq_info *info, static int xen_irq_info_common_setup(struct irq_info *info,
unsigned irq, unsigned irq,
...@@ -377,7 +390,7 @@ static void xen_irq_init(unsigned irq) ...@@ -377,7 +390,7 @@ static void xen_irq_init(unsigned irq)
info->type = IRQT_UNBOUND; info->type = IRQT_UNBOUND;
info->refcnt = -1; info->refcnt = -1;
irq_set_chip_data(irq, info); set_info_for_irq(irq, info);
list_add_tail(&info->list, &xen_irq_list_head); list_add_tail(&info->list, &xen_irq_list_head);
} }
...@@ -426,14 +439,14 @@ static int __must_check xen_allocate_irq_gsi(unsigned gsi) ...@@ -426,14 +439,14 @@ static int __must_check xen_allocate_irq_gsi(unsigned gsi)
static void xen_free_irq(unsigned irq) static void xen_free_irq(unsigned irq)
{ {
struct irq_info *info = irq_get_chip_data(irq); struct irq_info *info = info_for_irq(irq);
if (WARN_ON(!info)) if (WARN_ON(!info))
return; return;
list_del(&info->list); list_del(&info->list);
irq_set_chip_data(irq, NULL); set_info_for_irq(irq, NULL);
WARN_ON(info->refcnt > 0); WARN_ON(info->refcnt > 0);
...@@ -603,7 +616,7 @@ EXPORT_SYMBOL_GPL(xen_irq_from_gsi); ...@@ -603,7 +616,7 @@ EXPORT_SYMBOL_GPL(xen_irq_from_gsi);
static void __unbind_from_irq(unsigned int irq) static void __unbind_from_irq(unsigned int irq)
{ {
evtchn_port_t evtchn = evtchn_from_irq(irq); evtchn_port_t evtchn = evtchn_from_irq(irq);
struct irq_info *info = irq_get_chip_data(irq); struct irq_info *info = info_for_irq(irq);
if (info->refcnt > 0) { if (info->refcnt > 0) {
info->refcnt--; info->refcnt--;
...@@ -1108,7 +1121,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi, ...@@ -1108,7 +1121,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
void unbind_from_irqhandler(unsigned int irq, void *dev_id) void unbind_from_irqhandler(unsigned int irq, void *dev_id)
{ {
struct irq_info *info = irq_get_chip_data(irq); struct irq_info *info = info_for_irq(irq);
if (WARN_ON(!info)) if (WARN_ON(!info))
return; return;
...@@ -1142,7 +1155,7 @@ int evtchn_make_refcounted(evtchn_port_t evtchn) ...@@ -1142,7 +1155,7 @@ int evtchn_make_refcounted(evtchn_port_t evtchn)
if (irq == -1) if (irq == -1)
return -ENOENT; return -ENOENT;
info = irq_get_chip_data(irq); info = info_for_irq(irq);
if (!info) if (!info)
return -ENOENT; return -ENOENT;
...@@ -1170,7 +1183,7 @@ int evtchn_get(evtchn_port_t evtchn) ...@@ -1170,7 +1183,7 @@ int evtchn_get(evtchn_port_t evtchn)
if (irq == -1) if (irq == -1)
goto done; goto done;
info = irq_get_chip_data(irq); info = info_for_irq(irq);
if (!info) if (!info)
goto done; goto done;
......
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