From: "Jan Beulich" <JBeulich@suse.com>
To: xen-devel <xen-devel@lists.xenproject.org>
Cc: Ian Campbell <Ian.Campbell@eu.citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Keir Fraser <keir@xen.org>,
Ian Jackson <Ian.Jackson@eu.citrix.com>, Tim Deegan <tim@xen.org>
Subject: [PATCH 3/4] console: adjust IRQ initialization
Date: Tue, 23 Feb 2016 04:30:01 -0700 [thread overview]
Message-ID: <56CC50C902000078000D52D7@prv-mh.provo.novell.com> (raw)
In-Reply-To: <56CC4F0B02000078000D5290@prv-mh.provo.novell.com>
[-- Attachment #1: Type: text/plain, Size: 4074 bytes --]
In order for a Xen internal PCI device driver to enable MSI on the
device, we need another hook which the driver can use to create the IRQ
(doing this in the init_preirq hook is too early, since IRQ code hasn't
got initialized at that time yet, and doing it in init_postirq is too
late because at least on x86 smp_intr_init() needs to know the IRQ
number).
On x86 this additionally requires a slight ordering change to IRQ
initialization, to facilitate calling the new hook between basic
initialization and the call path leading to smp_intr_init().
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/i8259.c
+++ b/xen/arch/x86/i8259.c
@@ -342,8 +342,6 @@ void __init init_IRQ(void)
init_8259A(0);
- BUG_ON(init_irq_data() < 0);
-
for (irq = 0; platform_legacy_irq(irq); irq++) {
struct irq_desc *desc = irq_to_desc(irq);
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -576,6 +576,7 @@ void __init noreturn __start_xen(unsigne
unsigned long nr_pages, raw_max_page, modules_headroom, *module_map;
int i, j, e820_warn = 0, bytes = 0;
bool_t acpi_boot_table_init_done = 0;
+ int ret;
struct domain *dom0;
struct ns16550_defaults ns16550 = {
.data_bits = 8,
@@ -1281,6 +1282,12 @@ void __init noreturn __start_xen(unsigne
x2apic_bsp_setup();
+ ret = init_irq_data();
+ if ( ret < 0 )
+ panic("Error %d setting up IRQ data\n", ret);
+
+ console_init_irq();
+
init_IRQ();
module_map = xmalloc_array(unsigned long, BITS_TO_LONGS(mbi->mods_count));
@@ -1366,7 +1373,7 @@ void __init noreturn __start_xen(unsigne
if ( (num_online_cpus() < max_cpus) && !cpu_online(i) )
{
- int ret = cpu_up(i);
+ ret = cpu_up(i);
if ( ret != 0 )
printk("Failed to bring up CPU %u (error %d)\n", i, ret);
}
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -771,6 +771,11 @@ void __init console_init_ring(void)
printk("Allocated console ring of %u KiB.\n", opt_conring_size >> 10);
}
+void __init console_init_irq(void)
+{
+ serial_init_irq();
+}
+
void __init console_init_postirq(void)
{
serial_init_postirq();
--- a/xen/drivers/char/serial.c
+++ b/xen/drivers/char/serial.c
@@ -504,6 +504,15 @@ void __init serial_init_preirq(void)
com[i].driver->init_preirq(&com[i]);
}
+void __init serial_init_irq(void)
+{
+ unsigned int i;
+
+ for ( i = 0; i < ARRAY_SIZE(com); i++ )
+ if ( com[i].driver && com[i].driver->init_irq )
+ com[i].driver->init_irq(&com[i]);
+}
+
void __init serial_init_postirq(void)
{
int i;
--- a/xen/include/xen/console.h
+++ b/xen/include/xen/console.h
@@ -15,6 +15,7 @@ int console_loglvl_op(struct xen_sysctl_
void console_init_preirq(void);
void console_init_ring(void);
+void console_init_irq(void);
void console_init_postirq(void);
void console_endboot(void);
int console_has(const char *device);
--- a/xen/include/xen/serial.h
+++ b/xen/include/xen/serial.h
@@ -64,6 +64,7 @@ struct serial_port {
struct uart_driver {
/* Driver initialisation (pre- and post-IRQ subsystem setup). */
void (*init_preirq)(struct serial_port *);
+ void (*init_irq)(struct serial_port *);
void (*init_postirq)(struct serial_port *);
/* Hook to clean up after Xen bootstrap (before domain 0 runs). */
void (*endboot)(struct serial_port *);
@@ -99,8 +100,9 @@ struct uart_driver {
#define SERHND_LO (1<<3) /* Ditto, except that the MSB is cleared. */
#define SERHND_COOKED (1<<4) /* Newline/carriage-return translation? */
-/* Two-stage initialisation (before/after IRQ-subsystem initialisation). */
+/* Three-stage initialisation (before/during/after IRQ-subsystem setup). */
void serial_init_preirq(void);
+void serial_init_irq(void);
void serial_init_postirq(void);
/* Clean-up hook before domain 0 runs. */
[-- Attachment #2: console-irq-init.patch --]
[-- Type: text/plain, Size: 4106 bytes --]
console: adjust IRQ initialization
In order for a Xen internal PCI device driver to enable MSI on the
device, we need another hook which the driver can use to create the IRQ
(doing this in the init_preirq hook is too early, since IRQ code hasn't
got initialized at that time yet, and doing it in init_postirq is too
late because at least on x86 smp_intr_init() needs to know the IRQ
number).
On x86 this additionally requires a slight ordering change to IRQ
initialization, to facilitate calling the new hook between basic
initialization and the call path leading to smp_intr_init().
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/i8259.c
+++ b/xen/arch/x86/i8259.c
@@ -342,8 +342,6 @@ void __init init_IRQ(void)
init_8259A(0);
- BUG_ON(init_irq_data() < 0);
-
for (irq = 0; platform_legacy_irq(irq); irq++) {
struct irq_desc *desc = irq_to_desc(irq);
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -576,6 +576,7 @@ void __init noreturn __start_xen(unsigne
unsigned long nr_pages, raw_max_page, modules_headroom, *module_map;
int i, j, e820_warn = 0, bytes = 0;
bool_t acpi_boot_table_init_done = 0;
+ int ret;
struct domain *dom0;
struct ns16550_defaults ns16550 = {
.data_bits = 8,
@@ -1281,6 +1282,12 @@ void __init noreturn __start_xen(unsigne
x2apic_bsp_setup();
+ ret = init_irq_data();
+ if ( ret < 0 )
+ panic("Error %d setting up IRQ data\n", ret);
+
+ console_init_irq();
+
init_IRQ();
module_map = xmalloc_array(unsigned long, BITS_TO_LONGS(mbi->mods_count));
@@ -1366,7 +1373,7 @@ void __init noreturn __start_xen(unsigne
if ( (num_online_cpus() < max_cpus) && !cpu_online(i) )
{
- int ret = cpu_up(i);
+ ret = cpu_up(i);
if ( ret != 0 )
printk("Failed to bring up CPU %u (error %d)\n", i, ret);
}
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -771,6 +771,11 @@ void __init console_init_ring(void)
printk("Allocated console ring of %u KiB.\n", opt_conring_size >> 10);
}
+void __init console_init_irq(void)
+{
+ serial_init_irq();
+}
+
void __init console_init_postirq(void)
{
serial_init_postirq();
--- a/xen/drivers/char/serial.c
+++ b/xen/drivers/char/serial.c
@@ -504,6 +504,15 @@ void __init serial_init_preirq(void)
com[i].driver->init_preirq(&com[i]);
}
+void __init serial_init_irq(void)
+{
+ unsigned int i;
+
+ for ( i = 0; i < ARRAY_SIZE(com); i++ )
+ if ( com[i].driver && com[i].driver->init_irq )
+ com[i].driver->init_irq(&com[i]);
+}
+
void __init serial_init_postirq(void)
{
int i;
--- a/xen/include/xen/console.h
+++ b/xen/include/xen/console.h
@@ -15,6 +15,7 @@ int console_loglvl_op(struct xen_sysctl_
void console_init_preirq(void);
void console_init_ring(void);
+void console_init_irq(void);
void console_init_postirq(void);
void console_endboot(void);
int console_has(const char *device);
--- a/xen/include/xen/serial.h
+++ b/xen/include/xen/serial.h
@@ -64,6 +64,7 @@ struct serial_port {
struct uart_driver {
/* Driver initialisation (pre- and post-IRQ subsystem setup). */
void (*init_preirq)(struct serial_port *);
+ void (*init_irq)(struct serial_port *);
void (*init_postirq)(struct serial_port *);
/* Hook to clean up after Xen bootstrap (before domain 0 runs). */
void (*endboot)(struct serial_port *);
@@ -99,8 +100,9 @@ struct uart_driver {
#define SERHND_LO (1<<3) /* Ditto, except that the MSB is cleared. */
#define SERHND_COOKED (1<<4) /* Newline/carriage-return translation? */
-/* Two-stage initialisation (before/after IRQ-subsystem initialisation). */
+/* Three-stage initialisation (before/during/after IRQ-subsystem setup). */
void serial_init_preirq(void);
+void serial_init_irq(void);
void serial_init_postirq(void);
/* Clean-up hook before domain 0 runs. */
[-- Attachment #3: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-02-23 11:30 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-23 11:22 [PATCH 0/4] ns16550: enable support for Pericom controllers Jan Beulich
2016-02-23 11:28 ` [PATCH 1/4] ns16550: store pointer to config parameters for PCI Jan Beulich
2016-03-07 21:06 ` Konrad Rzeszutek Wilk
2016-02-23 11:28 ` [PATCH 2/4] ns16550: enable Pericom controller support Jan Beulich
2016-03-07 22:04 ` Konrad Rzeszutek Wilk
2016-03-08 8:48 ` Jan Beulich
2016-03-09 16:52 ` Konrad Rzeszutek Wilk
2016-03-09 17:01 ` Jan Beulich
2016-03-11 2:31 ` Konrad Rzeszutek Wilk
2016-03-11 11:02 ` Jan Beulich
2016-03-22 13:19 ` [PATCH v2 " Jan Beulich
2016-03-28 14:46 ` Konrad Rzeszutek Wilk
2016-02-23 11:30 ` Jan Beulich [this message]
2016-03-07 22:10 ` [PATCH 3/4] console: adjust IRQ initialization Konrad Rzeszutek Wilk
2016-02-23 11:30 ` [PATCH RFC 4/4] ns16550: enable use of PCI MSI Jan Beulich
2016-02-29 16:56 ` [PATCH 0/4] ns16550: enable support for Pericom controllers Konrad Rzeszutek Wilk
2016-02-29 17:03 ` Jan Beulich
2016-03-04 13:19 ` Ping: " Jan Beulich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56CC50C902000078000D52D7@prv-mh.provo.novell.com \
--to=jbeulich@suse.com \
--cc=Ian.Campbell@eu.citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=keir@xen.org \
--cc=tim@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).