From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BED48EEB57F for ; Sat, 9 Sep 2023 00:25:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240647AbjIIAZ2 (ORCPT ); Fri, 8 Sep 2023 20:25:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242630AbjIIAZ1 (ORCPT ); Fri, 8 Sep 2023 20:25:27 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65C38212F; Fri, 8 Sep 2023 17:24:51 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 191A9C116A3; Sat, 9 Sep 2023 00:24:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694219055; bh=w80pTsFQ1MwY45OPec2VNM3BQefFcCJwfE6EAZmEflY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=guq8rFrkgQhsmOieCUutRBhlLeS5yRrCgKR8b+9o3gCTFM00hZNY1NRy8ZtUK3Odi gIrKnYY/p8h7aONBhhRSebR9WS9W9EvciQQWF7syhJ90OXH87IpKi7+pwrq24IZKyW EFW7sRBMtAExemlWDNy4rc2n9/Mldwfg3u7eCaOUVnPoI6Cn1zlrON5z7IGU741LiI 0bDTrQ7tDmdr3MnnjublmZII+yr4ipzpsry6dCO2Or9YUBJ/ebXq0Zk5NgO21HR4+i mAUTYBLZbAn0dGKO9yxFdJJDJ7luOgPEFTns+MRuAS1Z4rV1TH0ay68vDzTUjuH8M8 WySjhd80gP9Zw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Niklas Schnelle , Arnd Bergmann , Bjorn Helgaas , Sasha Levin , linux-pci@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 3/6] PCI: Make quirk using inw() depend on HAS_IOPORT Date: Fri, 8 Sep 2023 20:24:02 -0400 Message-Id: <20230909002406.3578776-3-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230909002406.3578776-1-sashal@kernel.org> References: <20230909002406.3578776-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.256 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Niklas Schnelle [ Upstream commit f768c75d61582b011962f9dcb9ff8eafb8da0383 ] In the future inw() and friends will not be compiled on architectures without I/O port support. Co-developed-by: Arnd Bergmann Link: https://lore.kernel.org/r/20230703135255.2202721-2-schnelle@linux.ibm.com Signed-off-by: Arnd Bergmann Signed-off-by: Niklas Schnelle Signed-off-by: Bjorn Helgaas Signed-off-by: Sasha Levin --- drivers/pci/quirks.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 73260bd217278..947c2c2d8c8c5 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -270,6 +270,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_1, quirk_isa_d DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_2, quirk_isa_dma_hangs); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_3, quirk_isa_dma_hangs); +#ifdef CONFIG_HAS_IOPORT /* * Intel NM10 "TigerPoint" LPC PM1a_STS.BM_STS must be clear * for some HT machines to use C4 w/o hanging. @@ -289,6 +290,7 @@ static void quirk_tigerpoint_bm_sts(struct pci_dev *dev) } } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TGP_LPC, quirk_tigerpoint_bm_sts); +#endif /* Chipsets where PCI->PCI transfers vanish or hang */ static void quirk_nopcipci(struct pci_dev *dev) -- 2.40.1