* [PATCH] ACPI: IORT: Add extra message "applying workaround" for off-by-1 issue
@ 2020-05-07 13:41 Hanjun Guo
2020-05-07 13:49 ` Ard Biesheuvel
0 siblings, 1 reply; 5+ messages in thread
From: Hanjun Guo @ 2020-05-07 13:41 UTC (permalink / raw)
To: Ard Biesheuvel, Lorenzo Pieralisi, Rafael J. Wysocki,
Sudeep Holla, Will Deacon
Cc: linux-acpi, linux-arm-kernel, Hanjun Guo
As we already applied a workaround for the off-by-1 issue,
it's good to add extra message "applying workaround" to
make people less uneasy to see such message in the boot log.
Signed-off-by: Hanjun Guo <guohanjun@huawei.com>
---
Based on top of for-next/acpi branch of ARM64 repo
drivers/acpi/arm64/iort.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
index b011d25..f3d492a 100644
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@ -328,7 +328,7 @@ static int iort_id_map(struct acpi_iort_id_mapping *map, u8 type, u32 rid_in,
* Otherwise, things are *really* broken, and we just disregard
* duplicate matches entirely to retain compatibility.
*/
- pr_err(FW_BUG "[map %p] conflicting mapping for input ID 0x%x\n",
+ pr_err(FW_BUG "[map %p] conflicting mapping for input ID 0x%x, applying workaround\n",
map, rid_in);
if (rid_in != map->input_base)
return -ENXIO;
--
1.7.12.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] ACPI: IORT: Add extra message "applying workaround" for off-by-1 issue
2020-05-07 13:41 [PATCH] ACPI: IORT: Add extra message "applying workaround" for off-by-1 issue Hanjun Guo
@ 2020-05-07 13:49 ` Ard Biesheuvel
2020-05-07 13:53 ` Hanjun Guo
0 siblings, 1 reply; 5+ messages in thread
From: Ard Biesheuvel @ 2020-05-07 13:49 UTC (permalink / raw)
To: Hanjun Guo
Cc: Lorenzo Pieralisi, Rafael J. Wysocki, Sudeep Holla, Will Deacon,
ACPI Devel Maling List, Linux ARM
On Thu, 7 May 2020 at 15:47, Hanjun Guo <guohanjun@huawei.com> wrote:
>
> As we already applied a workaround for the off-by-1 issue,
> it's good to add extra message "applying workaround" to
> make people less uneasy to see such message in the boot log.
>
> Signed-off-by: Hanjun Guo <guohanjun@huawei.com>
Hi Hanjun,
> ---
>
> Based on top of for-next/acpi branch of ARM64 repo
>
> drivers/acpi/arm64/iort.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
> index b011d25..f3d492a 100644
> --- a/drivers/acpi/arm64/iort.c
> +++ b/drivers/acpi/arm64/iort.c
> @@ -328,7 +328,7 @@ static int iort_id_map(struct acpi_iort_id_mapping *map, u8 type, u32 rid_in,
> * Otherwise, things are *really* broken, and we just disregard
> * duplicate matches entirely to retain compatibility.
> */
> - pr_err(FW_BUG "[map %p] conflicting mapping for input ID 0x%x\n",
> + pr_err(FW_BUG "[map %p] conflicting mapping for input ID 0x%x, applying workaround\n",
This is not correct. The workaround is only applied if rid_in ==
map->input_base, so better to print a second line after the 'return'
below that is only reached in that particular case.
> map, rid_in);
> if (rid_in != map->input_base)
> return -ENXIO;
> --
> 1.7.12.4
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ACPI: IORT: Add extra message "applying workaround" for off-by-1 issue
2020-05-07 13:49 ` Ard Biesheuvel
@ 2020-05-07 13:53 ` Hanjun Guo
2020-05-07 14:02 ` Hanjun Guo
0 siblings, 1 reply; 5+ messages in thread
From: Hanjun Guo @ 2020-05-07 13:53 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: Lorenzo Pieralisi, Rafael J. Wysocki, Sudeep Holla, Will Deacon,
ACPI Devel Maling List, Linux ARM
Hi Ard,
On 2020/5/7 21:49, Ard Biesheuvel wrote:
> On Thu, 7 May 2020 at 15:47, Hanjun Guo <guohanjun@huawei.com> wrote:
>>
>> As we already applied a workaround for the off-by-1 issue,
>> it's good to add extra message "applying workaround" to
>> make people less uneasy to see such message in the boot log.
>>
>> Signed-off-by: Hanjun Guo <guohanjun@huawei.com>
>
> Hi Hanjun,
>
>> ---
>>
>> Based on top of for-next/acpi branch of ARM64 repo
>>
>> drivers/acpi/arm64/iort.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
>> index b011d25..f3d492a 100644
>> --- a/drivers/acpi/arm64/iort.c
>> +++ b/drivers/acpi/arm64/iort.c
>> @@ -328,7 +328,7 @@ static int iort_id_map(struct acpi_iort_id_mapping *map, u8 type, u32 rid_in,
>> * Otherwise, things are *really* broken, and we just disregard
>> * duplicate matches entirely to retain compatibility.
>> */
>> - pr_err(FW_BUG "[map %p] conflicting mapping for input ID 0x%x\n",
>> + pr_err(FW_BUG "[map %p] conflicting mapping for input ID 0x%x, applying workaround\n",
>
> This is not correct. The workaround is only applied if rid_in ==
> map->input_base, so better to print a second line after the 'return'
> below that is only reached in that particular case.
Obvious I'm wrong, I will update this patch, thanks a lot!
>
>> map, rid_in);
>> if (rid_in != map->input_base)
>> return -ENXIO;
>> --
>> 1.7.12.4
>>
>
> .
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ACPI: IORT: Add extra message "applying workaround" for off-by-1 issue
2020-05-07 13:53 ` Hanjun Guo
@ 2020-05-07 14:02 ` Hanjun Guo
2020-05-07 16:39 ` Ard Biesheuvel
0 siblings, 1 reply; 5+ messages in thread
From: Hanjun Guo @ 2020-05-07 14:02 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: Lorenzo Pieralisi, Rafael J. Wysocki, Sudeep Holla, Will Deacon,
ACPI Devel Maling List, Linux ARM
On 2020/5/7 21:53, Hanjun Guo wrote:
> Hi Ard,
>
> On 2020/5/7 21:49, Ard Biesheuvel wrote:
>> On Thu, 7 May 2020 at 15:47, Hanjun Guo <guohanjun@huawei.com> wrote:
>>>
>>> As we already applied a workaround for the off-by-1 issue,
>>> it's good to add extra message "applying workaround" to
>>> make people less uneasy to see such message in the boot log.
>>>
>>> Signed-off-by: Hanjun Guo <guohanjun@huawei.com>
>>
>> Hi Hanjun,
>>
>>> ---
>>>
>>> Based on top of for-next/acpi branch of ARM64 repo
>>>
>>> drivers/acpi/arm64/iort.c | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
>>> index b011d25..f3d492a 100644
>>> --- a/drivers/acpi/arm64/iort.c
>>> +++ b/drivers/acpi/arm64/iort.c
>>> @@ -328,7 +328,7 @@ static int iort_id_map(struct
>>> acpi_iort_id_mapping *map, u8 type, u32 rid_in,
>>> * Otherwise, things are *really* broken, and we
>>> just disregard
>>> * duplicate matches entirely to retain compatibility.
>>> */
>>> - pr_err(FW_BUG "[map %p] conflicting mapping for input
>>> ID 0x%x\n",
>>> + pr_err(FW_BUG "[map %p] conflicting mapping for input
>>> ID 0x%x, applying workaround\n",
>>
>> This is not correct. The workaround is only applied if rid_in ==
>> map->input_base, so better to print a second line after the 'return'
>> below that is only reached in that particular case.
>
> Obvious I'm wrong, I will update this patch, thanks a lot!
By the way, how about the print below? Should I add something more?
if (rid_in != map->input_base)
return -ENXIO;
+
+ pr_err(FW_BUG "applying workaround for the conflicting
mapping\n");
Thanks
Hanjun
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ACPI: IORT: Add extra message "applying workaround" for off-by-1 issue
2020-05-07 14:02 ` Hanjun Guo
@ 2020-05-07 16:39 ` Ard Biesheuvel
0 siblings, 0 replies; 5+ messages in thread
From: Ard Biesheuvel @ 2020-05-07 16:39 UTC (permalink / raw)
To: Hanjun Guo
Cc: Lorenzo Pieralisi, Rafael J. Wysocki, Sudeep Holla, Will Deacon,
ACPI Devel Maling List, Linux ARM
On Thu, 7 May 2020 at 16:02, Hanjun Guo <guohanjun@huawei.com> wrote:
>
> On 2020/5/7 21:53, Hanjun Guo wrote:
> > Hi Ard,
> >
> > On 2020/5/7 21:49, Ard Biesheuvel wrote:
> >> On Thu, 7 May 2020 at 15:47, Hanjun Guo <guohanjun@huawei.com> wrote:
> >>>
> >>> As we already applied a workaround for the off-by-1 issue,
> >>> it's good to add extra message "applying workaround" to
> >>> make people less uneasy to see such message in the boot log.
> >>>
> >>> Signed-off-by: Hanjun Guo <guohanjun@huawei.com>
> >>
> >> Hi Hanjun,
> >>
> >>> ---
> >>>
> >>> Based on top of for-next/acpi branch of ARM64 repo
> >>>
> >>> drivers/acpi/arm64/iort.c | 2 +-
> >>> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>>
> >>> diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
> >>> index b011d25..f3d492a 100644
> >>> --- a/drivers/acpi/arm64/iort.c
> >>> +++ b/drivers/acpi/arm64/iort.c
> >>> @@ -328,7 +328,7 @@ static int iort_id_map(struct
> >>> acpi_iort_id_mapping *map, u8 type, u32 rid_in,
> >>> * Otherwise, things are *really* broken, and we
> >>> just disregard
> >>> * duplicate matches entirely to retain compatibility.
> >>> */
> >>> - pr_err(FW_BUG "[map %p] conflicting mapping for input
> >>> ID 0x%x\n",
> >>> + pr_err(FW_BUG "[map %p] conflicting mapping for input
> >>> ID 0x%x, applying workaround\n",
> >>
> >> This is not correct. The workaround is only applied if rid_in ==
> >> map->input_base, so better to print a second line after the 'return'
> >> below that is only reached in that particular case.
> >
> > Obvious I'm wrong, I will update this patch, thanks a lot!
>
> By the way, how about the print below? Should I add something more?
>
> if (rid_in != map->input_base)
> return -ENXIO;
> +
> + pr_err(FW_BUG "applying workaround for the conflicting
> mapping\n");
>
Simply 'applying workaround' should do it imo.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-05-07 16:40 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-07 13:41 [PATCH] ACPI: IORT: Add extra message "applying workaround" for off-by-1 issue Hanjun Guo
2020-05-07 13:49 ` Ard Biesheuvel
2020-05-07 13:53 ` Hanjun Guo
2020-05-07 14:02 ` Hanjun Guo
2020-05-07 16:39 ` Ard Biesheuvel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).