Commit 5dd2020f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-6.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:

 - Finish a refactor of pgprot_framebuffer() which dependend
   on some changes that were merged via the drm tree

 - Fix some kernel-doc warnings to quieten the bots

Thanks to Nathan Lynch and Thomas Zimmermann.

* tag 'powerpc-6.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/rtas: Fix ppc_rtas_rmo_buf_show() kernel-doc
  powerpc/pseries/rtas-work-area: Fix rtas_work_area_reserve_arena() kernel-doc
  powerpc/fb: Call internal __phys_mem_access_prot() in fbdev code
  powerpc: Remove file parameter from phys_mem_access_prot()
  powerpc/machdep: Remove trailing whitespaces
parents 1b907d05 644b6025

arch/powerpc/include/asm/fb.h

+1 −6
Original line number Diff line number Diff line
@@ -8,12 +8,7 @@ static inline pgprot_t pgprot_framebuffer(pgprot_t prot, 
					  unsigned long vm_start, unsigned long vm_end,

					  unsigned long offset)

{

	/*

	 * PowerPC's implementation of phys_mem_access_prot() does

	 * not use the file argument. Set it to NULL in preparation

	 * of later updates to the interface.

	 */

	return phys_mem_access_prot(NULL, PHYS_PFN(offset), vm_end - vm_start, prot);

	return __phys_mem_access_prot(PHYS_PFN(offset), vm_end - vm_start, prot);

}

#define pgprot_framebuffer pgprot_framebuffer

arch/powerpc/include/asm/machdep.h

+6 −7
Original line number Diff line number Diff line
@@ -106,8 +106,7 @@ struct machdep_calls { 
	int		(*pci_get_legacy_ide_irq)(struct pci_dev *dev, int channel);



	/* Get access protection for /dev/mem */

	pgprot_t	(*phys_mem_access_prot)(struct file *file,

						unsigned long pfn,

	pgprot_t	(*phys_mem_access_prot)(unsigned long pfn,

						unsigned long size,

						pgprot_t vma_prot);

arch/powerpc/include/asm/pci.h

+1 −3
Original line number Diff line number Diff line
@@ -105,9 +105,7 @@ extern void of_scan_pci_bridge(struct pci_dev *dev); 
extern void of_scan_bus(struct device_node *node, struct pci_bus *bus);

extern void of_rescan_bus(struct device_node *node, struct pci_bus *bus);



struct file;

extern pgprot_t	pci_phys_mem_access_prot(struct file *file,

					 unsigned long pfn,

extern pgprot_t	pci_phys_mem_access_prot(unsigned long pfn,

					 unsigned long size,

					 pgprot_t prot);

arch/powerpc/include/asm/pgtable.h

+8 −2
Original line number Diff line number Diff line
@@ -120,9 +120,15 @@ static inline void mark_initmem_nx(void) { } 
int ptep_set_access_flags(struct vm_area_struct *vma, unsigned long address,

			  pte_t *ptep, pte_t entry, int dirty);



pgprot_t __phys_mem_access_prot(unsigned long pfn, unsigned long size,

				pgprot_t vma_prot);



struct file;

pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,

			      unsigned long size, pgprot_t vma_prot);

static inline pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,

					    unsigned long size, pgprot_t vma_prot)

{

	return __phys_mem_access_prot(pfn, size, vma_prot);

}

#define __HAVE_PHYS_MEM_ACCESS_PROT



void __update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t *ptep);

arch/powerpc/kernel/pci-common.c

+1 −2
Original line number Diff line number Diff line
@@ -521,8 +521,7 @@ int pci_iobar_pfn(struct pci_dev *pdev, int bar, struct vm_area_struct *vma) 
 * PCI device, it tries to find the PCI device first and calls the

 * above routine

 */

pgprot_t pci_phys_mem_access_prot(struct file *file,

				  unsigned long pfn,

pgprot_t pci_phys_mem_access_prot(unsigned long pfn,

				  unsigned long size,

				  pgprot_t prot)

{