Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1p8EqO-0002Z9-Iw for mharc-grub-devel@gnu.org; Thu, 22 Dec 2022 01:14:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p8EqK-0002YG-7l for grub-devel@gnu.org; Thu, 22 Dec 2022 01:14:12 -0500 Received: from gate.crashing.org ([63.228.1.57]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p8EqI-0002h6-LA for grub-devel@gnu.org; Thu, 22 Dec 2022 01:14:11 -0500 Received: from u0f3226c756e75a.ant.amazon.com (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.14.1) with ESMTP id 2BM6CxBj025856; Thu, 22 Dec 2022 00:13:08 -0600 From: Benjamin Herrenschmidt To: grub-devel@gnu.org Cc: Daniel Kiper Subject: [PATCH v2 5/8] ns8250: Add configuration parameter when adding ports Date: Thu, 22 Dec 2022 17:12:54 +1100 Message-Id: <20221222061257.1598483-6-benh@kernel.crashing.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221222061257.1598483-1-benh@kernel.crashing.org> References: <20221222061257.1598483-1-benh@kernel.crashing.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.228.1.57; envelope-from=benh@kernel.crashing.org; helo=gate.crashing.org X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Dec 2022 06:14:12 -0000 From: Benjamin Herrenschmidt This will allow ports to be added with a pre-set configuration Signed-off-by: Benjamin Herrenschmidt --- grub-core/term/ns8250.c | 27 ++++++++++++++++++++------- grub-core/term/serial.c | 2 +- include/grub/serial.h | 4 ++-- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/grub-core/term/ns8250.c b/grub-core/term/ns8250.c index 9e0ebff5a..d9d93fcf8 100644 --- a/grub-core/term/ns8250.c +++ b/grub-core/term/ns8250.c @@ -304,7 +304,7 @@ grub_ns8250_hw_get_port (const unsigned int unit) } char * -grub_serial_ns8250_add_port (grub_port_t port) +grub_serial_ns8250_add_port (grub_port_t port, struct grub_serial_config *config) { struct grub_serial_port *p; unsigned i; @@ -314,6 +314,9 @@ grub_serial_ns8250_add_port (grub_port_t port) { if (dead_ports & (1 << i)) return NULL; + /* give the opportunity for SPCR to configure a default com port */ + if (config != NULL) + grub_serial_port_configure (&com_ports[i], config); return com_names[i]; } @@ -326,32 +329,39 @@ grub_serial_ns8250_add_port (grub_port_t port) return NULL; p = grub_malloc (sizeof (*p)); - if (!p) + if (p == NULL) return NULL; p->name = grub_xasprintf ("port%lx", (unsigned long) port); - if (!p->name) + if (p->name == NULL) { grub_free (p); return NULL; } p->driver = &grub_ns8250_driver; - grub_serial_config_defaults (p); p->mmio = false; p->port = port; + if (config != NULL) + grub_serial_port_configure (p, config); + else + grub_serial_config_defaults (p); grub_serial_register (p); return p->name; } char * -grub_serial_ns8250_add_mmio (grub_addr_t addr) +grub_serial_ns8250_add_mmio (grub_addr_t addr, struct grub_serial_config *config) { struct grub_serial_port *p; unsigned i; for (i = 0; i < GRUB_SERIAL_PORT_NUM; i++) if (com_ports[i].mmio && com_ports[i].mmio_base == addr) - return com_names[i]; + { + if (config != NULL) + grub_serial_port_configure (&com_ports[i], config); + return com_names[i]; + } p = grub_malloc (sizeof (*p)); if (p == NULL) @@ -363,9 +373,12 @@ grub_serial_ns8250_add_mmio (grub_addr_t addr) return NULL; } p->driver = &grub_ns8250_driver; - grub_serial_config_defaults (p); p->mmio = true; p->mmio_base = addr; + if (config != NULL) + grub_serial_port_configure (p, config); + else + grub_serial_config_defaults (p); grub_serial_register (p); return p->name; diff --git a/grub-core/term/serial.c b/grub-core/term/serial.c index c8f5f02db..a1707d2f7 100644 --- a/grub-core/term/serial.c +++ b/grub-core/term/serial.c @@ -156,7 +156,7 @@ grub_serial_find (const char *name) && grub_isxdigit (name [sizeof ("port") - 1])) { name = grub_serial_ns8250_add_port (grub_strtoul (&name[sizeof ("port") - 1], - 0, 16)); + 0, 16), NULL); if (!name) return NULL; diff --git a/include/grub/serial.h b/include/grub/serial.h index 5e008f0f5..a94327140 100644 --- a/include/grub/serial.h +++ b/include/grub/serial.h @@ -185,8 +185,8 @@ grub_serial_config_defaults (struct grub_serial_port *port) #if defined(__mips__) || defined (__i386__) || defined (__x86_64__) void grub_ns8250_init (void); -char *grub_serial_ns8250_add_port (grub_port_t port); -char *grub_serial_ns8250_add_mmio (grub_addr_t addr); +char *grub_serial_ns8250_add_port (grub_port_t port, struct grub_serial_config *config); +char *grub_serial_ns8250_add_mmio (grub_addr_t addr, struct grub_serial_config *config); #endif #ifdef GRUB_MACHINE_IEEE1275 void grub_ofserial_init (void); -- 2.34.1