PCI/sysfs: Use correct variable for the legacy_mem sysfs object
Subsystems (2)
PATCH 1/1 PCI/sysfs: Use correct variable for the legacy_mem sysfs object
Two legacy PCI sysfs objects "legacy_io" and "legacy_mem" were updated to use an unified address space in the commit 636b21b50152 ("PCI: Revoke mappings like devmem"). This allows for revocations to be managed from a single place when drivers want to take over and mmap() a /dev/mem range.
Following the update, both of the sysfs objects should leverage the iomem_get_mapping() function to get an appropriate address range, but only the "legacy_io" has been correctly updated - the second attribute seems to be using a wrong variable to pass the iomem_get_mapping() function to.
Thus, correct the variable name used so that the "legacy_mem" sysfs object would also correctly call the iomem_get_mapping() function.
--- drivers/pci/pci-sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/pci-sysfs.c +1 -1
@@ -978,7 +978,7 @@ void pci_create_legacy_files(struct pci_bus *b) b->legacy_mem->size =1024 *1024 ; b->legacy_mem->attr.mode =0600 ; b->legacy_mem->mmap = pci_mmap_legacy_mem; - b->legacy_io->mapping =iomem_get_mapping (); + b->legacy_mem->mapping =iomem_get_mapping ();pci_adjust_legacy_attr (b, pci_mmap_mem); error =device_create_bin_file (&b->dev, b->legacy_mem);if (error)
Signature · 1 line
2.32.0
[+to Greg, please update sysfs_defferred_iomem_get_mapping-5.15]
Quoted 12 lines · Krzysztof Wilczyński
Two legacy PCI sysfs objects "
legacy_io" and "legacy_mem" were updated to use an unified address space in the commit636b21b50152("PCI: Revoke mappings like devmem"). This allows for revocations to be managed from a single place when drivers want to take over andmmap()a/dev/memrange.Following the update, both of the sysfs objects should leverage the
iomem_get_mapping()function to get an appropriate address range, but only the "legacy_io" has been correctly updated - the second attribute seems to be using a wrong variable to pass theiomem_get_mapping()function to.
Quoted 5 lines
Thus, correct the variable name used so that the "
legacy_mem" sysfs object would also correctly call theiomem_get_mapping()function.Fixes 636b21b50152 ("PCI: Revoke mappings like devmem")Signed-off-by Krzysztof Wilczyński <[email protected]>
Ouch. This needs to be applied to any -stable trees that contain 636b21b50152, which was merged in v5.12.
It *also* needs to be applied with the obvious updates to Greg's sysfs_defferred_iomem_get_mapping-5.15 branch because it was changed by f06aff924f97 ("sysfs: Rename struct bin_attribute member to f_mapping") [1]
[1] https://git.kernel.org/cgit/linux/kernel/git/gregkh/driver-core.git/commit/?id=f06aff924f97
Quoted 20 lines
--- drivers/pci/pci-sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pci/pci-sysfs.c +1
-1@@ -978,7 +978,7 @@ void pci_create_legacy_files(struct pci_bus *b) b->legacy_mem->size =1024 *1024 ; b->legacy_mem->attr.mode =0600 ; b->legacy_mem->mmap = pci_mmap_legacy_mem; - b->legacy_io->mapping =iomem_get_mapping (); + b->legacy_mem->mapping =iomem_get_mapping ();pci_adjust_legacy_attr (b, pci_mmap_mem); error =device_create_bin_file (&b->dev, b->legacy_mem);if (error)Signature · 1 line
2.32.0
Quoted 1 line · Bjorn Helgaas
[+to Greg, please update sysfs_defferred_iomem_get_mapping-5.15]
Actually, Greg, totally up to you, but if nobody else is depending on the sysfs_defferred_iomem_get_mapping-5.15 branch, another possibility would be for you to drop that branch and for me to merge the two patches on it + Krzysztof's fix below + (hopefully) Krzysztof's PCI static attribute work.
That would make my v5.15 pull request easier because I simple-mindedly base all my branches on -rc1 while your branch is based on -rc3. But again, up to you. I put those two patches on a local branch:
94b34bc04c25 ("sysfs: Rename struct bin_attribute member to f_mapping") 97e9dada53f1 ("sysfs: Invoke iomem_get_mapping() from the sysfs open callback")
in case that seems better to you.
Quoted 51 lines · Krzysztof Wilczyński
Quoted 12 lines
Two legacy PCI sysfs objects "
legacy_io" and "legacy_mem" were updated to use an unified address space in the commit636b21b50152("PCI: Revoke mappings like devmem"). This allows for revocations to be managed from a single place when drivers want to take over andmmap()a/dev/memrange.Following the update, both of the sysfs objects should leverage the
iomem_get_mapping()function to get an appropriate address range, but only the "legacy_io" has been correctly updated - the second attribute seems to be using a wrong variable to pass theiomem_get_mapping()function to.Quoted 5 lines
Thus, correct the variable name used so that the "
legacy_mem" sysfs object would also correctly call theiomem_get_mapping()function.Fixes 636b21b50152 ("PCI: Revoke mappings like devmem")Signed-off-by Krzysztof Wilczyński <[email protected]>Acked-by Bjorn Helgaas <[email protected]>Ouch. This needs to be applied to any -stable trees that contain
636b21b50152, which was merged in v5.12.It *also* needs to be applied with the obvious updates to Greg's sysfs_defferred_iomem_get_mapping-5.15 branch because it was changed by
f06aff924f97("sysfs: Rename structbin_attributemember tof_mapping") [1][1] https://git.kernel.org/cgit/linux/kernel/git/gregkh/driver-core.git/commit/?id=f06aff924f97
Quoted 20 lines
--- drivers/pci/pci-sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pci/pci-sysfs.c +1
-1@@ -978,7 +978,7 @@ void pci_create_legacy_files(struct pci_bus *b) b->legacy_mem->size =1024 *1024 ; b->legacy_mem->attr.mode =0600 ; b->legacy_mem->mmap = pci_mmap_legacy_mem; - b->legacy_io->mapping =iomem_get_mapping (); + b->legacy_mem->mapping =iomem_get_mapping ();pci_adjust_legacy_attr (b, pci_mmap_mem); error =device_create_bin_file (&b->dev, b->legacy_mem);if (error)Signature · 1 line
2.32.0
Greg Kroah-Hartman
maintainerQuoted 8 lines · Bjorn Helgaas
Quoted 1 line · Bjorn Helgaas
[+to Greg, please update sysfs_defferred_iomem_get_mapping-5.15]
Actually, Greg, totally up to you, but if nobody else is depending on the sysfs_defferred_iomem_get_mapping-5.15 branch, another possibility would be for you to drop that branch and for me to merge the two patches on it + Krzysztof's fix below + (hopefully) Krzysztof's PCI static attribute work.
I can not "drop" the branch as it is already merged into my driver-core-next branch that I can not rebase. I could revert it, but is that really needed?
Quoted 8 lines
That would make my v5.15 pull request easier because I simple-mindedly base all my branches on -rc1 while your branch is based on -rc3. But again, up to you. I put those two patches on a local branch:
94b34bc04c25("sysfs: Rename structbin_attributemember tof_mapping")97e9dada53f1("sysfs: Invokeiomem_get_mapping()from the sysfs open callback")in case that seems better to you.
I do not see what I can do with that here as it's already in my tree :(
confused,
greg k-h
Quoted 10 lines · Greg Kroah-Hartman
Quoted 8 lines · Bjorn Helgaas
Quoted 1 line · Bjorn Helgaas
[+to Greg, please update sysfs_defferred_iomem_get_mapping-5.15]
Actually, Greg, totally up to you, but if nobody else is depending on the sysfs_defferred_iomem_get_mapping-5.15 branch, another possibility would be for you to drop that branch and for me to merge the two patches on it + Krzysztof's fix below + (hopefully) Krzysztof's PCI static attribute work.
Quoted 3 lines
I can not "drop" the branch as it is already merged into my driver-core-next branch that I can not rebase. I could revert it, but is that really needed?
Nope, I don't think a revert is warranted. I'll take care of getting Krzysztof's fix into v5.15.
Bjorn
Greg Kroah-Hartman
maintainerQuoted 11 lines · Bjorn Helgaas
Quoted 10 lines · Greg Kroah-Hartman
Quoted 8 lines · Bjorn Helgaas
Quoted 1 line · Bjorn Helgaas
[+to Greg, please update sysfs_defferred_iomem_get_mapping-5.15]
Actually, Greg, totally up to you, but if nobody else is depending on the sysfs_defferred_iomem_get_mapping-5.15 branch, another possibility would be for you to drop that branch and for me to merge the two patches on it + Krzysztof's fix below + (hopefully) Krzysztof's PCI static attribute work.
Quoted 6 lines
Quoted 3 lines
I can not "drop" the branch as it is already merged into my driver-core-next branch that I can not rebase. I could revert it, but is that really needed?
Nope, I don't think a revert is warranted. I'll take care of getting Krzysztof's fix into v5.15.
Thanks, I'll handle the merge issues after that happens in my tree.
greg k-h
Quoted 19 lines · Bjorn Helgaas
[+to Greg, please update sysfs_defferred_iomem_get_mapping-5.15]
Quoted 15 lines · Krzysztof Wilczyński
Two legacy PCI sysfs objects "
legacy_io" and "legacy_mem" were updated to use an unified address space in the commit636b21b50152("PCI: Revoke mappings like devmem"). This allows for revocations to be managed from a single place when drivers want to take over andmmap()a/dev/memrange.Following the update, both of the sysfs objects should leverage the
iomem_get_mapping()function to get an appropriate address range, but only the "legacy_io" has been correctly updated - the second attribute seems to be using a wrong variable to pass theiomem_get_mapping()function to.Thus, correct the variable name used so that the "
legacy_mem" sysfs object would also correctly call theiomem_get_mapping()function.
Quoted 7 lines
Quoted 2 lines
Fixes 636b21b50152 ("PCI: Revoke mappings like devmem")Signed-off-by Krzysztof Wilczyński <[email protected]>Acked-by Bjorn Helgaas <[email protected]>Ouch. This needs to be applied to any -stable trees that contain
636b21b50152, which was merged in v5.12.
Ouch indeed. Reviewed-by: Daniel Vetter <[email protected]>
Quoted 28 lines
It *also* needs to be applied with the obvious updates to Greg's sysfs_defferred_iomem_get_mapping-5.15 branch because it was changed by
f06aff924f97("sysfs: Rename structbin_attributemember tof_mapping") [1][1] https://git.kernel.org/cgit/linux/kernel/git/gregkh/driver-core.git/commit/?id=f06aff924f97
Quoted 20 lines
--- drivers/pci/pci-sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pci/pci-sysfs.c +1
-2@@ -978,7 +978,7 @@ void pci_create_legacy_files(struct pci_bus *b) b->legacy_mem->size =1024 *1024 ; b->legacy_mem->attr.mode =0600 ; b->legacy_mem->mmap = pci_mmap_legacy_mem; - b->legacy_io->mapping =iomem_get_mapping (); + b->legacy_mem->mapping =iomem_get_mapping ();pci_adjust_legacy_attr (b, pci_mmap_mem); error =device_create_bin_file (&b->dev, b->legacy_mem);if (error) --2.32.0
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Bjorn Helgaas
AppliedQuoted 12 lines · Krzysztof Wilczyński
Two legacy PCI sysfs objects "
legacy_io" and "legacy_mem" were updated to use an unified address space in the commit636b21b50152("PCI: Revoke mappings like devmem"). This allows for revocations to be managed from a single place when drivers want to take over andmmap()a/dev/memrange.Following the update, both of the sysfs objects should leverage the
iomem_get_mapping()function to get an appropriate address range, but only the "legacy_io" has been correctly updated - the second attribute seems to be using a wrong variable to pass theiomem_get_mapping()function to.
Quoted 5 lines
Thus, correct the variable name used so that the "
legacy_mem" sysfs object would also correctly call theiomem_get_mapping()function.Fixes 636b21b50152 ("PCI: Revoke mappings like devmem")Signed-off-by Krzysztof Wilczyński <[email protected]>
Applied to for-linus for v5.14, thanks!
Quoted 20 lines
--- drivers/pci/pci-sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pci/pci-sysfs.c +1
-1@@ -978,7 +978,7 @@ void pci_create_legacy_files(struct pci_bus *b) b->legacy_mem->size =1024 *1024 ; b->legacy_mem->attr.mode =0600 ; b->legacy_mem->mmap = pci_mmap_legacy_mem; - b->legacy_io->mapping =iomem_get_mapping (); + b->legacy_mem->mapping =iomem_get_mapping ();pci_adjust_legacy_attr (b, pci_mmap_mem); error =device_create_bin_file (&b->dev, b->legacy_mem);if (error)Signature · 1 line
2.32.0