From patchwork Mon Mar 6 15:10:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Schnelle X-Patchwork-Id: 64779 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1907377wrd; Mon, 6 Mar 2023 07:34:27 -0800 (PST) X-Google-Smtp-Source: AK7set99tTHki8BbYGmzjVgw8/0SOYNjRKuf03JHOqIc7Kbo5x22bxI24iQItrZSTyveaRXt624I X-Received: by 2002:aa7:cfcb:0:b0:4af:6c25:ed9a with SMTP id r11-20020aa7cfcb000000b004af6c25ed9amr10517534edy.29.1678116867579; Mon, 06 Mar 2023 07:34:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678116867; cv=none; d=google.com; s=arc-20160816; b=YUX7KCfcn4gwEzsxyqIFsqqc3mCycQs8eGukTZXjjQBxmF8ZD6qtDvAoua9SZSEY2l nBwYkWQZ6dQs3C42T17nnnfC61EzHV24kML/3D50klSeRGXBQbHzbUemBbQqVueOE8Il BWEbu2eOcR1kHWmR49Mr77KDl071o23mwJy+obbarI0Z44TjHohIXWGwZxmTiErb2oyG 5IMXrT2PwVsItI2GuIM4Von0ZWydtkbrAdvXBFzDuvKVP4ydplv15jwCWtOaXTT2oOmn rQUUXLTda7XceMm0RL2I7KVezkDJJiyg5UEFjAeirDLbrNd0z7Tf3u+Ff5qgsf7r0jZU L/oA== 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=nrXCAvaJjz2L30F4zB4s/xlzVnWIOeQfO3bhE2rcpwM=; b=QTUTUFQc/vY2BURQd7nnZ7oXZynFc6pRP/sN57ehlFAoK8eX74taiUESsbhESyaHzU WEQ5kOroUui0D7drNfoOVIJF6ct+FozuwhZXw9aLD6lnVZh5z31rsxFLqjMA1XvZEVAT /7pzX+FLCLJ0e8U9nOwlqww3I51P6V9XhxLMKv8bmNNms22EkSlv24ucstnPHuhChpwj 0KWRNXVFWmLUwuoiJ1EwYoYAj1PUceB7FIBdeYDp4mcRCBrSVvjZgWy0jjC1DyapdrBM mpXI2/CFYr7bheddUQO64KD/O6YXIRSXWC5sFBQTZ3C1yc6LTcLFNSEoWbOxQX0zOcrm /J7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=fiVBcRZ+; 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 m15-20020a50ef0f000000b004acb626972dsi7488347eds.206.2023.03.06.07.34.03; Mon, 06 Mar 2023 07:34:27 -0800 (PST) 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=fiVBcRZ+; 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 S231344AbjCFPKj (ORCPT + 99 others); Mon, 6 Mar 2023 10:10:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230456AbjCFPKb (ORCPT ); Mon, 6 Mar 2023 10:10:31 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFF5222A1C; Mon, 6 Mar 2023 07:10:23 -0800 (PST) Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 326EwUsD023909; Mon, 6 Mar 2023 15:10:23 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=nrXCAvaJjz2L30F4zB4s/xlzVnWIOeQfO3bhE2rcpwM=; b=fiVBcRZ+cNy6EJTI0ejxqv3csq0obX7dCNqqA/OKxFr6ijjEmHPB0z4p4Ijw4YYRljHW fEKMH86GXxQEpFD4IStI/PKOQoJpa6leazV3Ev+7lvA7HwH/pRybRDp8nXri9VpBChew PPfOOE0ZFufanZDwG2/+anP0d58jH1Z/Ra2vweNscajEpuOQWjqhomKRQEEh7xUI9IPr KC19CmS0zh0YCgrCp5ml/WYseDPNUfpJ09ym/bEQsAAx38E0SZY419c6oxXT3AXQ3im5 xLPpefPDrUOf2tFWnOroQ212O0Lmm3E4wTGI+tZhPhjEDJFoZX+5eRuFBP5u3iVoL7bz OQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3p500dpbh8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 06 Mar 2023 15:10:22 +0000 Received: from m0098404.ppops.net (m0098404.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 326EuguL014491; Mon, 6 Mar 2023 15:10:22 GMT Received: from ppma05fra.de.ibm.com (6c.4a.5195.ip4.static.sl-reverse.com [149.81.74.108]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3p500dpbg8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 06 Mar 2023 15:10:22 +0000 Received: from pps.filterd (ppma05fra.de.ibm.com [127.0.0.1]) by ppma05fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3265Wnpw030346; Mon, 6 Mar 2023 15:10:19 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma05fra.de.ibm.com (PPS) with ESMTPS id 3p417q29ts-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 06 Mar 2023 15:10:19 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 326FAGKt17039772 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 6 Mar 2023 15:10:16 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0200C20040; Mon, 6 Mar 2023 15:10:16 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B3FEE20049; Mon, 6 Mar 2023 15:10:15 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 6 Mar 2023 15:10:15 +0000 (GMT) From: Niklas Schnelle To: Bjorn Helgaas , Lukas Wunner Cc: Gerd Bayer , Matthew Rosato , linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH v2 2/4] s390/pci: only add specific device in zpci_bus_scan_device() Date: Mon, 6 Mar 2023 16:10:12 +0100 Message-Id: <20230306151014.60913-3-schnelle@linux.ibm.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230306151014.60913-1-schnelle@linux.ibm.com> References: <20230306151014.60913-1-schnelle@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: K5H1T0Z0G4VSQ-gHJOwzuz_RGFiVhN7h X-Proofpoint-GUID: 51UhDrOQm3kH5qjA4TWU4712uDItC64q X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-06_08,2023-03-06_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 impostorscore=0 clxscore=1015 lowpriorityscore=0 bulkscore=0 suspectscore=0 adultscore=0 malwarescore=0 priorityscore=1501 mlxlogscore=999 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303060133 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS 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?1759633072084425437?= X-GMAIL-MSGID: =?utf-8?q?1759633072084425437?= As the name suggests zpci_bus_scan_device() is used to scan a specific device and thus pci_bus_add_device() for that device is sufficient. Furthermore move this call inside the rescan/remove locking. Signed-off-by: Niklas Schnelle Reviewed-by: Matthew Rosato --- arch/s390/pci/pci_bus.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/s390/pci/pci_bus.c b/arch/s390/pci/pci_bus.c index a99926af2b69..ae46c280b35f 100644 --- a/arch/s390/pci/pci_bus.c +++ b/arch/s390/pci/pci_bus.c @@ -85,9 +85,8 @@ int zpci_bus_scan_device(struct zpci_dev *zdev) if (!pdev) return -ENODEV; - pci_bus_add_device(pdev); pci_lock_rescan_remove(); - pci_bus_add_devices(zdev->zbus->bus); + pci_bus_add_device(pdev); pci_unlock_rescan_remove(); return 0;