hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FireWire (IEEE 1394) subsystem updates: 

- another y2038 fix
 
   - janitorial: code movement
 -----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCAA4FiEElVwAmOXEbvmhUkgUefNvslRdedAFAl3kCxUaHHN0ZWZhbnJA
 czVyNi5pbi1iZXJsaW4uZGUACgkQefNvslRdedC4nRAAgxZLcRpv5hLh37UQwY9C
 K5mRUnj2OFKOr6otsyTyOC5ZsW/geGO4zzt1LoikTWj0GtZIyhhOk4oJRRCvAOi3
 +l400+GtLbCrOSvcWKWGoA8W+6VK17kHtXgQqzAT2tVfO5VmOXr+uL30nCpdpfxO
 AKhmzkarkD56pjuLK5c1FaRQBBC5x8vrztke6VImp5jrv6fq6fZp+6I6cSEbUxTB
 yR54++CRTp77KPlNaFmJTN0kyP4CFfepOvBL6KVHm2q6DbOoeVqmPgvU/MFAfMTi
 lPP45H1vlcmV8l3uBryIaq4lYnOtQxRNuFGW0dcho4o9jldyMaPXt3joX9c82IDe
 fcMJe3/ebs4F2eJhcerYtIYWf6Yb32U2uYY8GPtPjZDs2Wm/tiZ5nr7GDQJm/KX0
 cc4+6p9MRRj8sRqdLXEpEr2Ps65hQzDJyfE5XH3iqqus5McZ8GR/pIcBZ1KpKcPW
 L48Ja8J7yYPqoqlQrZb1MCB3jWvKlR0QgTK3KfeZjIPR1ssBJts3tEmFPxUtcnKn
 +PEcSetaJS9OPldO5mRCcYuPOH/YPo6KbOz7pJs/fjHNYCJjSQZYTK77g6KOr9z2
 Wp1/ng970/P8KkFJKyyKMpwxuyrWhYUkO0u441QhQmHlaKYK9e+NcoazC4spM34w
 Jg6OFCM5edAPSbNWn0b5JfI=
 =kcwa
 -----END PGP SIGNATURE-----

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

Pull FireWire updates from Stefan Richter:

 - another y2038 fix

 - janitorial code movement

* tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: core: code cleanup after vm_map_pages_zero introduction
  firewire: ohci: stop using get_seconds() for BUS_TIME
This commit is contained in:
Linus Torvalds 2019-12-02 14:13:00 -08:00
parent ef2cc88e2a 7807759e4a
commit 9b326948c2
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/firewire/core-cdev.c
View File

@ -1686,7 +1686,8 @@ static int fw_device_op_mmap(struct file *file, struct vm_area_struct *vma)
if (ret < 0) if (ret < 0)
goto fail; goto fail;
ret = fw_iso_buffer_map_vma(&client->buffer, vma); ret = vm_map_pages_zero(vma, client->buffer.pages,
client->buffer.page_count);
if (ret < 0) if (ret < 0)
goto fail; goto fail;

7
drivers/firewire/core-iso.c
View File

@ -91,13 +91,6 @@ int fw_iso_buffer_init(struct fw_iso_buffer *buffer, struct fw_card *card,
} }
EXPORT_SYMBOL(fw_iso_buffer_init); EXPORT_SYMBOL(fw_iso_buffer_init);
int fw_iso_buffer_map_vma(struct fw_iso_buffer *buffer,
struct vm_area_struct *vma)
{
return vm_map_pages_zero(vma, buffer->pages,
buffer->page_count);
}
void fw_iso_buffer_destroy(struct fw_iso_buffer *buffer, void fw_iso_buffer_destroy(struct fw_iso_buffer *buffer,
struct fw_card *card) struct fw_card *card)
{ {

2
drivers/firewire/core.h
View File

@ -158,8 +158,6 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event);
int fw_iso_buffer_alloc(struct fw_iso_buffer *buffer, int page_count); int fw_iso_buffer_alloc(struct fw_iso_buffer *buffer, int page_count);
int fw_iso_buffer_map_dma(struct fw_iso_buffer *buffer, struct fw_card *card, int fw_iso_buffer_map_dma(struct fw_iso_buffer *buffer, struct fw_card *card,
enum dma_data_direction direction); enum dma_data_direction direction);
int fw_iso_buffer_map_vma(struct fw_iso_buffer *buffer,
struct vm_area_struct *vma);
/* -topology */ /* -topology */

2
drivers/firewire/ohci.c
View File

@ -1752,7 +1752,7 @@ static u32 update_bus_time(struct fw_ohci *ohci)
if (unlikely(!ohci->bus_time_running)) { if (unlikely(!ohci->bus_time_running)) {
reg_write(ohci, OHCI1394_IntMaskSet, OHCI1394_cycle64Seconds); reg_write(ohci, OHCI1394_IntMaskSet, OHCI1394_cycle64Seconds);
ohci->bus_time = (lower_32_bits(get_seconds()) & ~0x7f) | ohci->bus_time = (lower_32_bits(ktime_get_seconds()) & ~0x7f) |
(cycle_time_seconds & 0x40); (cycle_time_seconds & 0x40);
ohci->bus_time_running = true; ohci->bus_time_running = true;
} }