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.129.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 D878E195FE5 for ; Mon, 20 Jan 2025 09:13:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737364400; cv=none; b=DytsOJ7njMyQGX8/poWfcT0dkQytM5W08FdeOFTSaNJm+heTG4g14V3khLb+fOuaIIGN0WhKv3djIo2Hgmnj+53UwmfBZvxMMbOsTvVmf1jK06JcyXPxB/AluKyU/0uWI3J0DGJ/VNL9nFetog7+xq4aHy020WJLobes4nMTDPs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737364400; c=relaxed/simple; bh=VePvJXDhVilNON9Nq8kBauWhOzCcHtu+8tWCqvCaqto=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=LbJYGSbSnbjvmqiof8X6UQipsn++q7ZnS9L9MyhuAI2BHPbSUZ/eWUFeL64XPQcxAHXcgpeITgriImvTqDg1D8TBv0pSqv1RAnhcro2wlNn605XWy0YkUp3PCRLpkIB7YAiIA+IBp7qUaUIok77NY/InA/oJzXAbepQhZTG9aNM= 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=DwHKTBWb; arc=none smtp.client-ip=170.10.129.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="DwHKTBWb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1737364397; 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=ZOis2+SGh36gSDpTA7G0VGC55LeC+q410Z9E2bu9Wh0=; b=DwHKTBWbNWilp5DXeLJC/6uGBLdz5E8GpxIxoTT9hhAEjxY9D9R02TFctk3X8aQLPdHBMc 2cc1aJwa+8T+2z6Nlal8eFNgz14ebHpv9Okq00XTfYked41rYb5QwvdFiiGtFRkYifC2Oh 2UQbu5bxjV1UIHYXiaWEVOviplI3hqc= Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-445-Op4m3WBFOpC0a0IO-zLNAw-1; Mon, 20 Jan 2025 04:13:15 -0500 X-MC-Unique: Op4m3WBFOpC0a0IO-zLNAw-1 X-Mimecast-MFC-AGG-ID: Op4m3WBFOpC0a0IO-zLNAw Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-2ef8c7ef51dso8267608a91.1 for ; Mon, 20 Jan 2025 01:13:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737364394; x=1737969194; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ZOis2+SGh36gSDpTA7G0VGC55LeC+q410Z9E2bu9Wh0=; b=qVLYwZoGOCfWduYGJoleRqy3KSR54iZXUAYNAx5YVREyQjtV3dlSZ/TBMnf+EXOlr0 6U+DfhG8yPWOmimRT7FD12n0s4IJX+gum17WZDrmUa5BClCKcb7pTekfFjAHlfBn1Y5N V6gacCd98V5zCuA+I+fR1nTsMbMs6q9mVyhhWmdp+aohcbMji07+Loa24rSPuaSoRO8D itRyXu4yK2KvyDZJr6RDmsfxjaGsyYlKDQeIXgDeTTWWCcSPsyCQiXmGLQH9SW74TLQk qhjCIrUdzCpbSCwIJihA7hE3MjNhDYEEXQpd5XNHpxPTfeyOomr34To3pU1WCOwYc7AP byxQ== X-Forwarded-Encrypted: i=1; AJvYcCU4oCgRZTYi9bnsMlCsSDNCAHLVSNOoaD+FEWR7HPEWrAb4tsUk5L5/RO8bw7mQMcmed2HVBIjb8HcVj3I=@vger.kernel.org X-Gm-Message-State: AOJu0YzZMsg2KdDDjeg6zTErkhdwq6lq/wOMbxY2tu3sWg4Y8dsumDEh cVLhyTQwK7fweV/LTPlqlB20l5vJnmyIUEIkwdeUrQSv7fKjMIS8mn2s9zg0/oYAy81Qg9byFvP /u/ABHyzksQifBHJ4ayWUBFqkeBegtAI/kf1NuXbfQwiE5FFBfB0sLoE+h3/xHw== X-Gm-Gg: ASbGncsov27Ir9HuxlaJ0ElVdLiBlmSNimaHK4l3CrDU8K/RgdM3uqVEIK0+cU3phrS KjFg7XGP/7vyKCe5nIYJT6YLlkSD1Mdi90KoZ19YS0YwLaK9Ni1JfeB3qILfPpOIqcE1e//vVv5 zRmlZWyNmq05yvA4rD3qe2aFWREARC7UJN9FoW9l17fS1zHjjoUnT7Ja1VUGyfcfuV9+5TZWpU9 KfYaAzdSoE6sQeHwpyVcnGiSLV4OUqr3iSgsw3sykRkujZLkuP0Tb2jyCyMS8CYP1AAl6U8r6z3 +9mnz6syBL/ZSCIoHWK8 X-Received: by 2002:a17:90b:4f92:b0:2ee:d9d4:64a8 with SMTP id 98e67ed59e1d1-2f7284e2e9fmr33034786a91.0.1737364394255; Mon, 20 Jan 2025 01:13:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IFbLGwRcnbdpES2YQU/wa7wXYeibOgJAduA3aSxYxgLMxcouveQNO7OewgTeWoxgUudCiICAA== X-Received: by 2002:a17:90b:4f92:b0:2ee:d9d4:64a8 with SMTP id 98e67ed59e1d1-2f7284e2e9fmr33034758a91.0.1737364393879; Mon, 20 Jan 2025 01:13:13 -0800 (PST) Received: from [10.200.68.91] (nat-pool-muc-u.redhat.com. [149.14.88.27]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f77619e6a5sm7860060a91.26.2025.01.20.01.13.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2025 01:13:13 -0800 (PST) Message-ID: Subject: Re: [PATCH v4] vdpa: solidrun: Replace deprecated PCI functions From: Philipp Stanner To: Stefano Garzarella , Philipp Stanner Cc: Alvaro Karsz , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , Eugenio =?ISO-8859-1?Q?P=E9rez?= , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Date: Mon, 20 Jan 2025 10:13:03 +0100 In-Reply-To: References: <20241219094428.21511-2-phasta@kernel.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.52.4 (3.52.4-2.fc40) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 > >=20 > > The PCI functions > >=20 > > pcim_iomap_regions() > > pcim_iounmap_regions() > > pcim_iomap_table() > >=20 > > have been deprecated by the PCI subsystem. > >=20 > > Replace these functions with their successors pcim_iomap_region() > > and > > pcim_iounmap_region(). > >=20 > > Signed-off-by: Philipp Stanner > > --- > > Changes in v4: > > =C2=A0- snet_open_vf_bar(): use distinct temporary variable to ensure > > =C2=A0=C2=A0 snet->bar is never an ERR_PTR. (Stefano) >=20 > Thanks for that! >=20 > I don't have a device to test, but it LGTM: >=20 > Acked-by: Stefano Garzarella Hi all, can someone please finally merge this? Thanks, Philipp >=20 >=20 > >=20 > > Changes in v3: > > =C2=A0- Move __iomem *io declaration into the loop. (Stefano) > >=20 > > Changes in v2: > > =C2=A0- Fix build warning because of dead variable. > > =C2=A0- 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(-) > >=20 > > 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 =3D { > > static int psnet_open_pf_bar(struct pci_dev *pdev, struct psnet > > *psnet) > > { > > char *name; > > - int ret, i, mask =3D 0; > > + unsigned short i; > > + bool bars_found =3D false; > > + > > + name =3D 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 =3D 0; i < PCI_STD_NUM_BARS; i++) { > > - if (pci_resource_len(pdev, i)) > > - mask |=3D (1 << i); > > + void __iomem *io; > > + > > + if (pci_resource_len(pdev, i) =3D=3D 0) > > + continue; > > + > > + io =3D 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] =3D io; > > + bars_found =3D true; > > } > >=20 > > /* No BAR can be used.. */ > > - if (!mask) { > > + if (!bars_found) { > > SNET_ERR(pdev, "Failed to find a PCI BAR\n"); > > return -ENODEV; > > } > >=20 > > - name =3D devm_kasprintf(&pdev->dev, GFP_KERNEL, "psnet[%s]- > > bars", pci_name(pdev)); > > - if (!name) > > - return -ENOMEM; > > - > > - ret =3D pcim_iomap_regions(pdev, mask, name); > > - if (ret) { > > - SNET_ERR(pdev, "Failed to request and map PCI > > BARs\n"); > > - return ret; > > - } > > - > > - for (i =3D 0; i < PCI_STD_NUM_BARS; i++) { > > - if (mask & (1 << i)) > > - psnet->bars[i] =3D > > pcim_iomap_table(pdev)[i]; > > - } > > - > > return 0; > > } > >=20 > > static int snet_open_vf_bar(struct pci_dev *pdev, struct snet > > *snet) > > { > > char *name; > > - int ret; > > + void __iomem *io; > >=20 > > name =3D devm_kasprintf(&pdev->dev, GFP_KERNEL, "snet[%s]- > > bars", pci_name(pdev)); > > if (!name) > > return -ENOMEM; > >=20 > > /* Request and map BAR */ > > - ret =3D pcim_iomap_regions(pdev, BIT(snet->psnet- > > >cfg.vf_bar), name); > > - if (ret) { > > + io =3D 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); > > } > >=20 > > - snet->bar =3D pcim_iomap_table(pdev)[snet->psnet- > > >cfg.vf_bar]; > > + snet->bar =3D io; > >=20 > > return 0; > > } > > @@ -656,15 +658,12 @@ static int psnet_detect_bar(struct psnet > > *psnet, u32 off) > >=20 > > static void psnet_unmap_unused_bars(struct pci_dev *pdev, struct > > psnet *psnet) > > { > > - int i, mask =3D 0; > > + unsigned short i; > >=20 > > for (i =3D 0; i < PCI_STD_NUM_BARS; i++) { > > if (psnet->bars[i] && i !=3D psnet->barno) > > - mask |=3D (1 << i); > > + pcim_iounmap_region(pdev, i); > > } > > - > > - if (mask) > > - pcim_iounmap_regions(pdev, mask); > > } > >=20 > > /* Read SNET config from PCI BAR */ > > --=20 > > 2.47.1 > >=20 > >=20 >=20