Commit 96ba6c6e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'sysfs_defferred_iomem_get_mapping-5.15' of... 

Merge tag 'sysfs_defferred_iomem_get_mapping-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core driver-core-next

sysfs: Allow deferred execution of iomem_get_mapping()

Tag for toerh trees/branches to pull from in order to have a stable base
to build off of for the "Allow deferred execution of
iomem_get_mapping()" set of sysfs changes

Link: https://lore.kernel.org/r/20210729233235.1508920-1-kw@linux.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

* tag 'sysfs_defferred_iomem_get_mapping-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  sysfs: Rename struct bin_attribute member to f_mapping
  sysfs: Invoke iomem_get_mapping() from the sysfs open callback
parents 112cedc8 f06aff92

drivers/pci/pci-sysfs.c

+3 −3
Original line number Diff line number Diff line
@@ -965,7 +965,7 @@ void pci_create_legacy_files(struct pci_bus *b) 
	b->legacy_io->read = pci_read_legacy_io;

	b->legacy_io->write = pci_write_legacy_io;

	b->legacy_io->mmap = pci_mmap_legacy_io;

	b->legacy_io->mapping = iomem_get_mapping();

	b->legacy_io->f_mapping = iomem_get_mapping;

	pci_adjust_legacy_attr(b, pci_mmap_io);

	error = device_create_bin_file(&b->dev, b->legacy_io);

	if (error)
@@ -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_io->f_mapping = iomem_get_mapping;

	pci_adjust_legacy_attr(b, pci_mmap_mem);

	error = device_create_bin_file(&b->dev, b->legacy_mem);

	if (error)
@@ -1195,7 +1195,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine) 
		}

	}

	if (res_attr->mmap)

		res_attr->mapping = iomem_get_mapping();

		res_attr->f_mapping = iomem_get_mapping;

	res_attr->attr.name = res_attr_name;

	res_attr->attr.mode = 0600;

	res_attr->size = pci_resource_len(pdev, num);

fs/sysfs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -174,8 +174,8 @@ static int sysfs_kf_bin_open(struct kernfs_open_file *of) 
{

	struct bin_attribute *battr = of->kn->priv;



	if (battr->mapping)

		of->file->f_mapping = battr->mapping;

	if (battr->f_mapping)

		of->file->f_mapping = battr->f_mapping();



	return 0;

}

include/linux/sysfs.h

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ struct bin_attribute { 
	struct attribute	attr;

	size_t			size;

	void			*private;

	struct address_space	*mapping;

	struct address_space *(*f_mapping)(void);

	ssize_t (*read)(struct file *, struct kobject *, struct bin_attribute *,

			char *, loff_t, size_t);

	ssize_t (*write)(struct file *, struct kobject *, struct bin_attribute *,