Skip to content

L
linux
Commit d6742212 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'mips_5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS updates from Thomas Bogendoerfer:

 - converted Pistachio platform to use MIPS generic kernel

 - fixes and cleanups

* tag 'mips_5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (29 commits)
  MIPS: Malta: fix alignment of the devicetree buffer
  MIPS: ingenic: Unconditionally enable clock of CPU #0
  MIPS: mscc: ocelot: mark the phy-mode for internal PHY ports
  MIPS: mscc: ocelot: disable all switch ports by default
  MAINTAINERS: adjust PISTACHIO SOC SUPPORT after its retirement
  MIPS: Return true/false (not 1/0) from bool functions
  MIPS: generic: Return true/false (not 1/0) from bool functions
  MIPS: Make a alias for pistachio_defconfig
  MIPS: Retire MACH_PISTACHIO
  MIPS: config: generic: Add config for Marduk board
  pinctrl: pistachio: Make it as an option
  phy: pistachio-usb: Depend on MIPS || COMPILE_TEST
  clocksource/drivers/pistachio: Make it selectable for MIPS
  clk: pistachio: Make it selectable for generic MIPS kernel
  MIPS: DTS: Pistachio add missing cpc and cdmm
  MIPS: generic: Allow generating FIT image for Marduk board
  MIPS: locking/atomic: Fix atomic{_64,}_sub_if_positive
  MIPS: loongson2ef: don't build serial.o unconditionally
  MIPS: Replace deprecated CPU-hotplug functions.
  MIPS: Alchemy: Fix spelling contraction "cant" -> "can't"
  ...
parents 603eefda bea6a94a
Hide whitespace changes
Inline Side-by-side
Showing with 346 additions and 783 deletions
MAINTAINERS
View file @ d6742212
...@@ -11120,7 +11120,7 @@ MARDUK (CREATOR CI40) DEVICE TREE SUPPORT ...@@ -11120,7 +11120,7 @@ MARDUK (CREATOR CI40) DEVICE TREE SUPPORT
M: Rahul Bedarkar <rahulbedarkar89@gmail.com> M: Rahul Bedarkar <rahulbedarkar89@gmail.com>
L: linux-mips@vger.kernel.org L: linux-mips@vger.kernel.org
S: Maintained S: Maintained
F: arch/mips/boot/dts/img/pistachio_marduk.dts F: arch/mips/boot/dts/img/pistachio*
MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER
M: Andrew Lunn <andrew@lunn.ch> M: Andrew Lunn <andrew@lunn.ch>
...@@ -14824,14 +14824,6 @@ S: Maintained ...@@ -14824,14 +14824,6 @@ S: Maintained
W: http://www.st.com/spear W: http://www.st.com/spear
F: drivers/pinctrl/spear/ F: drivers/pinctrl/spear/
PISTACHIO SOC SUPPORT
M: James Hartley <james.hartley@sondrel.com>
L: linux-mips@vger.kernel.org
S: Odd Fixes
F: arch/mips/boot/dts/img/pistachio*
F: arch/mips/configs/pistachio*_defconfig
F: arch/mips/pistachio/
PKTCDVD DRIVER PKTCDVD DRIVER
M: linux-block@vger.kernel.org M: linux-block@vger.kernel.org
S: Orphan S: Orphan
......
arch/mips/Kbuild.platforms
View file @ d6742212
...@@ -21,7 +21,6 @@ platform-$(CONFIG_MIPS_MALTA) += mti-malta/ ...@@ -21,7 +21,6 @@ platform-$(CONFIG_MIPS_MALTA) += mti-malta/
platform-$(CONFIG_MACH_NINTENDO64) += n64/ platform-$(CONFIG_MACH_NINTENDO64) += n64/
platform-$(CONFIG_NLM_COMMON) += netlogic/ platform-$(CONFIG_NLM_COMMON) += netlogic/
platform-$(CONFIG_PIC32MZDA) += pic32/ platform-$(CONFIG_PIC32MZDA) += pic32/
platform-$(CONFIG_MACH_PISTACHIO) += pistachio/
platform-$(CONFIG_RALINK) += ralink/ platform-$(CONFIG_RALINK) += ralink/
platform-$(CONFIG_MIKROTIK_RB532) += rb532/ platform-$(CONFIG_MIKROTIK_RB532) += rb532/
platform-$(CONFIG_SGI_IP22) += sgi-ip22/ platform-$(CONFIG_SGI_IP22) += sgi-ip22/
......
arch/mips/Kconfig
View file @ d6742212
...@@ -514,35 +514,6 @@ config MACH_LOONGSON64 ...@@ -514,35 +514,6 @@ config MACH_LOONGSON64
and Loongson-2F which will be removed), developed by the Institute and Loongson-2F which will be removed), developed by the Institute
of Computing Technology (ICT), Chinese Academy of Sciences (CAS). of Computing Technology (ICT), Chinese Academy of Sciences (CAS).
config MACH_PISTACHIO
bool "IMG Pistachio SoC based boards"
select BOOT_ELF32
select BOOT_RAW
select CEVT_R4K
select CLKSRC_MIPS_GIC
select COMMON_CLK
select CSRC_R4K
select DMA_NONCOHERENT
select GPIOLIB
select IRQ_MIPS_CPU
select MFD_SYSCON
select MIPS_CPU_SCACHE
select MIPS_GIC
select PINCTRL
select REGULATOR
select SYS_HAS_CPU_MIPS32_R2
select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_LITTLE_ENDIAN
select SYS_SUPPORTS_MIPS_CPS
select SYS_SUPPORTS_MULTITHREADING
select SYS_SUPPORTS_RELOCATABLE
select SYS_SUPPORTS_ZBOOT
select SYS_HAS_EARLY_PRINTK
select USE_GENERIC_EARLY_PRINTK_8250
select USE_OF
help
This enables support for the IMG Pistachio SoC platform.
config MIPS_MALTA config MIPS_MALTA
bool "MIPS Malta board" bool "MIPS Malta board"
select ARCH_MAY_HAVE_PC_FDC select ARCH_MAY_HAVE_PC_FDC
...@@ -1089,7 +1060,6 @@ source "arch/mips/ingenic/Kconfig" ...@@ -1089,7 +1060,6 @@ source "arch/mips/ingenic/Kconfig"
source "arch/mips/jazz/Kconfig" source "arch/mips/jazz/Kconfig"
source "arch/mips/lantiq/Kconfig" source "arch/mips/lantiq/Kconfig"
source "arch/mips/pic32/Kconfig" source "arch/mips/pic32/Kconfig"
source "arch/mips/pistachio/Kconfig"
source "arch/mips/ralink/Kconfig" source "arch/mips/ralink/Kconfig"
source "arch/mips/sgi-ip27/Kconfig" source "arch/mips/sgi-ip27/Kconfig"
source "arch/mips/sibyte/Kconfig" source "arch/mips/sibyte/Kconfig"
......
arch/mips/Makefile
View file @ d6742212
...@@ -560,6 +560,9 @@ sead3micro_defconfig-y := micro32r2el_defconfig BOARDS=sead-3 ...@@ -560,6 +560,9 @@ sead3micro_defconfig-y := micro32r2el_defconfig BOARDS=sead-3
legacy_defconfigs += xilfpga_defconfig legacy_defconfigs += xilfpga_defconfig
xilfpga_defconfig-y := 32r2el_defconfig BOARDS=xilfpga xilfpga_defconfig-y := 32r2el_defconfig BOARDS=xilfpga
legacy_defconfigs += pistachio_defconfig
pistachio_defconfig-y := 32r2el_defconfig BOARDS=marduk
.PHONY: $(legacy_defconfigs) .PHONY: $(legacy_defconfigs)
$(legacy_defconfigs): $(legacy_defconfigs):
$(Q)$(MAKE) -f $(srctree)/Makefile $($@-y) $(Q)$(MAKE) -f $(srctree)/Makefile $($@-y)
arch/mips/alchemy/devboards/db1200.c
View file @ d6742212
...@@ -835,7 +835,7 @@ int __init db1200_dev_setup(void) ...@@ -835,7 +835,7 @@ int __init db1200_dev_setup(void)
if (!IS_ERR(c)) { if (!IS_ERR(c)) {
pfc = clk_round_rate(c, 50000000); pfc = clk_round_rate(c, 50000000);
if ((pfc < 1) || (abs(50000000 - pfc) > 2500000)) if ((pfc < 1) || (abs(50000000 - pfc) > 2500000))
pr_warn("DB1200: cant get I2C close to 50MHz\n"); pr_warn("DB1200: can't get I2C close to 50MHz\n");
else else
clk_set_rate(c, pfc); clk_set_rate(c, pfc);
clk_prepare_enable(c); clk_prepare_enable(c);
......
arch/mips/boot/dts/Makefile
View file @ d6742212
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
subdir-$(CONFIG_BMIPS_GENERIC) += brcm subdir-$(CONFIG_BMIPS_GENERIC) += brcm
subdir-$(CONFIG_CAVIUM_OCTEON_SOC) += cavium-octeon subdir-$(CONFIG_CAVIUM_OCTEON_SOC) += cavium-octeon
subdir-$(CONFIG_MACH_PISTACHIO) += img subdir-$(CONFIG_FIT_IMAGE_FDT_MARDUK) += img
subdir-$(CONFIG_FIT_IMAGE_FDT_BOSTON) += img subdir-$(CONFIG_FIT_IMAGE_FDT_BOSTON) += img
subdir-$(CONFIG_MACH_INGENIC) += ingenic subdir-$(CONFIG_MACH_INGENIC) += ingenic
subdir-$(CONFIG_LANTIQ) += lantiq subdir-$(CONFIG_LANTIQ) += lantiq
......
arch/mips/boot/dts/img/Makefile
View file @ d6742212
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
dtb-$(CONFIG_FIT_IMAGE_FDT_BOSTON) += boston.dtb dtb-$(CONFIG_FIT_IMAGE_FDT_BOSTON) += boston.dtb
dtb-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb dtb-$(CONFIG_FIT_IMAGE_FDT_MARDUK) += pistachio_marduk.dtb
obj-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb.o
arch/mips/boot/dts/img/pistachio.dtsi
View file @ d6742212
...@@ -900,6 +900,16 @@ timer { ...@@ -900,6 +900,16 @@ timer {
}; };
}; };
cpc: cpc@1bde0000 {
compatible = "mti,mips-cpc";
reg = <0x1bde0000 0x10000>;
};
cdmm: cdmm@1bdf0000 {
compatible = "mti,mips-cdmm";
reg = <0x1bdf0000 0x10000>;
};
usb_phy: usb-phy { usb_phy: usb-phy {
compatible = "img,pistachio-usb-phy"; compatible = "img,pistachio-usb-phy";
clocks = <&clk_core CLK_USB_PHY>; clocks = <&clk_core CLK_USB_PHY>;
......
arch/mips/boot/dts/mscc/ocelot.dtsi
View file @ d6742212
...@@ -150,36 +150,47 @@ ethernet-ports { ...@@ -150,36 +150,47 @@ ethernet-ports {
port0: port@0 { port0: port@0 {
reg = <0>; reg = <0>;
status = "disabled";
}; };
port1: port@1 { port1: port@1 {
reg = <1>; reg = <1>;
status = "disabled";
}; };
port2: port@2 { port2: port@2 {
reg = <2>; reg = <2>;
status = "disabled";
}; };
port3: port@3 { port3: port@3 {
reg = <3>; reg = <3>;
status = "disabled";
}; };
port4: port@4 { port4: port@4 {
reg = <4>; reg = <4>;
status = "disabled";
}; };
port5: port@5 { port5: port@5 {
reg = <5>; reg = <5>;
status = "disabled";
}; };
port6: port@6 { port6: port@6 {
reg = <6>; reg = <6>;
status = "disabled";
}; };
port7: port@7 { port7: port@7 {
reg = <7>; reg = <7>;
status = "disabled";
}; };
port8: port@8 { port8: port@8 {
reg = <8>; reg = <8>;
status = "disabled";
}; };
port9: port@9 { port9: port@9 {
reg = <9>; reg = <9>;
status = "disabled";
}; };
port10: port@10 { port10: port@10 {
reg = <10>; reg = <10>;
status = "disabled";
}; };
}; };
}; };
......
arch/mips/boot/dts/mscc/ocelot_pcb120.dts
View file @ d6742212
...@@ -69,40 +69,52 @@ phy4: ethernet-phy@3 { ...@@ -69,40 +69,52 @@ phy4: ethernet-phy@3 {
}; };
&port0 { &port0 {
status = "okay";
phy-handle = <&phy0>; phy-handle = <&phy0>;
phy-mode = "internal";
}; };
&port1 { &port1 {
status = "okay";
phy-handle = <&phy1>; phy-handle = <&phy1>;
phy-mode = "internal";
}; };
&port2 { &port2 {
status = "okay";
phy-handle = <&phy2>; phy-handle = <&phy2>;
phy-mode = "internal";
}; };
&port3 { &port3 {
status = "okay";
phy-handle = <&phy3>; phy-handle = <&phy3>;
phy-mode = "internal";
}; };
&port4 { &port4 {
status = "okay";
phy-handle = <&phy7>; phy-handle = <&phy7>;
phy-mode = "sgmii"; phy-mode = "sgmii";
phys = <&serdes 4 SERDES1G(2)>; phys = <&serdes 4 SERDES1G(2)>;
}; };
&port5 { &port5 {
status = "okay";
phy-handle = <&phy4>; phy-handle = <&phy4>;
phy-mode = "sgmii"; phy-mode = "sgmii";
phys = <&serdes 5 SERDES1G(5)>; phys = <&serdes 5 SERDES1G(5)>;
}; };
&port6 { &port6 {
status = "okay";
phy-handle = <&phy6>; phy-handle = <&phy6>;
phy-mode = "sgmii"; phy-mode = "sgmii";
phys = <&serdes 6 SERDES1G(3)>; phys = <&serdes 6 SERDES1G(3)>;
}; };
&port9 { &port9 {
status = "okay";
phy-handle = <&phy5>; phy-handle = <&phy5>;
phy-mode = "sgmii"; phy-mode = "sgmii";
phys = <&serdes 9 SERDES1G(4)>; phys = <&serdes 9 SERDES1G(4)>;
......
arch/mips/boot/dts/mscc/ocelot_pcb123.dts
View file @ d6742212
...@@ -47,17 +47,25 @@ &mdio0 { ...@@ -47,17 +47,25 @@ &mdio0 {
}; };
&port0 { &port0 {
status = "okay";
phy-handle = <&phy0>; phy-handle = <&phy0>;
phy-mode = "internal";
}; };
&port1 { &port1 {
status = "okay";
phy-handle = <&phy1>; phy-handle = <&phy1>;
phy-mode = "internal";
}; };
&port2 { &port2 {
status = "okay";
phy-handle = <&phy2>; phy-handle = <&phy2>;
phy-mode = "internal";
}; };
&port3 { &port3 {
status = "okay";
phy-handle = <&phy3>; phy-handle = <&phy3>;
phy-mode = "internal";
}; };
arch/mips/cavium-octeon/executive/cvmx-bootmem.c
View file @ d6742212
...@@ -44,7 +44,7 @@ static struct cvmx_bootmem_desc *cvmx_bootmem_desc; ...@@ -44,7 +44,7 @@ static struct cvmx_bootmem_desc *cvmx_bootmem_desc;
/* See header file for descriptions of functions */ /* See header file for descriptions of functions */
/** /*
* This macro returns a member of the * This macro returns a member of the
* cvmx_bootmem_named_block_desc_t structure. These members can't * cvmx_bootmem_named_block_desc_t structure. These members can't
* be directly addressed as they might be in memory not directly * be directly addressed as they might be in memory not directly
...@@ -60,7 +60,7 @@ static struct cvmx_bootmem_desc *cvmx_bootmem_desc; ...@@ -60,7 +60,7 @@ static struct cvmx_bootmem_desc *cvmx_bootmem_desc;
offsetof(struct cvmx_bootmem_named_block_desc, field), \ offsetof(struct cvmx_bootmem_named_block_desc, field), \
sizeof_field(struct cvmx_bootmem_named_block_desc, field)) sizeof_field(struct cvmx_bootmem_named_block_desc, field))
/** /*
* This function is the implementation of the get macros defined * This function is the implementation of the get macros defined
* for individual structure members. The argument are generated * for individual structure members. The argument are generated
* by the macros inorder to read only the needed memory. * by the macros inorder to read only the needed memory.
...@@ -115,7 +115,7 @@ static uint64_t cvmx_bootmem_phy_get_next(uint64_t addr) ...@@ -115,7 +115,7 @@ static uint64_t cvmx_bootmem_phy_get_next(uint64_t addr)
return cvmx_read64_uint64((addr + NEXT_OFFSET) | (1ull << 63)); return cvmx_read64_uint64((addr + NEXT_OFFSET) | (1ull << 63));
} }
/** /*
* Allocate a block of memory from the free list that was * Allocate a block of memory from the free list that was
* passed to the application by the bootloader within a specified * passed to the application by the bootloader within a specified
* address range. This is an allocate-only algorithm, so * address range. This is an allocate-only algorithm, so
...@@ -550,7 +550,7 @@ int __cvmx_bootmem_phy_free(uint64_t phy_addr, uint64_t size, uint32_t flags) ...@@ -550,7 +550,7 @@ int __cvmx_bootmem_phy_free(uint64_t phy_addr, uint64_t size, uint32_t flags)
} }
/** /*
* Finds a named memory block by name. * Finds a named memory block by name.
* Also used for finding an unused entry in the named block table. * Also used for finding an unused entry in the named block table.
* *
...@@ -657,7 +657,7 @@ struct cvmx_bootmem_named_block_desc *cvmx_bootmem_find_named_block(char *name) ...@@ -657,7 +657,7 @@ struct cvmx_bootmem_named_block_desc *cvmx_bootmem_find_named_block(char *name)
} }
EXPORT_SYMBOL(cvmx_bootmem_find_named_block); EXPORT_SYMBOL(cvmx_bootmem_find_named_block);
/** /*
* Frees a named block. * Frees a named block.
* *
* @name: name of block to free * @name: name of block to free
......
arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c
View file @ d6742212
...@@ -42,14 +42,14 @@ ...@@ -42,14 +42,14 @@
#include <asm/octeon/cvmx-pexp-defs.h> #include <asm/octeon/cvmx-pexp-defs.h>
#include <asm/octeon/cvmx-pko-defs.h> #include <asm/octeon/cvmx-pko-defs.h>
/** /*
* This application uses this pointer to access the global queue * This application uses this pointer to access the global queue
* state. It points to a bootmem named block. * state. It points to a bootmem named block.
*/ */
__cvmx_cmd_queue_all_state_t *__cvmx_cmd_queue_state_ptr; __cvmx_cmd_queue_all_state_t *__cvmx_cmd_queue_state_ptr;
EXPORT_SYMBOL_GPL(__cvmx_cmd_queue_state_ptr); EXPORT_SYMBOL_GPL(__cvmx_cmd_queue_state_ptr);
/** /*
* Initialize the Global queue state pointer. * Initialize the Global queue state pointer.
* *
* Returns CVMX_CMD_QUEUE_SUCCESS or a failure code * Returns CVMX_CMD_QUEUE_SUCCESS or a failure code
...@@ -57,27 +57,14 @@ EXPORT_SYMBOL_GPL(__cvmx_cmd_queue_state_ptr); ...@@ -57,27 +57,14 @@ EXPORT_SYMBOL_GPL(__cvmx_cmd_queue_state_ptr);
static cvmx_cmd_queue_result_t __cvmx_cmd_queue_init_state_ptr(void) static cvmx_cmd_queue_result_t __cvmx_cmd_queue_init_state_ptr(void)
{ {
char *alloc_name = "cvmx_cmd_queues"; char *alloc_name = "cvmx_cmd_queues";
#if defined(CONFIG_CAVIUM_RESERVE32) && CONFIG_CAVIUM_RESERVE32
extern uint64_t octeon_reserve32_memory;
#endif
if (likely(__cvmx_cmd_queue_state_ptr)) if (likely(__cvmx_cmd_queue_state_ptr))
return CVMX_CMD_QUEUE_SUCCESS; return CVMX_CMD_QUEUE_SUCCESS;
#if defined(CONFIG_CAVIUM_RESERVE32) && CONFIG_CAVIUM_RESERVE32 __cvmx_cmd_queue_state_ptr =
if (octeon_reserve32_memory) cvmx_bootmem_alloc_named(sizeof(*__cvmx_cmd_queue_state_ptr),
__cvmx_cmd_queue_state_ptr = 128,
cvmx_bootmem_alloc_named_range(sizeof(*__cvmx_cmd_queue_state_ptr), alloc_name);
octeon_reserve32_memory,
octeon_reserve32_memory +
(CONFIG_CAVIUM_RESERVE32 <<
20) - 1, 128, alloc_name);
else
#endif
__cvmx_cmd_queue_state_ptr =
cvmx_bootmem_alloc_named(sizeof(*__cvmx_cmd_queue_state_ptr),
128,
alloc_name);
if (__cvmx_cmd_queue_state_ptr) if (__cvmx_cmd_queue_state_ptr)
memset(__cvmx_cmd_queue_state_ptr, 0, memset(__cvmx_cmd_queue_state_ptr, 0,
sizeof(*__cvmx_cmd_queue_state_ptr)); sizeof(*__cvmx_cmd_queue_state_ptr));
...@@ -97,7 +84,7 @@ static cvmx_cmd_queue_result_t __cvmx_cmd_queue_init_state_ptr(void) ...@@ -97,7 +84,7 @@ static cvmx_cmd_queue_result_t __cvmx_cmd_queue_init_state_ptr(void)
return CVMX_CMD_QUEUE_SUCCESS; return CVMX_CMD_QUEUE_SUCCESS;
} }
/** /*
* Initialize a command queue for use. The initial FPA buffer is * Initialize a command queue for use. The initial FPA buffer is
* allocated and the hardware unit is configured to point to the * allocated and the hardware unit is configured to point to the
* new command queue. * new command queue.
...@@ -195,7 +182,7 @@ cvmx_cmd_queue_result_t cvmx_cmd_queue_initialize(cvmx_cmd_queue_id_t queue_id, ...@@ -195,7 +182,7 @@ cvmx_cmd_queue_result_t cvmx_cmd_queue_initialize(cvmx_cmd_queue_id_t queue_id,
} }
} }
/** /*
* Shutdown a queue a free it's command buffers to the FPA. The * Shutdown a queue a free it's command buffers to the FPA. The
* hardware connected to the queue must be stopped before this * hardware connected to the queue must be stopped before this
* function is called. * function is called.
...@@ -231,7 +218,7 @@ cvmx_cmd_queue_result_t cvmx_cmd_queue_shutdown(cvmx_cmd_queue_id_t queue_id) ...@@ -231,7 +218,7 @@ cvmx_cmd_queue_result_t cvmx_cmd_queue_shutdown(cvmx_cmd_queue_id_t queue_id)
return CVMX_CMD_QUEUE_SUCCESS; return CVMX_CMD_QUEUE_SUCCESS;
} }
/** /*
* Return the number of command words pending in the queue. This * Return the number of command words pending in the queue. This
* function may be relatively slow for some hardware units. * function may be relatively slow for some hardware units.
* *
...@@ -287,7 +274,7 @@ int cvmx_cmd_queue_length(cvmx_cmd_queue_id_t queue_id) ...@@ -287,7 +274,7 @@ int cvmx_cmd_queue_length(cvmx_cmd_queue_id_t queue_id)
return CVMX_CMD_QUEUE_INVALID_PARAM; return CVMX_CMD_QUEUE_INVALID_PARAM;
} }
/** /*
* Return the command buffer to be written to. The purpose of this * Return the command buffer to be written to. The purpose of this
* function is to allow CVMX routine access t othe low level buffer * function is to allow CVMX routine access t othe low level buffer
* for initial hardware setup. User applications should not call this * for initial hardware setup. User applications should not call this
......
arch/mips/cavium-octeon/executive/cvmx-helper-board.c
View file @ d6742212
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include <asm/octeon/cvmx-gmxx-defs.h> #include <asm/octeon/cvmx-gmxx-defs.h>
#include <asm/octeon/cvmx-asxx-defs.h> #include <asm/octeon/cvmx-asxx-defs.h>
/** /*
* Return the MII PHY address associated with the given IPD * Return the MII PHY address associated with the given IPD
* port. A result of -1 means there isn't a MII capable PHY * port. A result of -1 means there isn't a MII capable PHY
* connected to this port. On chips supporting multiple MII * connected to this port. On chips supporting multiple MII
...@@ -189,7 +189,7 @@ int cvmx_helper_board_get_mii_address(int ipd_port) ...@@ -189,7 +189,7 @@ int cvmx_helper_board_get_mii_address(int ipd_port)
return -1; return -1;
} }
/** /*
* This function is the board specific method of determining an * This function is the board specific method of determining an
* ethernet ports link speed. Most Octeon boards have Marvell PHYs * ethernet ports link speed. Most Octeon boards have Marvell PHYs
* and are handled by the fall through case. This function must be * and are handled by the fall through case. This function must be
...@@ -274,7 +274,7 @@ union cvmx_helper_link_info __cvmx_helper_board_link_get(int ipd_port) ...@@ -274,7 +274,7 @@ union cvmx_helper_link_info __cvmx_helper_board_link_get(int ipd_port)
return result; return result;
} }
/** /*
* This function is called by cvmx_helper_interface_probe() after it * This function is called by cvmx_helper_interface_probe() after it
* determines the number of ports Octeon can support on a specific * determines the number of ports Octeon can support on a specific
* interface. This function is the per board location to override * interface. This function is the per board location to override
...@@ -320,7 +320,7 @@ int __cvmx_helper_board_interface_probe(int interface, int supported_ports) ...@@ -320,7 +320,7 @@ int __cvmx_helper_board_interface_probe(int interface, int supported_ports)
return supported_ports; return supported_ports;
} }
/** /*
* Get the clock type used for the USB block based on board type. * Get the clock type used for the USB block based on board type.
* Used by the USB code for auto configuration of clock type. * Used by the USB code for auto configuration of clock type.
* *
......
arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c
View file @ d6742212
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#include <asm/octeon/cvmx-asxx-defs.h> #include <asm/octeon/cvmx-asxx-defs.h>
#include <asm/octeon/cvmx-dbg-defs.h> #include <asm/octeon/cvmx-dbg-defs.h>
/** /*
* Probe RGMII ports and determine the number present * Probe RGMII ports and determine the number present
* *
* @interface: Interface to probe * @interface: Interface to probe
...@@ -88,7 +88,7 @@ int __cvmx_helper_rgmii_probe(int interface) ...@@ -88,7 +88,7 @@ int __cvmx_helper_rgmii_probe(int interface)
return num_ports; return num_ports;
} }
/** /*
* Put an RGMII interface in loopback mode. Internal packets sent * Put an RGMII interface in loopback mode. Internal packets sent
* out will be received back again on the same port. Externally * out will be received back again on the same port. Externally
* received packets will echo back out. * received packets will echo back out.
...@@ -120,7 +120,7 @@ void cvmx_helper_rgmii_internal_loopback(int port) ...@@ -120,7 +120,7 @@ void cvmx_helper_rgmii_internal_loopback(int port)
cvmx_write_csr(CVMX_GMXX_PRTX_CFG(index, interface), gmx_cfg.u64); cvmx_write_csr(CVMX_GMXX_PRTX_CFG(index, interface), gmx_cfg.u64);
} }
/** /*
* Workaround ASX setup errata with CN38XX pass1 * Workaround ASX setup errata with CN38XX pass1
* *
* @interface: Interface to setup * @interface: Interface to setup
...@@ -148,7 +148,7 @@ static int __cvmx_helper_errata_asx_pass1(int interface, int port, ...@@ -148,7 +148,7 @@ static int __cvmx_helper_errata_asx_pass1(int interface, int port,
return 0; return 0;
} }
/** /*
* Configure all of the ASX, GMX, and PKO registers required * Configure all of the ASX, GMX, and PKO registers required
* to get RGMII to function on the supplied interface. * to get RGMII to function on the supplied interface.
* *
...@@ -251,7 +251,7 @@ int __cvmx_helper_rgmii_enable(int interface) ...@@ -251,7 +251,7 @@ int __cvmx_helper_rgmii_enable(int interface)
return 0; return 0;
} }
/** /*
* Return the link state of an IPD/PKO port as returned by * Return the link state of an IPD/PKO port as returned by
* auto negotiation. The result of this function may not match * auto negotiation. The result of this function may not match
* Octeon's link config if auto negotiation has changed since * Octeon's link config if auto negotiation has changed since
...@@ -280,7 +280,7 @@ union cvmx_helper_link_info __cvmx_helper_rgmii_link_get(int ipd_port) ...@@ -280,7 +280,7 @@ union cvmx_helper_link_info __cvmx_helper_rgmii_link_get(int ipd_port)
return __cvmx_helper_board_link_get(ipd_port); return __cvmx_helper_board_link_get(ipd_port);
} }
/** /*
* Configure an IPD/PKO port for the specified link state. This * Configure an IPD/PKO port for the specified link state. This
* function does not influence auto negotiation at the PHY level. * function does not influence auto negotiation at the PHY level.
* The passed link state must always match the link state returned * The passed link state must always match the link state returned
......
arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c
View file @ d6742212
...@@ -54,7 +54,7 @@ int __cvmx_helper_xaui_enumerate(int interface) ...@@ -54,7 +54,7 @@ int __cvmx_helper_xaui_enumerate(int interface)
return 1; return 1;
} }
/** /*
* Probe a XAUI interface and determine the number of ports * Probe a XAUI interface and determine the number of ports
* connected to it. The XAUI interface should still be down * connected to it. The XAUI interface should still be down
* after this call. * after this call.
...@@ -102,7 +102,7 @@ int __cvmx_helper_xaui_probe(int interface) ...@@ -102,7 +102,7 @@ int __cvmx_helper_xaui_probe(int interface)
return __cvmx_helper_xaui_enumerate(interface); return __cvmx_helper_xaui_enumerate(interface);
} }
/** /*
* Bringup and enable a XAUI interface. After this call packet * Bringup and enable a XAUI interface. After this call packet
* I/O should be fully functional. This is called with IPD * I/O should be fully functional. This is called with IPD
* enabled but PKO disabled. * enabled but PKO disabled.
...@@ -249,7 +249,7 @@ int __cvmx_helper_xaui_enable(int interface) ...@@ -249,7 +249,7 @@ int __cvmx_helper_xaui_enable(int interface)
return 0; return 0;
} }
/** /*
* Return the link state of an IPD/PKO port as returned by * Return the link state of an IPD/PKO port as returned by
* auto negotiation. The result of this function may not match * auto negotiation. The result of this function may not match
* Octeon's link config if auto negotiation has changed since * Octeon's link config if auto negotiation has changed since
...@@ -288,7 +288,7 @@ union cvmx_helper_link_info __cvmx_helper_xaui_link_get(int ipd_port) ...@@ -288,7 +288,7 @@ union cvmx_helper_link_info __cvmx_helper_xaui_link_get(int ipd_port)
return result; return result;
} }
/** /*
* Configure an IPD/PKO port for the specified link state. This * Configure an IPD/PKO port for the specified link state. This
* function does not influence auto negotiation at the PHY level. * function does not influence auto negotiation at the PHY level.
* The passed link state must always match the link state returned * The passed link state must always match the link state returned
......
arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c
View file @ d6742212
...@@ -46,7 +46,9 @@ ...@@ -46,7 +46,9 @@
/** /**
* __cvmx_interrupt_gmxx_rxx_int_en_enable enables all interrupt bits in cvmx_gmxx_rxx_int_en_t * __cvmx_interrupt_gmxx_rxx_int_en_enable - enable all interrupt bits in cvmx_gmxx_rxx_int_en_t
* @index: interrupt register offset
* @block: interrupt register block_id
*/ */
void __cvmx_interrupt_gmxx_rxx_int_en_enable(int index, int block) void __cvmx_interrupt_gmxx_rxx_int_en_enable(int index, int block)
{ {
...@@ -227,7 +229,9 @@ void __cvmx_interrupt_gmxx_rxx_int_en_enable(int index, int block) ...@@ -227,7 +229,9 @@ void __cvmx_interrupt_gmxx_rxx_int_en_enable(int index, int block)
cvmx_write_csr(CVMX_GMXX_RXX_INT_EN(index, block), gmx_rx_int_en.u64); cvmx_write_csr(CVMX_GMXX_RXX_INT_EN(index, block), gmx_rx_int_en.u64);
} }
/** /**
* __cvmx_interrupt_pcsx_intx_en_reg_enable enables all interrupt bits in cvmx_pcsx_intx_en_reg_t * __cvmx_interrupt_pcsx_intx_en_reg_enable - enable all interrupt bits in cvmx_pcsx_intx_en_reg_t
* @index: interrupt register offset
* @block: interrupt register block_id
*/ */
void __cvmx_interrupt_pcsx_intx_en_reg_enable(int index, int block) void __cvmx_interrupt_pcsx_intx_en_reg_enable(int index, int block)
{ {
...@@ -268,7 +272,8 @@ void __cvmx_interrupt_pcsx_intx_en_reg_enable(int index, int block) ...@@ -268,7 +272,8 @@ void __cvmx_interrupt_pcsx_intx_en_reg_enable(int index, int block)
cvmx_write_csr(CVMX_PCSX_INTX_EN_REG(index, block), pcs_int_en_reg.u64); cvmx_write_csr(CVMX_PCSX_INTX_EN_REG(index, block), pcs_int_en_reg.u64);
} }
/** /**
* __cvmx_interrupt_pcsxx_int_en_reg_enable enables all interrupt bits in cvmx_pcsxx_int_en_reg_t * __cvmx_interrupt_pcsxx_int_en_reg_enable - enable all interrupt bits in cvmx_pcsxx_int_en_reg_t
* @index: interrupt register block_id
*/ */
void __cvmx_interrupt_pcsxx_int_en_reg_enable(int index) void __cvmx_interrupt_pcsxx_int_en_reg_enable(int index)
{ {
...@@ -298,7 +303,8 @@ void __cvmx_interrupt_pcsxx_int_en_reg_enable(int index) ...@@ -298,7 +303,8 @@ void __cvmx_interrupt_pcsxx_int_en_reg_enable(int index)
} }
/** /**
* __cvmx_interrupt_spxx_int_msk_enable enables all interrupt bits in cvmx_spxx_int_msk_t * __cvmx_interrupt_spxx_int_msk_enable - enable all interrupt bits in cvmx_spxx_int_msk_t
* @index: interrupt register block_id
*/ */
void __cvmx_interrupt_spxx_int_msk_enable(int index) void __cvmx_interrupt_spxx_int_msk_enable(int index)
{ {
...@@ -337,7 +343,8 @@ void __cvmx_interrupt_spxx_int_msk_enable(int index) ...@@ -337,7 +343,8 @@ void __cvmx_interrupt_spxx_int_msk_enable(int index)
cvmx_write_csr(CVMX_SPXX_INT_MSK(index), spx_int_msk.u64); cvmx_write_csr(CVMX_SPXX_INT_MSK(index), spx_int_msk.u64);
} }
/** /**
* __cvmx_interrupt_stxx_int_msk_enable enables all interrupt bits in cvmx_stxx_int_msk_t * __cvmx_interrupt_stxx_int_msk_enable - enable all interrupt bits in cvmx_stxx_int_msk_t
* @index: interrupt register block_id
*/ */
void __cvmx_interrupt_stxx_int_msk_enable(int index) void __cvmx_interrupt_stxx_int_msk_enable(int index)
{ {
......
arch/mips/cavium-octeon/executive/cvmx-l2c.c
View file @ d6742212
...@@ -281,7 +281,7 @@ uint64_t cvmx_l2c_read_perf(uint32_t counter) ...@@ -281,7 +281,7 @@ uint64_t cvmx_l2c_read_perf(uint32_t counter)
} }
} }
/** /*
* @INTERNAL * @INTERNAL
* Helper function use to fault in cache lines for L2 cache locking * Helper function use to fault in cache lines for L2 cache locking
* *
...@@ -575,7 +575,7 @@ union __cvmx_l2c_tag { ...@@ -575,7 +575,7 @@ union __cvmx_l2c_tag {
}; };
/** /*
* @INTERNAL * @INTERNAL
* Function to read a L2C tag. This code make the current core * Function to read a L2C tag. This code make the current core
* the 'debug core' for the L2. This code must only be executed by * the 'debug core' for the L2. This code must only be executed by
...@@ -764,9 +764,8 @@ int cvmx_l2c_get_cache_size_bytes(void) ...@@ -764,9 +764,8 @@ int cvmx_l2c_get_cache_size_bytes(void)
CVMX_CACHE_LINE_SIZE; CVMX_CACHE_LINE_SIZE;
} }
/** /*
* Return log base 2 of the number of sets in the L2 cache * Return log base 2 of the number of sets in the L2 cache
* Returns
*/ */
int cvmx_l2c_get_set_bits(void) int cvmx_l2c_get_set_bits(void)
{ {
...@@ -857,7 +856,7 @@ int cvmx_l2c_get_num_assoc(void) ...@@ -857,7 +856,7 @@ int cvmx_l2c_get_num_assoc(void)
return l2_assoc; return l2_assoc;
} }
/** /*
* Flush a line from the L2 cache * Flush a line from the L2 cache
* This should only be called from one core at a time, as this routine * This should only be called from one core at a time, as this routine
* sets the core to the 'debug' core in order to flush the line. * sets the core to the 'debug' core in order to flush the line.
......
arch/mips/cavium-octeon/executive/cvmx-pko.c
View file @ d6742212
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <asm/octeon/cvmx-pko.h> #include <asm/octeon/cvmx-pko.h>
#include <asm/octeon/cvmx-helper.h> #include <asm/octeon/cvmx-helper.h>
/** /*
* Internal state of packet output * Internal state of packet output
*/ */
...@@ -176,7 +176,7 @@ static void __cvmx_pko_chip_init(void) ...@@ -176,7 +176,7 @@ static void __cvmx_pko_chip_init(void)
} }
} }
/** /*
* Call before any other calls to initialize the packet * Call before any other calls to initialize the packet
* output system. This does chip global config, and should only be * output system. This does chip global config, and should only be
* done by one core. * done by one core.
...@@ -229,7 +229,7 @@ void cvmx_pko_initialize_global(void) ...@@ -229,7 +229,7 @@ void cvmx_pko_initialize_global(void)
} }
} }
/** /*
* This function does per-core initialization required by the PKO routines. * This function does per-core initialization required by the PKO routines.
* This must be called on all cores that will do packet output, and must * This must be called on all cores that will do packet output, and must
* be called after the FPA has been initialized and filled with pages. * be called after the FPA has been initialized and filled with pages.
...@@ -243,7 +243,7 @@ int cvmx_pko_initialize_local(void) ...@@ -243,7 +243,7 @@ int cvmx_pko_initialize_local(void)
return 0; return 0;
} }
/** /*
* Enables the packet output hardware. It must already be * Enables the packet output hardware. It must already be
* configured. * configured.
*/ */
...@@ -266,7 +266,7 @@ void cvmx_pko_enable(void) ...@@ -266,7 +266,7 @@ void cvmx_pko_enable(void)
cvmx_write_csr(CVMX_PKO_REG_FLAGS, flags.u64); cvmx_write_csr(CVMX_PKO_REG_FLAGS, flags.u64);
} }
/** /*
* Disables the packet output. Does not affect any configuration. * Disables the packet output. Does not affect any configuration.
*/ */
void cvmx_pko_disable(void) void cvmx_pko_disable(void)
...@@ -278,7 +278,7 @@ void cvmx_pko_disable(void) ...@@ -278,7 +278,7 @@ void cvmx_pko_disable(void)
} }
EXPORT_SYMBOL_GPL(cvmx_pko_disable); EXPORT_SYMBOL_GPL(cvmx_pko_disable);
/** /*
* Reset the packet output. * Reset the packet output.
*/ */
static void __cvmx_pko_reset(void) static void __cvmx_pko_reset(void)
...@@ -289,7 +289,7 @@ static void __cvmx_pko_reset(void) ...@@ -289,7 +289,7 @@ static void __cvmx_pko_reset(void)
cvmx_write_csr(CVMX_PKO_REG_FLAGS, pko_reg_flags.u64); cvmx_write_csr(CVMX_PKO_REG_FLAGS, pko_reg_flags.u64);
} }
/** /*
* Shutdown and free resources required by packet output. * Shutdown and free resources required by packet output.
*/ */
void cvmx_pko_shutdown(void) void cvmx_pko_shutdown(void)
...@@ -320,7 +320,7 @@ void cvmx_pko_shutdown(void) ...@@ -320,7 +320,7 @@ void cvmx_pko_shutdown(void)
} }
EXPORT_SYMBOL_GPL(cvmx_pko_shutdown); EXPORT_SYMBOL_GPL(cvmx_pko_shutdown);
/** /*
* Configure a output port and the associated queues for use. * Configure a output port and the associated queues for use.
* *
* @port: Port to configure. * @port: Port to configure.
...@@ -548,7 +548,7 @@ cvmx_pko_status_t cvmx_pko_config_port(uint64_t port, uint64_t base_queue, ...@@ -548,7 +548,7 @@ cvmx_pko_status_t cvmx_pko_config_port(uint64_t port, uint64_t base_queue,
} }
#ifdef PKO_DEBUG #ifdef PKO_DEBUG
/** /*
* Show map of ports -> queues for different cores. * Show map of ports -> queues for different cores.
*/ */
void cvmx_pko_show_queue_map() void cvmx_pko_show_queue_map()
...@@ -573,7 +573,7 @@ void cvmx_pko_show_queue_map() ...@@ -573,7 +573,7 @@ void cvmx_pko_show_queue_map()
} }
#endif #endif
/** /*
* Rate limit a PKO port to a max packets/sec. This function is only * Rate limit a PKO port to a max packets/sec. This function is only
* supported on CN51XX and higher, excluding CN58XX. * supported on CN51XX and higher, excluding CN58XX.
* *
...@@ -606,7 +606,7 @@ int cvmx_pko_rate_limit_packets(int port, int packets_s, int burst) ...@@ -606,7 +606,7 @@ int cvmx_pko_rate_limit_packets(int port, int packets_s, int burst)
return 0; return 0;
} }
/** /*
* Rate limit a PKO port to a max bits/sec. This function is only * Rate limit a PKO port to a max bits/sec. This function is only
* supported on CN51XX and higher, excluding CN58XX. * supported on CN51XX and higher, excluding CN58XX.
* *
......
arch/mips/cavium-octeon/executive/cvmx-spi.c
View file @ d6742212
...@@ -66,7 +66,7 @@ static cvmx_spi_callbacks_t cvmx_spi_callbacks = { ...@@ -66,7 +66,7 @@ static cvmx_spi_callbacks_t cvmx_spi_callbacks = {
.interface_up_cb = cvmx_spi_interface_up_cb .interface_up_cb = cvmx_spi_interface_up_cb
}; };
/** /*
* Get current SPI4 initialization callbacks * Get current SPI4 initialization callbacks
* *
* @callbacks: Pointer to the callbacks structure.to fill * @callbacks: Pointer to the callbacks structure.to fill
...@@ -78,7 +78,7 @@ void cvmx_spi_get_callbacks(cvmx_spi_callbacks_t *callbacks) ...@@ -78,7 +78,7 @@ void cvmx_spi_get_callbacks(cvmx_spi_callbacks_t *callbacks)
memcpy(callbacks, &cvmx_spi_callbacks, sizeof(cvmx_spi_callbacks)); memcpy(callbacks, &cvmx_spi_callbacks, sizeof(cvmx_spi_callbacks));
} }
/** /*
* Set new SPI4 initialization callbacks * Set new SPI4 initialization callbacks
* *
* @new_callbacks: Pointer to an updated callbacks structure. * @new_callbacks: Pointer to an updated callbacks structure.
...@@ -88,7 +88,7 @@ void cvmx_spi_set_callbacks(cvmx_spi_callbacks_t *new_callbacks) ...@@ -88,7 +88,7 @@ void cvmx_spi_set_callbacks(cvmx_spi_callbacks_t *new_callbacks)
memcpy(&cvmx_spi_callbacks, new_callbacks, sizeof(cvmx_spi_callbacks)); memcpy(&cvmx_spi_callbacks, new_callbacks, sizeof(cvmx_spi_callbacks));
} }
/** /*
* Initialize and start the SPI interface. * Initialize and start the SPI interface.
* *
* @interface: The identifier of the packet interface to configure and * @interface: The identifier of the packet interface to configure and
...@@ -133,7 +133,7 @@ int cvmx_spi_start_interface(int interface, cvmx_spi_mode_t mode, int timeout, ...@@ -133,7 +133,7 @@ int cvmx_spi_start_interface(int interface, cvmx_spi_mode_t mode, int timeout,
return res; return res;
} }
/** /*
* This routine restarts the SPI interface after it has lost synchronization * This routine restarts the SPI interface after it has lost synchronization
* with its correspondent system. * with its correspondent system.
* *
...@@ -179,7 +179,7 @@ int cvmx_spi_restart_interface(int interface, cvmx_spi_mode_t mode, int timeout) ...@@ -179,7 +179,7 @@ int cvmx_spi_restart_interface(int interface, cvmx_spi_mode_t mode, int timeout)
} }
EXPORT_SYMBOL_GPL(cvmx_spi_restart_interface); EXPORT_SYMBOL_GPL(cvmx_spi_restart_interface);
/** /*
* Callback to perform SPI4 reset * Callback to perform SPI4 reset
* *
* @interface: The identifier of the packet interface to configure and * @interface: The identifier of the packet interface to configure and
...@@ -294,7 +294,7 @@ int cvmx_spi_reset_cb(int interface, cvmx_spi_mode_t mode) ...@@ -294,7 +294,7 @@ int cvmx_spi_reset_cb(int interface, cvmx_spi_mode_t mode)
return 0; return 0;
} }
/** /*
* Callback to setup calendar and miscellaneous settings before clock detection * Callback to setup calendar and miscellaneous settings before clock detection
* *
* @interface: The identifier of the packet interface to configure and * @interface: The identifier of the packet interface to configure and
...@@ -413,7 +413,7 @@ int cvmx_spi_calendar_setup_cb(int interface, cvmx_spi_mode_t mode, ...@@ -413,7 +413,7 @@ int cvmx_spi_calendar_setup_cb(int interface, cvmx_spi_mode_t mode,
return 0; return 0;
} }
/** /*
* Callback to perform clock detection * Callback to perform clock detection
* *
* @interface: The identifier of the packet interface to configure and * @interface: The identifier of the packet interface to configure and
...@@ -491,7 +491,7 @@ int cvmx_spi_clock_detect_cb(int interface, cvmx_spi_mode_t mode, int timeout) ...@@ -491,7 +491,7 @@ int cvmx_spi_clock_detect_cb(int interface, cvmx_spi_mode_t mode, int timeout)
return 0; return 0;
} }
/** /*
* Callback to perform link training * Callback to perform link training
* *
* @interface: The identifier of the packet interface to configure and * @interface: The identifier of the packet interface to configure and
...@@ -560,7 +560,7 @@ int cvmx_spi_training_cb(int interface, cvmx_spi_mode_t mode, int timeout) ...@@ -560,7 +560,7 @@ int cvmx_spi_training_cb(int interface, cvmx_spi_mode_t mode, int timeout)
return 0; return 0;
} }
/** /*
* Callback to perform calendar data synchronization * Callback to perform calendar data synchronization
* *
* @interface: The identifier of the packet interface to configure and * @interface: The identifier of the packet interface to configure and
...@@ -617,7 +617,7 @@ int cvmx_spi_calendar_sync_cb(int interface, cvmx_spi_mode_t mode, int timeout) ...@@ -617,7 +617,7 @@ int cvmx_spi_calendar_sync_cb(int interface, cvmx_spi_mode_t mode, int timeout)
return 0; return 0;
} }
/** /*
* Callback to handle interface up * Callback to handle interface up
* *
* @interface: The identifier of the packet interface to configure and * @interface: The identifier of the packet interface to configure and
......
arch/mips/cavium-octeon/flash_setup.c
View file @ d6742212
...@@ -62,7 +62,7 @@ static void octeon_flash_map_copy_to(struct map_info *map, unsigned long to, ...@@ -62,7 +62,7 @@ static void octeon_flash_map_copy_to(struct map_info *map, unsigned long to,
up(&octeon_bootbus_sem); up(&octeon_bootbus_sem);
} }
/** /*
* Module/ driver initialization. * Module/ driver initialization.
* *
* Returns Zero on success * Returns Zero on success
......
arch/mips/cavium-octeon/setup.c
View file @ d6742212
...@@ -284,11 +284,6 @@ void octeon_crash_smp_send_stop(void) ...@@ -284,11 +284,6 @@ void octeon_crash_smp_send_stop(void)
#endif /* CONFIG_KEXEC */ #endif /* CONFIG_KEXEC */
#ifdef CONFIG_CAVIUM_RESERVE32
uint64_t octeon_reserve32_memory;
EXPORT_SYMBOL(octeon_reserve32_memory);
#endif
#ifdef CONFIG_KEXEC #ifdef CONFIG_KEXEC
/* crashkernel cmdline parameter is parsed _after_ memory setup /* crashkernel cmdline parameter is parsed _after_ memory setup
* we also parse it here (workaround for EHB5200) */ * we also parse it here (workaround for EHB5200) */
...@@ -300,9 +295,10 @@ static int octeon_uart; ...@@ -300,9 +295,10 @@ static int octeon_uart;
extern asmlinkage void handle_int(void); extern asmlinkage void handle_int(void);
/** /**
* Return non zero if we are currently running in the Octeon simulator * octeon_is_simulation - Return non-zero if we are currently running
* in the Octeon simulator
* *
* Returns * Return: non-0 if running in the Octeon simulator, 0 otherwise
*/ */
int octeon_is_simulation(void) int octeon_is_simulation(void)
{ {
...@@ -311,10 +307,10 @@ int octeon_is_simulation(void) ...@@ -311,10 +307,10 @@ int octeon_is_simulation(void)
EXPORT_SYMBOL(octeon_is_simulation); EXPORT_SYMBOL(octeon_is_simulation);
/** /**
* Return true if Octeon is in PCI Host mode. This means * octeon_is_pci_host - Return true if Octeon is in PCI Host mode. This means
* Linux can control the PCI bus. * Linux can control the PCI bus.
* *
* Returns Non zero if Octeon in host mode. * Return: Non-zero if Octeon is in host mode.
*/ */
int octeon_is_pci_host(void) int octeon_is_pci_host(void)
{ {
...@@ -326,9 +322,9 @@ int octeon_is_pci_host(void) ...@@ -326,9 +322,9 @@ int octeon_is_pci_host(void)
} }
/** /**
* Get the clock rate of Octeon * octeon_get_clock_rate - Get the clock rate of Octeon
* *
* Returns Clock rate in HZ * Return: Clock rate in HZ
*/ */
uint64_t octeon_get_clock_rate(void) uint64_t octeon_get_clock_rate(void)
{ {
...@@ -348,11 +344,11 @@ EXPORT_SYMBOL(octeon_get_io_clock_rate); ...@@ -348,11 +344,11 @@ EXPORT_SYMBOL(octeon_get_io_clock_rate);
/** /**
* Write to the LCD display connected to the bootbus. This display * octeon_write_lcd - Write to the LCD display connected to the bootbus.
* exists on most Cavium evaluation boards. If it doesn't exist, then
* this function doesn't do anything.
*
* @s: String to write * @s: String to write
*
* This display exists on most Cavium evaluation boards. If it doesn't exist,
* then this function doesn't do anything.
*/ */
static void octeon_write_lcd(const char *s) static void octeon_write_lcd(const char *s)
{ {
...@@ -372,9 +368,9 @@ static void octeon_write_lcd(const char *s) ...@@ -372,9 +368,9 @@ static void octeon_write_lcd(const char *s)
} }
/** /**
* Return the console uart passed by the bootloader * octeon_get_boot_uart - Return the console uart passed by the bootloader
* *
* Returns uart (0 or 1) * Return: uart number (0 or 1)
*/ */
static int octeon_get_boot_uart(void) static int octeon_get_boot_uart(void)
{ {
...@@ -383,9 +379,9 @@ static int octeon_get_boot_uart(void) ...@@ -383,9 +379,9 @@ static int octeon_get_boot_uart(void)
} }
/** /**
* Get the coremask Linux was booted on. * octeon_get_boot_coremask - Get the coremask Linux was booted on.
* *
* Returns Core mask * Return: Core mask
*/ */
int octeon_get_boot_coremask(void) int octeon_get_boot_coremask(void)
{ {
...@@ -393,7 +389,7 @@ int octeon_get_boot_coremask(void) ...@@ -393,7 +389,7 @@ int octeon_get_boot_coremask(void)
} }
/** /**
* Check the hardware BIST results for a CPU * octeon_check_cpu_bist - Check the hardware BIST results for a CPU
*/ */
void octeon_check_cpu_bist(void) void octeon_check_cpu_bist(void)
{ {
...@@ -424,7 +420,7 @@ void octeon_check_cpu_bist(void) ...@@ -424,7 +420,7 @@ void octeon_check_cpu_bist(void)
} }
/** /**
* Reboot Octeon * octeon_restart - Reboot Octeon
* *
* @command: Command to pass to the bootloader. Currently ignored. * @command: Command to pass to the bootloader. Currently ignored.
*/ */
...@@ -449,7 +445,7 @@ static void octeon_restart(char *command) ...@@ -449,7 +445,7 @@ static void octeon_restart(char *command)
/** /**
* Permanently stop a core. * octeon_kill_core - Permanently stop a core.
* *
* @arg: Ignored. * @arg: Ignored.
*/ */
...@@ -469,7 +465,7 @@ static void octeon_kill_core(void *arg) ...@@ -469,7 +465,7 @@ static void octeon_kill_core(void *arg)
/** /**
* Halt the system * octeon_halt - Halt the system
*/ */
static void octeon_halt(void) static void octeon_halt(void)
{ {
...@@ -512,9 +508,9 @@ static void __init init_octeon_system_type(void) ...@@ -512,9 +508,9 @@ static void __init init_octeon_system_type(void)
} }
/** /**
* Return a string representing the system type * octeon_board_type_string - Return a string representing the system type
* *
* Returns * Return: system type string
*/ */
const char *octeon_board_type_string(void) const char *octeon_board_type_string(void)
{ {
...@@ -655,7 +651,7 @@ void octeon_user_io_init(void) ...@@ -655,7 +651,7 @@ void octeon_user_io_init(void)
} }
/** /**
* Early entry point for arch setup * prom_init - Early entry point for arch setup
*/ */
void __init prom_init(void) void __init prom_init(void)
{ {
...@@ -665,9 +661,7 @@ void __init prom_init(void) ...@@ -665,9 +661,7 @@ void __init prom_init(void)
int i; int i;
u64 t; u64 t;
int argc; int argc;
#ifdef CONFIG_CAVIUM_RESERVE32
int64_t addr = -1;
#endif
/* /*
* The bootloader passes a pointer to the boot descriptor in * The bootloader passes a pointer to the boot descriptor in
* $a3, this is available as fw_arg3. * $a3, this is available as fw_arg3.
...@@ -782,25 +776,6 @@ void __init prom_init(void) ...@@ -782,25 +776,6 @@ void __init prom_init(void)
cvmx_write_csr(CVMX_LED_UDD_DATX(1), 0); cvmx_write_csr(CVMX_LED_UDD_DATX(1), 0);
cvmx_write_csr(CVMX_LED_EN, 1); cvmx_write_csr(CVMX_LED_EN, 1);
} }
#ifdef CONFIG_CAVIUM_RESERVE32
/*
* We need to temporarily allocate all memory in the reserve32
* region. This makes sure the kernel doesn't allocate this
* memory when it is getting memory from the
* bootloader. Later, after the memory allocations are
* complete, the reserve32 will be freed.
*
* Allocate memory for RESERVED32 aligned on 2MB boundary. This
* is in case we later use hugetlb entries with it.
*/
addr = cvmx_bootmem_phy_named_block_alloc(CONFIG_CAVIUM_RESERVE32 << 20,
0, 0, 2 << 20,
"CAVIUM_RESERVE32", 0);
if (addr < 0)
pr_err("Failed to allocate CAVIUM_RESERVE32 memory area\n");
else
octeon_reserve32_memory = addr;
#endif
#ifdef CONFIG_CAVIUM_OCTEON_LOCK_L2 #ifdef CONFIG_CAVIUM_OCTEON_LOCK_L2
if (cvmx_read_csr(CVMX_L2D_FUS3) & (3ull << 34)) { if (cvmx_read_csr(CVMX_L2D_FUS3) & (3ull << 34)) {
...@@ -1078,16 +1053,6 @@ void __init plat_mem_setup(void) ...@@ -1078,16 +1053,6 @@ void __init plat_mem_setup(void)
cvmx_bootmem_unlock(); cvmx_bootmem_unlock();
#endif /* CONFIG_CRASH_DUMP */ #endif /* CONFIG_CRASH_DUMP */
#ifdef CONFIG_CAVIUM_RESERVE32
/*
* Now that we've allocated the kernel memory it is safe to
* free the reserved region. We free it here so that builtin
* drivers can use the memory.
*/
if (octeon_reserve32_memory)
cvmx_bootmem_free_named("CAVIUM_RESERVE32");
#endif /* CONFIG_CAVIUM_RESERVE32 */
if (total == 0) if (total == 0)
panic("Unable to allocate memory from " panic("Unable to allocate memory from "
"cvmx_bootmem_phy_alloc"); "cvmx_bootmem_phy_alloc");
......
arch/mips/cavium-octeon/smp.c
View file @ d6742212
...@@ -91,7 +91,7 @@ static irqreturn_t mailbox_interrupt(int irq, void *dev_id) ...@@ -91,7 +91,7 @@ static irqreturn_t mailbox_interrupt(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
/** /*
* Cause the function described by call_data to be executed on the passed * Cause the function described by call_data to be executed on the passed
* cpu. When the function has finished, increment the finished field of * cpu. When the function has finished, increment the finished field of
* call_data. * call_data.
...@@ -115,7 +115,7 @@ static inline void octeon_send_ipi_mask(const struct cpumask *mask, ...@@ -115,7 +115,7 @@ static inline void octeon_send_ipi_mask(const struct cpumask *mask,
octeon_send_ipi_single(i, action); octeon_send_ipi_single(i, action);
} }
/** /*
* Detect available CPUs, populate cpu_possible_mask * Detect available CPUs, populate cpu_possible_mask
*/ */
static void octeon_smp_hotplug_setup(void) static void octeon_smp_hotplug_setup(void)
...@@ -202,9 +202,8 @@ int plat_post_relocation(long offset) ...@@ -202,9 +202,8 @@ int plat_post_relocation(long offset)
} }
#endif /* CONFIG_RELOCATABLE */ #endif /* CONFIG_RELOCATABLE */
/** /*
* Firmware CPU startup hook * Firmware CPU startup hook
*
*/ */
static int octeon_boot_secondary(int cpu, struct task_struct *idle) static int octeon_boot_secondary(int cpu, struct task_struct *idle)
{ {
...@@ -232,7 +231,7 @@ static int octeon_boot_secondary(int cpu, struct task_struct *idle) ...@@ -232,7 +231,7 @@ static int octeon_boot_secondary(int cpu, struct task_struct *idle)
return 0; return 0;
} }
/** /*
* After we've done initial boot, this function is called to allow the * After we've done initial boot, this function is called to allow the
* board code to clean up state, if needed * board code to clean up state, if needed
*/ */
...@@ -250,9 +249,8 @@ static void octeon_init_secondary(void) ...@@ -250,9 +249,8 @@ static void octeon_init_secondary(void)
octeon_irq_setup_secondary(); octeon_irq_setup_secondary();
} }
/** /*
* Callout to firmware before smp_init * Callout to firmware before smp_init
*
*/ */
static void __init octeon_prepare_cpus(unsigned int max_cpus) static void __init octeon_prepare_cpus(unsigned int max_cpus)
{ {
...@@ -268,7 +266,7 @@ static void __init octeon_prepare_cpus(unsigned int max_cpus) ...@@ -268,7 +266,7 @@ static void __init octeon_prepare_cpus(unsigned int max_cpus)
} }
} }
/** /*
* Last chance for the board code to finish SMP initialization before * Last chance for the board code to finish SMP initialization before
* the CPU is "online". * the CPU is "online".
*/ */
......
arch/mips/configs/generic/board-marduk.config 0 → 100644
View file @ d6742212
CONFIG_FIT_IMAGE_FDT_MARDUK=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_CLKSRC_PISTACHIO=y
CONFIG_COMMON_CLK_PISTACHIO=y
CONFIG_DMADEVICES=y
CONFIG_IMG_MDC_DMA=y
CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_PCH=y
CONFIG_I2C=y
CONFIG_I2C_IMG=y
CONFIG_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_DW=y
CONFIG_MMC_DW_PLTFM=y
CONFIG_NETDEVICES=y
CONFIG_STMMAC_ETH=y
CONFIG_STMMAC_PLATFORM=y
CONFIG_PHY_PISTACHIO_USB=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_PISTACHIO=y
CONFIG_RESET_PISTACHIO=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SERIAL_8250_DW=y
CONFIG_SPI=y
CONFIG_SRAM=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_DWC2=y
CONFIG_CRYPTO_DEV_IMGTEC_HASH=y
CONFIG_IMGPDC_WDT=y
CONFIG_IR_IMG=y
CONFIG_CC10001_ADC=y
CONFIG_SND_SOC_IMG=y
arch/mips/configs/pistachio_defconfig deleted 100644 → 0
View file @ 603eefda
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_DEFAULT_HOSTNAME="localhost"
CONFIG_SYSVIPC=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_IKCONFIG=m
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=18
CONFIG_CGROUPS=y
CONFIG_CGROUP_SCHED=y
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_FREEZER=y
CONFIG_NAMESPACES=y
CONFIG_USER_NS=y
CONFIG_BLK_DEV_INITRD=y
# CONFIG_RD_BZIP2 is not set
# CONFIG_RD_LZMA is not set
# CONFIG_RD_LZO is not set
# CONFIG_RD_LZ4 is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_EMBEDDED=y
# CONFIG_COMPAT_BRK is not set
CONFIG_PROFILING=y
CONFIG_MACH_PISTACHIO=y
CONFIG_MIPS_CPS=y
CONFIG_NR_CPUS=4
CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
CONFIG_CPU_IDLE=y
# CONFIG_MIPS_CPS_CPUIDLE is not set
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_PARTITION_ADVANCED=y
# CONFIG_COMPACTION is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
CONFIG_ZSMALLOC=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_NET_KEY=m
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_ROUTE_MULTIPATH=y
CONFIG_IP_ROUTE_VERBOSE=y
CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y
CONFIG_IP_MROUTE=y
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
CONFIG_SYN_COOKIES=y
CONFIG_INET_AH=m
CONFIG_INET_ESP=m
CONFIG_INET_IPCOMP=m
CONFIG_INET_XFRM_MODE_TRANSPORT=m
CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET_XFRM_MODE_BEET=m
# CONFIG_INET_DIAG is not set
CONFIG_TCP_CONG_ADVANCED=y
# CONFIG_TCP_CONG_BIC is not set
# CONFIG_TCP_CONG_WESTWOOD is not set
# CONFIG_TCP_CONG_HTCP is not set
CONFIG_TCP_CONG_LP=m
CONFIG_TCP_MD5SIG=y
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_XFRM_MODE_TRANSPORT=m
CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET6_XFRM_MODE_BEET=m
CONFIG_IPV6_SIT=m
CONFIG_NETWORK_SECMARK=y
CONFIG_NETFILTER=y
# CONFIG_BRIDGE_NETFILTER is not set
CONFIG_NF_CONNTRACK=y
CONFIG_NF_CT_NETLINK=y
CONFIG_NETFILTER_XT_MARK=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
CONFIG_NETFILTER_XT_TARGET_DSCP=y
CONFIG_NETFILTER_XT_TARGET_NFLOG=y
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
CONFIG_NETFILTER_XT_TARGET_SECMARK=y
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
CONFIG_NETFILTER_XT_MATCH_DSCP=y
CONFIG_NETFILTER_XT_MATCH_POLICY=y
CONFIG_NETFILTER_XT_MATCH_STATE=y
CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_IPTABLES=y
CONFIG_IP_NF_FILTER=y
CONFIG_IP_NF_TARGET_REJECT=y
CONFIG_IP_NF_MANGLE=y
CONFIG_NF_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_IPV6HEADER=m
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_BRIDGE=m
CONFIG_VLAN_8021Q=m
CONFIG_NET_SCHED=y
CONFIG_NET_SCH_HTB=m
CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_FQ_CODEL=m
CONFIG_NET_CLS_U32=m
CONFIG_CLS_U32_MARK=y
CONFIG_BT=m
CONFIG_BT_RFCOMM=m
CONFIG_BT_HCIBTUSB=m
CONFIG_BT_HCIBFUSB=m
CONFIG_BT_HCIVHCI=m
CONFIG_CFG80211=m
CONFIG_NL80211_TESTMODE=y
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_WEXT=y
CONFIG_MAC80211=m
CONFIG_MAC80211_LEDS=y
CONFIG_MAC80211_DEBUGFS=y
CONFIG_MAC80211_DEBUG_MENU=y
CONFIG_MAC80211_VERBOSE_DEBUG=y
CONFIG_RFKILL=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_DEBUG_DEVRES=y
CONFIG_CONNECTOR=y
CONFIG_MTD=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_BLOCK=y
CONFIG_ZRAM=m
CONFIG_BLK_DEV_LOOP=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SR=m
CONFIG_SCSI_SPI_ATTRS=y
CONFIG_MD=y
CONFIG_BLK_DEV_DM=y
CONFIG_DM_CRYPT=y
CONFIG_DM_VERITY=y
CONFIG_NETDEVICES=y
CONFIG_TUN=m
CONFIG_VETH=m
# CONFIG_NET_VENDOR_MARVELL is not set
# CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MICROCHIP is not set
# CONFIG_NET_VENDOR_NATSEMI is not set
# CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_SMSC is not set
CONFIG_STMMAC_ETH=y
# CONFIG_NET_VENDOR_VIA is not set
CONFIG_PPP=m
CONFIG_PPP_ASYNC=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m
CONFIG_USB_RTL8152=m
CONFIG_USB_NET_DM9601=m
CONFIG_USB_NET_SMSC75XX=m
CONFIG_USB_NET_SMSC95XX=m
CONFIG_USB_NET_MCS7830=m
# CONFIG_USB_NET_CDC_SUBSET is not set
# CONFIG_USB_NET_ZAURUS is not set
CONFIG_HOSTAP=m
CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_FIRMWARE_NVRAM=y
CONFIG_LIBERTAS_THINFIRM=m
CONFIG_RT2X00=m
CONFIG_RT2800USB=m
CONFIG_MAC80211_HWSIM=m
CONFIG_USB_NET_RNDIS_WLAN=m
CONFIG_INPUT_EVDEV=y
# CONFIG_KEYBOARD_ATKBD is not set
CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set
# CONFIG_SERIO is not set
# CONFIG_VT is not set
# CONFIG_LEGACY_PTYS is not set
CONFIG_SERIAL_8250=y
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_DW=y
CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_HW_RANDOM=y
CONFIG_TCG_TPM=y
CONFIG_I2C=y
CONFIG_I2C_CHARDEV=m
CONFIG_I2C_IMG=y
CONFIG_I2C_STUB=m
CONFIG_SPI=y
CONFIG_SPI_BITBANG=m
CONFIG_SPI_IMG_SPFI=y
CONFIG_SPI_SPIDEV=y
CONFIG_DEBUG_GPIO=y
CONFIG_GPIO_SYSFS=y
CONFIG_POWER_SUPPLY=y
CONFIG_THERMAL=y
CONFIG_WATCHDOG=y
CONFIG_IMGPDC_WDT=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_GPIO=y
CONFIG_RC_CORE=y
CONFIG_RC_DEVICES=y
CONFIG_IR_IMG=y
CONFIG_IR_IMG_NEC=y
CONFIG_IR_IMG_JVC=y
CONFIG_IR_IMG_SONY=y
CONFIG_IR_IMG_SHARP=y
CONFIG_IR_IMG_SANYO=y
CONFIG_IR_IMG_RC5=y
CONFIG_IR_IMG_RC6=y
CONFIG_MEDIA_SUPPORT=y
CONFIG_FB=y
CONFIG_FB_MODE_HELPERS=y
# CONFIG_LCD_CLASS_DEVICE is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_SOUND=y
CONFIG_SND=y
CONFIG_SND_HRTIMER=m
CONFIG_SND_DYNAMIC_MINORS=y
CONFIG_SND_SEQUENCER=m
CONFIG_SND_SEQ_DUMMY=m
# CONFIG_SND_SPI is not set
CONFIG_SND_USB_AUDIO=m
CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
# CONFIG_USB_DEFAULT_PERSIST is not set
CONFIG_USB_MON=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_ACM=y
CONFIG_USB_STORAGE=y
CONFIG_USB_DWC2=y
CONFIG_USB_SERIAL=y
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_CP210X=m
CONFIG_USB_SERIAL_FTDI_SIO=m
CONFIG_USB_SERIAL_KEYSPAN=m
CONFIG_USB_SERIAL_PL2303=m
CONFIG_USB_SERIAL_OTI6858=m
CONFIG_USB_SERIAL_QUALCOMM=m
CONFIG_USB_SERIAL_SIERRAWIRELESS=m
CONFIG_USB_SERIAL_OPTION=m
CONFIG_MMC=y
CONFIG_MMC_BLOCK_MINORS=16
CONFIG_MMC_TEST=m
CONFIG_MMC_DW=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_RTC_CLASS=y
CONFIG_DMADEVICES=y
CONFIG_IMG_MDC_DMA=y
CONFIG_STAGING=y
CONFIG_ASHMEM=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_MEMORY=y
CONFIG_IIO=y
CONFIG_CC10001_ADC=y
CONFIG_PWM=y
CONFIG_PWM_IMG=y
CONFIG_PHY_PISTACHIO_USB=y
CONFIG_ANDROID=y
CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
# CONFIG_DNOTIFY is not set
CONFIG_FUSE_FS=m
CONFIG_ISO9660_FS=m
CONFIG_JOLIET=y
CONFIG_ZISOFS=y
CONFIG_UDF_FS=m
CONFIG_VFAT_FS=m
CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_ECRYPT_FS=y
CONFIG_HFSPLUS_FS=m
CONFIG_UBIFS_FS=y
CONFIG_SQUASHFS=y
CONFIG_SQUASHFS_FILE_DIRECT=y
CONFIG_SQUASHFS_LZO=y
CONFIG_PSTORE=y
CONFIG_PSTORE_CONSOLE=y
CONFIG_PSTORE_RAM=y
CONFIG_NFS_FS=y
CONFIG_ROOT_NFS=y
CONFIG_NLS_DEFAULT="utf8"
CONFIG_NLS_CODEPAGE_437=m
CONFIG_NLS_ASCII=m
CONFIG_NLS_ISO8859_1=m
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_YAMA=y
CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_ARC4=y
CONFIG_CRYPTO_DES=y
CONFIG_CRC_CCITT=y
CONFIG_CRC_T10DIF=m
CONFIG_CRC7=m
# CONFIG_XZ_DEC_X86 is not set
CONFIG_PRINTK_TIME=y
CONFIG_DEBUG_INFO=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0
# CONFIG_SCHED_DEBUG is not set
CONFIG_SCHEDSTATS=y
CONFIG_DEBUG_SPINLOCK=y
CONFIG_DEBUG_CREDENTIALS=y
CONFIG_FUNCTION_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_LKDTM=y
CONFIG_TEST_UDELAY=m
arch/mips/generic/Kconfig
View file @ d6742212
...@@ -58,6 +58,12 @@ config FIT_IMAGE_FDT_BOSTON ...@@ -58,6 +58,12 @@ config FIT_IMAGE_FDT_BOSTON
enable this if you wish to boot on a MIPS Boston board, as it is enable this if you wish to boot on a MIPS Boston board, as it is
expected by the bootloader. expected by the bootloader.
config FIT_IMAGE_FDT_MARDUK
bool "Include FDT for IMG Pistachio Marduk (CI40) boards"
help
Enable this to include the FDT for the IMG Pistachio Marduk (CI40)
from Imagination Technologies in the FIT kernel image.
config FIT_IMAGE_FDT_NI169445 config FIT_IMAGE_FDT_NI169445
bool "Include FDT for NI 169445" bool "Include FDT for NI 169445"
help help
......
arch/mips/generic/Platform
View file @ d6742212
...@@ -24,3 +24,4 @@ its-$(CONFIG_FIT_IMAGE_FDT_LUTON) += board-luton.its.S ...@@ -24,3 +24,4 @@ its-$(CONFIG_FIT_IMAGE_FDT_LUTON) += board-luton.its.S
its-$(CONFIG_FIT_IMAGE_FDT_JAGUAR2) += board-jaguar2.its.S its-$(CONFIG_FIT_IMAGE_FDT_JAGUAR2) += board-jaguar2.its.S
its-$(CONFIG_FIT_IMAGE_FDT_SERVAL) += board-serval.its.S its-$(CONFIG_FIT_IMAGE_FDT_SERVAL) += board-serval.its.S
its-$(CONFIG_FIT_IMAGE_FDT_XILFPGA) += board-xilfpga.its.S its-$(CONFIG_FIT_IMAGE_FDT_XILFPGA) += board-xilfpga.its.S
its-$(CONFIG_FIT_IMAGE_FDT_MARDUK) += board-marduk.its.S
arch/mips/generic/board-ingenic.c
View file @ d6742212
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
* Copyright (C) 2020 Paul Cercueil <paul@crapouillou.net> * Copyright (C) 2020 Paul Cercueil <paul@crapouillou.net>
*/ */
#include <linux/clk.h>
#include <linux/of.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/of_fdt.h> #include <linux/of_fdt.h>
#include <linux/pm.h> #include <linux/pm.h>
...@@ -21,6 +23,10 @@ ...@@ -21,6 +23,10 @@
static __init char *ingenic_get_system_type(unsigned long machtype) static __init char *ingenic_get_system_type(unsigned long machtype)
{ {
switch (machtype) { switch (machtype) {
case MACH_INGENIC_X2100:
return "X2100";
case MACH_INGENIC_X2000H:
return "X2000H";
case MACH_INGENIC_X2000E: case MACH_INGENIC_X2000E:
return "X2000E"; return "X2000E";
case MACH_INGENIC_X2000: case MACH_INGENIC_X2000:
...@@ -37,8 +43,18 @@ static __init char *ingenic_get_system_type(unsigned long machtype) ...@@ -37,8 +43,18 @@ static __init char *ingenic_get_system_type(unsigned long machtype)
return "JZ4775"; return "JZ4775";
case MACH_INGENIC_JZ4770: case MACH_INGENIC_JZ4770:
return "JZ4770"; return "JZ4770";
case MACH_INGENIC_JZ4760B:
return "JZ4760B";
case MACH_INGENIC_JZ4760:
return "JZ4760";
case MACH_INGENIC_JZ4755:
return "JZ4755";
case MACH_INGENIC_JZ4750:
return "JZ4750";
case MACH_INGENIC_JZ4725B: case MACH_INGENIC_JZ4725B:
return "JZ4725B"; return "JZ4725B";
case MACH_INGENIC_JZ4730:
return "JZ4730";
default: default:
return "JZ4740"; return "JZ4740";
} }
...@@ -61,8 +77,13 @@ static __init const void *ingenic_fixup_fdt(const void *fdt, const void *match_d ...@@ -61,8 +77,13 @@ static __init const void *ingenic_fixup_fdt(const void *fdt, const void *match_d
} }
static const struct of_device_id ingenic_of_match[] __initconst = { static const struct of_device_id ingenic_of_match[] __initconst = {
{ .compatible = "ingenic,jz4730", .data = (void *)MACH_INGENIC_JZ4730 },
{ .compatible = "ingenic,jz4740", .data = (void *)MACH_INGENIC_JZ4740 }, { .compatible = "ingenic,jz4740", .data = (void *)MACH_INGENIC_JZ4740 },
{ .compatible = "ingenic,jz4725b", .data = (void *)MACH_INGENIC_JZ4725B }, { .compatible = "ingenic,jz4725b", .data = (void *)MACH_INGENIC_JZ4725B },
{ .compatible = "ingenic,jz4750", .data = (void *)MACH_INGENIC_JZ4750 },
{ .compatible = "ingenic,jz4755", .data = (void *)MACH_INGENIC_JZ4755 },
{ .compatible = "ingenic,jz4760", .data = (void *)MACH_INGENIC_JZ4760 },
{ .compatible = "ingenic,jz4760b", .data = (void *)MACH_INGENIC_JZ4760B },
{ .compatible = "ingenic,jz4770", .data = (void *)MACH_INGENIC_JZ4770 }, { .compatible = "ingenic,jz4770", .data = (void *)MACH_INGENIC_JZ4770 },
{ .compatible = "ingenic,jz4775", .data = (void *)MACH_INGENIC_JZ4775 }, { .compatible = "ingenic,jz4775", .data = (void *)MACH_INGENIC_JZ4775 },
{ .compatible = "ingenic,jz4780", .data = (void *)MACH_INGENIC_JZ4780 }, { .compatible = "ingenic,jz4780", .data = (void *)MACH_INGENIC_JZ4780 },
...@@ -71,6 +92,8 @@ static const struct of_device_id ingenic_of_match[] __initconst = { ...@@ -71,6 +92,8 @@ static const struct of_device_id ingenic_of_match[] __initconst = {
{ .compatible = "ingenic,x1830", .data = (void *)MACH_INGENIC_X1830 }, { .compatible = "ingenic,x1830", .data = (void *)MACH_INGENIC_X1830 },
{ .compatible = "ingenic,x2000", .data = (void *)MACH_INGENIC_X2000 }, { .compatible = "ingenic,x2000", .data = (void *)MACH_INGENIC_X2000 },
{ .compatible = "ingenic,x2000e", .data = (void *)MACH_INGENIC_X2000E }, { .compatible = "ingenic,x2000e", .data = (void *)MACH_INGENIC_X2000E },
{ .compatible = "ingenic,x2000h", .data = (void *)MACH_INGENIC_X2000H },
{ .compatible = "ingenic,x2100", .data = (void *)MACH_INGENIC_X2100 },
{} {}
}; };
...@@ -108,10 +131,36 @@ static const struct platform_suspend_ops ingenic_pm_ops __maybe_unused = { ...@@ -108,10 +131,36 @@ static const struct platform_suspend_ops ingenic_pm_ops __maybe_unused = {
static int __init ingenic_pm_init(void) static int __init ingenic_pm_init(void)
{ {
struct device_node *cpu_node;
struct clk *cpu0_clk;
int ret;
if (boot_cpu_type() == CPU_XBURST) { if (boot_cpu_type() == CPU_XBURST) {
if (IS_ENABLED(CONFIG_PM_SLEEP)) if (IS_ENABLED(CONFIG_PM_SLEEP))
suspend_set_ops(&ingenic_pm_ops); suspend_set_ops(&ingenic_pm_ops);
_machine_halt = ingenic_halt; _machine_halt = ingenic_halt;
/*
* Unconditionally enable the clock for the first CPU.
* This makes sure that the PLL that feeds the CPU won't be
* stopped while the kernel is running.
*/
cpu_node = of_get_cpu_node(0, NULL);
if (!cpu_node) {
pr_err("Unable to get CPU node\n");
} else {
cpu0_clk = of_clk_get(cpu_node, 0);
if (IS_ERR(cpu0_clk)) {
pr_err("Unable to get CPU0 clock\n");
return PTR_ERR(cpu0_clk);
}
ret = clk_prepare_enable(cpu0_clk);
if (ret) {
pr_err("Unable to enable CPU0 clock\n");
return ret;
}
}
} }
return 0; return 0;
......
arch/mips/generic/board-marduk.its.S 0 → 100644
View file @ d6742212
/ {
images {
fdt-marduk {
description = "img,pistachio-marduk Device Tree";
data = /incbin/("boot/dts/img/pistachio_marduk.dtb");
type = "flat_dt";
arch = "mips";
compression = "none";
hash {
algo = "sha1";
};
};
};
configurations {
conf-marduk {
description = "Marduk Linux kernel";
kernel = "kernel";
fdt = "fdt-marduk";
};
};
};
arch/mips/generic/board-ocelot.c
View file @ d6742212
...@@ -26,13 +26,13 @@ static __init bool ocelot_detect(void) ...@@ -26,13 +26,13 @@ static __init bool ocelot_detect(void)
tlb_probe_hazard(); tlb_probe_hazard();
idx = read_c0_index(); idx = read_c0_index();
if (idx < 0) if (idx < 0)
return 0; return false;
/* A TLB entry exists, lets assume its usable and check the CHIP ID */ /* A TLB entry exists, lets assume its usable and check the CHIP ID */
rev = __raw_readl((void __iomem *)DEVCPU_GCB_CHIP_REGS_CHIP_ID); rev = __raw_readl((void __iomem *)DEVCPU_GCB_CHIP_REGS_CHIP_ID);
if ((rev & CHIP_ID_PART_ID) != OCELOT_PART_ID) if ((rev & CHIP_ID_PART_ID) != OCELOT_PART_ID)
return 0; return false;
/* Copy command line from bootloader early for Initrd detection */ /* Copy command line from bootloader early for Initrd detection */
if (fw_arg0 < 10 && (fw_arg1 & 0xFFF00000) == 0x80000000) { if (fw_arg0 < 10 && (fw_arg1 & 0xFFF00000) == 0x80000000) {
...@@ -44,7 +44,7 @@ static __init bool ocelot_detect(void) ...@@ -44,7 +44,7 @@ static __init bool ocelot_detect(void)
strcpy(arcs_cmdline, prom_argv[1]); strcpy(arcs_cmdline, prom_argv[1]);
} }
return 1; return true;
} }
static void __init ocelot_earlyprintk_init(void) static void __init ocelot_earlyprintk_init(void)
......
arch/mips/include/asm/atomic.h
View file @ d6742212
...@@ -206,7 +206,7 @@ ATOMIC_OPS(atomic64, xor, s64, ^=, xor, lld, scd) ...@@ -206,7 +206,7 @@ ATOMIC_OPS(atomic64, xor, s64, ^=, xor, lld, scd)
* The function returns the old value of @v minus @i. * The function returns the old value of @v minus @i.
*/ */
#define ATOMIC_SIP_OP(pfx, type, op, ll, sc) \ #define ATOMIC_SIP_OP(pfx, type, op, ll, sc) \
static __inline__ int arch_##pfx##_sub_if_positive(type i, pfx##_t * v) \ static __inline__ type arch_##pfx##_sub_if_positive(type i, pfx##_t * v) \
{ \ { \
type temp, result; \ type temp, result; \
\ \
......
arch/mips/include/asm/bootinfo.h
View file @ d6742212
...@@ -75,6 +75,7 @@ enum ingenic_machine_type { ...@@ -75,6 +75,7 @@ enum ingenic_machine_type {
MACH_INGENIC_JZ4750, MACH_INGENIC_JZ4750,
MACH_INGENIC_JZ4755, MACH_INGENIC_JZ4755,
MACH_INGENIC_JZ4760, MACH_INGENIC_JZ4760,
MACH_INGENIC_JZ4760B,
MACH_INGENIC_JZ4770, MACH_INGENIC_JZ4770,
MACH_INGENIC_JZ4775, MACH_INGENIC_JZ4775,
MACH_INGENIC_JZ4780, MACH_INGENIC_JZ4780,
...@@ -83,6 +84,8 @@ enum ingenic_machine_type { ...@@ -83,6 +84,8 @@ enum ingenic_machine_type {
MACH_INGENIC_X1830, MACH_INGENIC_X1830,
MACH_INGENIC_X2000, MACH_INGENIC_X2000,
MACH_INGENIC_X2000E, MACH_INGENIC_X2000E,
MACH_INGENIC_X2000H,
MACH_INGENIC_X2100,
}; };
extern char *system_type; extern char *system_type;
......
arch/mips/include/asm/cpu.h
View file @ d6742212
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
#define PRID_COMP_NETLOGIC 0x0c0000 #define PRID_COMP_NETLOGIC 0x0c0000
#define PRID_COMP_CAVIUM 0x0d0000 #define PRID_COMP_CAVIUM 0x0d0000
#define PRID_COMP_LOONGSON 0x140000 #define PRID_COMP_LOONGSON 0x140000
#define PRID_COMP_INGENIC_13 0x130000 /* X2000 */ #define PRID_COMP_INGENIC_13 0x130000 /* X2000, X2100 */
#define PRID_COMP_INGENIC_D0 0xd00000 /* JZ4740, JZ4750, X1830 */ #define PRID_COMP_INGENIC_D0 0xd00000 /* JZ4730, JZ4740, JZ4750, JZ4755, JZ4760, X1830 */
#define PRID_COMP_INGENIC_D1 0xd10000 /* JZ4770, JZ4775, X1000 */ #define PRID_COMP_INGENIC_D1 0xd10000 /* JZ4770, JZ4775, X1000 */
#define PRID_COMP_INGENIC_E1 0xe10000 /* JZ4780 */ #define PRID_COMP_INGENIC_E1 0xe10000 /* JZ4780 */
......
arch/mips/kernel/mips-mt-fpaff.c
View file @ d6742212
...@@ -76,13 +76,13 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len, ...@@ -76,13 +76,13 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len,
if (copy_from_user(&new_mask, user_mask_ptr, sizeof(new_mask))) if (copy_from_user(&new_mask, user_mask_ptr, sizeof(new_mask)))
return -EFAULT; return -EFAULT;
get_online_cpus(); cpus_read_lock();
rcu_read_lock(); rcu_read_lock();
p = find_process_by_pid(pid); p = find_process_by_pid(pid);
if (!p) { if (!p) {
rcu_read_unlock(); rcu_read_unlock();
put_online_cpus(); cpus_read_unlock();
return -ESRCH; return -ESRCH;
} }
...@@ -147,7 +147,7 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len, ...@@ -147,7 +147,7 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len,
free_cpumask_var(cpus_allowed); free_cpumask_var(cpus_allowed);
out_put_task: out_put_task:
put_task_struct(p); put_task_struct(p);
put_online_cpus(); cpus_read_unlock();
return retval; return retval;
} }
...@@ -166,7 +166,7 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len, ...@@ -166,7 +166,7 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len,
if (len < real_len) if (len < real_len)
return -EINVAL; return -EINVAL;
get_online_cpus(); cpus_read_lock();
rcu_read_lock(); rcu_read_lock();
retval = -ESRCH; retval = -ESRCH;
...@@ -182,7 +182,7 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len, ...@@ -182,7 +182,7 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len,
out_unlock: out_unlock:
rcu_read_unlock(); rcu_read_unlock();
put_online_cpus(); cpus_read_unlock();
if (retval) if (retval)
return retval; return retval;
if (copy_to_user(user_mask_ptr, &mask, real_len)) if (copy_to_user(user_mask_ptr, &mask, real_len))
......
arch/mips/kernel/process.c
View file @ d6742212
...@@ -859,10 +859,10 @@ int mips_set_process_fp_mode(struct task_struct *task, unsigned int value) ...@@ -859,10 +859,10 @@ int mips_set_process_fp_mode(struct task_struct *task, unsigned int value)
* scheduled in then it will already have picked up the new FP mode * scheduled in then it will already have picked up the new FP mode
* whilst doing so. * whilst doing so.
*/ */
get_online_cpus(); cpus_read_lock();
for_each_cpu_and(cpu, &process_cpus, cpu_online_mask) for_each_cpu_and(cpu, &process_cpus, cpu_online_mask)
work_on_cpu(cpu, prepare_for_fp_mode_switch, NULL); work_on_cpu(cpu, prepare_for_fp_mode_switch, NULL);
put_online_cpus(); cpus_read_unlock();
return 0; return 0;
} }
......
arch/mips/kernel/uprobes.c
View file @ d6742212
...@@ -75,7 +75,7 @@ bool is_trap_insn(uprobe_opcode_t *insn) ...@@ -75,7 +75,7 @@ bool is_trap_insn(uprobe_opcode_t *insn)
case tlt_op: case tlt_op:
case tltu_op: case tltu_op:
case tne_op: case tne_op:
return 1; return true;
} }
break; break;
...@@ -87,12 +87,12 @@ bool is_trap_insn(uprobe_opcode_t *insn) ...@@ -87,12 +87,12 @@ bool is_trap_insn(uprobe_opcode_t *insn)
case tlti_op: case tlti_op:
case tltiu_op: case tltiu_op:
case tnei_op: case tnei_op:
return 1; return true;
} }
break; break;
} }
return 0; return false;
} }
#define UPROBE_TRAP_NR ULONG_MAX #define UPROBE_TRAP_NR ULONG_MAX
...@@ -254,9 +254,9 @@ unsigned long uprobe_get_swbp_addr(struct pt_regs *regs) ...@@ -254,9 +254,9 @@ unsigned long uprobe_get_swbp_addr(struct pt_regs *regs)
* See if the instruction can be emulated. * See if the instruction can be emulated.
* Returns true if instruction was emulated, false otherwise. * Returns true if instruction was emulated, false otherwise.
* *
* For now we always emulate so this function just returns 0. * For now we always emulate so this function just returns false.
*/ */
bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs) bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs)
{ {
return 0; return false;
} }
arch/mips/kvm/Makefile
View file @ d6742212
...@@ -2,21 +2,18 @@ ...@@ -2,21 +2,18 @@
# Makefile for KVM support for MIPS # Makefile for KVM support for MIPS
# #
common-objs-y = $(addprefix ../../../virt/kvm/, kvm_main.o coalesced_mmio.o eventfd.o binary_stats.o) ccflags-y += -Ivirt/kvm -Iarch/mips/kvm
EXTRA_CFLAGS += -Ivirt/kvm -Iarch/mips/kvm kvm-y := $(addprefix ../../../virt/kvm/, kvm_main.o coalesced_mmio.o eventfd.o binary_stats.o)
kvm-$(CONFIG_CPU_HAS_MSA) += msa.o
common-objs-$(CONFIG_CPU_HAS_MSA) += msa.o kvm-y += mips.o emulate.o entry.o \
kvm-objs := $(common-objs-y) mips.o emulate.o entry.o \
interrupt.o stats.o \ interrupt.o stats.o \
fpu.o fpu.o
kvm-objs += hypcall.o kvm-y += hypcall.o
kvm-objs += mmu.o kvm-y += mmu.o
ifdef CONFIG_CPU_LOONGSON64 kvm-$(CONFIG_CPU_LOONGSON64) += loongson_ipi.o
kvm-objs += loongson_ipi.o
endif
kvm-objs += vz.o kvm-y += vz.o
obj-$(CONFIG_KVM) += kvm.o obj-$(CONFIG_KVM) += kvm.o
obj-y += callback.o tlb.o obj-y += callback.o tlb.o
arch/mips/kvm/mmu.c
View file @ d6742212
...@@ -442,7 +442,7 @@ static int kvm_mips_mkold_gpa_pt(struct kvm *kvm, gfn_t start_gfn, ...@@ -442,7 +442,7 @@ static int kvm_mips_mkold_gpa_pt(struct kvm *kvm, gfn_t start_gfn,
bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range) bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range)
{ {
kvm_mips_flush_gpa_pt(kvm, range->start, range->end); kvm_mips_flush_gpa_pt(kvm, range->start, range->end);
return 1; return true;
} }
bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range) bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range)
...@@ -486,7 +486,7 @@ bool kvm_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range) ...@@ -486,7 +486,7 @@ bool kvm_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range)
pte_t *gpa_pte = kvm_mips_pte_for_gpa(kvm, NULL, gpa); pte_t *gpa_pte = kvm_mips_pte_for_gpa(kvm, NULL, gpa);
if (!gpa_pte) if (!gpa_pte)
return 0; return false;
return pte_young(*gpa_pte); return pte_young(*gpa_pte);
} }
......
arch/mips/loongson2ef/common/Makefile
View file @ d6742212
...@@ -4,12 +4,14 @@ ...@@ -4,12 +4,14 @@
# #
obj-y += setup.o init.o env.o time.o reset.o irq.o \ obj-y += setup.o init.o env.o time.o reset.o irq.o \
bonito-irq.o mem.o machtype.o platform.o serial.o bonito-irq.o mem.o machtype.o platform.o
obj-$(CONFIG_PCI) += pci.o obj-$(CONFIG_PCI) += pci.o
# #
# Serial port support # Serial port support
# #
obj-$(CONFIG_LOONGSON_UART_BASE) += serial.o
obj-$(CONFIG_EARLY_PRINTK) += serial.o
obj-$(CONFIG_LOONGSON_UART_BASE) += uart_base.o obj-$(CONFIG_LOONGSON_UART_BASE) += uart_base.o
obj-$(CONFIG_LOONGSON_MC146818) += rtc.o obj-$(CONFIG_LOONGSON_MC146818) += rtc.o
......
arch/mips/mm/c-octeon.c
View file @ d6742212
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
unsigned long long cache_err_dcache[NR_CPUS]; unsigned long long cache_err_dcache[NR_CPUS];
EXPORT_SYMBOL_GPL(cache_err_dcache); EXPORT_SYMBOL_GPL(cache_err_dcache);
/** /*
* Octeon automatically flushes the dcache on tlb changes, so * Octeon automatically flushes the dcache on tlb changes, so
* from Linux's viewpoint it acts much like a physically * from Linux's viewpoint it acts much like a physically
* tagged cache. No flushing is needed * tagged cache. No flushing is needed
...@@ -56,8 +56,8 @@ static void local_octeon_flush_icache_range(unsigned long start, ...@@ -56,8 +56,8 @@ static void local_octeon_flush_icache_range(unsigned long start,
} }
/** /**
* Flush caches as necessary for all cores affected by a * octeon_flush_icache_all_cores - Flush caches as necessary for all cores
* vma. If no vma is supplied, all cores are flushed. * affected by a vma. If no vma is supplied, all cores are flushed.
* *
* @vma: VMA to flush or NULL to flush all icaches. * @vma: VMA to flush or NULL to flush all icaches.
*/ */
...@@ -92,7 +92,7 @@ static void octeon_flush_icache_all_cores(struct vm_area_struct *vma) ...@@ -92,7 +92,7 @@ static void octeon_flush_icache_all_cores(struct vm_area_struct *vma)
} }
/** /*
* Called to flush the icache on all cores * Called to flush the icache on all cores
*/ */
static void octeon_flush_icache_all(void) static void octeon_flush_icache_all(void)
...@@ -102,8 +102,7 @@ static void octeon_flush_icache_all(void) ...@@ -102,8 +102,7 @@ static void octeon_flush_icache_all(void)
/** /**
* Called to flush all memory associated with a memory * octeon_flush_cache_mm - flush all memory associated with a memory context.
* context.
* *
* @mm: Memory context to flush * @mm: Memory context to flush
*/ */
...@@ -116,7 +115,7 @@ static void octeon_flush_cache_mm(struct mm_struct *mm) ...@@ -116,7 +115,7 @@ static void octeon_flush_cache_mm(struct mm_struct *mm)
} }
/** /*
* Flush a range of kernel addresses out of the icache * Flush a range of kernel addresses out of the icache
* *
*/ */
...@@ -127,11 +126,11 @@ static void octeon_flush_icache_range(unsigned long start, unsigned long end) ...@@ -127,11 +126,11 @@ static void octeon_flush_icache_range(unsigned long start, unsigned long end)
/** /**
* Flush a range out of a vma * octeon_flush_cache_range - Flush a range out of a vma
* *
* @vma: VMA to flush * @vma: VMA to flush
* @start: * @start: beginning address for flush
* @end: * @end: ending address for flush
*/ */
static void octeon_flush_cache_range(struct vm_area_struct *vma, static void octeon_flush_cache_range(struct vm_area_struct *vma,
unsigned long start, unsigned long end) unsigned long start, unsigned long end)
...@@ -142,11 +141,11 @@ static void octeon_flush_cache_range(struct vm_area_struct *vma, ...@@ -142,11 +141,11 @@ static void octeon_flush_cache_range(struct vm_area_struct *vma,
/** /**
* Flush a specific page of a vma * octeon_flush_cache_page - Flush a specific page of a vma
* *
* @vma: VMA to flush page for * @vma: VMA to flush page for
* @page: Page to flush * @page: Page to flush
* @pfn: * @pfn: Page frame number
*/ */
static void octeon_flush_cache_page(struct vm_area_struct *vma, static void octeon_flush_cache_page(struct vm_area_struct *vma,
unsigned long page, unsigned long pfn) unsigned long page, unsigned long pfn)
...@@ -160,7 +159,7 @@ static void octeon_flush_kernel_vmap_range(unsigned long vaddr, int size) ...@@ -160,7 +159,7 @@ static void octeon_flush_kernel_vmap_range(unsigned long vaddr, int size)
BUG(); BUG();
} }
/** /*
* Probe Octeon's caches * Probe Octeon's caches
* *
*/ */
...@@ -256,7 +255,7 @@ static void octeon_cache_error_setup(void) ...@@ -256,7 +255,7 @@ static void octeon_cache_error_setup(void)
set_handler(0x100, &except_vec2_octeon, 0x80); set_handler(0x100, &except_vec2_octeon, 0x80);
} }
/** /*
* Setup the Octeon cache flush routines * Setup the Octeon cache flush routines
* *
*/ */
...@@ -341,7 +340,7 @@ asmlinkage void cache_parity_error_octeon_recoverable(void) ...@@ -341,7 +340,7 @@ asmlinkage void cache_parity_error_octeon_recoverable(void)
co_cache_error_call_notifiers(0); co_cache_error_call_notifiers(0);
} }
/** /*
* Called when the the exception is not recoverable * Called when the the exception is not recoverable
*/ */
......
arch/mips/mti-malta/malta-dtshim.c
View file @ d6742212
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#define ROCIT_CONFIG_GEN1_MEMMAP_SHIFT 8 #define ROCIT_CONFIG_GEN1_MEMMAP_SHIFT 8
#define ROCIT_CONFIG_GEN1_MEMMAP_MASK (0xf << 8) #define ROCIT_CONFIG_GEN1_MEMMAP_MASK (0xf << 8)
static unsigned char fdt_buf[16 << 10] __initdata; static unsigned char fdt_buf[16 << 10] __initdata __aligned(8);
/* determined physical memory size, not overridden by command line args */ /* determined physical memory size, not overridden by command line args */
extern unsigned long physical_memsize; extern unsigned long physical_memsize;
......
arch/mips/netlogic/xlr/fmn-config.c
View file @ d6742212
...@@ -103,18 +103,19 @@ static void check_credit_distribution(void) ...@@ -103,18 +103,19 @@ static void check_credit_distribution(void)
} }
/** /**
* Configure bucket size and credits for a device. 'size' is the size of * setup_fmn_cc - Configure bucket size and credits for a device.
* the buckets for the device. This size is distributed among all the CPUs
* so that all of them can send messages to the device.
*
* The device is also given 'cpu_credits' to send messages to the CPUs
*
* @dev_info: FMN information structure for each devices * @dev_info: FMN information structure for each devices
* @start_stn_id: Starting station id of dev_info * @start_stn_id: Starting station id of dev_info
* @end_stn_id: End station id of dev_info * @end_stn_id: End station id of dev_info
* @num_buckets: Total number of buckets for den_info * @num_buckets: Total number of buckets for den_info
* @cpu_credits: Allowed credits to cpu for each devices pointing by dev_info * @cpu_credits: Allowed credits to cpu for each devices pointing by dev_info
* @size: Size of the each buckets in the device station * @size: Size of the each buckets in the device station
*
* 'size' is the size of the buckets for the device. This size is
* distributed among all the CPUs
* so that all of them can send messages to the device.
*
* The device is also given 'cpu_credits' to send messages to the CPUs
*/ */
static void setup_fmn_cc(struct xlr_fmn_info *dev_info, int start_stn_id, static void setup_fmn_cc(struct xlr_fmn_info *dev_info, int start_stn_id,
int end_stn_id, int num_buckets, int cpu_credits, int size) int end_stn_id, int num_buckets, int cpu_credits, int size)
...@@ -174,6 +175,8 @@ static void setup_cpu_fmninfo(struct xlr_fmn_info *cpu, int num_core) ...@@ -174,6 +175,8 @@ static void setup_cpu_fmninfo(struct xlr_fmn_info *cpu, int num_core)
} }
/** /**
* xlr_board_info_setup - Setup FMN details
*
* Setup the FMN details for each devices according to the device available * Setup the FMN details for each devices according to the device available
* in each variant of XLR/XLS processor * in each variant of XLR/XLS processor
*/ */
......
arch/mips/pistachio/Kconfig deleted 100644 → 0
View file @ 603eefda
# SPDX-License-Identifier: GPL-2.0
config PISTACHIO_GPTIMER_CLKSRC
bool "Enable General Purpose Timer based clocksource"
depends on MACH_PISTACHIO
select CLKSRC_PISTACHIO
select MIPS_EXTERNAL_TIMER
help
This option enables a clocksource driver based on a Pistachio
SoC General Purpose external timer.
If you want to enable the CPUFreq, you need to enable
this option.
If you don't want to enable CPUFreq, you can leave this disabled.
arch/mips/pistachio/Makefile deleted 100644 → 0
View file @ 603eefda
# SPDX-License-Identifier: GPL-2.0-only
obj-y += init.o irq.o time.o
arch/mips/pistachio/Platform deleted 100644 → 0
View file @ 603eefda
#
# IMG Pistachio SoC
#
load-$(CONFIG_MACH_PISTACHIO) += 0xffffffff80400000
zload-$(CONFIG_MACH_PISTACHIO) += 0xffffffff81000000
all-$(CONFIG_MACH_PISTACHIO) := uImage.gz
arch/mips/pistachio/init.c deleted 100644 → 0
View file @ 603eefda
// SPDX-License-Identifier: GPL-2.0-only
/*
* Pistachio platform setup
*
* Copyright (C) 2014 Google, Inc.
* Copyright (C) 2016 Imagination Technologies
*/
#include <linux/init.h>
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/of_address.h>
#include <linux/of_fdt.h>
#include <asm/cacheflush.h>
#include <asm/fw/fw.h>
#include <asm/mips-boards/generic.h>
#include <asm/mips-cps.h>
#include <asm/prom.h>
#include <asm/smp-ops.h>
#include <asm/traps.h>
/*
* Core revision register decoding
* Bits 23 to 20: Major rev
* Bits 15 to 8: Minor rev
* Bits 7 to 0: Maintenance rev
*/
#define PISTACHIO_CORE_REV_REG 0xB81483D0
#define PISTACHIO_CORE_REV_A1 0x00100006
#define PISTACHIO_CORE_REV_B0 0x00100106
const char *get_system_type(void)
{
u32 core_rev;
const char *sys_type;
core_rev = __raw_readl((const void *)PISTACHIO_CORE_REV_REG);
switch (core_rev) {
case PISTACHIO_CORE_REV_B0:
sys_type = "IMG Pistachio SoC (B0)";
break;
case PISTACHIO_CORE_REV_A1:
sys_type = "IMG Pistachio SoC (A1)";
break;
default:
sys_type = "IMG Pistachio SoC";
break;
}
return sys_type;
}
void __init *plat_get_fdt(void)
{
if (fw_arg0 != -2)
panic("Device-tree not present");
return (void *)fw_arg1;
}
void __init plat_mem_setup(void)
{
__dt_setup_arch(plat_get_fdt());
}
#define DEFAULT_CPC_BASE_ADDR 0x1bde0000
#define DEFAULT_CDMM_BASE_ADDR 0x1bdd0000
phys_addr_t mips_cpc_default_phys_base(void)
{
return DEFAULT_CPC_BASE_ADDR;
}
phys_addr_t mips_cdmm_phys_base(void)
{
return DEFAULT_CDMM_BASE_ADDR;
}
static void __init mips_nmi_setup(void)
{
void *base;
base = cpu_has_veic ?
(void *)(CAC_BASE + 0xa80) :
(void *)(CAC_BASE + 0x380);
memcpy(base, except_vec_nmi, 0x80);
flush_icache_range((unsigned long)base,
(unsigned long)base + 0x80);
}
static void __init mips_ejtag_setup(void)
{
void *base;
extern char except_vec_ejtag_debug[];
base = cpu_has_veic ?
(void *)(CAC_BASE + 0xa00) :
(void *)(CAC_BASE + 0x300);
memcpy(base, except_vec_ejtag_debug, 0x80);
flush_icache_range((unsigned long)base,
(unsigned long)base + 0x80);
}
void __init prom_init(void)
{
board_nmi_handler_setup = mips_nmi_setup;
board_ejtag_handler_setup = mips_ejtag_setup;
mips_cm_probe();
mips_cpc_probe();
register_cps_smp_ops();
pr_info("SoC Type: %s\n", get_system_type());
}
void __init device_tree_init(void)
{
if (!initial_boot_params)
return;
unflatten_and_copy_device_tree();
}
arch/mips/pistachio/irq.c deleted 100644 → 0
View file @ 603eefda
// SPDX-License-Identifier: GPL-2.0-only
/*
* Pistachio IRQ setup
*
* Copyright (C) 2014 Google, Inc.
*/
#include <linux/init.h>
#include <linux/irqchip.h>
#include <linux/kernel.h>
#include <asm/cpu-features.h>
#include <asm/irq_cpu.h>
void __init arch_init_irq(void)
{
pr_info("EIC is %s\n", cpu_has_veic ? "on" : "off");
pr_info("VINT is %s\n", cpu_has_vint ? "on" : "off");
if (!cpu_has_veic)
mips_cpu_irq_init();
irqchip_init();
}
arch/mips/pistachio/time.c deleted 100644 → 0
View file @ 603eefda
// SPDX-License-Identifier: GPL-2.0-only
/*
* Pistachio clocksource/timer setup
*
* Copyright (C) 2014 Google, Inc.
*/
#include <linux/clk.h>
#include <linux/clocksource.h>
#include <linux/init.h>
#include <linux/of.h>
#include <linux/of_clk.h>
#include <asm/mips-cps.h>
#include <asm/time.h>
unsigned int get_c0_compare_int(void)
{
return gic_get_c0_compare_int();
}
int get_c0_perfcount_int(void)
{
return gic_get_c0_perfcount_int();
}
EXPORT_SYMBOL_GPL(get_c0_perfcount_int);
int get_c0_fdc_int(void)
{
return gic_get_c0_fdc_int();
}
void __init plat_time_init(void)
{
struct device_node *np;
struct clk *clk;
of_clk_init(NULL);
timer_probe();
np = of_get_cpu_node(0, NULL);
if (!np) {
pr_err("Failed to get CPU node\n");
return;
}
clk = of_clk_get(np, 0);
if (IS_ERR(clk)) {
pr_err("Failed to get CPU clock: %ld\n", PTR_ERR(clk));
return;
}
mips_hpt_frequency = clk_get_rate(clk) / 2;
clk_put(clk);
}
drivers/clk/Kconfig
View file @ d6742212
...@@ -403,6 +403,7 @@ source "drivers/clk/mediatek/Kconfig" ...@@ -403,6 +403,7 @@ source "drivers/clk/mediatek/Kconfig"
source "drivers/clk/meson/Kconfig" source "drivers/clk/meson/Kconfig"
source "drivers/clk/mstar/Kconfig" source "drivers/clk/mstar/Kconfig"
source "drivers/clk/mvebu/Kconfig" source "drivers/clk/mvebu/Kconfig"
source "drivers/clk/pistachio/Kconfig"
source "drivers/clk/qcom/Kconfig" source "drivers/clk/qcom/Kconfig"
source "drivers/clk/ralink/Kconfig" source "drivers/clk/ralink/Kconfig"
source "drivers/clk/renesas/Kconfig" source "drivers/clk/renesas/Kconfig"
......
drivers/clk/Makefile
View file @ d6742212
...@@ -97,7 +97,7 @@ obj-y += mstar/ ...@@ -97,7 +97,7 @@ obj-y += mstar/
obj-y += mvebu/ obj-y += mvebu/
obj-$(CONFIG_ARCH_MXS) += mxs/ obj-$(CONFIG_ARCH_MXS) += mxs/
obj-$(CONFIG_COMMON_CLK_NXP) += nxp/ obj-$(CONFIG_COMMON_CLK_NXP) += nxp/
obj-$(CONFIG_MACH_PISTACHIO) += pistachio/ obj-$(CONFIG_COMMON_CLK_PISTACHIO) += pistachio/
obj-$(CONFIG_COMMON_CLK_PXA) += pxa/ obj-$(CONFIG_COMMON_CLK_PXA) += pxa/
obj-$(CONFIG_COMMON_CLK_QCOM) += qcom/ obj-$(CONFIG_COMMON_CLK_QCOM) += qcom/
obj-y += ralink/ obj-y += ralink/
......
drivers/clk/pistachio/Kconfig 0 → 100644
View file @ d6742212
# SPDX-License-Identifier: GPL-2.0
config COMMON_CLK_PISTACHIO
bool "Support for IMG Pistachio SoC clock controllers"
depends on MIPS || COMPILE_TEST
help
Support for the IMG Pistachio SoC clock controller.
Say Y if you want to include clock support.
drivers/clocksource/Kconfig
View file @ d6742212
...@@ -234,8 +234,9 @@ config CLKSRC_LPC32XX ...@@ -234,8 +234,9 @@ config CLKSRC_LPC32XX
Support for the LPC32XX clocksource. Support for the LPC32XX clocksource.
config CLKSRC_PISTACHIO config CLKSRC_PISTACHIO
bool "Clocksource for Pistachio SoC" if COMPILE_TEST bool "Clocksource for Pistachio SoC"
depends on HAS_IOMEM depends on HAS_IOMEM
depends on MIPS || COMPILE_TEST
select TIMER_OF select TIMER_OF
help help
Enables the clocksource for the Pistachio SoC. Enables the clocksource for the Pistachio SoC.
......
drivers/phy/Kconfig
View file @ d6742212
...@@ -37,7 +37,7 @@ config PHY_LPC18XX_USB_OTG ...@@ -37,7 +37,7 @@ config PHY_LPC18XX_USB_OTG
config PHY_PISTACHIO_USB config PHY_PISTACHIO_USB
tristate "IMG Pistachio USB2.0 PHY driver" tristate "IMG Pistachio USB2.0 PHY driver"
depends on MACH_PISTACHIO depends on MIPS || COMPILE_TEST
select GENERIC_PHY select GENERIC_PHY
help help
Enable this to support the USB2.0 PHY on the IMG Pistachio SoC. Enable this to support the USB2.0 PHY on the IMG Pistachio SoC.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7