From patchwork Tue Apr 11 23:19:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 749676 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3w2jgK4YwPz9s7q for ; Wed, 12 Apr 2017 09:19:25 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="grZzGMwp"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752508AbdDKXTY (ORCPT ); Tue, 11 Apr 2017 19:19:24 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:34673 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752010AbdDKXTX (ORCPT ); Tue, 11 Apr 2017 19:19:23 -0400 Received: by mail-pg0-f68.google.com with SMTP id o123so2020797pga.1; Tue, 11 Apr 2017 16:19:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=XU78QPFAYwaK93TElNVvf+QgDP9mfFXSUvSKjUIq2q8=; b=grZzGMwpXTVHcia+oMk/Z51l1ghM+RdsGhLBg9fiEaSnhprepTuttTkLzFe1YNK/Rl 2dl0b0o+/0iE3c1MjNoCl33S5YRZXBkUJx90nGbSiZfr65fEWpYqBj4aVzx4CT6bEuwJ 7TCg+BAlRE0jq9NLuo9Mpo4T5gNDG3w2xfWeexilxW9dlqSg5p5V0+XWwGhEcPqLxa6i cw2/xeKde8et0IcMWtMmO92Zdo/cfUKNkjp0Mk6XsXvECVzqPdl3kQLEHVBhZHhGjsny 6AAbycxyPZDt9FDq4bnncqFnCD9sYAH/iAfJ/dwXXLOI9DRACU+mBHZM0kzwv2IxebTh GxBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :mime-version:content-disposition:user-agent; bh=XU78QPFAYwaK93TElNVvf+QgDP9mfFXSUvSKjUIq2q8=; b=ssbRYVxT9wF3FHlGAG7ZGHi/WJPVML99NNDbHbnIrU+fBaHBbpITuYUGMqSM+Tr84/ zBqxQMqK2TRXVJFhOo+x4773ZSEzd7JUMgZpxz9dDRT0Jnqjgzk3+74D8/cv7uePIGD6 Y3lskHw8OL7WFAO3N/PZzrYCrdXl5+bUoJHgxGAceeEe9rkx55ggfk5CSsy6BFO/PoaJ pW9t4bfuPB39GrJc/DP3IYA6fUHywS72rH441inXFcT/RSwZMK6Ngd6tRb/tWEm1cda/ 9VH2UY/MZyAI9ewmMov6nOf/v6hO105woZmo8s2nanBixP13WT2xmk1cYvnB4ZKJJdTW R6aQ== X-Gm-Message-State: AFeK/H36dlzYKH4u82BIQs7AjK+HXAnySa1yHSUCFcJhPsepW/sIO6UHxls/WN7DRoVmGw== X-Received: by 10.84.198.164 with SMTP id p33mr80454945pld.127.1491952762974; Tue, 11 Apr 2017 16:19:22 -0700 (PDT) Received: from localhost ([121.167.220.198]) by smtp.gmail.com with ESMTPSA id s10sm15492933pfe.28.2017.04.11.16.19.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Apr 2017 16:19:21 -0700 (PDT) Date: Wed, 12 Apr 2017 08:19:19 +0900 From: Tejun Heo To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org Subject: [GIT PULL] libata fixes for v4.11-rc6 Message-ID: <20170411231919.GA3573@wtj.duckdns.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.8.0 (2017-02-23) Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Hello, Linus. Two libata fixes. One to disable hotplug on VT6420 which never worked properly. The other reverts an earlier patch which disabled the second port on SB600/700. There were some confusions due to earlier datasheets which incorrectly indicated that the second port is not implemented on both SB600 and 700. Thanks. The following changes since commit 6022c5cadf1a43ca30f431f128daa6163909ad60: ahci: qoriq: correct the sata ecc setting error (2017-03-09 11:55:23 -0500) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git for-4.11-fixes for you to fetch changes up to 3cf864520e877505158f09075794a08abab11bbe: sata_via: Enable hotplug only on VT6421 (2017-04-11 09:12:18 +0900) ---------------------------------------------------------------- Ondrej Zary (1): sata_via: Enable hotplug only on VT6421 Tejun Heo (1): Revert "pata_atiixp: Don't use unconnected secondary port on SB600/SB700" drivers/ata/pata_atiixp.c | 5 ----- drivers/ata/sata_via.c | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 13 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c index 6c9aa95..49d705c 100644 --- a/drivers/ata/pata_atiixp.c +++ b/drivers/ata/pata_atiixp.c @@ -278,11 +278,6 @@ static int atiixp_init_one(struct pci_dev *pdev, const struct pci_device_id *id) }; const struct ata_port_info *ppi[] = { &info, &info }; - /* SB600/700 don't have secondary port wired */ - if ((pdev->device == PCI_DEVICE_ID_ATI_IXP600_IDE) || - (pdev->device == PCI_DEVICE_ID_ATI_IXP700_IDE)) - ppi[1] = &ata_dummy_port_info; - return ata_pci_bmdma_init_one(pdev, ppi, &atiixp_sht, NULL, ATA_HOST_PARALLEL_SCAN); } diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c index 0636d84..f3f538e 100644 --- a/drivers/ata/sata_via.c +++ b/drivers/ata/sata_via.c @@ -644,14 +644,16 @@ static void svia_configure(struct pci_dev *pdev, int board_id, pci_write_config_byte(pdev, SATA_NATIVE_MODE, tmp8); } - /* enable IRQ on hotplug */ - pci_read_config_byte(pdev, SVIA_MISC_3, &tmp8); - if ((tmp8 & SATA_HOTPLUG) != SATA_HOTPLUG) { - dev_dbg(&pdev->dev, - "enabling SATA hotplug (0x%x)\n", - (int) tmp8); - tmp8 |= SATA_HOTPLUG; - pci_write_config_byte(pdev, SVIA_MISC_3, tmp8); + if (board_id == vt6421) { + /* enable IRQ on hotplug */ + pci_read_config_byte(pdev, SVIA_MISC_3, &tmp8); + if ((tmp8 & SATA_HOTPLUG) != SATA_HOTPLUG) { + dev_dbg(&pdev->dev, + "enabling SATA hotplug (0x%x)\n", + (int) tmp8); + tmp8 |= SATA_HOTPLUG; + pci_write_config_byte(pdev, SVIA_MISC_3, tmp8); + } } /*