Skip to contentSkip to conversation

scsi: smartpqi: properly set both the DMA mask and the coherent DMA mask in pqi_pci_init()

PATCH Superseded Lianbo Jiang 3 participants 4 messages May 23, 2019 – May 24, 2019

Subsystems (2)
SCSI Microsemi smart array smartpqi driver (smartpqi)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Lianbo Jiang

author
#0 lore raw

PATCH 1/1 scsi: smartpqi: properly set both the DMA mask and the coherent DMA mask in pqi_pci_init()

When SME is enabled, the smartpqi driver won't work on the HP DL385 G10 machine, which causes the failure of kernel boot because it fails to allocate pqi error buffer. Please refer to the kernel log:
....

[    9.431749] usbcore: registered new interface driver uas
[    9.441524] Microsemi PQI Driver (v1.1.4-130)
[    9.442956] i40e 0000:04:00.0: fw 6.70.48768 api 1.7 nvm 10.2.5
[    9.447237] smartpqi 0000:23:00.0: Microsemi Smart Family Controller found
         Starting dracut initqueue hook...

[ OK ] Started Show Plymouth Boot Scre[ 9.471654] Broadcom NetXtreme-C/E driver bnxt_en v1.9.1
en.
[ OK ] Started Forward Password Requests to Plymouth Directory Watch.
[[0;[ 9.487108] smartpqi 0000:23:00.0: failed to allocate PQI error buffer
....

[  139.050544] dracut-initqueue[949]: Warning: dracut-initqueue timeout - starting timeout scripts
[  139.589779] dracut-initqueue[949]: Warning: dracut-initqueue timeout - starting timeout scripts

For correct operation, lets call the dma_set_mask_and_coherent() to properly set the mask for both streaming and coherent, in order to inform the kernel about the devices DMA addressing capabilities.

Signed-off-by Lianbo Jiang <[email protected]>
---
 drivers/scsi/smartpqi/smartpqi_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/smartpqi/smartpqi_init.c +1 -1
index c26cac819f9e..8b1fde6c7dab 100644
@@ -7282,7 +7282,7 @@ static int pqi_pci_init(struct pqi_ctrl_info *ctrl_info)
 	else
 		mask = DMA_BIT_MASK(32);
 
-	rc = dma_set_mask(&ctrl_info->pci_dev->dev, mask);
+	rc = dma_set_mask_and_coherent(&ctrl_info->pci_dev->dev, mask);
 	if (rc) {
 		dev_err(&ctrl_info->pci_dev->dev, "failed to set DMA mask\n");
 		goto disable_device;
Signature · 1 line
2.17.1
#1 lore raw
Quoted 14 lines · Lianbo Jiang

When SME is enabled, the smartpqi driver won't work on the HP DL385 G10 machine, which causes the failure of kernel boot because it fails to allocate pqi error buffer. Please refer to the kernel log:
....

[    9.431749] usbcore: registered new interface driver uas
[    9.441524] Microsemi PQI Driver (v1.1.4-130)
[    9.442956] i40e 0000:04:00.0: fw 6.70.48768 api 1.7 nvm 10.2.5
[    9.447237] smartpqi 0000:23:00.0: Microsemi Smart Family Controller found
         Starting dracut initqueue hook...

[ OK ] Started Show Plymouth Boot Scre[ 9.471654] Broadcom NetXtreme-C/E driver bnxt_en v1.9.1
en.
[ OK ] Started Forward Password Requests to Plymouth Directory Watch.
[[0;[ 9.487108] smartpqi 0000:23:00.0: failed to allocate PQI error buffer
....

Quoted 6 lines
[  139.050544] dracut-initqueue[949]: Warning: dracut-initqueue timeout - starting timeout scripts
[  139.589779] dracut-initqueue[949]: Warning: dracut-initqueue timeout - starting timeout scripts

For correct operation, lets call the dma_set_mask_and_coherent() to properly set the mask for both streaming and coherent, in order to inform the kernel about the devices DMA addressing capabilities.

You should probably expand on this a bit... Basically, the fact that the coherent DMA mask value wasn't set caused the driver to fall back to SWIOTLB when SME is active. I'm not sure if the failure was from running out of SWIOTLB or exceeding the maximum allocation size for SWIOTLB.

I believe the fix is proper, but I'll let the driver owner comment on that.

Thanks,
Tom

Quoted 22 lines
Signed-off-by Lianbo Jiang <[email protected]>
---
 drivers/scsi/smartpqi/smartpqi_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/smartpqi/smartpqi_init.c +1 -2
index c26cac819f9e..8b1fde6c7dab 100644
@@ -7282,7 +7282,7 @@ static int pqi_pci_init(struct pqi_ctrl_info *ctrl_info)
        else
                mask = DMA_BIT_MASK(32);
 
-       rc = dma_set_mask(&ctrl_info->pci_dev->dev, mask);
+       rc = dma_set_mask_and_coherent(&ctrl_info->pci_dev->dev, mask);
        if (rc) {
                dev_err(&ctrl_info->pci_dev->dev, "failed to set DMA mask\n");
                goto disable_device;
--

2.17.1

maintainer Acked-by Don Brace Tested-by Don Brace
#2 lore raw

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Lendacky, Thomas
Sent: Thursday, May 23, 2019 9:45 AM
To: Lianbo Jiang <[email protected]>; [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH] scsi: smartpqi: properly set both the DMA mask and the coherent DMA mask in pqi_pci_init()

Quoted 14 lines · Lianbo Jiang

When SME is enabled, the smartpqi driver won't work on the HP DL385 G10 machine, which causes the failure of kernel boot because it fails to allocate pqi error buffer. Please refer to the kernel log:
....

[    9.431749] usbcore: registered new interface driver uas
[    9.441524] Microsemi PQI Driver (v1.1.4-130)
[    9.442956] i40e 0000:04:00.0: fw 6.70.48768 api 1.7 nvm 10.2.5
[    9.447237] smartpqi 0000:23:00.0: Microsemi Smart Family Controller found
         Starting dracut initqueue hook...

[ OK ] Started Show Plymouth Boot Scre[ 9.471654] Broadcom NetXtreme-C/E driver bnxt_en v1.9.1
en.
[ OK ] Started Forward Password Requests to Plymouth Directory Watch.
[[0;[ 9.487108] smartpqi 0000:23:00.0: failed to allocate PQI error buffer
....

Quoted 8 lines
[  139.050544] dracut-initqueue[949]: Warning: dracut-initqueue

timeout - starting timeout scripts [ 139.589779] dracut-initqueue[949]: Warning: dracut-initqueue timeout - starting timeout scripts

For correct operation, lets call the dma_set_mask_and_coherent() to properly set the mask for both streaming and coherent, in order to inform the kernel about the devices DMA addressing capabilities.

You should probably expand on this a bit... Basically, the fact that the coherent DMA mask value wasn't set caused the driver to fall back to SWIOTLB when SME is active. I'm not sure if the failure was from running out of SWIOTLB or exceeding the maximum allocation size for SWIOTLB.

I believe the fix is proper, but I'll let the driver owner comment on that.

Thanks,
Tom

Acked-by Don Brace <[email protected]>
Tested-by Don Brace <[email protected]>

Please add the extra description suggested by Thomas.

Quoted 24 lines
Signed-off-by Lianbo Jiang <[email protected]>
---
 drivers/scsi/smartpqi/smartpqi_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/smartpqi/smartpqi_init.c +2 -2
index c26cac819f9e..8b1fde6c7dab 100644
@@ -7282,7 +7282,7 @@ static int pqi_pci_init(struct pqi_ctrl_info *ctrl_info)
        else
                mask = DMA_BIT_MASK(32);
 
-       rc = dma_set_mask(&ctrl_info->pci_dev->dev, mask);
+       rc = dma_set_mask_and_coherent(&ctrl_info->pci_dev->dev, 
+ mask);
        if (rc) {
                dev_err(&ctrl_info->pci_dev->dev, "failed to set DMA mask\n");
                goto disable_device;
--

2.17.1

author
#3 lore raw
Quoted 27 lines · 在 2019年05月24日 06:55, [email protected] 写道:

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Lendacky, Thomas
Sent: Thursday, May 23, 2019 9:45 AM
To: Lianbo Jiang <[email protected]>; [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH] scsi: smartpqi: properly set both the DMA mask and the coherent DMA mask in pqi_pci_init()

Quoted 19 lines · Lianbo Jiang

When SME is enabled, the smartpqi driver won't work on the HP DL385 G10 machine, which causes the failure of kernel boot because it fails to allocate pqi error buffer. Please refer to the kernel log:
....

[    9.431749] usbcore: registered new interface driver uas
[    9.441524] Microsemi PQI Driver (v1.1.4-130)
[    9.442956] i40e 0000:04:00.0: fw 6.70.48768 api 1.7 nvm 10.2.5
[    9.447237] smartpqi 0000:23:00.0: Microsemi Smart Family Controller found
         Starting dracut initqueue hook...

[ OK ] Started Show Plymouth Boot Scre[ 9.471654] Broadcom NetXtreme-C/E driver bnxt_en v1.9.1
en.
[ OK ] Started Forward Password Requests to Plymouth Directory Watch.
[[0;[ 9.487108] smartpqi 0000:23:00.0: failed to allocate PQI error buffer
....

[  139.050544] dracut-initqueue[949]: Warning: dracut-initqueue

timeout - starting timeout scripts [ 139.589779] dracut-initqueue[949]: Warning: dracut-initqueue timeout - starting timeout scripts

Quoted 5 lines
Quoted 3 lines

For correct operation, lets call the dma_set_mask_and_coherent() to properly set the mask for both streaming and coherent, in order to inform the kernel about the devices DMA addressing capabilities.

You should probably expand on this a bit... Basically, the fact that the coherent DMA mask value wasn't set caused the driver to fall back to SWIOTLB when SME is active.

Thank you, Tom.

Quoted 1 line

I'm not sure if the failure was from running out of SWIOTLB or exceeding the maximum allocation size for SWIOTLB

If so, it should print some messages like "swiotlb buffer is full", but i did not get such a log.

Quoted 10 lines

I believe the fix is proper, but I'll let the driver owner comment on that.

Thanks,
Tom

Acked-by Don Brace <[email protected]>
Tested-by Don Brace <[email protected]>

Please add the extra description suggested by Thomas.

OK, i will add Tom's description to patch log and post again.

Thank you, Don.

Lianbo

Quoted 25 lines
Quoted 25 lines
Signed-off-by Lianbo Jiang <[email protected]>
---
 drivers/scsi/smartpqi/smartpqi_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/smartpqi/smartpqi_init.c +2 -2
index c26cac819f9e..8b1fde6c7dab 100644
@@ -7282,7 +7282,7 @@ static int pqi_pci_init(struct pqi_ctrl_info *ctrl_info)
        else
                mask = DMA_BIT_MASK(32);
 
-       rc = dma_set_mask(&ctrl_info->pci_dev->dev, mask);
+       rc = dma_set_mask_and_coherent(&ctrl_info->pci_dev->dev, 
+ mask);
        if (rc) {
                dev_err(&ctrl_info->pci_dev->dev, "failed to set DMA mask\n");
                goto disable_device;
--

2.17.1