From mboxrd@z Thu Jan 1 00:00:00 1970 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 5CA141B413E for ; Mon, 20 Jan 2025 11:22:02 +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=1737372125; cv=none; b=Rpp/fxWYXCvJ1tYhYnkEdrlKbrb0Htn6SodxNUlLW9uty5HOU9buh8ZQEbCybIjYePjVC8iPEqrD2o5ZyKBS1JtZAFp4QKAqBeTfsfypimz+cvnNZ6/5doW+9OSZkftMuwKo/X7BlB2CufHRuhC48Kb+0JF9jOoKpfSSterqKUM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737372125; c=relaxed/simple; bh=2l7A7TeV3X8j9mnivi/jkfDMh4Rz8Q2+Ph6/WqDIvQI=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=CPmiTYq3w82t4knrPBQbJOaQhc4Pn4Ad0GhaHYKzewC6lsEDck1+v5Vnerp8x5EbsPtlnQeXM6DDPfWwNfCZdZfa313tRle+T5L84Yj1/jeaVNcf3FqrLhbofHwJkSrYwhAlMUxXrIJqmUo7d60KtUZdIWdy6oHqmHEXfX8Ou8k= 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=OX6F3hqw; 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="OX6F3hqw" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1737372122; 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: in-reply-to:in-reply-to:references:references; bh=hDN8/OU5ZPgRjRU42+KPmnKZnvnXStpzfvzO5vgYb6k=; b=OX6F3hqwqCsRdIN+mkXe0zRFSJ3/Rb8hnHJwVAs1f1NbMGEb7Pj4H5GynHRvWN3GWQTv2J EUO8ecEdxjc9AWeIxvnYwt0mWr2KNSm7OhUBMp1ocr6tj9D0dzzJ41Bc7LBVaHAhTLRe5j /lYEZIFDHj5qOFIq2DW8eaAOGuEam6M= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-350-J7Ubng6hMjeHafZbwpVp5w-1; Mon, 20 Jan 2025 06:22:01 -0500 X-MC-Unique: J7Ubng6hMjeHafZbwpVp5w-1 X-Mimecast-MFC-AGG-ID: J7Ubng6hMjeHafZbwpVp5w Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-43623bf2a83so33834965e9.0 for ; Mon, 20 Jan 2025 03:22:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737372120; x=1737976920; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hDN8/OU5ZPgRjRU42+KPmnKZnvnXStpzfvzO5vgYb6k=; b=Rh/Bx9ndGBDE+zDqePmePWXnUy74fnKz1jz93ztLaMlvzYhMM+3iBqazmKqLZLF05v 3zY6Gi8BAshx1LJqH+go/4lBZT71HpNyh0KTtzW5HGtrhR+90y4VvckRuf38P7nRHVoD LvTMaf09aSdJyTjUpYk+ZiYbd7mZvdG8Nd9rlEbHqyWThIhzLW3eUFXo8y8S6J8nLiPv TO5aKfylY656JfUHXnPYCaGvLb0vNtGSn5ACUIIjYHcnaH1ATBUAGiEuxJl0Sp242gPm L2MjreJT78EMNgOgfpZyUoFFAFn8TBzYurIcBEdgGSAMyFn4lhFLZLSlOn+UTKJvRDkE 1RIA== X-Forwarded-Encrypted: i=1; AJvYcCW6eSecJ6088EIqOMEKNjT9GwgVXCICRcqr2W5gJ0TklHwe5HgjfaPZ1Z3qHsJ+rAUMxO+oWV8hVTzbkjs=@vger.kernel.org X-Gm-Message-State: AOJu0YxE2kMh1vKs40P6fUwPMH/6k1td2Avm85a8vlAXdso2hbQnLb3h CanMUg/cTdD2bF08xUxtteR92Hxp8I2ApV8XwRUkSw8NbBHex5ytrWkrVMUW/MjJY0hVH7VOx64 4/tOClk4bIiJ/PIhyN3flKTcrsVEojdFktf1zV0L78vfXFJB30GuElO1FJuHq4Q== X-Gm-Gg: ASbGncsKS487QP6mnfhpAwnLrt3G8+TJ2E7SES5QCvYChKa/91MAuJR6gEbb4Rs9Jvl Y4s1u6GWZTU3AmjRaE/MkIpXXqv3VdhqKZdo4L0fbaL06BwcA5qQDLh+0jgtuGHVmZQlwlUxIft RjrWJGxi5SfZhBZ2y+pVZA8HyafR8jFPzTpvKxiWavrxPyQRrmZxtHQ3iS2tifgXPctsS4MfHAm Tiwt9+xok7EOmN2rwtB8igV9KLXX+Ff9Zmhhbq3j2OdeuI2yYTRa7q5hW6uwP8= X-Received: by 2002:a05:600c:34c1:b0:438:a432:7c44 with SMTP id 5b1f17b1804b1-438a4327dadmr50197315e9.21.1737372119630; Mon, 20 Jan 2025 03:21:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IGWy0kjOQf8h9QWlTFPhEYVIabNW61BmYVmliYWqqxS4FloxqnHQNyYnxsGGp91Bz44zAL7+w== X-Received: by 2002:a05:600c:34c1:b0:438:a432:7c44 with SMTP id 5b1f17b1804b1-438a4327dadmr50197075e9.21.1737372119178; Mon, 20 Jan 2025 03:21:59 -0800 (PST) Received: from redhat.com ([2a02:14f:176:7d07:198a:d25:1f09:1ff9]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4389041f603sm134587725e9.21.2025.01.20.03.21.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2025 03:21:57 -0800 (PST) Date: Mon, 20 Jan 2025 06:21:53 -0500 From: "Michael S. Tsirkin" To: Philipp Stanner Cc: Stefano Garzarella , Philipp Stanner , Alvaro Karsz , Jason Wang , Xuan Zhuo , Eugenio =?iso-8859-1?Q?P=E9rez?= , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Subject: Re: [PATCH v4] vdpa: solidrun: Replace deprecated PCI functions Message-ID: <20250120062144-mutt-send-email-mst@kernel.org> References: <20241219094428.21511-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: On Mon, Jan 20, 2025 at 10:13:03AM +0100, Philipp Stanner wrote: > On Thu, 2024-12-19 at 10:51 +0100, Stefano Garzarella wrote: > > On Thu, Dec 19, 2024 at 10:44:29AM +0100, Philipp Stanner wrote: > > > From: Philipp Stanner > > > > > > The PCI functions > > > > > > pcim_iomap_regions() > > > pcim_iounmap_regions() > > > pcim_iomap_table() > > > > > > have been deprecated by the PCI subsystem. > > > > > > Replace these functions with their successors pcim_iomap_region() > > > and > > > pcim_iounmap_region(). > > > > > > Signed-off-by: Philipp Stanner > > > --- > > > Changes in v4: > > >  - snet_open_vf_bar(): use distinct temporary variable to ensure > > >    snet->bar is never an ERR_PTR. (Stefano) > > > > Thanks for that! > > > > I don't have a device to test, but it LGTM: > > > > Acked-by: Stefano Garzarella > > Hi all, > > can someone please finally merge this? > > Thanks, > Philipp > > > > > > > > > > > > Changes in v3: > > >  - Move __iomem *io declaration into the loop. (Stefano) > > > > > > Changes in v2: > > >  - Fix build warning because of dead variable. > > >  - Make "bars_found" a boolean, since only true or false are > > > relevant. > > > --- > > > drivers/vdpa/solidrun/snet_main.c | 57 +++++++++++++++------------- > > > --- > > > 1 file changed, 28 insertions(+), 29 deletions(-) > > > > > > diff --git a/drivers/vdpa/solidrun/snet_main.c > > > b/drivers/vdpa/solidrun/snet_main.c > > > index c8b74980dbd1..55ec51c17ab3 100644 > > > --- a/drivers/vdpa/solidrun/snet_main.c > > > +++ b/drivers/vdpa/solidrun/snet_main.c > > > @@ -556,58 +556,60 @@ static const struct vdpa_config_ops > > > snet_config_ops = { > > > static int psnet_open_pf_bar(struct pci_dev *pdev, struct psnet > > > *psnet) > > > { > > > char *name; > > > - int ret, i, mask = 0; > > > + unsigned short i; > > > + bool bars_found = false; > > > + > > > + name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "psnet[%s]- > > > bars", pci_name(pdev)); > > > + if (!name) > > > + return -ENOMEM; > > > + > > > /* We don't know which BAR will be used to communicate.. > > > * We will map every bar with len > 0. > > > * > > > * Later, we will discover the BAR and unmap all other > > > BARs. > > > */ > > > for (i = 0; i < PCI_STD_NUM_BARS; i++) { > > > - if (pci_resource_len(pdev, i)) > > > - mask |= (1 << i); > > > + void __iomem *io; > > > + > > > + if (pci_resource_len(pdev, i) == 0) > > > + continue; > > > + > > > + io = pcim_iomap_region(pdev, i, name); > > > + if (IS_ERR(io)) { > > > + SNET_ERR(pdev, "Failed to request and map > > > PCI BARs\n"); > > > + return PTR_ERR(io); > > > + } > > > + > > > + psnet->bars[i] = io; > > > + bars_found = true; > > > } > > > > > > /* No BAR can be used.. */ > > > - if (!mask) { > > > + if (!bars_found) { > > > SNET_ERR(pdev, "Failed to find a PCI BAR\n"); > > > return -ENODEV; > > > } > > > > > > - name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "psnet[%s]- > > > bars", pci_name(pdev)); > > > - if (!name) > > > - return -ENOMEM; > > > - > > > - ret = pcim_iomap_regions(pdev, mask, name); > > > - if (ret) { > > > - SNET_ERR(pdev, "Failed to request and map PCI > > > BARs\n"); > > > - return ret; > > > - } > > > - > > > - for (i = 0; i < PCI_STD_NUM_BARS; i++) { > > > - if (mask & (1 << i)) > > > - psnet->bars[i] = > > > pcim_iomap_table(pdev)[i]; > > > - } > > > - > > > return 0; > > > } > > > > > > static int snet_open_vf_bar(struct pci_dev *pdev, struct snet > > > *snet) > > > { > > > char *name; > > > - int ret; > > > + void __iomem *io; > > > > > > name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "snet[%s]- > > > bars", pci_name(pdev)); > > > if (!name) > > > return -ENOMEM; > > > > > > /* Request and map BAR */ > > > - ret = pcim_iomap_regions(pdev, BIT(snet->psnet- > > > >cfg.vf_bar), name); > > > - if (ret) { > > > + io = pcim_iomap_region(pdev, snet->psnet->cfg.vf_bar, > > > name); > > > + if (IS_ERR(io)) { > > > SNET_ERR(pdev, "Failed to request and map PCI BAR > > > for a VF\n"); > > > - return ret; > > > + return PTR_ERR(io); > > > } > > > > > > - snet->bar = pcim_iomap_table(pdev)[snet->psnet- > > > >cfg.vf_bar]; > > > + snet->bar = io; > > > > > > return 0; > > > } > > > @@ -656,15 +658,12 @@ static int psnet_detect_bar(struct psnet > > > *psnet, u32 off) > > > > > > static void psnet_unmap_unused_bars(struct pci_dev *pdev, struct > > > psnet *psnet) > > > { > > > - int i, mask = 0; > > > + unsigned short i; > > > > > > for (i = 0; i < PCI_STD_NUM_BARS; i++) { > > > if (psnet->bars[i] && i != psnet->barno) > > > - mask |= (1 << i); > > > + pcim_iounmap_region(pdev, i); > > > } > > > - > > > - if (mask) > > > - pcim_iounmap_regions(pdev, mask); > > > } > > > > > > /* Read SNET config from PCI BAR */ > > > -- > > > 2.47.1 > > > > > > > > it's in my tree and linux-next