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 0F19418E045 for ; Wed, 9 Oct 2024 10:55:50 +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=1728471354; cv=none; b=WdZbh46Rk4oZVogHLlZY0/Fi51yt3vjUTKjjpVNMduNsOMx9qhfvSgj1MP1D7YjTl1VhiqkSQwIrHGEad/Fna7U49JAyoITihHE20jt+SCzDA0nw676EbpUJ+JwXj/ELzj8d+f0Warry5ggIUW03hK958Iv8qRV6/HQeBpwzWHU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728471354; c=relaxed/simple; bh=P6wOEJFH1gN3pSkiGKb7z2pqnwnI+EOwPE66fTmRo9I=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: MIME-Version:Content-Type; b=QqPlQHSm3gwN2SxwNVORYo4BTARbMSPI8Pcz4I/8EtIMx8MGbf0Ucob1NWp8dDhmym8B04p2vmeJ94IpKRygA+FI2NHqW0xfmnEndWIM/thYrRW8i7fjd5L6+phqT9UwvRD9Z2iRpQrsr3Uz0C71bSBA0ibGF7vChvzjgtFvhJI= 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=UXGmAd/u; 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="UXGmAd/u" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728471350; 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=P6wOEJFH1gN3pSkiGKb7z2pqnwnI+EOwPE66fTmRo9I=; b=UXGmAd/ueXQSn/ubVKycETMgPvnqcbMzwle74kYnWoMEhebollHM8MDV2txuKWVZCozMPX kNrEnoRrZH5x1zEXDvYl+dhxxPTmnL9HVZF1xaB+J3j7k03oa3WnDVxBIUtE0mqWvhmVTG blFopCum6ELHK9KO96pzznYvLq8XAg8= Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-235-ixROyyV6OvCyMY9W_r3Xag-1; Wed, 09 Oct 2024 06:55:49 -0400 X-MC-Unique: ixROyyV6OvCyMY9W_r3Xag-1 Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-2e2a29fa586so674165a91.2 for ; Wed, 09 Oct 2024 03:55:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728471348; x=1729076148; 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=AcZlzWYyN8UAcZA3DQr50bLqr6cMtcb31GCRb120JWk=; b=Gd7aT516zCqRwpQtpOmCd1+gaHsmgXUdwPTZbtogUfY7g/jQOIn5etWsAxoIWXNHQG ILzU/2FYfnDM4cCW3tvf0CdQkwYQk4Sg2JGTJbQgNP1o4J2ytZu24JHUfIcSc9shmyww Q2YdVcCeJgqL5SiWN7ViArbDTzDKI+HBAjUa9xPu7UHY1a3QRQu8ITn2zrov7FCX7ego 70p43L7J+oMejcAb+gwvgoepbFD2u/wlKDko4jwuIQ6ImH0R7ei4rNCxYv+8iFKOlgqE is0L9MhTyPk3/M56bz/riWgkYSUXjChCXRIysG6DZ37NEnt7YFQd0iO25XF8d9lJAbL9 1vNA== X-Forwarded-Encrypted: i=1; AJvYcCUSs6ajZJmkGg4v8Knt4z3TKT5wksCYJ0SzJwlAr7hVu0NWiQ/bFwNwhQjY73o76iqrZu+v/0J6LqA0HcJ1@lists.linux.dev X-Gm-Message-State: AOJu0YwsrpOwJK1Wm6BxY4v6eiZYW4Axln0aMshJvNGcPOKD/v8Z3T9Z Cicuy+Fe94n/yv5skkpbEpO3QUnSSr7wFlUZbuIm7vOy8+xY0rchLxsYvknjDJFModW2TWxKPI8 Lz83TzDk6TiDr/FcBMKnjEWEwf3NNKo4k+dzzKyzBQ4pXjp839PFOf/l82HKEfpk= X-Received: by 2002:a17:90b:28c7:b0:2e2:b21b:2247 with SMTP id 98e67ed59e1d1-2e2b21b2322mr933585a91.27.1728471348028; Wed, 09 Oct 2024 03:55:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEVV2txsjAP9qEDQxARdGlpHpBZTxsJXvis+5//ouL/mBT0m0DdnB1NIlYvykMWn/28LY/iUQ== X-Received: by 2002:a17:90b:28c7:b0:2e2:b21b:2247 with SMTP id 98e67ed59e1d1-2e2b21b2322mr933536a91.27.1728471347607; Wed, 09 Oct 2024 03:55:47 -0700 (PDT) Received: from dhcp-64-16.muc.redhat.com (nat-pool-muc-t.redhat.com. [149.14.88.26]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e2a365cb84sm1341556a91.0.2024.10.09.03.55.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2024 03:55:46 -0700 (PDT) Message-ID: Subject: Re: [RFC PATCH 09/13] ata: Use always-managed version of pci_intx() From: Philipp Stanner To: Damien Le Moal , Niklas Cassel , Sergey Shtylyov , Basavaraj Natikar , Jiri Kosina , Benjamin Tissoires , Arnd Bergmann , Greg Kroah-Hartman , Alex Dubov , Sudarsana Kalluru , Manish Chopra , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rasesh Mody , GR-Linux-NIC-Dev@marvell.com, Igor Mitsyanko , Sergey Matyukevich , Kalle Valo , Sanjay R Mehta , Shyam Sundar S K , Jon Mason , Dave Jiang , Allen Hubbe , Bjorn Helgaas , Alex Williamson , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Jaroslav Kysela , Takashi Iwai , Mario Limonciello , Chen Ni , Ricky Wu , Al Viro , Breno Leitao , Kevin Tian , Thomas Gleixner , Ilpo =?ISO-8859-1?Q?J=E4rvinen?= , Mostafa Saleh , Andy Shevchenko , Hannes Reinecke , John Garry , Soumya Negi , Jason Gunthorpe , Yi Liu , "Dr. David Alan Gilbert" , Christian Brauner , Ankit Agrawal , Reinette Chatre , Eric Auger , Ye Bin , Marek =?ISO-8859-1?Q?Marczykowski-G=F3recki?= , Pierre-Louis Bossart , Maarten Lankhorst , Kai Vehmanen , Peter Ujfalusi , Rui Salvaterra , Marc Zyngier Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, ntb@lists.linux.dev, linux-pci@vger.kernel.org, linux-staging@lists.linux.dev, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, linux-sound@vger.kernel.org Date: Wed, 09 Oct 2024 12:55:07 +0200 In-Reply-To: <95b23ff9-eb17-4e1c-b7a3-2d3691ffc48f@kernel.org> References: <20241009083519.10088-1-pstanner@redhat.com> <20241009083519.10088-10-pstanner@redhat.com> <95b23ff9-eb17-4e1c-b7a3-2d3691ffc48f@kernel.org> User-Agent: Evolution 3.52.4 (3.52.4-1.fc40) Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 2024-10-09 at 17:51 +0900, Damien Le Moal wrote: > On 10/9/24 17:35, Philipp Stanner wrote: > > pci_intx() is a hybrid function which can sometimes be managed > > through > > devres. To remove this hybrid nature from pci_intx(), it is > > necessary to > > port users to either an always-managed or a never-managed version. > >=20 > > All users in ata enable their PCI-Device with pcim_enable_device(). > > Thus, > > they need the always-managed version. > >=20 > > Replace pci_intx() with pci_intx_unmanaged(). >=20 > This contradicts the sentence above and the patche replaces > pci_intx() with > pcim_intx()... So s/pci_intx_unmanaged/pcim_intx in the above > sentence ? Yes, absolutely correct, the commit message is broken. The code itself is fine, I grepped through it for pci_enable / pcim_enable P. >=20 > >=20 > > Signed-off-by: Philipp Stanner > > --- > > =C2=A0drivers/ata/ahci.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 2 +- > > =C2=A0drivers/ata/ata_piix.c=C2=A0=C2=A0 | 2 +- > > =C2=A0drivers/ata/pata_rdc.c=C2=A0=C2=A0 | 2 +- > > =C2=A0drivers/ata/sata_sil24.c | 2 +- > > =C2=A0drivers/ata/sata_sis.c=C2=A0=C2=A0 | 2 +- > > =C2=A0drivers/ata/sata_uli.c=C2=A0=C2=A0 | 2 +- > > =C2=A0drivers/ata/sata_vsc.c=C2=A0=C2=A0 | 2 +- > > =C2=A07 files changed, 7 insertions(+), 7 deletions(-) > >=20 > > diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c > > index 45f63b09828a..9273ff3d4732 100644 > > --- a/drivers/ata/ahci.c > > +++ b/drivers/ata/ahci.c > > @@ -1985,7 +1985,7 @@ static int ahci_init_one(struct pci_dev > > *pdev, const struct pci_device_id *ent) > > =C2=A0 > > =C2=A0=09if (ahci_init_msi(pdev, n_ports, hpriv) < 0) { > > =C2=A0=09=09/* legacy intx interrupts */ > > -=09=09pci_intx(pdev, 1); > > +=09=09pcim_intx(pdev, 1); > > =C2=A0=09} > > =C2=A0=09hpriv->irq =3D pci_irq_vector(pdev, 0); > > =C2=A0 > > diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c > > index 093b940bc953..d441246fa357 100644 > > --- a/drivers/ata/ata_piix.c > > +++ b/drivers/ata/ata_piix.c > > @@ -1725,7 +1725,7 @@ static int piix_init_one(struct pci_dev > > *pdev, const struct pci_device_id *ent) > > =C2=A0=09 * message-signalled interrupts currently). > > =C2=A0=09 */ > > =C2=A0=09if (port_flags & PIIX_FLAG_CHECKINTR) > > -=09=09pci_intx(pdev, 1); > > +=09=09pcim_intx(pdev, 1); > > =C2=A0 > > =C2=A0=09if (piix_check_450nx_errata(pdev)) { > > =C2=A0=09=09/* This writes into the master table but it does > > not > > diff --git a/drivers/ata/pata_rdc.c b/drivers/ata/pata_rdc.c > > index 0a9689862f71..09792aac7f9d 100644 > > --- a/drivers/ata/pata_rdc.c > > +++ b/drivers/ata/pata_rdc.c > > @@ -340,7 +340,7 @@ static int rdc_init_one(struct pci_dev *pdev, > > const struct pci_device_id *ent) > > =C2=A0=09=09return rc; > > =C2=A0=09host->private_data =3D hpriv; > > =C2=A0 > > -=09pci_intx(pdev, 1); > > +=09pcim_intx(pdev, 1); > > =C2=A0 > > =C2=A0=09host->flags |=3D ATA_HOST_PARALLEL_SCAN; > > =C2=A0 > > diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c > > index 72c03cbdaff4..b771ebd41252 100644 > > --- a/drivers/ata/sata_sil24.c > > +++ b/drivers/ata/sata_sil24.c > > @@ -1317,7 +1317,7 @@ static int sil24_init_one(struct pci_dev > > *pdev, const struct pci_device_id *ent) > > =C2=A0 > > =C2=A0=09if (sata_sil24_msi && !pci_enable_msi(pdev)) { > > =C2=A0=09=09dev_info(&pdev->dev, "Using MSI\n"); > > -=09=09pci_intx(pdev, 0); > > +=09=09pcim_intx(pdev, 0); > > =C2=A0=09} > > =C2=A0 > > =C2=A0=09pci_set_master(pdev); > > diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c > > index ef8724986de3..b8b6d9eff3b8 100644 > > --- a/drivers/ata/sata_sis.c > > +++ b/drivers/ata/sata_sis.c > > @@ -290,7 +290,7 @@ static int sis_init_one(struct pci_dev *pdev, > > const struct pci_device_id *ent) > > =C2=A0=09} > > =C2=A0 > > =C2=A0=09pci_set_master(pdev); > > -=09pci_intx(pdev, 1); > > +=09pcim_intx(pdev, 1); > > =C2=A0=09return ata_host_activate(host, pdev->irq, > > ata_bmdma_interrupt, > > =C2=A0=09=09=09=09 IRQF_SHARED, &sis_sht); > > =C2=A0} > > diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c > > index 60ea45926cd1..52894ff49dcb 100644 > > --- a/drivers/ata/sata_uli.c > > +++ b/drivers/ata/sata_uli.c > > @@ -221,7 +221,7 @@ static int uli_init_one(struct pci_dev *pdev, > > const struct pci_device_id *ent) > > =C2=A0=09} > > =C2=A0 > > =C2=A0=09pci_set_master(pdev); > > -=09pci_intx(pdev, 1); > > +=09pcim_intx(pdev, 1); > > =C2=A0=09return ata_host_activate(host, pdev->irq, > > ata_bmdma_interrupt, > > =C2=A0=09=09=09=09 IRQF_SHARED, &uli_sht); > > =C2=A0} > > diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c > > index d39b87537168..a53a2dfc1e17 100644 > > --- a/drivers/ata/sata_vsc.c > > +++ b/drivers/ata/sata_vsc.c > > @@ -384,7 +384,7 @@ static int vsc_sata_init_one(struct pci_dev > > *pdev, > > =C2=A0=09=09pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, > > 0x80); > > =C2=A0 > > =C2=A0=09if (pci_enable_msi(pdev) =3D=3D 0) > > -=09=09pci_intx(pdev, 0); > > +=09=09pcim_intx(pdev, 0); > > =C2=A0 > > =C2=A0=09/* > > =C2=A0=09 * Config offset 0x98 is "Extended Control and Status > > Register 0" >=20 >=20