Message ID | A33E225544E47D4DB5713032774B132783960382@irsmsx105.ger.corp.intel.com |
---|---|
State | Accepted |
Headers | show |
On Mon, Apr 24, 2017 at 02:16:31PM +0000, Byczkowski, Jakub wrote:
> Tested-by: Jakub Byczkowski <jakub.byczkowski@intel.com>
Are you (and Doug) ok with queueing this up in the PCI tree?
On 04/24/2017 10:35 AM, Christoph Hellwig wrote: > On Mon, Apr 24, 2017 at 02:16:31PM +0000, Byczkowski, Jakub wrote: >> Tested-by: Jakub Byczkowski <jakub.byczkowski@intel.com> > > Are you (and Doug) ok with queueing this up in the PCI tree? We are fine however Doug wants to handle it. -Denny
On Mon, 2017-04-24 at 16:35 +0200, Christoph Hellwig wrote: > On Mon, Apr 24, 2017 at 02:16:31PM +0000, Byczkowski, Jakub wrote: > > > > Tested-by: Jakub Byczkowski <jakub.byczkowski@intel.com> > > Are you (and Doug) ok with queueing this up in the PCI tree? I'm fine with that. Feel free to add my Acked-by to the hfi1 patch.
On Mon, Apr 24, 2017 at 04:35:07PM +0200, Christoph Hellwig wrote: > On Mon, Apr 24, 2017 at 02:16:31PM +0000, Byczkowski, Jakub wrote: > > Tested-by: Jakub Byczkowski <jakub.byczkowski@intel.com> > > Are you (and Doug) ok with queueing this up in the PCI tree? Applied this with Jakub's tested-by and Doug's ack to pci/virtualization for v4.12. This still leaves these: [PATCH 4/7] ixgbe: use pcie_flr instead of duplicating it [PATCH 6/7] crypto: qat: use pcie_flr instead of duplicating it [PATCH 7/7] liquidio: use pcie_flr instead of duplicating it I haven't seen any response to 4 and 6. Felix reported an unused variable in 7. Let me know if you'd like me to do anything with these. Bjorn
On Tue, 2017-04-25 at 14:39 -0500, Bjorn Helgaas wrote: > On Mon, Apr 24, 2017 at 04:35:07PM +0200, Christoph Hellwig wrote: > > On Mon, Apr 24, 2017 at 02:16:31PM +0000, Byczkowski, Jakub wrote: > > > Tested-by: Jakub Byczkowski <jakub.byczkowski@intel.com> > > > > Are you (and Doug) ok with queueing this up in the PCI tree? > > Applied this with Jakub's tested-by and Doug's ack to pci/virtualization > for v4.12. > > This still leaves these: > > [PATCH 4/7] ixgbe: use pcie_flr instead of duplicating it > [PATCH 6/7] crypto: qat: use pcie_flr instead of duplicating it > [PATCH 7/7] liquidio: use pcie_flr instead of duplicating it > > I haven't seen any response to 4 and 6. Felix reported an unused > variable in 7. Let me know if you'd like me to do anything with > these. Just provided my ACK for ixgbe patch.
On Tue, Apr 25, 2017 at 02:39:55PM -0500, Bjorn Helgaas wrote: > This still leaves these: > > [PATCH 4/7] ixgbe: use pcie_flr instead of duplicating it > [PATCH 6/7] crypto: qat: use pcie_flr instead of duplicating it > [PATCH 7/7] liquidio: use pcie_flr instead of duplicating it > > I haven't seen any response to 4 and 6. Felix reported an unused > variable in 7. Let me know if you'd like me to do anything with > these. Now that Jeff ACKed 4 it might be worth to add it to the pci tree last minute. I'll resend liquidio and qat to the respective maintainers for the next merge window.
On Thu, Apr 27, 2017 at 08:47:58AM +0200, Christoph Hellwig wrote: > On Tue, Apr 25, 2017 at 02:39:55PM -0500, Bjorn Helgaas wrote: > > This still leaves these: > > > > [PATCH 4/7] ixgbe: use pcie_flr instead of duplicating it > > [PATCH 6/7] crypto: qat: use pcie_flr instead of duplicating it > > [PATCH 7/7] liquidio: use pcie_flr instead of duplicating it > > > > I haven't seen any response to 4 and 6. Felix reported an unused > > variable in 7. Let me know if you'd like me to do anything with > > these. > > Now that Jeff ACKed 4 it might be worth to add it to the pci tree last > minute. I'll resend liquidio and qat to the respective maintainers for > the next merge window. I applied 4 with Jeff's ack to pci/virtualization for v4.12, thanks!
diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c index 121a4c920f1b..d037f72e4d96 100644 --- a/drivers/infiniband/hw/hfi1/chip.c +++ b/drivers/infiniband/hw/hfi1/chip.c @@ -13610,14 +13610,14 @@ static void init_chip(struct hfi1_devdata *dd) dd_dev_info(dd, "Resetting CSRs with FLR\n"); /* do the FLR, the DC reset will remain */ - hfi1_pcie_flr(dd); + pcie_flr(dd->pcidev); /* restore command and BARs */ restore_pci_variables(dd); if (is_ax(dd)) { dd_dev_info(dd, "Resetting CSRs with FLR\n"); - hfi1_pcie_flr(dd); + pcie_flr(dd->pcidev); restore_pci_variables(dd); } } else { diff --git a/drivers/infiniband/hw/hfi1/hfi.h b/drivers/infiniband/hw/hfi1/hfi.h index 0808e3c3ba39..40d7559fa723 100644 --- a/drivers/infiniband/hw/hfi1/hfi.h +++ b/drivers/infiniband/hw/hfi1/hfi.h @@ -1764,7 +1764,6 @@ int hfi1_pcie_init(struct pci_dev *, const struct pci_device_id *); void hfi1_pcie_cleanup(struct pci_dev *); int hfi1_pcie_ddinit(struct hfi1_devdata *, struct pci_dev *); void hfi1_pcie_ddcleanup(struct hfi1_devdata *); -void hfi1_pcie_flr(struct hfi1_devdata *); int pcie_speeds(struct hfi1_devdata *); void request_msix(struct hfi1_devdata *, u32 *, struct hfi1_msix_entry *); void hfi1_enable_intx(struct pci_dev *); diff --git a/drivers/infiniband/hw/hfi1/pcie.c b/drivers/infiniband/hw/hfi1/pcie.c index 0829fce06172..c81556e84831 100644 --- a/drivers/infiniband/hw/hfi1/pcie.c +++ b/drivers/infiniband/hw/hfi1/pcie.c @@ -240,36 +240,6 @@ void hfi1_pcie_ddcleanup(struct hfi1_devdata *dd) iounmap(dd->piobase); } -/*