[PATCH v3] ns16550: enable memory decoding on MMIO-based PCI console card

Marek Marczykowski-Górecki posted 1 patch 11 months, 4 weeks ago
Patches applied successfully (tree, apply log)
git fetch https://gitlab.com/xen-project/patchew/xen tags/patchew/20230505214810.406061-1-marmarek@invisiblethingslab.com
xen/drivers/char/ns16550.c | 8 ++++++++
1 file changed, 8 insertions(+)
[PATCH v3] ns16550: enable memory decoding on MMIO-based PCI console card
Posted by Marek Marczykowski-Górecki 11 months, 4 weeks ago
pci_serial_early_init() enables PCI_COMMAND_IO for IO-based UART
devices, add setting PCI_COMMAND_MEMORY for MMIO-based UART devices too.
Note the MMIO-based devices in practice need a "pci" sub-option,
otherwise a few parameters are not initialized (including bar_idx,
reg_shift, reg_width etc). The "pci" is not supposed to be used with
explicit BDF, so do not key setting PCI_COMMAND_MEMORY on explicit BDF
being set. Contrary to the IO-based UART, pci_serial_early_init() will
not attempt to set BAR0 address, even if user provided io_base manually
- in most cases, those are with an offest and the current cmdline syntax
doesn't allow expressing it. Due to this, enable PCI_COMMAND_MEMORY only
if uart->bar is already populated. In similar spirit, this patch does
not support setting BAR0 of the bridge.

Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
---
This fixes the issue I was talking about on #xendevel. Thanks Roger for
the hint.

Changes in v2:
 - check if uart->bar instead of uart->io_base
 - move it ahead of !uart->ps_bdf_enable return
 - expand commit message.
Changes in v3:
- restore io_base check
---
 xen/drivers/char/ns16550.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c
index 1b21eb93c45f..ae845a720f7a 100644
--- a/xen/drivers/char/ns16550.c
+++ b/xen/drivers/char/ns16550.c
@@ -272,6 +272,14 @@ static int cf_check ns16550_getc(struct serial_port *port, char *pc)
 static void pci_serial_early_init(struct ns16550 *uart)
 {
 #ifdef NS16550_PCI
+    if ( uart->bar && uart->io_base >= 0x10000)
+    {
+        pci_conf_write16(PCI_SBDF(0, uart->ps_bdf[0], uart->ps_bdf[1],
+                                  uart->ps_bdf[2]),
+                         PCI_COMMAND, PCI_COMMAND_MEMORY);
+        return;
+    }
+
     if ( !uart->ps_bdf_enable || uart->io_base >= 0x10000 )
         return;
 
-- 
2.39.2


Re: [PATCH v3] ns16550: enable memory decoding on MMIO-based PCI console card
Posted by Jan Beulich 11 months, 3 weeks ago
On 05.05.2023 23:48, Marek Marczykowski-Górecki wrote:
> pci_serial_early_init() enables PCI_COMMAND_IO for IO-based UART
> devices, add setting PCI_COMMAND_MEMORY for MMIO-based UART devices too.
> Note the MMIO-based devices in practice need a "pci" sub-option,
> otherwise a few parameters are not initialized (including bar_idx,
> reg_shift, reg_width etc). The "pci" is not supposed to be used with
> explicit BDF, so do not key setting PCI_COMMAND_MEMORY on explicit BDF
> being set. Contrary to the IO-based UART, pci_serial_early_init() will
> not attempt to set BAR0 address, even if user provided io_base manually
> - in most cases, those are with an offest and the current cmdline syntax
> doesn't allow expressing it. Due to this, enable PCI_COMMAND_MEMORY only
> if uart->bar is already populated. In similar spirit, this patch does
> not support setting BAR0 of the bridge.
> 
> Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>

Acked-by: Jan Beulich <jbeulich@suse.com>
with ...

> --- a/xen/drivers/char/ns16550.c
> +++ b/xen/drivers/char/ns16550.c
> @@ -272,6 +272,14 @@ static int cf_check ns16550_getc(struct serial_port *port, char *pc)
>  static void pci_serial_early_init(struct ns16550 *uart)
>  {
>  #ifdef NS16550_PCI
> +    if ( uart->bar && uart->io_base >= 0x10000)

... (nit) the missing blank inserted, which I'll be happy to do while
committing.

Jan

Re: [PATCH v3] ns16550: enable memory decoding on MMIO-based PCI console card
Posted by Marek Marczykowski-Górecki 11 months, 3 weeks ago
On Mon, May 08, 2023 at 11:01:18AM +0200, Jan Beulich wrote:
> On 05.05.2023 23:48, Marek Marczykowski-Górecki wrote:
> > pci_serial_early_init() enables PCI_COMMAND_IO for IO-based UART
> > devices, add setting PCI_COMMAND_MEMORY for MMIO-based UART devices too.
> > Note the MMIO-based devices in practice need a "pci" sub-option,
> > otherwise a few parameters are not initialized (including bar_idx,
> > reg_shift, reg_width etc). The "pci" is not supposed to be used with
> > explicit BDF, so do not key setting PCI_COMMAND_MEMORY on explicit BDF
> > being set. Contrary to the IO-based UART, pci_serial_early_init() will
> > not attempt to set BAR0 address, even if user provided io_base manually
> > - in most cases, those are with an offest and the current cmdline syntax
> > doesn't allow expressing it. Due to this, enable PCI_COMMAND_MEMORY only
> > if uart->bar is already populated. In similar spirit, this patch does
> > not support setting BAR0 of the bridge.
> > 
> > Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
> 
> Acked-by: Jan Beulich <jbeulich@suse.com>
> with ...
> 
> > --- a/xen/drivers/char/ns16550.c
> > +++ b/xen/drivers/char/ns16550.c
> > @@ -272,6 +272,14 @@ static int cf_check ns16550_getc(struct serial_port *port, char *pc)
> >  static void pci_serial_early_init(struct ns16550 *uart)
> >  {
> >  #ifdef NS16550_PCI
> > +    if ( uart->bar && uart->io_base >= 0x10000)
> 
> ... (nit) the missing blank inserted, which I'll be happy to do while
> committing.

Thanks!

-- 
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab