Commit 949268ec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'firewire-updates-6.14' of... 

Merge tag 'firewire-updates-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

Pull firewire updates from Takashi Sakamoto:
 "Two changes for the 6.14 kernel.

  The first change concerns the PCI driver for 1394 OHCI hardware.
  Previously, it used legacy PCI suspend/resume callbacks, which have
  now been replaced with callbacks defined in the Linux generic power
  management framework. This original patch was posted in 2020 and has
  been adapted with some modifications for the latest kernel. Note that
  the driver still includes platform-specific operations for PowerPC,
  and these operations have not been tested in the new implementation
  yet. It would be helpful to share the results of suspending/resuming
  on the platform.

  The other one is a minor fix for the memory allocation in some KUnit
  tests"

* tag 'firewire-updates-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: test: Fix potential null dereference in firewire kunit test
  firewire: ohci: use generic power management
parents 41bfad50 352fafe9

drivers/firewire/device-attribute-test.c

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ static void device_attr_simple_avc(struct kunit *test) 
	struct device *unit0_dev = (struct device *)&unit0.device;

	static const int unit0_expected_ids[] = {0x00ffffff, 0x00ffffff, 0x0000a02d, 0x00010001};

	char *buf = kunit_kzalloc(test, PAGE_SIZE, GFP_KERNEL);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, buf);

	int ids[4] = {0, 0, 0, 0};



	// Ensure associations for node and unit devices.
@@ -180,6 +181,7 @@ static void device_attr_legacy_avc(struct kunit *test) 
	struct device *unit0_dev = (struct device *)&unit0.device;

	static const int unit0_expected_ids[] = {0x00012345, 0x00fedcba, 0x00abcdef, 0x00543210};

	char *buf = kunit_kzalloc(test, PAGE_SIZE, GFP_KERNEL);

	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, buf);

	int ids[4] = {0, 0, 0, 0};



	// Ensure associations for node and unit devices.

drivers/firewire/ohci.c

+13 −31
Original line number Diff line number Diff line
@@ -3301,8 +3301,7 @@ static int ohci_set_iso_channels(struct fw_iso_context *base, u64 *channels) 
	}

}



#ifdef CONFIG_PM

static void ohci_resume_iso_dma(struct fw_ohci *ohci)

static void __maybe_unused ohci_resume_iso_dma(struct fw_ohci *ohci)

{

	int i;

	struct iso_context *ctx;
@@ -3319,7 +3318,6 @@ static void ohci_resume_iso_dma(struct fw_ohci *ohci) 
			ohci_start_iso(&ctx->base, 0, ctx->sync, ctx->tags);

	}

}

#endif



static int queue_iso_transmit(struct iso_context *ctx,

			      struct fw_iso_packet *packet,
@@ -3888,39 +3886,25 @@ static void pci_remove(struct pci_dev *dev) 
	dev_notice(&dev->dev, "removing fw-ohci device\n");

}



#ifdef CONFIG_PM

static int pci_suspend(struct pci_dev *dev, pm_message_t state)

static int __maybe_unused pci_suspend(struct device *dev)

{

	struct fw_ohci *ohci = pci_get_drvdata(dev);

	int err;

	struct pci_dev *pdev = to_pci_dev(dev);

	struct fw_ohci *ohci = pci_get_drvdata(pdev);



	software_reset(ohci);

	err = pci_save_state(dev);

	if (err) {

		ohci_err(ohci, "pci_save_state failed\n");

		return err;

	}

	err = pci_set_power_state(dev, pci_choose_state(dev, state));

	if (err)

		ohci_err(ohci, "pci_set_power_state failed with %d\n", err);

	pmac_ohci_off(dev);

	pmac_ohci_off(pdev);



	return 0;

}



static int pci_resume(struct pci_dev *dev)



static int __maybe_unused pci_resume(struct device *dev)

{

	struct fw_ohci *ohci = pci_get_drvdata(dev);

	struct pci_dev *pdev = to_pci_dev(dev);

	struct fw_ohci *ohci = pci_get_drvdata(pdev);

	int err;



	pmac_ohci_on(dev);

	pci_set_power_state(dev, PCI_D0);

	pci_restore_state(dev);

	err = pci_enable_device(dev);

	if (err) {

		ohci_err(ohci, "pci_enable_device failed\n");

		return err;

	}

	pmac_ohci_on(pdev);



	/* Some systems don't setup GUID register on resume from ram  */

	if (!reg_read(ohci, OHCI1394_GUIDLo) &&
@@ -3937,7 +3921,6 @@ static int pci_resume(struct pci_dev *dev) 


	return 0;

}

#endif



static const struct pci_device_id pci_table[] = {

	{ PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_FIREWIRE_OHCI, ~0) },
@@ -3946,15 +3929,14 @@ static const struct pci_device_id pci_table[] = { 


MODULE_DEVICE_TABLE(pci, pci_table);



static SIMPLE_DEV_PM_OPS(pci_pm_ops, pci_suspend, pci_resume);



static struct pci_driver fw_ohci_pci_driver = {

	.name		= ohci_driver_name,

	.id_table	= pci_table,

	.probe		= pci_probe,

	.remove		= pci_remove,

#ifdef CONFIG_PM

	.resume		= pci_resume,

	.suspend	= pci_suspend,

#endif

	.driver.pm	= &pci_pm_ops,

};



static int __init fw_ohci_init(void)