mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
ns16550: correct name/value pair parsing for PCI port/bridge
First of all these were inverted: "bridge=" caused the port coordinates to be established, while "port=" controlled the bridge coordinates. And then the error messages being identical also wasn't helpful. While correcting this also move both case blocks close together. Fixes:97fd49a7e0("ns16550: add support for UART parameters to be specifed with name-value pairs") Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com> master commit:e692b22230master date: 2023-03-29 14:55:37 +0200
This commit is contained in:
1 parent
d080287c2a
commit
06264af090
1 file changed
+8
-8
@@ -1536,13 +1536,6 @@ static bool __init parse_namevalue_pairs(char *str, struct ns16550 *uart)
|
||||
break;
|
||||
|
||||
#ifdef CONFIG_HAS_PCI
|
||||
case bridge_bdf:
|
||||
if ( !parse_pci(param_value, NULL, &uart->ps_bdf[0],
|
||||
&uart->ps_bdf[1], &uart->ps_bdf[2]) )
|
||||
PARSE_ERR_RET("Bad port PCI coordinates\n");
|
||||
uart->ps_bdf_enable = true;
|
||||
break;
|
||||
|
||||
case device:
|
||||
if ( strncmp(param_value, "pci", 3) == 0 )
|
||||
{
|
||||
@@ -1557,9 +1550,16 @@ static bool __init parse_namevalue_pairs(char *str, struct ns16550 *uart)
|
||||
break;
|
||||
|
||||
case port_bdf:
|
||||
if ( !parse_pci(param_value, NULL, &uart->ps_bdf[0],
|
||||
&uart->ps_bdf[1], &uart->ps_bdf[2]) )
|
||||
PARSE_ERR_RET("Bad port PCI coordinates\n");
|
||||
uart->ps_bdf_enable = true;
|
||||
break;
|
||||
|
||||
case bridge_bdf:
|
||||
if ( !parse_pci(param_value, NULL, &uart->pb_bdf[0],
|
||||
&uart->pb_bdf[1], &uart->pb_bdf[2]) )
|
||||
PARSE_ERR_RET("Bad port PCI coordinates\n");
|
||||
PARSE_ERR_RET("Bad bridge PCI coordinates\n");
|
||||
uart->pb_bdf_enable = true;
|
||||
break;
|
||||
#endif
|
||||
|
||||