From patchwork Thu Aug 29 14:16:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 13783318 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84DD91AE04E for ; Thu, 29 Aug 2024 14:18:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724941137; cv=none; b=SVjYb3xVcmv+HEU7x6JWkROd4P9Y6/FwKl6eLcWqdv89bTEJgiSznb4/+AnDX2gM7h6wTIdwsUDRAmxY5Lcen5v5+/5JeEzYVwk5MbZxi6rn5RLtm2oMa3ejysBn7ug8SjLjtW3Ic2cKbqg8hZeZPAj4fPhAUz3JqGmdxQQGJ+8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724941137; c=relaxed/simple; bh=bN72jrToXfY+vJucKr9xb19mZvJ9IN7YKnm5yOK/+sI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=IMxhSVRQbIN4xuYJluREJwPfD5ln+e8jW4ergX45Vkw9COShuSIvdPcViOnw7d/bXaEwiaKxnms1yxUI1057xXsv2k4jB1rhV0+Xgtf6hVtCjtVroFycakc3K5flLKOwkpPUIuZA0XXBJ9XTKVhVGaRBD/OE+qfuZ8gKh7IhxFs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=HrnCz1T6; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HrnCz1T6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724941132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UljbUeQcl4wkbV7mOtS08F4hh+nFyo1TBvQFl+wrPVQ=; b=HrnCz1T6by7iT8T8q5inoSQ6uGKmsiCgbdSWXS8Fe75G1UnZOnnj0GMOENLZI9QBws4lJd +NJ7PUDPQ6Mmn3ORraxJsq7Ao6SLbpcbf5zLkOZRqlN5SIru6wmqM4iupWU+JBDpVWXFxi YyfzQPCKRNtloTQsKoYO+Ss6yijpW1Y= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-190-J8Iy_NZCM_GFXK1Cn5_7Qw-1; Thu, 29 Aug 2024 10:18:50 -0400 X-MC-Unique: J8Iy_NZCM_GFXK1Cn5_7Qw-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-428076fef5dso7326535e9.2 for ; Thu, 29 Aug 2024 07:18:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724941129; x=1725545929; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=UljbUeQcl4wkbV7mOtS08F4hh+nFyo1TBvQFl+wrPVQ=; b=IJes1wUXGwRYxOBIEOaGWj8ghjVorhm+JtXgfwbe5lHgcPwfCC7HLd46BHxVD16JrD INfi3POwTGASBbiKHZt3nzAoCNwlhPVM6Zgz/m4CmWxvAMK2a1mtPg2fk9Ub0QiT8nrA 8p1n3Kcl7Kc9ZHuEe0DOAhnO93eQsCsbx872TB++rH57WlLnZPFO/se+RPe41X9T7lNR ReD7jl36Vmni3RvwKOhWq+aluQD3bJ3Sk99Ix0yu65BCiVWlbMeBGY0RF2ATa375DFoL BA6un4ngxvdSxtKawIL3AFFyXD+jXUgC7VfyQVzOXs2ESug47nqn5AOfAB5as87ELYbk sbPA== X-Gm-Message-State: AOJu0YyhB7nt/BbxnR2IG10IqLJAI3DHedUJT1bhJkvgwgxr2VW5vXsZ 3RE/YCSIyjtnJfT00FnzAanJ1Q1EqrQpSpNJl86Pyjx2fbELlab+s7SHW6p/2XxUXCFnTDOPVuN tGPQ2cTsBIk9+HgIeKfuDDFy6dbXWaTg9vgG2CshmXjtMQWNc6kWqLkamTNy1 X-Received: by 2002:a05:600c:470f:b0:428:9ba:39f with SMTP id 5b1f17b1804b1-42bb024d9d6mr24548665e9.11.1724941128529; Thu, 29 Aug 2024 07:18:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHaWAd/dk5mVFnN9RDmi+8yHhRiBHqeSEZqBrS5gu6xo2wvJc2Dt1Hm0EPgbT3w2rGsknEV9A== X-Received: by 2002:a05:600c:470f:b0:428:9ba:39f with SMTP id 5b1f17b1804b1-42bb024d9d6mr24548445e9.11.1724941127865; Thu, 29 Aug 2024 07:18:47 -0700 (PDT) Received: from eisenberg.muc.redhat.com (nat-pool-muc-t.redhat.com. [149.14.88.26]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42ba63abebdsm52670425e9.27.2024.08.29.07.18.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Aug 2024 07:18:47 -0700 (PDT) From: Philipp Stanner To: Jens Axboe , Wu Hao , Tom Rix , Moritz Fischer , Xu Yilun , Andy Shevchenko , Linus Walleij , Bartosz Golaszewski , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bjorn Helgaas , Alvaro Karsz , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Richard Cochran , Damien Le Moal , Hannes Reinecke , John Garry , Philipp Stanner Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fpga@vger.kernel.org, linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-pci@vger.kernel.org, virtualization@lists.linux.dev Subject: [PATCH v5 0/7] PCI: Remove pcim_iounmap_regions() Date: Thu, 29 Aug 2024 16:16:19 +0200 Message-ID: <20240829141844.39064-1-pstanner@redhat.com> X-Mailer: git-send-email 2.46.0 Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 OK, so unfortunately it seems very challenging to reconcile the merge conflict pointed up by Serge between net-next and pci-devres regarding "ethernet: stmicro": A patch that applies to the net-next tree does not apply anymore to pci-devres (and vice versa). So I actually think that it would be best if we just drop the portation of "ethernet: stmicro" for now and port it as the last user in v6.13. Then we can also remove pcim_iounmap_regions() completely. That should then be trivial. Changes in v5: - Patch "ethernet: cavium": Re-add accidentally removed pcim_iounmap_region(). (Me) - Add Jens's Reviewed-by to patch "block: mtip32xx". (Jens) Changes in v4: - Drop the "ethernet: stmicro: [...] patch since it doesn't apply to net-next, and making it apply to that prevents it from being applyable to PCI ._. (Serge, me) - Instead, deprecate pcim_iounmap_regions() and keep "ethernet: stimicro" as the last user for now. - ethernet: cavium: Use PTR_ERR_OR_ZERO(). (Andy) - vdpa: solidrun (Bugfix) Correct wrong printf string (was "psnet" instead of "snet"). (Christophe) - vdpa: solidrun (Bugfix): Add missing blank line. (Andy) - vdpa: solidrun (Portation): Use PTR_ERR_OR_ZERO(). (Andy) - Apply Reviewed-by's from Andy and Xu Yilun. Changes in v3: - fpga/dfl-pci.c: remove now surplus wrapper around pcim_iomap_region(). (Andy) - block: mtip32xx: remove now surplus label. (Andy) - vdpa: solidrun: Bugfix: Include forgotten place where stack UB occurs. (Andy, Christophe) - Some minor wording improvements in commit messages. (Me) Changes in v2: - Add a fix for the UB stack usage bug in vdap/solidrun. Separate patch, put stable kernel on CC. (Christophe, Andy). - Drop unnecessary pcim_release_region() in mtip32xx (Andy) - Consequently, drop patch "PCI: Make pcim_release_region() a public function", since there's no user anymore. (obsoletes the squash requested by Damien). - vdap/solidrun: • make 'i' an 'unsigned short' (Andy, me) • Use 'continue' to simplify loop (Andy) • Remove leftover blank line - Apply given Reviewed- / acked-bys (Andy, Damien, Bartosz) Important things first: This series is based on [1] and [2] which Bjorn Helgaas has currently queued for v6.12 in the PCI tree. This series shall remove pcim_iounmap_regions() in order to make way to remove its brother, pcim_iomap_regions(). @Bjorn: Feel free to squash the PCI commits. Regards, P. [1] https://lore.kernel.org/all/20240729093625.17561-4-pstanner@redhat.com/ [2] https://lore.kernel.org/all/20240807083018.8734-2-pstanner@redhat.com/ Philipp Stanner (7): PCI: Deprecate pcim_iounmap_regions() fpga/dfl-pci.c: Replace deprecated PCI functions block: mtip32xx: Replace deprecated PCI functions gpio: Replace deprecated PCI functions ethernet: cavium: Replace deprecated PCI functions vdpa: solidrun: Fix UB bug with devres vdap: solidrun: Replace deprecated PCI functions drivers/block/mtip32xx/mtip32xx.c | 18 +++--- drivers/fpga/dfl-pci.c | 16 ++--- drivers/gpio/gpio-merrifield.c | 14 ++--- .../net/ethernet/cavium/common/cavium_ptp.c | 7 +-- drivers/pci/devres.c | 8 ++- drivers/vdpa/solidrun/snet_main.c | 59 ++++++++----------- include/linux/pci.h | 1 + 7 files changed, 53 insertions(+), 70 deletions(-)