Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5723b4a3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc fixes from David Miller:
 "Some small __init annotation and build fixes from Stephen Rostedt and
  Thomas Petazzoni"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: use asm-generic version of msi.h
  sparc: move MSI related definitions to where they are used
  sparc/time: Add missing __init to init_tick_ops()
parents d5125847 12be1036

arch/sparc/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ generic-y += local64.h 
generic-y += mcs_spinlock.h

generic-y += mm-arch-hooks.h

generic-y += module.h

generic-y += msi.h

generic-y += preempt.h

generic-y += rwsem.h

generic-y += serial.h

arch/sparc/include/asm/msi.h

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

/*

 * msi.h:  Defines specific to the MBus - Sbus - Interface.

 *

 * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)

 * Copyright (C) 1996 Eddie C. Dost   (ecd@skynet.be)

 */



#ifndef _SPARC_MSI_H

#define _SPARC_MSI_H



/*

 * Locations of MSI Registers.

 */

#define MSI_MBUS_ARBEN	0xe0001008	/* MBus Arbiter Enable register */



/*

 * Useful bits in the MSI Registers.

 */

#define MSI_ASYNC_MODE  0x80000000	/* Operate the MSI asynchronously */





static inline void msi_set_sync(void)

{

	__asm__ __volatile__ ("lda [%0] %1, %%g3\n\t"

			      "andn %%g3, %2, %%g3\n\t"

			      "sta %%g3, [%0] %1\n\t" : :

			      "r" (MSI_MBUS_ARBEN),

			      "i" (ASI_M_CTL), "r" (MSI_ASYNC_MODE) : "g3");

}



#endif /* !(_SPARC_MSI_H) */

arch/sparc/kernel/time_64.c

+1 −1
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ static void __init get_tick_patch(void) 
	}

}



static void init_tick_ops(struct sparc64_tick_ops *ops)

static void __init init_tick_ops(struct sparc64_tick_ops *ops)

{

	unsigned long freq, quotient, tick;

arch/sparc/mm/srmmu.c

+19 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include <asm/mbus.h>

#include <asm/page.h>

#include <asm/asi.h>

#include <asm/msi.h>

#include <asm/smp.h>

#include <asm/io.h>
@@ -116,6 +115,25 @@ static inline void srmmu_ctxd_set(ctxd_t *ctxp, pgd_t *pgdp) 
	set_pte((pte_t *)ctxp, pte);

}



/*

 * Locations of MSI Registers.

 */

#define MSI_MBUS_ARBEN	0xe0001008	/* MBus Arbiter Enable register */



/*

 * Useful bits in the MSI Registers.

 */

#define MSI_ASYNC_MODE  0x80000000	/* Operate the MSI asynchronously */



static void msi_set_sync(void)

{

	__asm__ __volatile__ ("lda [%0] %1, %%g3\n\t"

			      "andn %%g3, %2, %%g3\n\t"

			      "sta %%g3, [%0] %1\n\t" : :

			      "r" (MSI_MBUS_ARBEN),

			      "i" (ASI_M_CTL), "r" (MSI_ASYNC_MODE) : "g3");

}



void pmd_set(pmd_t *pmdp, pte_t *ptep)

{

	unsigned long ptp;	/* Physical address, shifted right by 4 */