From patchwork Thu Jan 11 12:55:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Westerberg X-Patchwork-Id: 859102 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zHQr82BzCz9s0g for ; Thu, 11 Jan 2018 23:56:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934238AbeAKM4z (ORCPT ); Thu, 11 Jan 2018 07:56:55 -0500 Received: from mga09.intel.com ([134.134.136.24]:44729 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933571AbeAKM4y (ORCPT ); Thu, 11 Jan 2018 07:56:54 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Jan 2018 04:56:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,344,1511856000"; d="scan'208";a="20140804" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 11 Jan 2018 04:56:53 -0800 Received: by black.fi.intel.com (Postfix, from userid 1001) id 1E1BA3AF; Thu, 11 Jan 2018 14:55:51 +0200 (EET) From: Mika Westerberg To: Tejun Heo Cc: Mika Westerberg , linux-ide@vger.kernel.org Subject: [PATCH 1/2] ahci: Add Intel Cannon Lake PCH-H PCI ID Date: Thu, 11 Jan 2018 15:55:50 +0300 Message-Id: <20180111125551.61877-1-mika.westerberg@linux.intel.com> X-Mailer: git-send-email 2.15.1 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Add Intel Cannon Lake PCH-H PCI ID to the list of supported controllers. Signed-off-by: Mika Westerberg --- 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, From patchwork Thu Jan 11 12:55:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Westerberg X-Patchwork-Id: 859101 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zHQqZ1w9mz9s0g for ; Thu, 11 Jan 2018 23:56:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932396AbeAKM4Z (ORCPT ); Thu, 11 Jan 2018 07:56:25 -0500 Received: from mga14.intel.com ([192.55.52.115]:34897 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932365AbeAKM4Y (ORCPT ); Thu, 11 Jan 2018 07:56:24 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Jan 2018 04:56:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,344,1511856000"; d="scan'208";a="18423066" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 11 Jan 2018 04:56:23 -0800 Received: by black.fi.intel.com (Postfix, from userid 1001) id 3571E3CA; Thu, 11 Jan 2018 14:55:52 +0200 (EET) From: Mika Westerberg To: Tejun Heo Cc: Mika Westerberg , linux-ide@vger.kernel.org Subject: [PATCH 2/2] ahci: Use usleep_range() in ahci_start_port() Date: Thu, 11 Jan 2018 15:55:51 +0300 Message-Id: <20180111125551.61877-2-mika.westerberg@linux.intel.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180111125551.61877-1-mika.westerberg@linux.intel.com> References: <20180111125551.61877-1-mika.westerberg@linux.intel.com> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org 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 --- 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; }