From patchwork Mon Jul 3 13:52:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Schnelle X-Patchwork-Id: 115383 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp555336vqx; Mon, 3 Jul 2023 07:13:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ78qrdXajTf3+XWbnrHp02yHkeqgyb+zNZKeUYQUKrSz5Y3VHLPS+ldwGBG5sFbWipJzRn9 X-Received: by 2002:a6b:1494:0:b0:780:cde6:3e22 with SMTP id 142-20020a6b1494000000b00780cde63e22mr10687465iou.0.1688393630206; Mon, 03 Jul 2023 07:13:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688393630; cv=none; d=google.com; s=arc-20160816; b=QUEmcK4XULtz5egMBI3qYFvFuApHIbpgW3u6cUNRNYFpfoZKT87yNwtGaaNChhOszu t67nJ54RoTKeP3CI3CVUznC9qReYaR2yen+YFpW36fm5HbFnp/VZ/SDmYeke7kURmgzV S4iGFiIZ96BT3kXmAbvUqzPKeVojMF3MuEacKZQX8vfARif8swco/nnjczHmb4d8B5Ub hmldIGS49fl0dKcPtm4C5tO/XRqhqv4+RNanWk9ri2DX0+l1u+7B99arQVRuOHmtVYOh 8IxAO2oFa2pRTnrdCLtrWL6puFkWdrnUhV0IAT/lERkIdViYgPK3LBdrPXjVcKF0HDyq eOUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=18j0m/ynOHQa4pbhGiId88z2r+xMr5jNzJOlwfD4qhU=; fh=MF1qQLg0laKClmXe/aTx7xuDCb6JvNmW1GVHxaYRWxA=; b=npEM5uCnO0NxxqQriQpCCkZv23TfRcN1J7xETegrqnz6bcX+o7oulGEf1X0fwpkuES CRydTfAauGuZkmZ+xq2GdEhWYQou+w1hJWs3SObn+iGoj49a/QPMQv8Iy/ucGoYUMvWK NiCk6f6XzRfmI1GcOupsX4Q4VTabQRwuRgFKC0aqNq/bVFVDaD0WXxbJTZ66LbevXKW+ jVQeU5gm72eFGihd0lwQq0Z7S+ixYK1EoF7zxv4IJ80ZCqif4rBQNLRDX+sn6yNND5nL Yych1hzJHLwRKqGrWjn9DQ563Q4ivddb9Scacyx4iTtsiIAwomJMgN0sWTwAotiIU+LS oBxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=rwU80ok2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x63-20020a638642000000b0053fc9f253basi1157890pgd.403.2023.07.03.07.13.37; Mon, 03 Jul 2023 07:13:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=rwU80ok2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230197AbjGCNxh (ORCPT + 99 others); Mon, 3 Jul 2023 09:53:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230095AbjGCNxe (ORCPT ); Mon, 3 Jul 2023 09:53:34 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42825173C; Mon, 3 Jul 2023 06:53:03 -0700 (PDT) Received: from pps.filterd (m0353724.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 363DlVXx010963; Mon, 3 Jul 2023 13:53:01 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=18j0m/ynOHQa4pbhGiId88z2r+xMr5jNzJOlwfD4qhU=; b=rwU80ok2f423X+tGCRGQmytAgbKZh4I28NFX7xqWGCHO1qCwxtppEzEYvNXzMoOJ4dJ1 zkmx0zAJhKLtTHt7TyXEQZU1h5wE2r3IXTYefhDD4YTN30J9y+e9T73HKprfzdROumQm HyLUjrxkjslfC/GTwKOBpeSPcSreCE2mFlCaBMvkxZX36vTggYlEp3K1zbnUYCYT5sSz sHYjK/k5j64guAKIQMl2/b2jzWOH4ryl0Mx01LQRJzbiknV+CG8lOV7ZQj1A1QsZmvHz BjGtXk785weyU4wJk7UUFldA9+Y2WfF882Giya7bDNeyCZd3NyYwFZj7lwbeBrxFWnhw Jg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rkyhc039s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 03 Jul 2023 13:53:00 +0000 Received: from m0353724.ppops.net (m0353724.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 363Dn0GK015531; Mon, 3 Jul 2023 13:53:00 GMT Received: from ppma02fra.de.ibm.com (47.49.7a9f.ip4.static.sl-reverse.com [159.122.73.71]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rkyhc0396-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 03 Jul 2023 13:53:00 +0000 Received: from pps.filterd (ppma02fra.de.ibm.com [127.0.0.1]) by ppma02fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3630bvPV021475; Mon, 3 Jul 2023 13:52:58 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma02fra.de.ibm.com (PPS) with ESMTPS id 3rjbs4s08u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 03 Jul 2023 13:52:58 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 363DqufJ20775466 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 3 Jul 2023 13:52:56 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0988A20043; Mon, 3 Jul 2023 13:52:56 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C4ACD2004D; Mon, 3 Jul 2023 13:52:55 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 3 Jul 2023 13:52:55 +0000 (GMT) From: Niklas Schnelle To: Bjorn Helgaas Cc: Arnd Bergmann , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 1/2] PCI: Make quirk using inw() depend on HAS_IOPORT Date: Mon, 3 Jul 2023 15:52:54 +0200 Message-Id: <20230703135255.2202721-2-schnelle@linux.ibm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230703135255.2202721-1-schnelle@linux.ibm.com> References: <20230703135255.2202721-1-schnelle@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: EnYWAN0rm930nPBhxVZAtmQGjC_kRE0U X-Proofpoint-ORIG-GUID: i1IwCSEoaiPLoDOUAfNLGujB_s5hdf5n X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-03_11,2023-06-30_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxscore=0 bulkscore=0 spamscore=0 clxscore=1015 impostorscore=0 adultscore=0 phishscore=0 suspectscore=0 lowpriorityscore=0 mlxlogscore=999 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2307030122 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770409039146687541?= X-GMAIL-MSGID: =?utf-8?q?1770409039146687541?= In the future inw() and friends will not be compiled on architectures without I/O port support. Acked-by: Bjorn Helgaas Co-developed-by: Arnd Bergmann Signed-off-by: Arnd Bergmann Signed-off-by: Niklas Schnelle --- drivers/pci/quirks.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 321156ca273d..ef193661c3d1 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -361,6 +361,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. @@ -380,6 +381,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) From patchwork Mon Jul 3 13:52:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Schnelle X-Patchwork-Id: 115380 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp553393vqx; Mon, 3 Jul 2023 07:11:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlE4cH+ib047iAytcTSECOKachuClhtPVGzP71CI7A2q6HrY43STUsR3WwwqQef3OvTl+2MX X-Received: by 2002:a17:90a:5107:b0:259:8305:5d6e with SMTP id t7-20020a17090a510700b0025983055d6emr11886767pjh.0.1688393470543; Mon, 03 Jul 2023 07:11:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688393470; cv=none; d=google.com; s=arc-20160816; b=wrIQQ1bERsFBTCjUn+6imQLu/tHu60TQC8yuZeS9IbA4TSpU1I5SHmZJa90/M6SKup wTR3Jk1yjoVI+V3L/ruhmruMLcpgshwhgzAZJPeSAk11YexNF5znkyVlcQi8Tg4H08wn Dz2DWhQ/hJQMHKzwgF8TyWys0aKpq6Osh5NGOiandjaLO0LSM3/kJmeEPu4/oKLABQ/b N/ok6xlcwuxW9VarXfdC8wtOalEYNcOXDNaYmpPucm/jDW8je34aJAoyfwhpi3zzxKfS nRGfaN5SYDpvLajM2CHyY70ZJPiFyDUco9t/LBPN4vBSWi6mLjBNoBHhu2FeYJMsv7XK E9UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kOVkRocUNzoCE3Ax5Q0vzHkYAKeyWtHflf+V2JFhZf0=; fh=MF1qQLg0laKClmXe/aTx7xuDCb6JvNmW1GVHxaYRWxA=; b=oyw6VTvgxrhDGHFr3nAqYhEzYg6cinsTh2/3Rw7GSenl1jxblNWcVokLsDxe/yFlsZ bKsI9NTHYfB+6Xi2SMox0LMYIb1uGrfKBU9hc8/KtazBaHcC4sMEol0/5QxTU5JS1ycS oweoZ+PHuHm7TICa0FbygLgINe17vZkeQ0Tw5lvvVm/6hN1Fki5iOmHaz6N0whOaSf4P w02oASALkZznaCCkDGP5EdwbU35Z9XDVBRIwabS//KNmzVvZwKQkHmSyLm6RZ3jT55F6 QAVQI312EtggBnqy1rjagzx6zG19uMp6KwTh/VhLL0QNvB66OrZM/EMMmBpnWXX95S7I gikg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=WSqkNri2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h5-20020a17090acf0500b0026333edfaafsi11254116pju.128.2023.07.03.07.10.57; Mon, 03 Jul 2023 07:11:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=WSqkNri2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230316AbjGCNxl (ORCPT + 99 others); Mon, 3 Jul 2023 09:53:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230252AbjGCNxe (ORCPT ); Mon, 3 Jul 2023 09:53:34 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 884B1173D; Mon, 3 Jul 2023 06:53:03 -0700 (PDT) Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 363DnIBt028914; Mon, 3 Jul 2023 13:53:01 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=kOVkRocUNzoCE3Ax5Q0vzHkYAKeyWtHflf+V2JFhZf0=; b=WSqkNri2m9NCeihrVBP6yvMLLxokRAhAPwE5nq8IHC11BIj6hBy4kM/cLhGUPJ0Aws+L IaAOSJPcLoSi5mt6qdJ2cpRENfqcPgpkrqJeUWhx53xYIpQjYDeS8gk5ArkQS8Qtln0+ SmKrS3h6HipdWrqsb2yLg48vImYgVHGsw9LhTWBpGxjqaeN7bcH5TOd9Bxc4VjJFi9Sg /MDDJldL7sPoKpfq/cyP+J0ZfvcqayENH03fQU/tpkD9x0xJlhqCir6jP2oJy80ZWx52 XQ64MlU819bKKvphteaiy/V2AcuppDdgHvzs9E/x0xMHp2oVUR2+ck34S89nJXR1KZy3 hw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rkyj20345-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 03 Jul 2023 13:53:00 +0000 Received: from m0360072.ppops.net (m0360072.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 363Do6g2032231; Mon, 3 Jul 2023 13:53:00 GMT Received: from ppma06fra.de.ibm.com (48.49.7a9f.ip4.static.sl-reverse.com [159.122.73.72]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rkyj2033k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 03 Jul 2023 13:53:00 +0000 Received: from pps.filterd (ppma06fra.de.ibm.com [127.0.0.1]) by ppma06fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3639lk2o015520; Mon, 3 Jul 2023 13:52:58 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma06fra.de.ibm.com (PPS) with ESMTPS id 3rjbdds0dg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 03 Jul 2023 13:52:58 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 363DquFh20775468 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 3 Jul 2023 13:52:56 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4DF3920043; Mon, 3 Jul 2023 13:52:56 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 156D52004B; Mon, 3 Jul 2023 13:52:56 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 3 Jul 2023 13:52:56 +0000 (GMT) From: Niklas Schnelle To: Bjorn Helgaas Cc: Arnd Bergmann , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 2/2] PCI/sysfs: Make I/O resource depend on HAS_IOPORT Date: Mon, 3 Jul 2023 15:52:55 +0200 Message-Id: <20230703135255.2202721-3-schnelle@linux.ibm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230703135255.2202721-1-schnelle@linux.ibm.com> References: <20230703135255.2202721-1-schnelle@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: OYsUJTNEEXc8g8Xp-t235-NITmdmGW0i X-Proofpoint-GUID: AiZlJ6jjpZ_9lAPf1U_VHBVqIkV4mYdl X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-03_11,2023-06-30_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 malwarescore=0 mlxlogscore=999 impostorscore=0 mlxscore=0 priorityscore=1501 clxscore=1015 adultscore=0 spamscore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2307030122 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770408871694735558?= X-GMAIL-MSGID: =?utf-8?q?1770408871694735558?= If legacy I/O spaces are not supported simply return an error when trying to access them via pci_resource_io(). This allows inb() and friends to become undefined when they are known at compile time to be non-functional in a later patch. Co-developed-by: Arnd Bergmann Signed-off-by: Arnd Bergmann Acked-by: Bjorn Helgaas Signed-off-by: Niklas Schnelle --- drivers/pci/pci-sysfs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index ab32a91f287b..d9eede2dbc0e 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -1083,6 +1083,7 @@ static ssize_t pci_resource_io(struct file *filp, struct kobject *kobj, struct bin_attribute *attr, char *buf, loff_t off, size_t count, bool write) { +#ifdef CONFIG_HAS_IOPORT struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj)); int bar = (unsigned long)attr->private; unsigned long port = off; @@ -1116,6 +1117,9 @@ static ssize_t pci_resource_io(struct file *filp, struct kobject *kobj, return 4; } return -EINVAL; +#else + return -ENXIO; +#endif } static ssize_t pci_read_resource_io(struct file *filp, struct kobject *kobj,