mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-19 01:33:10 +00:00
e5b3e87dfa
In arch/arm/mach-mvebu/dram.c we always include axp's xor.h for common
XOR definitions, regardless whether we compile for axp or a38x.
But the declaration of this function has a different signature in axp's
xor.h from the one used in a38x' implementation - one parameter is u64
instead of u32. This can result in wrong argument's being passed to that
function on a38x with no one the wiser.
I discovered this when building U-Boot for Turris Omnia with LTO. The
compiler complains about the different signatures being thrown into the
same linking process:
axp/xor.h:67:5: warning: type of ‘mv_xor_mem_init’ does not match
original declaration [-Wlto-type-mismatch]
67 | int mv_xor_mem_init(u32 chan, u32 start_ptr, u32 block_size,
| ^
a38x/xor.c:165:5: note: type mismatch in parameter 3
165 | int mv_xor_mem_init(u32 chan, u32 start_ptr, unsigned long long
| ^
a38x/xor.c:165:5: note: type ‘long long unsigned int’ should match
type ‘u32’
Fix this by changing the type of the block_size argument in the axp's
implementation and header file to the one used in a38x (and upstream
mv-ddr-marvell).
Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
70 lines
2.2 KiB
C
70 lines
2.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Copyright (C) Marvell International Ltd. and its affiliates
|
|
*/
|
|
|
|
#ifndef __XOR_H
|
|
#define __XOR_H
|
|
|
|
#include "ddr3_hw_training.h"
|
|
|
|
#define MV_XOR_MAX_CHAN 4 /* total channels for all units together */
|
|
|
|
/*
|
|
* This enumerator describes the type of functionality the XOR channel
|
|
* can have while using the same data structures.
|
|
*/
|
|
enum xor_type {
|
|
MV_XOR, /* XOR channel functions as XOR accelerator */
|
|
MV_DMA, /* XOR channel functions as IDMA channel */
|
|
MV_CRC32 /* XOR channel functions as CRC 32 calculator */
|
|
};
|
|
|
|
/*
|
|
* This enumerator describes the set of commands that can be applied on
|
|
* an engine (e.g. IDMA, XOR). Appling a comman depends on the current
|
|
* status (see MV_STATE enumerator)
|
|
* Start can be applied only when status is IDLE
|
|
* Stop can be applied only when status is IDLE, ACTIVE or PAUSED
|
|
* Pause can be applied only when status is ACTIVE
|
|
* Restart can be applied only when status is PAUSED
|
|
*/
|
|
enum mv_command {
|
|
MV_START, /* Start */
|
|
MV_STOP, /* Stop */
|
|
MV_PAUSE, /* Pause */
|
|
MV_RESTART /* Restart */
|
|
};
|
|
|
|
/*
|
|
* This enumerator describes the set of state conditions.
|
|
* Moving from one state to other is stricted.
|
|
*/
|
|
enum mv_state {
|
|
MV_IDLE,
|
|
MV_ACTIVE,
|
|
MV_PAUSED,
|
|
MV_UNDEFINED_STATE
|
|
};
|
|
|
|
/* XOR descriptor structure for CRC and DMA descriptor */
|
|
struct crc_dma_desc {
|
|
u32 status; /* Successful descriptor execution indication */
|
|
u32 crc32_result; /* Result of CRC-32 calculation */
|
|
u32 desc_cmd; /* type of operation to be carried out on the data */
|
|
u32 next_desc_ptr; /* Next descriptor address pointer */
|
|
u32 byte_cnt; /* Size of source block part represented by the descriptor */
|
|
u32 dst_addr; /* Destination Block address pointer (not used in CRC32 */
|
|
u32 src_addr0; /* Mode: Source Block address pointer */
|
|
u32 src_addr1; /* Mode: Source Block address pointer */
|
|
} __packed;
|
|
|
|
void mv_xor_hal_init(u32 chan_num);
|
|
int mv_xor_state_get(u32 chan);
|
|
void mv_sys_xor_init(MV_DRAM_INFO *dram_info);
|
|
void mv_sys_xor_finish(void);
|
|
int mv_xor_transfer(u32 chan, int xor_type, u32 xor_chain_ptr);
|
|
int mv_xor_mem_init(u32 chan, u32 start_ptr, unsigned long long block_size,
|
|
u32 init_val_high, u32 init_val_low);
|
|
|
|
#endif /* __XOR_H */
|