1. Patchew
  2. Xen
  3. View series

[Xen-devel] [PATCH] ns16550: Re-order the serial port address checking

Wei Xu posted 1 patch 4 years, 2 months ago
Failed in applying to current master (apply log)
xen/drivers/char/ns16550.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
[Xen-devel] [PATCH] ns16550: Re-order the serial port address checking
Posted by Wei Xu 4 years, 2 months ago 
Check the serial port address space before checking the address.

Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
---
 xen/drivers/char/ns16550.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c
index dc8ac4c..425e044 100644
--- a/xen/drivers/char/ns16550.c
+++ b/xen/drivers/char/ns16550.c
@@ -1644,6 +1644,12 @@ static int __init ns16550_acpi_uart_init(const void *data)

     spcr = container_of(table, struct acpi_table_spcr, header);

+    if ( unlikely(spcr->serial_port.space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) )
+    {
+        printk("ns16550: Address space type is not mmio\n");
+        return -EINVAL;
+    }
+
     /*
      * The serial port address may be 0 for example
      * if the console redirection is disabled.
@@ -1654,12 +1660,6 @@ static int __init ns16550_acpi_uart_init(const void *data)
         return -EINVAL;
     }

-    if ( unlikely(spcr->serial_port.space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) )
-    {
-        printk("ns16550: Address space type is not mmio\n");
-        return -EINVAL;
-    }
-
     ns16550_init_common(uart);

     /*
-- 
2.8.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH] ns16550: Re-order the serial port address checking
Posted by Julien Grall 4 years, 2 months ago 
Hi Wei,

Thank you for sending a follow-up.

On 24/02/2020 11:30, Wei Xu wrote:
> Check the serial port address space before checking the address.

Could you explain in a sentence why you want to re-order?

Cheers,

> 
> Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
> ---
>   xen/drivers/char/ns16550.c | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c
> index dc8ac4c..425e044 100644
> --- a/xen/drivers/char/ns16550.c
> +++ b/xen/drivers/char/ns16550.c
> @@ -1644,6 +1644,12 @@ static int __init ns16550_acpi_uart_init(const void *data)
> 
>       spcr = container_of(table, struct acpi_table_spcr, header);
> 
> +    if ( unlikely(spcr->serial_port.space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) )
> +    {
> +        printk("ns16550: Address space type is not mmio\n");
> +        return -EINVAL;
> +    }
> +
>       /*
>        * The serial port address may be 0 for example
>        * if the console redirection is disabled.
> @@ -1654,12 +1660,6 @@ static int __init ns16550_acpi_uart_init(const void *data)
>           return -EINVAL;
>       }
> 
> -    if ( unlikely(spcr->serial_port.space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) )
> -    {
> -        printk("ns16550: Address space type is not mmio\n");
> -        return -EINVAL;
> -    }
> -
>       ns16550_init_common(uart);
> 
>       /*
> 

-- 
Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH] ns16550: Re-order the serial port address checking
Posted by Wei Xu 4 years, 2 months ago 
Hi Julien,

On 2020/2/25 6:03, Julien Grall wrote:
> Hi Wei,
> 
> Thank you for sending a follow-up.
> 
> On 24/02/2020 11:30, Wei Xu wrote:
>> Check the serial port address space before checking the address.
> 
> Could you explain in a sentence why you want to re-order?

Do you think is it OK to explain as following:

The serial port address space ID qualifies the address.
Whether a value of zero for the serial port address can sensibly
mean "disabled" depends on the address space ID. Hence check the
address space ID before checking the address.

Thanks!

Best Regards,
Wei

> 
> Cheers,
> 
>>
>> Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
>> ---
>>   xen/drivers/char/ns16550.c | 12 ++++++------
>>   1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c
>> index dc8ac4c..425e044 100644
>> --- a/xen/drivers/char/ns16550.c
>> +++ b/xen/drivers/char/ns16550.c
>> @@ -1644,6 +1644,12 @@ static int __init ns16550_acpi_uart_init(const void *data)
>>
>>       spcr = container_of(table, struct acpi_table_spcr, header);
>>
>> +    if ( unlikely(spcr->serial_port.space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) )
>> +    {
>> +        printk("ns16550: Address space type is not mmio\n");
>> +        return -EINVAL;
>> +    }
>> +
>>       /*
>>        * The serial port address may be 0 for example
>>        * if the console redirection is disabled.
>> @@ -1654,12 +1660,6 @@ static int __init ns16550_acpi_uart_init(const void *data)
>>           return -EINVAL;
>>       }
>>
>> -    if ( unlikely(spcr->serial_port.space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) )
>> -    {
>> -        printk("ns16550: Address space type is not mmio\n");
>> -        return -EINVAL;
>> -    }
>> -
>>       ns16550_init_common(uart);
>>
>>       /*
>>
> 


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH] ns16550: Re-order the serial port address checking
Posted by Jan Beulich 4 years, 2 months ago 
On 25.02.2020 01:33, Wei Xu wrote:
> On 2020/2/25 6:03, Julien Grall wrote:
>> Thank you for sending a follow-up.
>>
>> On 24/02/2020 11:30, Wei Xu wrote:
>>> Check the serial port address space before checking the address.
>>
>> Could you explain in a sentence why you want to re-order?
> 
> Do you think is it OK to explain as following:
> 
> The serial port address space ID qualifies the address.
> Whether a value of zero for the serial port address can sensibly
> mean "disabled" depends on the address space ID. Hence check the
> address space ID before checking the address.

With this description ...

>>> Signed-off-by: Wei Xu <xuwei5@hisilicon.com>

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

And I'm sorry for having forgotten to switch these around
while committing your earlier patch.

Jan

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH] ns16550: Re-order the serial port address checking
Posted by Wei Xu 4 years, 2 months ago 
Hi Jan,

On 2020/2/25 21:10, Jan Beulich wrote:
> On 25.02.2020 01:33, Wei Xu wrote:
>> On 2020/2/25 6:03, Julien Grall wrote:
>>> Thank you for sending a follow-up.
>>>
>>> On 24/02/2020 11:30, Wei Xu wrote:
>>>> Check the serial port address space before checking the address.
>>>
>>> Could you explain in a sentence why you want to re-order?
>>
>> Do you think is it OK to explain as following:
>>
>> The serial port address space ID qualifies the address.
>> Whether a value of zero for the serial port address can sensibly
>> mean "disabled" depends on the address space ID. Hence check the
>> address space ID before checking the address.
> 
> With this description ...
> 
>>>> Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
> 
> Reviewed-by: Jan Beulich <jbeulich@suse.com>

Thanks!

Best Regards,
Wei

> 
> And I'm sorry for having forgotten to switch these around
> while committing your earlier patch.
> 
> Jan
> 
> .
> 


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.