Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2695582ybg; Mon, 28 Oct 2019 00:24:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqxnY/+RbFpQFr42fdPp+Jca/lMn1kCxaFB+jqwULktkPWIAqcnmjnFKlnCYMREDJ/wC7NYE X-Received: by 2002:a05:6402:882:: with SMTP id e2mr10913198edy.289.1572247461821; Mon, 28 Oct 2019 00:24:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572247461; cv=none; d=google.com; s=arc-20160816; b=Mkd7O6zZeaUGgPzxCDfihII5NQmiTHYZuST7TUwbo2IxqVWzH8bcsmAYLsTu5lDh3z m9yexVjiP7ovNCtKRNeTKEubqr4ic1fnAsqdj5CzZ5jwjkjlngDIZLqGlKoUAHJDl6ul grZcieF8NTV4i37rpv4jZMXAQ7V0hagaMNNBHXAT3dWK0C7V84hBNdybfSB16xqmxxsP aoOrQcr1KWFqfid1aRKoDPUGHxf6yAfJEk3g6lCdMqh2WtPxbePrpQ/+7m+9jgu1AONd iPDoB00L2j986p1ZKhomjHB2RLGp0qR6cltM14HUlapfT+0lrrw//W6idjvLUM0GI2HY e9Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/tqEmUom7tycDFT3c65jIwVDi1YcQ7Dxvd5p11DfBI8=; b=kBniD2sfay4yeM338ELTPt+/Sy5pfVfCU/RmZD45/uDasMMp0ULfFtaU3aW8O5rsgP l3G9AzyISHxhbuLakctDoqpUqQBMAoArVtd96VIJgDSKfY1bHmzhWZB0ywHKAAXErDIj 7zR3844NO27dO0AXdfsTqJuDuqsxtpl0DAtROMG+JRYkReOU5SLedyfsHRp6dqkgHdSA ziO+15pOfdK58grUm4g19eie0nK4kVZlpDCCD4edxH/Shs6dF9Cxq1fqowIEI5G1/mvL qPHaMj44FVcpXNJZab61QGPwr28xOhKmRT3urGUjtlBjh7Kd43K07sJ+hfWu5XXDlm/v yDCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=r0aG0ghh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d6si6701940ede.119.2019.10.28.00.23.57; Mon, 28 Oct 2019 00:24:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=r0aG0ghh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731591AbfJ0VT7 (ORCPT + 99 others); Sun, 27 Oct 2019 17:19:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:40314 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730943AbfJ0VTw (ORCPT ); Sun, 27 Oct 2019 17:19:52 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A28352070B; Sun, 27 Oct 2019 21:19:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211192; bh=a35Svl5/lKHXrc2V5aFh4F8Q+GFYEOSVk+PbJ9K6IvQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r0aG0ghh787D9gG6DQc6xbRFmEupgh3ylxYg7D4UfD8xSJLBzNZXiZc6XA7BBrwkF OVP70XC9ssV1kLp2W62ySaTNDYGnwn18C5NYRPIcMlnfGoy/8yth2ipuHAw4QoXfV2 1LtutJ8EDWqJ3zbh+O5u1VI4HaKlV6hNdaAddbvE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andreas Friedrich , Stephen Douthit , Dan Williams , Jens Axboe , Sasha Levin Subject: [PATCH 5.3 064/197] libata/ahci: Fix PCS quirk application Date: Sun, 27 Oct 2019 21:59:42 +0100 Message-Id: <20191027203355.117224422@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Williams [ Upstream commit 09d6ac8dc51a033ae0043c1fe40b4d02563c2496 ] Commit c312ef176399 "libata/ahci: Drop PCS quirk for Denverton and beyond" got the polarity wrong on the check for which board-ids should have the quirk applied. The board type board_ahci_pcs7 is defined at the end of the list such that "pcs7" boards can be special cased in the future if they need the quirk. All prior Intel board ids "< board_ahci_pcs7" should proceed with applying the quirk. Reported-by: Andreas Friedrich Reported-by: Stephen Douthit Fixes: c312ef176399 ("libata/ahci: Drop PCS quirk for Denverton and beyond") Cc: Signed-off-by: Dan Williams Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/ata/ahci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 3e63294304c72..691852b8bb41f 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1617,7 +1617,9 @@ static void ahci_intel_pcs_quirk(struct pci_dev *pdev, struct ahci_host_priv *hp */ if (!id || id->vendor != PCI_VENDOR_ID_INTEL) return; - if (((enum board_ids) id->driver_data) < board_ahci_pcs7) + + /* Skip applying the quirk on Denverton and beyond */ + if (((enum board_ids) id->driver_data) >= board_ahci_pcs7) return; /* -- 2.20.1