[Qemu-devel] [PATCH 0/3] fix pci related code typos

[Qemu-devel] [PATCH 0/3] fix pci related code typos

[Chen Fan]

Chen Fan (3):
  pcie_aer: fix typos in pcie_aer_inject_error comment
  aer: fix a wrong init PCI_ERR_COR_STATUS w1cmask type register
  pci: fix several trivial typos in comment

 hw/pci/pcie_aer.c         | 8 ++++----
 include/hw/pci/pci.h      | 2 +-
 include/hw/pci/pcie_aer.h | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

-- 
1.9.3

[Qemu-devel] [PATCH 1/3] pcie_aer: fix typos in pcie_aer_inject_error comment

[Chen Fan]

Refer to "PCI Express Base Spec3.0", this comments can't
fit the description in spec, so we should fix them.

Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
---
 hw/pci/pcie_aer.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index 1f4be16..7ca077a 100644
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -618,11 +618,11 @@ static bool pcie_aer_inject_uncor_error(PCIEAERInject *inj, bool is_fatal)
  * non-Function specific error must be recorded in all functions.
  * It is the responsibility of the caller of this function.
  * It is also caller's responsibility to determine which function should
- * report the rerror.
+ * report the error.
  *
  * 6.2.4 Error Logging
- * 6.2.5 Sqeunce of Device Error Signaling and Logging Operations
- * table 6-2: Flowchard Showing Sequence of Device Error Signaling and Logging
+ * 6.2.5 Sequence of Device Error Signaling and Logging Operations
+ * table 6-2: Flowchart Showing Sequence of Device Error Signaling and Logging
  *            Operations
  */
 int pcie_aer_inject_error(PCIDevice *dev, const PCIEAERErr *err)
-- 
1.9.3

[Qemu-devel] [PATCH 2/3] aer: fix a wrong init PCI_ERR_COR_STATUS w1cmask type register

[Chen Fan]

>From pcie spec, the bits attributes are RW1CS in Correctable
Error Status Register, so this patch fix a wrong definition
for PCI_ERR_COR_STATUS register with w1cmask type.

Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
---
 hw/pci/pcie_aer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index 7ca077a..ece1487 100644
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -123,7 +123,7 @@ int pcie_aer_init(PCIDevice *dev, uint16_t offset)
                  PCI_ERR_UNC_SUPPORTED);
 
     pci_long_test_and_set_mask(dev->w1cmask + offset + PCI_ERR_COR_STATUS,
-                               PCI_ERR_COR_STATUS);
+                               PCI_ERR_COR_SUPPORTED);
 
     pci_set_long(dev->config + offset + PCI_ERR_COR_MASK,
                  PCI_ERR_COR_MASK_DEFAULT);
-- 
1.9.3

[Qemu-devel] [PATCH 3/3] pci: fix several trivial typos in comment

[Chen Fan]

Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
---
 include/hw/pci/pci.h      | 2 +-
 include/hw/pci/pcie_aer.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index bdee464..b82de15 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -137,7 +137,7 @@ enum {
 #define PCI_CONFIG_HEADER_SIZE 0x40
 /* Size of the standard PCI config space */
 #define PCI_CONFIG_SPACE_SIZE 0x100
-/* Size of the standart PCIe config space: 4KB */
+/* Size of the standard PCIe config space: 4KB */
 #define PCIE_CONFIG_SPACE_SIZE  0x1000
 
 #define PCI_NUM_PINS 4 /* A-D */
diff --git a/include/hw/pci/pcie_aer.h b/include/hw/pci/pcie_aer.h
index bcac80a..2fb8388 100644
--- a/include/hw/pci/pcie_aer.h
+++ b/include/hw/pci/pcie_aer.h
@@ -51,7 +51,7 @@ struct PCIEAERLog {
     PCIEAERErr *log;
 };
 
-/* aer error message: error signaling message has only error sevirity and
+/* aer error message: error signaling message has only error severity and
    source id. See 2.2.8.3 error signaling messages */
 struct PCIEAERMsg {
     /*
-- 
1.9.3

Re: [Qemu-devel] [PATCH 0/3] fix pci related code typos

[Chen Fan]

Cc: qemu-trivial

On 03/10/2015 09:49 AM, Chen Fan wrote:
> Chen Fan (3):
>    pcie_aer: fix typos in pcie_aer_inject_error comment
>    aer: fix a wrong init PCI_ERR_COR_STATUS w1cmask type register
>    pci: fix several trivial typos in comment
>
>   hw/pci/pcie_aer.c         | 8 ++++----
>   include/hw/pci/pci.h      | 2 +-
>   include/hw/pci/pcie_aer.h | 2 +-
>   3 files changed, 6 insertions(+), 6 deletions(-)
>

Re: [Qemu-devel] [PATCH 1/3] pcie_aer: fix typos in pcie_aer_inject_error comment

[Michael Tokarev]

10.03.2015 04:49, Chen Fan пишет:
> Refer to "PCI Express Base Spec3.0", this comments can't
> fit the description in spec, so we should fix them.
> 
> Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
> ---
>  hw/pci/pcie_aer.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
> index 1f4be16..7ca077a 100644
> --- a/hw/pci/pcie_aer.c
> +++ b/hw/pci/pcie_aer.c
> @@ -618,11 +618,11 @@ static bool pcie_aer_inject_uncor_error(PCIEAERInject *inj, bool is_fatal)
>   * non-Function specific error must be recorded in all functions.
>   * It is the responsibility of the caller of this function.
>   * It is also caller's responsibility to determine which function should
> - * report the rerror.
> + * report the error.
>   *
>   * 6.2.4 Error Logging
> - * 6.2.5 Sqeunce of Device Error Signaling and Logging Operations
> - * table 6-2: Flowchard Showing Sequence of Device Error Signaling and Logging
> + * 6.2.5 Sequence of Device Error Signaling and Logging Operations
> + * table 6-2: Flowchart Showing Sequence of Device Error Signaling and Logging
>   *            Operations

this 6-2 is not a table, it is "Figure 6-2" on page 479, unless, ofcourse, you mean
"Table 6-2: General PCI Express Error List" on page 481.

I can fix this when applying.

Thanks,

/mjt

>   */
>  int pcie_aer_inject_error(PCIDevice *dev, const PCIEAERErr *err)
> 

Re: [Qemu-devel] [PATCH 0/3] fix pci related code typos

[Michael S. Tsirkin]

On Tue, Mar 10, 2015 at 09:49:47AM +0800, Chen Fan wrote:
> Chen Fan (3):
>   pcie_aer: fix typos in pcie_aer_inject_error comment
>   aer: fix a wrong init PCI_ERR_COR_STATUS w1cmask type register
>   pci: fix several trivial typos in comment

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>


>  hw/pci/pcie_aer.c         | 8 ++++----
>  include/hw/pci/pci.h      | 2 +-
>  include/hw/pci/pcie_aer.h | 2 +-
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> -- 
> 1.9.3

Re: [Qemu-devel] [PATCH 1/3] pcie_aer: fix typos in pcie_aer_inject_error comment

[Michael S. Tsirkin]

On Tue, Mar 10, 2015 at 09:34:58AM +0300, Michael Tokarev wrote:
> 10.03.2015 04:49, Chen Fan пишет:
> > Refer to "PCI Express Base Spec3.0", this comments can't
> > fit the description in spec, so we should fix them.
> > 
> > Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
> > ---
> >  hw/pci/pcie_aer.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
> > index 1f4be16..7ca077a 100644
> > --- a/hw/pci/pcie_aer.c
> > +++ b/hw/pci/pcie_aer.c
> > @@ -618,11 +618,11 @@ static bool pcie_aer_inject_uncor_error(PCIEAERInject *inj, bool is_fatal)
> >   * non-Function specific error must be recorded in all functions.
> >   * It is the responsibility of the caller of this function.
> >   * It is also caller's responsibility to determine which function should
> > - * report the rerror.
> > + * report the error.
> >   *
> >   * 6.2.4 Error Logging
> > - * 6.2.5 Sqeunce of Device Error Signaling and Logging Operations
> > - * table 6-2: Flowchard Showing Sequence of Device Error Signaling and Logging
> > + * 6.2.5 Sequence of Device Error Signaling and Logging Operations
> > + * table 6-2: Flowchart Showing Sequence of Device Error Signaling and Logging
> >   *            Operations
> 
> this 6-2 is not a table, it is "Figure 6-2" on page 479, unless, ofcourse, you mean
> "Table 6-2: General PCI Express Error List" on page 481.
> 
> I can fix this when applying.
> 
> Thanks,
> 
> /mjt

OK so you want to take all 3 patches?


> >   */
> >  int pcie_aer_inject_error(PCIDevice *dev, const PCIEAERErr *err)
> > 

Re: [Qemu-devel] [PATCH 1/3] pcie_aer: fix typos in pcie_aer_inject_error comment

[Michael S. Tsirkin]

On Tue, Mar 10, 2015 at 09:49:48AM +0800, Chen Fan wrote:
> Refer to "PCI Express Base Spec3.0", this comments can't
> fit the description in spec, so we should fix them.
> 
> Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  hw/pci/pcie_aer.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
> index 1f4be16..7ca077a 100644
> --- a/hw/pci/pcie_aer.c
> +++ b/hw/pci/pcie_aer.c
> @@ -618,11 +618,11 @@ static bool pcie_aer_inject_uncor_error(PCIEAERInject *inj, bool is_fatal)
>   * non-Function specific error must be recorded in all functions.
>   * It is the responsibility of the caller of this function.
>   * It is also caller's responsibility to determine which function should
> - * report the rerror.
> + * report the error.
>   *
>   * 6.2.4 Error Logging
> - * 6.2.5 Sqeunce of Device Error Signaling and Logging Operations
> - * table 6-2: Flowchard Showing Sequence of Device Error Signaling and Logging
> + * 6.2.5 Sequence of Device Error Signaling and Logging Operations
> + * table 6-2: Flowchart Showing Sequence of Device Error Signaling and Logging
>   *            Operations
>   */
>  int pcie_aer_inject_error(PCIDevice *dev, const PCIEAERErr *err)
> -- 
> 1.9.3

Re: [Qemu-devel] [PATCH 2/3] aer: fix a wrong init PCI_ERR_COR_STATUS w1cmask type register

[Michael S. Tsirkin]

On Tue, Mar 10, 2015 at 09:49:49AM +0800, Chen Fan wrote:
> >From pcie spec, the bits attributes are RW1CS in Correctable
> Error Status Register, so this patch fix a wrong definition
> for PCI_ERR_COR_STATUS register with w1cmask type.
> 
> Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  hw/pci/pcie_aer.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
> index 7ca077a..ece1487 100644
> --- a/hw/pci/pcie_aer.c
> +++ b/hw/pci/pcie_aer.c
> @@ -123,7 +123,7 @@ int pcie_aer_init(PCIDevice *dev, uint16_t offset)
>                   PCI_ERR_UNC_SUPPORTED);
>  
>      pci_long_test_and_set_mask(dev->w1cmask + offset + PCI_ERR_COR_STATUS,
> -                               PCI_ERR_COR_STATUS);
> +                               PCI_ERR_COR_SUPPORTED);
>  
>      pci_set_long(dev->config + offset + PCI_ERR_COR_MASK,
>                   PCI_ERR_COR_MASK_DEFAULT);
> -- 
> 1.9.3

Re: [Qemu-devel] [PATCH 3/3] pci: fix several trivial typos in comment

[Michael S. Tsirkin]

On Tue, Mar 10, 2015 at 09:52:23AM +0800, Chen Fan wrote:
> Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  include/hw/pci/pci.h      | 2 +-
>  include/hw/pci/pcie_aer.h | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
> index bdee464..b82de15 100644
> --- a/include/hw/pci/pci.h
> +++ b/include/hw/pci/pci.h
> @@ -137,7 +137,7 @@ enum {
>  #define PCI_CONFIG_HEADER_SIZE 0x40
>  /* Size of the standard PCI config space */
>  #define PCI_CONFIG_SPACE_SIZE 0x100
> -/* Size of the standart PCIe config space: 4KB */
> +/* Size of the standard PCIe config space: 4KB */
>  #define PCIE_CONFIG_SPACE_SIZE  0x1000
>  
>  #define PCI_NUM_PINS 4 /* A-D */
> diff --git a/include/hw/pci/pcie_aer.h b/include/hw/pci/pcie_aer.h
> index bcac80a..2fb8388 100644
> --- a/include/hw/pci/pcie_aer.h
> +++ b/include/hw/pci/pcie_aer.h
> @@ -51,7 +51,7 @@ struct PCIEAERLog {
>      PCIEAERErr *log;
>  };
>  
> -/* aer error message: error signaling message has only error sevirity and
> +/* aer error message: error signaling message has only error severity and
>     source id. See 2.2.8.3 error signaling messages */
>  struct PCIEAERMsg {
>      /*
> -- 
> 1.9.3

Re: [Qemu-devel] [PATCH 1/3] pcie_aer: fix typos in pcie_aer_inject_error comment

[Chen Fan]

On 03/10/2015 10:57 PM, Michael S. Tsirkin wrote:
> On Tue, Mar 10, 2015 at 09:34:58AM +0300, Michael Tokarev wrote:
>> 10.03.2015 04:49, Chen Fan пишет:
>>> Refer to "PCI Express Base Spec3.0", this comments can't
>>> fit the description in spec, so we should fix them.
>>>
>>> Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
>>> ---
>>>   hw/pci/pcie_aer.c | 6 +++---
>>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
>>> index 1f4be16..7ca077a 100644
>>> --- a/hw/pci/pcie_aer.c
>>> +++ b/hw/pci/pcie_aer.c
>>> @@ -618,11 +618,11 @@ static bool pcie_aer_inject_uncor_error(PCIEAERInject *inj, bool is_fatal)
>>>    * non-Function specific error must be recorded in all functions.
>>>    * It is the responsibility of the caller of this function.
>>>    * It is also caller's responsibility to determine which function should
>>> - * report the rerror.
>>> + * report the error.
>>>    *
>>>    * 6.2.4 Error Logging
>>> - * 6.2.5 Sqeunce of Device Error Signaling and Logging Operations
>>> - * table 6-2: Flowchard Showing Sequence of Device Error Signaling and Logging
>>> + * 6.2.5 Sequence of Device Error Signaling and Logging Operations
>>> + * table 6-2: Flowchart Showing Sequence of Device Error Signaling and Logging
>>>    *            Operations
>> this 6-2 is not a table, it is "Figure 6-2" on page 479, unless, ofcourse, you mean
>> "Table 6-2: General PCI Express Error List" on page 481.
>>
>> I can fix this when applying.
>>
>> Thanks,
>>
>> /mjt
> OK so you want to take all 3 patches?
Hi mjt,

can you check in these patch?

Thanks,
Chen

>
>
>>>    */
>>>   int pcie_aer_inject_error(PCIDevice *dev, const PCIEAERErr *err)
>>>
> .
>