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 145C2EEB57C for ; Sat, 9 Sep 2023 00:24:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243170AbjIIAYn (ORCPT ); Fri, 8 Sep 2023 20:24:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344814AbjIIAYl (ORCPT ); Fri, 8 Sep 2023 20:24:41 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE7F42110; Fri, 8 Sep 2023 17:24:07 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E513C433AB; Sat, 9 Sep 2023 00:23:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694218991; bh=Snqvgixc7bVxYnxBEd8RYTOCCMGUKkpLC2JkYXwsr+M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VcQCA6Bsmkc3B6ZMeQXCXMtz2MR+XYy/pKfkpkjWunpsmX2Y6ig7vAgCBLd357APG Opgqk5bTmOAnGPCJHTu49j4BYnyKcvxEavQLUgx8wmNj0AcckRXbzIS0sreNCJqgLJ 2z24N4TaHWPDVN+eUYgBLGERfpJVrgYlWb1D1hCsfDUOD1f5m/lRRdbZ3mEWcRwuTn 8LG+nojMCYT10FMlkB/Tr/MBASXVNq7IQLIQfRExhSNRh2e3B10SX3iUft/NglZEfi E03y46cTbbdz8dtSdindZrQHGvkoULbSdnH6pH18kEzM2ukyVJftpXzEwoZATNVEWT cBFKpFz6f9oIQ== 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 6.1 3/9] PCI: Make quirk using inw() depend on HAS_IOPORT Date: Fri, 8 Sep 2023 20:22:54 -0400 Message-Id: <20230909002302.3578361-3-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230909002302.3578361-1-sashal@kernel.org> References: <20230909002302.3578361-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.52 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 472fa2c8ebcec..3caa0907de00a 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -268,6 +268,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_2, quirk_isa_d DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_3, quirk_isa_dma_hangs); #endif +#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. @@ -287,6 +288,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