Commit 342d9653 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull parisc architecture updates and fixes from Helge Deller:
 "Fixes for the IPv4 and IPv6 checksum functions, a fix for the 64-bit
  unaligned memory exception handler and various code cleanups.

  Most of the patches are tagged for stable series.

   - Fix inline assembly in ipv4 and ipv6 checksum functions (Guenter
     Roeck)

   - Rewrite 64-bit inline assembly of emulate_ldd() (Guenter Roeck)

   - Do not clobber carry/borrow bits in tophys and tovirt macros (John
     David Anglin)

   - Warn when kernel accesses unaligned memory"

* tag 'parisc-for-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: led: Convert to platform remove callback returning void
  parisc: Strip upper 32 bit of sum in csum_ipv6_magic for 64-bit builds
  parisc: Fix csum_ipv6_magic on 64-bit systems
  parisc: Fix csum_ipv6_magic on 32-bit systems
  parisc: Fix ip_fast_csum
  parisc: Avoid clobbering the C/B bits in the PSW with tophys and tovirt macros
  parisc/unaligned: Rewrite 64-bit inline assembly of emulate_ldd()
  parisc: make parisc_bus_type const
  parisc: avoid c23 'nullptr' idenitifier
  parisc: Show kernel unaligned memory accesses
  parisc: Use irq_enter_rcu() to fix warning at kernel/context_tracking.c:367
parents c1f10ac8 26dd4878

arch/parisc/include/asm/assembly.h

+10 −8
Original line number Diff line number Diff line
@@ -97,26 +97,28 @@ 
	 * version takes two arguments: a src and destination register.

	 * However, the source and destination registers can not be

	 * the same register.

	 *

	 * We use add,l to avoid clobbering the C/B bits in the PSW.

	 */



	.macro  tophys  grvirt, grphys

	ldil    L%(__PAGE_OFFSET), \grphys

	sub     \grvirt, \grphys, \grphys

	ldil    L%(-__PAGE_OFFSET), \grphys

	addl    \grvirt, \grphys, \grphys

	.endm



	.macro  tovirt  grphys, grvirt

	ldil    L%(__PAGE_OFFSET), \grvirt

	add     \grphys, \grvirt, \grvirt

	addl    \grphys, \grvirt, \grvirt

	.endm



	.macro  tophys_r1  gr

	ldil    L%(__PAGE_OFFSET), %r1

	sub     \gr, %r1, \gr

	ldil    L%(-__PAGE_OFFSET), %r1

	addl    \gr, %r1, \gr

	.endm



	.macro  tovirt_r1  gr

	ldil    L%(__PAGE_OFFSET), %r1

	add     \gr, %r1, \gr

	addl    \gr, %r1, \gr

	.endm



	.macro delay value

arch/parisc/include/asm/checksum.h

+6 −4
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl) 
"	addc		%0, %5, %0\n"

"	addc		%0, %3, %0\n"

"1:	ldws,ma		4(%1), %3\n"

"	addib,<		0, %2, 1b\n"

"	addib,>		-1, %2, 1b\n"

"	addc		%0, %3, %0\n"

"\n"

"	extru		%0, 31, 16, %4\n"
@@ -126,6 +126,7 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, 
	** Try to keep 4 registers with "live" values ahead of the ALU.

	*/



"	depdi		0, 31, 32, %0\n"/* clear upper half of incoming checksum */

"	ldd,ma		8(%1), %4\n"	/* get 1st saddr word */

"	ldd,ma		8(%2), %5\n"	/* get 1st daddr word */

"	add		%4, %0, %0\n"
@@ -137,8 +138,8 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, 
"	add,dc		%3, %0, %0\n"  /* fold in proto+len | carry bit */

"	extrd,u		%0, 31, 32, %4\n"/* copy upper half down */

"	depdi		0, 31, 32, %0\n"/* clear upper half */

"	add		%4, %0, %0\n"	/* fold into 32-bits */

"	addc		0, %0, %0\n"	/* add carry */

"	add,dc		%4, %0, %0\n"	/* fold into 32-bits, plus carry */

"	addc		0, %0, %0\n"	/* add final carry */



#else
@@ -163,7 +164,8 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, 
"	ldw,ma		4(%2), %7\n"	/* 4th daddr */

"	addc		%6, %0, %0\n"

"	addc		%7, %0, %0\n"

"	addc		%3, %0, %0\n"	/* fold in proto+len, catch carry */

"	addc		%3, %0, %0\n"	/* fold in proto+len */

"	addc		0, %0, %0\n"	/* add carry */



#endif

	: "=r" (sum), "=r" (saddr), "=r" (daddr), "=r" (len),

arch/parisc/include/asm/parisc-device.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ parisc_get_drvdata(struct parisc_device *d) 
	return dev_get_drvdata(&d->dev);

}



extern struct bus_type parisc_bus_type;

extern const struct bus_type parisc_bus_type;



int iosapic_serial_irq(struct parisc_device *dev);

arch/parisc/kernel/drivers.c

+1 −1
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ static struct attribute *parisc_device_attrs[] = { 
};

ATTRIBUTE_GROUPS(parisc_device);



struct bus_type parisc_bus_type = {

const struct bus_type parisc_bus_type = {

	.name = "parisc",

	.match = parisc_generic_match,

	.uevent = parisc_uevent,

arch/parisc/kernel/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ asmlinkage void do_cpu_irq_mask(struct pt_regs *regs) 


	old_regs = set_irq_regs(regs);

	local_irq_disable();

	irq_enter();

	irq_enter_rcu();



	eirr_val = mfctl(23) & cpu_eiem & per_cpu(local_ack_eiem, cpu);

	if (!eirr_val)
@@ -533,7 +533,7 @@ asmlinkage void do_cpu_irq_mask(struct pt_regs *regs) 
#endif /* CONFIG_IRQSTACKS */



 out:

	irq_exit();

	irq_exit_rcu();

	set_irq_regs(old_regs);

	return;