2019-05-06 04:13:34

by Qian Cai

[permalink] [raw]
Subject: [PATCH] iommu/amd: print out "tag" in INVALID_PPR_REQUEST

The commit e7f63ffc1bf1 ("iommu/amd: Update logging information for new
event type") introduced a variable "tag" but had never used it which
generates a warning below,

drivers/iommu/amd_iommu.c: In function 'iommu_print_event':
drivers/iommu/amd_iommu.c:567:33: warning: variable 'tag' set but not
used [-Wunused-but-set-variable]
int type, devid, pasid, flags, tag;
^~~
so just use it during the logging.

Signed-off-by: Qian Cai <[email protected]>
---
drivers/iommu/amd_iommu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index f7cdd2ab7f11..52f41369c5b3 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -631,9 +631,9 @@ static void iommu_print_event(struct amd_iommu *iommu, void *__evt)
pasid = ((event[0] >> 16) & 0xFFFF)
| ((event[1] << 6) & 0xF0000);
tag = event[1] & 0x03FF;
- dev_err(dev, "Event logged [INVALID_PPR_REQUEST device=%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x]\n",
+ dev_err(dev, "Event logged [INVALID_PPR_REQUEST device=%02x:%02x.%x pasid=0x%05x tag=0x%04x address=0x%llx flags=0x%04x]\n",
PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
- pasid, address, flags);
+ pasid, tag, address, flags);
break;
default:
dev_err(dev, "Event logged [UNKNOWN event[0]=0x%08x event[1]=0x%08x event[2]=0x%08x event[3]=0x%08x\n",
--
2.20.1 (Apple Git-117)


2019-05-07 13:48:45

by Gary R Hook

[permalink] [raw]
Subject: Re: [PATCH] iommu/amd: print out "tag" in INVALID_PPR_REQUEST

On 5/5/19 11:11 PM, Qian Cai wrote:
> [CAUTION: External Email]
>
> The commit e7f63ffc1bf1 ("iommu/amd: Update logging information for new
> event type") introduced a variable "tag" but had never used it which
> generates a warning below,
>
> drivers/iommu/amd_iommu.c: In function 'iommu_print_event':
> drivers/iommu/amd_iommu.c:567:33: warning: variable 'tag' set but not
> used [-Wunused-but-set-variable]
> int type, devid, pasid, flags, tag;
> ^~~
> so just use it during the logging.
>
> Signed-off-by: Qian Cai <[email protected]>
> ---
> drivers/iommu/amd_iommu.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
> index f7cdd2ab7f11..52f41369c5b3 100644
> --- a/drivers/iommu/amd_iommu.c
> +++ b/drivers/iommu/amd_iommu.c
> @@ -631,9 +631,9 @@ static void iommu_print_event(struct amd_iommu *iommu, void *__evt)
> pasid = ((event[0] >> 16) & 0xFFFF)
> | ((event[1] << 6) & 0xF0000);
> tag = event[1] & 0x03FF;
> - dev_err(dev, "Event logged [INVALID_PPR_REQUEST device=%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x]\n",
> + dev_err(dev, "Event logged [INVALID_PPR_REQUEST device=%02x:%02x.%x pasid=0x%05x tag=0x%04x address=0x%llx flags=0x%04x]\n",
> PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
> - pasid, address, flags);
> + pasid, tag, address, flags);
> break;
> default:
> dev_err(dev, "Event logged [UNKNOWN event[0]=0x%08x event[1]=0x%08x event[2]=0x%08x event[3]=0x%08x\n",

I did manage to overlook that variable when I posted the original patch.
But it looks to me like 41e59a41fc5d1 (iommu tree) already fixed this...
I'm not sure why it never got pushed to the main tree.

grh

2019-05-14 14:57:44

by Qian Cai

[permalink] [raw]
Subject: Re: [PATCH] iommu/amd: print out "tag" in INVALID_PPR_REQUEST

On Tue, 2019-05-07 at 13:47 +0000, Gary R Hook wrote:
> On 5/5/19 11:11 PM, Qian Cai wrote:
> > [CAUTION: External Email]
> >
> > The commit e7f63ffc1bf1 ("iommu/amd: Update logging information for new
> > event type") introduced a variable "tag" but had never used it which
> > generates a warning below,
> >
> > drivers/iommu/amd_iommu.c: In function 'iommu_print_event':
> > drivers/iommu/amd_iommu.c:567:33: warning: variable 'tag' set but not
> > used [-Wunused-but-set-variable]
> >    int type, devid, pasid, flags, tag;
> >                                   ^~~
> > so just use it during the logging.
> >
> > Signed-off-by: Qian Cai <[email protected]>
> > ---
> >   drivers/iommu/amd_iommu.c | 4 ++--
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
> > index f7cdd2ab7f11..52f41369c5b3 100644
> > --- a/drivers/iommu/amd_iommu.c
> > +++ b/drivers/iommu/amd_iommu.c
> > @@ -631,9 +631,9 @@ static void iommu_print_event(struct amd_iommu *iommu,
> > void *__evt)
> >                  pasid = ((event[0] >> 16) & 0xFFFF)
> >                          | ((event[1] << 6) & 0xF0000);
> >                  tag = event[1] & 0x03FF;
> > -               dev_err(dev, "Event logged [INVALID_PPR_REQUEST
> > device=%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x]\n",
> > +               dev_err(dev, "Event logged [INVALID_PPR_REQUEST
> > device=%02x:%02x.%x pasid=0x%05x tag=0x%04x address=0x%llx flags=0x%04x]\n",
> >                          PCI_BUS_NUM(devid), PCI_SLOT(devid),
> > PCI_FUNC(devid),
> > -                       pasid, address, flags);
> > +                       pasid, tag, address, flags);
> >                  break;
> >          default:
> >                  dev_err(dev, "Event logged [UNKNOWN event[0]=0x%08x
> > event[1]=0x%08x event[2]=0x%08x event[3]=0x%08x\n",
>
> I did manage to overlook that variable when I posted the original patch. 
> But it looks to me like 41e59a41fc5d1 (iommu tree) already fixed this... 
> I'm not sure why it never got pushed to the main tree.

Jroedel, I am wondering what the plan for 41e59a41fc5d1 (iommu tree) or this
patch to be pushed to the linux-next or mainline...

2019-05-28 13:40:31

by Jörg Rödel

[permalink] [raw]
Subject: Re: [PATCH] iommu/amd: print out "tag" in INVALID_PPR_REQUEST

On Tue, May 14, 2019 at 10:55:46AM -0400, Qian Cai wrote:
> Jroedel, I am wondering what the plan for 41e59a41fc5d1 (iommu tree) or this
> patch to be pushed to the linux-next or mainline...

Looks like I applied that patch directly to the master branch, which is
not what goes upstream. I cherry-picked it to x86/amd, so it will go
upstream for v5.3.


Regards,

Joerg