Commit 847165d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'parisc-for-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc architecture fixes from Helge Deller:

 - fix reference to exported symbols for parisc64 [Masahiro Yamada]

 - Block-TLB (BTLB) support on 32-bit CPUs

 - sparse and build-warning fixes

* tag 'parisc-for-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  linux/export: fix reference to exported functions for parisc64
  parisc: BTLB: Initialize BTLB tables at CPU startup
  parisc: firmware: Simplify calling non-PA20 functions
  parisc: BTLB: _edata symbol has to be page aligned for BTLB support
  parisc: BTLB: Add BTLB insert and purge firmware function wrappers
  parisc: BTLB: Clear possibly existing BTLB entries
  parisc: Prepare for Block-TLB support on 32-bit kernel
  parisc: shmparam.h: Document aliasing requirements of PA-RISC
  parisc: irq: Make irq_stack_union static to avoid sparse warning
  parisc: drivers: Fix sparse warning
  parisc: iosapic.c: Fix sparse warnings
  parisc: ccio-dma: Fix sparse warnings
  parisc: sba-iommu: Fix sparse warnigs
  parisc: sba: Fix compile warning wrt list of SBA devices
  parisc: sba_iommu: Fix build warning if procfs if disabled
parents 99214f67 08700ec7

arch/parisc/include/asm/cache.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ extern int split_tlb; 
extern int dcache_stride;

extern int icache_stride;

extern struct pdc_cache_info cache_info;

extern struct pdc_btlb_info btlb_info;

void parisc_setup_cache_timing(void);



#define pdtlb(sr, addr)	asm volatile("pdtlb 0(%%sr%0,%1)" \

arch/parisc/include/asm/mckinley.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef ASM_PARISC_MCKINLEY_H

#define ASM_PARISC_MCKINLEY_H



/* declared in arch/parisc/kernel/setup.c */

extern struct proc_dir_entry * proc_mckinley_root;



#endif /*ASM_PARISC_MCKINLEY_H*/

arch/parisc/include/asm/pdc.h

+3 −2
Original line number Diff line number Diff line
@@ -44,10 +44,11 @@ int pdc_model_capabilities(unsigned long *capabilities); 
int pdc_model_platform_info(char *orig_prod_num, char *current_prod_num, char *serial_no);

int pdc_cache_info(struct pdc_cache_info *cache);

int pdc_spaceid_bits(unsigned long *space_bits);

#ifndef CONFIG_PA20

int pdc_btlb_info(struct pdc_btlb_info *btlb);

int pdc_btlb_insert(unsigned long long vpage, unsigned long physpage, unsigned long len,

                    unsigned long entry_info, unsigned long slot);

int pdc_btlb_purge_all(void);

int pdc_mem_map_hpa(struct pdc_memory_map *r_addr, struct pdc_module_path *mod_path);

#endif /* !CONFIG_PA20 */

int pdc_pim_toc11(struct pdc_toc_pim_11 *ret);

int pdc_pim_toc20(struct pdc_toc_pim_20 *ret);

int pdc_lan_station_id(char *lan_addr, unsigned long net_hpa);

arch/parisc/include/asm/processor.h

+1 −0
Original line number Diff line number Diff line
@@ -310,6 +310,7 @@ extern void do_syscall_trace_exit(struct pt_regs *); 
struct seq_file;

extern void early_trap_init(void);

extern void collect_boot_cpu_data(void);

extern void btlb_init_per_cpu(void);

extern int show_cpuinfo (struct seq_file *m, void *v);



/* driver code in driver/parisc */

arch/parisc/include/asm/ropes.h

+5 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
struct ioc {

	void __iomem	*ioc_hpa;	/* I/O MMU base address */

	char		*res_map;	/* resource map, bit == pdir entry */

	u64		*pdir_base;	/* physical base address */

	__le64		*pdir_base;	/* physical base address */

	unsigned long	ibase;		/* pdir IOV Space base - shared w/lba_pci */

	unsigned long	imask;		/* pdir IOV Space mask - shared w/lba_pci */

#ifdef ZX1_SUPPORT
@@ -86,6 +86,9 @@ struct sba_device { 
	struct ioc		ioc[MAX_IOC];

};



/* list of SBA's in system, see drivers/parisc/sba_iommu.c */

extern struct sba_device *sba_list;



#define ASTRO_RUNWAY_PORT	0x582

#define IKE_MERCED_PORT		0x803

#define REO_MERCED_PORT		0x804
@@ -110,7 +113,7 @@ static inline int IS_PLUTO(struct parisc_device *d) { 


#define SBA_PDIR_VALID_BIT	0x8000000000000000ULL



#define SBA_AGPGART_COOKIE	0x0000badbadc0ffeeULL

#define SBA_AGPGART_COOKIE	(__force __le64) 0x0000badbadc0ffeeULL



#define SBA_FUNC_ID	0x0000	/* function id */

#define SBA_FCLASS	0x0008	/* function class, bist, header, rev... */