[0/2] HID: amd_sfh: Minor DMA mapping bugfixes

Message

Dylan MacKenzie June 22, 2021, 12:15 a.m. UTC

While preparing to investigate
https://bugzilla.kernel.org/show_bug.cgi?id=212615, I read through the amd_sfh
driver and saw two (unrelated) bugs in the logic that sets the DMA mask.
Ultimately these are harmless, but they should probably get fixed.

FYI, this is my first time submitting a kernel patch. If I've done something
wrong in formatting this email, it is likely due to incompetence rather than
malice.

Dylan MacKenzie (2):
  HID: amd_sfh: Set correct DMA mask
  HID: amd_sfh: Continue if fallback DMA mask is accepted

 drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--
2.31.1

Comments

Jiri Kosina July 28, 2021, 9:28 a.m. UTC | #1

On Mon, 21 Jun 2021, Dylan MacKenzie wrote:

> While preparing to investigate
> https://bugzilla.kernel.org/show_bug.cgi?id=212615, I read through the amd_sfh
> driver and saw two (unrelated) bugs in the logic that sets the DMA mask.
> Ultimately these are harmless, but they should probably get fixed.
> 
> FYI, this is my first time submitting a kernel patch. If I've done something
> wrong in formatting this email, it is likely due to incompetence rather than
> malice.
> 
> Dylan MacKenzie (2):
>   HID: amd_sfh: Set correct DMA mask
>   HID: amd_sfh: Continue if fallback DMA mask is accepted
> 
>  drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)

Nehal, Sandeep, could you please provide your Ack to this series? Thanks,

Jiri Kosina July 28, 2021, 9:33 a.m. UTC | #2

[ dropping Sandeep, CCing Basavaraj ]

On Wed, 28 Jul 2021, Jiri Kosina wrote:

> On Mon, 21 Jun 2021, Dylan MacKenzie wrote:
> 
> > While preparing to investigate
> > https://bugzilla.kernel.org/show_bug.cgi?id=212615, I read through the amd_sfh
> > driver and saw two (unrelated) bugs in the logic that sets the DMA mask.
> > Ultimately these are harmless, but they should probably get fixed.
> > 
> > FYI, this is my first time submitting a kernel patch. If I've done something
> > wrong in formatting this email, it is likely due to incompetence rather than
> > malice.
> > 
> > Dylan MacKenzie (2):
> >   HID: amd_sfh: Set correct DMA mask
> >   HID: amd_sfh: Continue if fallback DMA mask is accepted
> > 
> >  drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 8 ++++++--
> >  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> Nehal, Sandeep, could you please provide your Ack to this series? Thanks,
> 
> -- 
> Jiri Kosina
> SUSE Labs
> 
>

Basavaraj Natikar July 28, 2021, 7:22 p.m. UTC | #3

On 7/28/2021 3:03 PM, Jiri Kosina wrote:
> [CAUTION: External Email]
>
> [ dropping Sandeep, CCing Basavaraj ]
>
> On Wed, 28 Jul 2021, Jiri Kosina wrote:
>
>> On Mon, 21 Jun 2021, Dylan MacKenzie wrote:
>>
>>> While preparing to investigate
>>> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugzilla.kernel.org%2Fshow_bug.cgi%3Fid%3D212615&data=04%7C01%7Cbasavaraj.natikar%40amd.com%7C2dff45d8dc964dbc5b1c08d951aab806%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637630615935776199%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=hGpNFpr6BjVg8dvfUTNF8Td1SOdtN5T8c2WACGAZWUo%3D&reserved=0, I read through the amd_sfh
>>> driver and saw two (unrelated) bugs in the logic that sets the DMA mask.
>>> Ultimately these are harmless, but they should probably get fixed.
>>>
>>> FYI, this is my first time submitting a kernel patch. If I've done something
>>> wrong in formatting this email, it is likely due to incompetence rather than
>>> malice.
>>>
>>> Dylan MacKenzie (2):
>>>   HID: amd_sfh: Set correct DMA mask
>>>   HID: amd_sfh: Continue if fallback DMA mask is accepted
>>>
>>>  drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 8 ++++++--
>>>  1 file changed, 6 insertions(+), 2 deletions(-)
>> Nehal, Sandeep, could you please provide your Ack to this series? Thanks,

I think, you can merge both of them together as it addresses a single problem. 
can you please respin a v2 with the changes something like this?

        privdata->mmio = pcim_iomap_table(pdev)[2];
        pci_set_master(pdev);
-       rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
+
+       rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
        if (rc) {
-               rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
-               return rc;
+               rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
+               if (rc) {
+                       pci_err(pdev, "Failed to set DMA mask");
+                       return rc;
                 }
        }

Thanks,
Basavaraj