Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9877C282E1 for ; Wed, 24 Apr 2019 17:21:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 75DAC20675 for ; Wed, 24 Apr 2019 17:21:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126483; bh=kvoszp9IDmHg9ngeL4CEh7OMph4HwrbQW4aEiH5OQf8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=afO/ae8NNfGOvPodyfO+T5EzRxSUHSaDU+ZhcifYaTILCWRcnH4BPHy/00EdqmeDD y61oZyjIOSCGvYmAWZ8n95g/xxZPuepfbJHdqO7BZN4kD2ywKOyUokZZOLD85W3T6q km/2+IRFQpHlde/DhA4tj2PM+QGC7V6L/612wHUk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388743AbfDXRVW (ORCPT ); Wed, 24 Apr 2019 13:21:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:46850 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388321AbfDXRVV (ORCPT ); Wed, 24 Apr 2019 13:21:21 -0400 Received: from localhost (62-193-50-229.as16211.net [62.193.50.229]) (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 85D9F205ED; Wed, 24 Apr 2019 17:21:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126481; bh=kvoszp9IDmHg9ngeL4CEh7OMph4HwrbQW4aEiH5OQf8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L3aoNn9BsomLihxbZG076t3Dva0X7jzqmZBH4k7m4pILrg3mdZXHlnQiIjJqQLUh8 ZRwUEk1FsUR9N7ZF/7eH1sGMqQSNMgvoPVqyygexPb7q+rSnj1QEssGlNwbdOF4dYz iTIhI8Dq7wuIK4R5i9GvvAPo7H/z8f+9rbqhj4sE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andre Przywara , Bjorn Helgaas Subject: [PATCH 4.4 097/168] PCI: Add function 1 DMA alias quirk for Marvell 9170 SATA controller Date: Wed, 24 Apr 2019 19:09:01 +0200 Message-Id: <20190424170929.430446249@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170923.452349382@linuxfoundation.org> References: <20190424170923.452349382@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andre Przywara commit 9cde402a59770a0669d895399c13407f63d7d209 upstream. There is a Marvell 88SE9170 PCIe SATA controller I found on a board here. Some quick testing with the ARM SMMU enabled reveals that it suffers from the same requester ID mixup problems as the other Marvell chips listed already. Add the PCI vendor/device ID to the list of chips which need the workaround. Signed-off-by: Andre Przywara Signed-off-by: Bjorn Helgaas CC: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/pci/quirks.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -3623,6 +3623,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_M /* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c14 */ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9130, quirk_dma_func1_alias); +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9170, + quirk_dma_func1_alias); /* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c47 + c57 */ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9172, quirk_dma_func1_alias);