[PATCH 1/2] ahci: Add Intel Cannon Lake PCH-H PCI ID

[PATCH 1/2] ahci: Add Intel Cannon Lake PCH-H PCI ID

[Mika Westerberg]

Add Intel Cannon Lake PCH-H PCI ID to the list of supported controllers.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
 drivers/ata/ahci.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 5443cb71d7ba..a3131107136f 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -386,6 +386,7 @@ static const struct pci_device_id ahci_pci_tbl[] = {
 	{ PCI_VDEVICE(INTEL, 0xa206), board_ahci }, /* Lewisburg RAID*/
 	{ PCI_VDEVICE(INTEL, 0xa252), board_ahci }, /* Lewisburg RAID*/
 	{ PCI_VDEVICE(INTEL, 0xa256), board_ahci }, /* Lewisburg RAID*/
+	{ PCI_VDEVICE(INTEL, 0xa356), board_ahci }, /* Cannon Lake PCH-H RAID */
 
 	/* JMicron 360/1/3/5/6, match class to avoid IDE function */
 	{ PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
-- 
2.15.1

[PATCH 2/2] ahci: Use usleep_range() in ahci_start_port()

[Mika Westerberg]

Using msleep(1) may actually sleep much longer than 1 msecs (~20 msecs)
which unnecessarily slows down system startup. Avoid that and use
usleep_range() instead.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
 drivers/ata/libahci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index a0de7a38430c..27e7daa01ccb 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -871,7 +871,7 @@ static void ahci_start_port(struct ata_port *ap)
 				 * ports to fail the same way.
 				 */
 				if (rc == -EBUSY)
-					msleep(1);
+					usleep_range(1000, 1050);
 				else
 					break;
 			}
-- 
2.15.1

Re: [PATCH 1/2] ahci: Add Intel Cannon Lake PCH-H PCI ID

[Tejun Heo]

On Thu, Jan 11, 2018 at 03:55:50PM +0300, Mika Westerberg wrote:
> Add Intel Cannon Lake PCH-H PCI ID to the list of supported controllers.
> 
> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

Applied to libata/for-4.16.

Thanks.

-- 
tejun

Re: [PATCH 2/2] ahci: Use usleep_range() in ahci_start_port()

[Tejun Heo]

On Thu, Jan 11, 2018 at 03:55:51PM +0300, Mika Westerberg wrote:
> Using msleep(1) may actually sleep much longer than 1 msecs (~20 msecs)
> which unnecessarily slows down system startup. Avoid that and use
> usleep_range() instead.
> 
> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

Heh, I'm not sure.  How big of a problem is this?

Thanks.

-- 
tejun

Re: [PATCH 2/2] ahci: Use usleep_range() in ahci_start_port()

[Mika Westerberg]

On Thu, Jan 11, 2018 at 10:11:17AM -0800, Tejun Heo wrote:
> On Thu, Jan 11, 2018 at 03:55:51PM +0300, Mika Westerberg wrote:
> > Using msleep(1) may actually sleep much longer than 1 msecs (~20 msecs)
> > which unnecessarily slows down system startup. Avoid that and use
> > usleep_range() instead.
> > 
> > Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
> 
> Heh, I'm not sure.  How big of a problem is this?

It's not a big problem so you may ignore the patch if you think it is
not needed. I just noticed the msleep(1) there and though we could do
better using usleep_range().