sparc: move MSI related definitions to where they are used
PATCH 1/2 sparc: move MSI related definitions to where they are used
The definitions in arch/sparc/include/asm/msi.h are only used in arch/sparc/mm/srmmu.c, so it makes sense to have them in the C file directly.
In addition, having a custom arch/sparc/include/asm/msi.h prevents from using the asm-generic version of this header, which is necessary to be able to include <linux/msi.h> when CONFIG_GENERIC_MSI_IRQ_DOMAIN is enabled.
--- arch/sparc/include/asm/msi.h | 32 -------------------------------- arch/sparc/mm/srmmu.c | 20 +++++++++++++++++++- 2 files changed, 19 insertions(+), 33 deletions(-) delete mode 100644 arch/sparc/include/asm/msi.h
arch/sparc/include/asm/msi.h deleted +0 -32
@@ -1,32 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* msi.h: Defines specific to the MBus - Sbus - Interface. -* -* Copyright (C) 1996 David S. Miller ([email protected]) -* Copyright (C) 1996 Eddie C. Dost ([email protected]) -*/ - -#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/mm/srmmu.c +19 -1
@@ -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 */
Signature · 1 line
2.14.4
PATCH 2/2 sparc: use asm-generic version of msi.h
This is necessary to be able to include <linux/msi.h> when CONFIG_GENERIC_MSI_IRQ_DOMAIN is enabled. Without this, a build with CONFIG_GENERIC_MSI_IRQ_DOMAIN fails with:
In file included from drivers//ata/ahci.c:45:0:
Quoted 1 line
Quoted 1 line
include/linux/msi.h:226:10: error: unknown type name 'msi_alloc_info_t'; did you mean 'sg_alloc_fn'?
msi_alloc_info_t *arg);
^~~~~~~~~~~~~~~~
sg_alloc_fn
include/linux/msi.h:230:9: error: unknown type name 'msi_alloc_info_t'; did you mean 'sg_alloc_fn'?
msi_alloc_info_t *arg);
^~~~~~~~~~~~~~~~
sg_alloc_fn
include/linux/msi.h:239:12: error: unknown type name 'msi_alloc_info_t'; did you mean 'sg_alloc_fn'?
msi_alloc_info_t *arg);
^~~~~~~~~~~~~~~~
sg_alloc_fn
include/linux/msi.h:240:22: error: unknown type name 'msi_alloc_info_t'; did you mean 'sg_alloc_fn'?
void (*msi_finish)(msi_alloc_info_t *arg, int retval);
^~~~~~~~~~~~~~~~
sg_alloc_fn
include/linux/msi.h:241:20: error: unknown type name 'msi_alloc_info_t'; did you mean 'sg_alloc_fn'?
void (*set_desc)(msi_alloc_info_t *arg,
^~~~~~~~~~~~~~~~
sg_alloc_fn
include/linux/msi.h:316:18: error: unknown type name 'msi_alloc_info_t'; did you mean 'sg_alloc_fn'?
int nvec, msi_alloc_info_t *args);
^~~~~~~~~~~~~~~~
sg_alloc_fn
include/linux/msi.h:318:29: error: unknown type name 'msi_alloc_info_t'; did you mean 'sg_alloc_fn'?
int virq, int nvec, msi_alloc_info_t *args);
^~~~~~~~~~~~~~~~
sg_alloc_fn--- arch/sparc/include/asm/Kbuild | 1 + 1 file changed, 1 insertion(+)
arch/sparc/include/asm/Kbuild +1 -0
@@ -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
Signature · 1 line
2.14.4
Re: [PATCH 2/2] sparc: use asm-generic version of msi.h
From: Thomas Petazzoni <[email protected]>
Date: Tue, 24 Jul 2018 13:53:05 +0200
Quoted 3 lines
This is necessary to be able to include <
linux/msi.h> whenCONFIG_GENERIC_MSI_IRQ_DOMAINis enabled. Without this, a build withCONFIG_GENERIC_MSI_IRQ_DOMAINfails with:
...
Quoted 1 line
Signed-off-by Thomas Petazzoni <[email protected]>
Applied.
Hi Thomas.
One nitpick below.
But other than that this is a nice cleanup:
Quoted 3 lines
+/*
+ * Locations of MSI Registers.
+ */
The SPARC way to format comments follows netdev style. So put it all in one line and everyone are happy:
/* Locations of MSI Registers. */
arch/sparc/mm/srmmu.c static inline void srmmu_ctxd_set(ctxd_t *ctxp, pgd_t *pgdp) · line 125
Quoted 5 lines
arch/sparc/mm/srmmu.c +5
-0+#define MSI_MBUS_ARBEN 0xe0001008/* MBus Arbiter Enable register */ + +/* +* Useful bits in the MSI Registers. +*/
Likewise
Sam
Hello,
Thanks for the review.
Quoted 9 lines · Sam Ravnborg
One nitpick below.
But other than that this is a nice cleanup:Acked-by Sam Ravnborg <[email protected]>Quoted 3 lines
+/*
+ * Locations of MSI Registers.
+ */The SPARC way to format comments follows netdev style. So put it all in one line and everyone are happy:
Well, the code is being moved from arch/sparc to arch/sparc, so apparently, it was already non-compliant to this specific coding style rule. Should the comments be made compliant as part of the same commit, or a separate one ?
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
Hi Thomas.
Quoted 8 lines
Quoted 3 lines
The SPARC way to format comments follows netdev style. So put it all in one line and everyone are happy:
Well, the code is being moved from
arch/sparctoarch/sparc, so apparently, it was already non-compliant to this specific coding style rule. Should the comments be made compliant as part of the same commit, or a separate one ?
Same commit, no reason to slit this in two.
So post a v2, then everyone should be happy.
I also looked at the second patch which looked obviously correct. Feel free to add my Ack on both.
Sam
From: Thomas Petazzoni <[email protected]>
Date: Tue, 24 Jul 2018 13:53:04 +0200
Quoted 10 lines
The definitions in
arch/sparc/include/asm/msi.hare only used inarch/sparc/mm/srmmu.c, so it makes sense to have them in the C file directly.In addition, having a custom
arch/sparc/include/asm/msi.hprevents from using the asm-generic version of this header, which is necessary to be able to include <linux/msi.h> whenCONFIG_GENERIC_MSI_IRQ_DOMAINis enabled.Signed-off-by Thomas Petazzoni <[email protected]>
Applied.