Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1oQsJ4-0007nJ-61 for mharc-grub-devel@gnu.org; Wed, 24 Aug 2022 11:28:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQoYT-0004wp-Qz for grub-devel@gnu.org; Wed, 24 Aug 2022 07:28:17 -0400 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]:55326) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQoYN-0002N3-OZ for grub-devel@gnu.org; Wed, 24 Aug 2022 07:28:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:MIME-Version:Message-ID: Subject:To:From:Date:Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:In-Reply-To:References; bh=PS1zuf/3xBQOUKsijrjeW7qavo+h5fY1LqzS11rbOkc=; b=BRU4nj4U9vRQmJoo6yHZ5WQVBq thIl3EO+e28050i3/3VK3a1l+/2BW7Vx6A5ruBIuiEBv4RujsQ2WXV4X1gkCvS2PSxSJrQPWXiQzt MpF1Nrfk/+Ulah3PCvbdNoQLNGxN3kVBfKY7/O7wX3wwVGhg1VSlPouKt2WXDHANOdiRDBLmHYPBA y2wJEBJETY7AoR7ubDzRzgsOYHrotAxAg26VA9tO5gz10ZV8FmT/7usMyaX19gsM+JsoEu80n4Mnk M9kLsnB0z4YYDm+6pexPozlKxSHSDEBbaJOqfS/uJ9KclsDUnHgNQgDIc8yVpl6dh+t5oQtUsCkn6 N8XwbE2g==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=worktop.programming.kicks-ass.net) by desiato.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1oQoYH-005hzX-LO for grub-devel@gnu.org; Wed, 24 Aug 2022 11:28:06 +0000 Received: by worktop.programming.kicks-ass.net (Postfix, from userid 1000) id 19A53980BE2; Wed, 24 Aug 2022 13:28:04 +0200 (CEST) Date: Wed, 24 Aug 2022 13:28:03 +0200 From: Peter Zijlstra To: grub-devel@gnu.org Subject: [PATCH] term/serial: Add support for PCI serial devices Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: none client-ip=2001:8b0:10b:1:d65d:64ff:fe57:4e05; envelope-from=peterz@infradead.org; helo=desiato.infradead.org X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 24 Aug 2022 11:28:37 -0400 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: Wed, 24 Aug 2022 11:28:18 -0000 Loosely based on early_pci_serial_init() from Linux, allow GRUB to make use of PCI serial devices. Specifically, my Alderlake NUC exposes the Intel AMT SoL UART as a PCI enumerated device but doesn't include it in the EFI tables. Tested and confirmed working on a "Lenovo P360 Tiny" with Intel AMT enabled. This specific machine has (from lspci -vv): 00:16.3 Serial controller: Intel Corporation Device 7aeb (rev 11) (prog-if 02 [16550]) DeviceName: Onboard - Other Subsystem: Lenovo Device 330e Control: I/O+ Mem+ BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap+ 66MHz+ UDF- FastB2B+ ParErr- DEVSEL=fast >TAbort- SERR- --- grub-core/term/serial.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ include/grub/pci.h | 3 ++ include/grub/serial.h | 2 + 3 files changed, 64 insertions(+) Index: grub2-2.06/grub-core/term/serial.c =================================================================== --- grub2-2.06.orig/grub-core/term/serial.c +++ grub2-2.06/grub-core/term/serial.c @@ -34,6 +34,7 @@ #ifdef GRUB_MACHINE_IEEE1275 #include #endif +#include GRUB_MOD_LICENSE ("GPLv3+"); @@ -448,6 +449,7 @@ GRUB_MOD_INIT(serial) #ifdef GRUB_MACHINE_ARC grub_arcserial_init (); #endif + grub_pciserial_init (); } GRUB_MOD_FINI(serial) @@ -461,3 +463,60 @@ GRUB_MOD_FINI(serial) } grub_unregister_extcmd (cmd); } + +#define GRUB_SERIAL_PORT_NUM 4 +static char com_names[GRUB_SERIAL_PORT_NUM][20]; +static struct grub_serial_port com_ports[GRUB_SERIAL_PORT_NUM]; +static int ports = 0; + +static int +find_pciserial (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) +{ + grub_pci_address_t cmd_addr, class_addr, bar_addr; + grub_uint32_t class, bar; + grub_uint16_t cmdreg; + int err, i = ports; + + (void)data; + (void)pciid; + + cmd_addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND); + cmdreg = grub_pci_read (cmd_addr); + + class_addr = grub_pci_make_address (dev, GRUB_PCI_REG_REVISION); + class = grub_pci_read (class_addr); + + bar_addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); + bar = grub_pci_read (bar_addr); + + /* MODEM, SERIAL or MAGIC */ + if (((class >> 16) != GRUB_PCI_CLASS_COMMUNICATION_MODEM && + (class >> 16) != GRUB_PCI_CLASS_COMMUNICATION_SERIAL) || + ((class >> 8) & 0xff) != 0x02) + return 0; + + if (!(bar & 1)) /* Not I/O */ + return 0; + + grub_pci_write (cmd_addr, cmdreg | GRUB_PCI_COMMAND_IO_ENABLED); + + grub_snprintf (com_names[i], sizeof (com_names[i]), "pci%d", i); + com_ports[i].name = com_names[i]; + com_ports[i].driver = &grub_ns8250_driver; + com_ports[i].port = bar & 0xfffffffc; + err = grub_serial_config_defaults (&com_ports[i]); + if (err) { + grub_print_error(); + return 0; + } + + grub_serial_register (&com_ports[i]); + + return ++ports >= GRUB_SERIAL_PORT_NUM; +} + +void +grub_pciserial_init (void) +{ + grub_pci_iterate (find_pciserial, NULL); +} Index: grub2-2.06/include/grub/serial.h =================================================================== --- grub2-2.06.orig/include/grub/serial.h +++ grub2-2.06/include/grub/serial.h @@ -193,6 +193,8 @@ const char * grub_arcserial_add_port (const char *path); #endif +void grub_pciserial_init (void); + struct grub_serial_port *grub_serial_find (const char *name); extern struct grub_serial_driver grub_ns8250_driver; void EXPORT_FUNC(grub_serial_unregister_driver) (struct grub_serial_driver *driver); Index: grub2-2.06/include/grub/pci.h =================================================================== --- grub2-2.06.orig/include/grub/pci.h +++ grub2-2.06/include/grub/pci.h @@ -83,6 +83,9 @@ #define GRUB_PCI_CLASS_SUBCLASS_VGA 0x0300 #define GRUB_PCI_CLASS_SUBCLASS_USB 0x0c03 +#define GRUB_PCI_CLASS_COMMUNICATION_SERIAL 0x0700 +#define GRUB_PCI_CLASS_COMMUNICATION_MODEM 0x0703 + #ifndef ASM_FILE enum