From patchwork Tue May 16 11:00:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Schnelle X-Patchwork-Id: 94639 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp338761vqo; Tue, 16 May 2023 04:07:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5wteQtleDupYSJY7PaD6xR+mRo0jpzBieUlcYDE26KbUen1jmdofum71DNlfrfChZc9iCp X-Received: by 2002:a17:902:eb4b:b0:1a6:7632:2b20 with SMTP id i11-20020a170902eb4b00b001a676322b20mr38451852pli.40.1684235236028; Tue, 16 May 2023 04:07:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684235236; cv=none; d=google.com; s=arc-20160816; b=fKQ3w1Ws+IlEw26g9tW6RBqnNzjxDvxVi2gvqwjR0cm74Z8JrlI8MTfYdnUp5GKagx /BuknPQyZuT653j7aMySaYD1++V/yidS5xbppKEhWPao2xEH3o0jRhGvQzYk5gPZTON8 YJTQuRal63ggCgVlkUjYyQ5KDXpItFZIxfwG4k8V1yVKV3a+J39jEqwuuMrP86GGrcWN MUkuN/3uGCX+GnT3fNocFxYsBobggP/P19FvV5pgBYAmNRHbVxj5F+CZGxn/zSa8oE6I QJpV2jMryAnjbMR/ayc6HKkK7dtvlYuJSOCZKkAdom4voJvKRJq+6afZ69mNxfjXKD8x au1g== 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=RVIzDrAWPiQXR6ffUvucTybwBKlcsI4V8/WTkZjmngU=; b=RplWmfVN0WevNrIM2uwNSafnXwX9VLBJs+O12//PY8GhZ/5lXME2fSjFxSlxdcnJ2G LqdGTtVsQA6ozW+MdD6xL/CsODoZeuowgYV/hnpvfVlAk38vmITq2syUJW5BZ7ZO3rY5 Xcio+kH2GOxPSURYX8hy/wYelRWSgh17pi4ZFkO2O9aRSCOhzHsCctSAsVsSK2ieR+Vh 9RQs4d88pAEGa/KGfDMAUeeHJKYuTE7J2+CRV5S7c2TXg8tW6BOgwPAOCfE9i+FTFayI yJguUWMPlbYFWB62aNWWGTjmzymyj47+kUqZyA7HLVqGEfM+tx2fKkIqk2IBjQ8PEkDS Lf9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=p1DFTRnK; 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 m2-20020a170902db0200b001a97e24eb34si19580842plx.201.2023.05.16.04.06.59; Tue, 16 May 2023 04:07:16 -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=p1DFTRnK; 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 S232775AbjEPLFl (ORCPT + 99 others); Tue, 16 May 2023 07:05:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232477AbjEPLEy (ORCPT ); Tue, 16 May 2023 07:04:54 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D63427ED0; Tue, 16 May 2023 04:02:43 -0700 (PDT) Received: from pps.filterd (m0353723.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34GB0ZBb006778; Tue, 16 May 2023 11:01:21 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=RVIzDrAWPiQXR6ffUvucTybwBKlcsI4V8/WTkZjmngU=; b=p1DFTRnKFTAldREx2Ey1h9bJK84EH0yZZRLcEpinduHnTcJcIBsDZZG7HMZ5hPcNrNMg X1/sV51v9CpYHc5BfWrIvX38qOp+4HBMH49mep6Cyc8I8j9vJ02aJaz358/WasKAGBNQ EXidSQFIRI3bKqjZj3ecvjfGdfw6tD3VeNFA3uAOLy6GiEPQNINtoyGAwfSlvffLbPU4 /KoRPHc11qQH7+I8bOISBJT+M6oljFd7a+ePijmUmsnHYoFs0uH40vzMZVzslpQ0bWkO actENe6ew+LeesJeRdIhybI2So1Pw2+eFFZ+nyWGGokagmF7srMaVKvG6W3ipfZw7pJL BA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qm8fbg743-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 16 May 2023 11:01:20 +0000 Received: from m0353723.ppops.net (m0353723.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 34GAr100008815; Tue, 16 May 2023 11:01:20 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 3qm8fbg72x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 16 May 2023 11:01:19 +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 34G9cQYH029898; Tue, 16 May 2023 11:01:17 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma06fra.de.ibm.com (PPS) with ESMTPS id 3qj1tdsauw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 16 May 2023 11:01:17 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 34GB1EoZ19792586 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 16 May 2023 11:01:15 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C78D42004B; Tue, 16 May 2023 11:01:14 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6DC8720043; Tue, 16 May 2023 11:01:14 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 16 May 2023 11:01:14 +0000 (GMT) From: Niklas Schnelle To: Arnd Bergmann , Wim Van Sebroeck , Guenter Roeck Cc: Greg Kroah-Hartman , Bjorn Helgaas , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Mauro Carvalho Chehab , Alan Stern , "Rafael J. Wysocki" , Geert Uytterhoeven , Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-pci@vger.kernel.org, Arnd Bergmann , linux-watchdog@vger.kernel.org Subject: [PATCH v4 39/41] watchdog: add HAS_IOPORT dependencies Date: Tue, 16 May 2023 13:00:35 +0200 Message-Id: <20230516110038.2413224-40-schnelle@linux.ibm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230516110038.2413224-1-schnelle@linux.ibm.com> References: <20230516110038.2413224-1-schnelle@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: ICc3xa9c-LhXN9ke-mmQHJSjiGr_z7pI X-Proofpoint-GUID: Qr3xvqAz8BNz7FK19AYNEyD5NGMtsBsI X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-16_04,2023-05-16_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 mlxscore=0 clxscore=1011 adultscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=999 impostorscore=0 priorityscore=1501 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305160089 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,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?1766048647188633678?= X-GMAIL-MSGID: =?utf-8?q?1766048647188633678?= In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them. Co-developed-by: Arnd Bergmann Signed-off-by: Arnd Bergmann Acked-by: Guenter Roeck Signed-off-by: Niklas Schnelle --- Note: The HAS_IOPORT Kconfig option was added in v6.4-rc1 so per-subsystem patches may be applied independently drivers/watchdog/Kconfig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index f22138709bf5..affe25b96cfe 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -453,6 +453,7 @@ config 21285_WATCHDOG config 977_WATCHDOG tristate "NetWinder WB83C977 watchdog" depends on (FOOTBRIDGE && ARCH_NETWINDER) || (ARM && COMPILE_TEST) + depends on HAS_IOPORT help Say Y here to include support for the WB977 watchdog included in NetWinder machines. Alternatively say M to compile the driver as @@ -1271,6 +1272,7 @@ config ITCO_WDT select WATCHDOG_CORE depends on I2C || I2C=n depends on MFD_INTEL_PMC_BXT || !MFD_INTEL_PMC_BXT + depends on HAS_IOPORT # for I2C_I801 select LPC_ICH if !EXPERT select I2C_I801 if !EXPERT && I2C help @@ -2159,7 +2161,7 @@ comment "PCI-based Watchdog Cards" config PCIPCWATCHDOG tristate "Berkshire Products PCI-PC Watchdog" - depends on PCI + depends on PCI && HAS_IOPORT help This is the driver for the Berkshire Products PCI-PC Watchdog card. This card simply watches your kernel to make sure it doesn't freeze, @@ -2174,7 +2176,7 @@ config PCIPCWATCHDOG config WDTPCI tristate "PCI-WDT500/501 Watchdog timer" - depends on PCI + depends on PCI && HAS_IOPORT help If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N.