* [PATCH 3/6] MIPS: octeon: remove typedef declaration for cvmx_wqe
2020-02-05 0:11 [PATCH 0/6] Re-instate octeon staging drivers Chris Packham
@ 2020-02-05 0:11 ` Chris Packham
2020-02-05 0:11 ` [PATCH 4/6] MIPS: octeon: remove typedef declaration for cvmx_helper_link_info Chris Packham
` (3 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Chris Packham @ 2020-02-05 0:11 UTC (permalink / raw)
To: gregkh, ralf, paulburton, linux, dan.carpenter, willy
Cc: linux-mips, devel, linux-kernel, Chris Packham
Remove typedef declaration from struct cvmx_wqe and replace its previous
uses with new struct declaration.
Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
.../cavium-octeon/executive/cvmx-helper.c | 2 +-
.../include/asm/octeon/cvmx-helper-util.h | 2 +-
arch/mips/include/asm/octeon/cvmx-pko.h | 2 +-
arch/mips/include/asm/octeon/cvmx-pow.h | 22 +++++++++----------
arch/mips/include/asm/octeon/cvmx-wqe.h | 16 +++++++-------
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper.c b/arch/mips/cavium-octeon/executive/cvmx-helper.c
index de391541d6f7..bb84ae33399a 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper.c
@@ -784,7 +784,7 @@ static int __cvmx_helper_errata_fix_ipd_ptr_alignment(void)
uint64_t *p64;
cvmx_pko_command_word0_t pko_command;
union cvmx_buf_ptr g_buffer, pkt_buffer;
- cvmx_wqe_t *work;
+ struct cvmx_wqe *work;
int size, num_segs = 0, wqe_pcnt, pkt_pcnt;
union cvmx_gmxx_prtx_cfg gmx_cfg;
int retry_cnt;
diff --git a/arch/mips/include/asm/octeon/cvmx-helper-util.h b/arch/mips/include/asm/octeon/cvmx-helper-util.h
index e9a97e7ee604..97b27a07cfb0 100644
--- a/arch/mips/include/asm/octeon/cvmx-helper-util.h
+++ b/arch/mips/include/asm/octeon/cvmx-helper-util.h
@@ -123,7 +123,7 @@ static inline int cvmx_helper_get_last_ipd_port(int interface)
*
* @work: Work queue entry with packet to free
*/
-static inline void cvmx_helper_free_packet_data(cvmx_wqe_t *work)
+static inline void cvmx_helper_free_packet_data(struct cvmx_wqe *work)
{
uint64_t number_buffers;
union cvmx_buf_ptr buffer_ptr;
diff --git a/arch/mips/include/asm/octeon/cvmx-pko.h b/arch/mips/include/asm/octeon/cvmx-pko.h
index 20eb9c46a75a..f033523c19f8 100644
--- a/arch/mips/include/asm/octeon/cvmx-pko.h
+++ b/arch/mips/include/asm/octeon/cvmx-pko.h
@@ -394,7 +394,7 @@ static inline void cvmx_pko_send_packet_prepare(uint64_t port, uint64_t queue,
CVMX_TAG_SW_BITS_INTERNAL << CVMX_TAG_SW_SHIFT |
CVMX_TAG_SUBGROUP_PKO << CVMX_TAG_SUBGROUP_SHIFT |
(CVMX_TAG_SUBGROUP_MASK & queue);
- cvmx_pow_tag_sw_full((cvmx_wqe_t *) cvmx_phys_to_ptr(0x80), tag,
+ cvmx_pow_tag_sw_full((struct cvmx_wqe *) cvmx_phys_to_ptr(0x80), tag,
CVMX_POW_TAG_TYPE_ATOMIC, 0);
}
}
diff --git a/arch/mips/include/asm/octeon/cvmx-pow.h b/arch/mips/include/asm/octeon/cvmx-pow.h
index 410bb70e5aac..ba366f4f3c3d 100644
--- a/arch/mips/include/asm/octeon/cvmx-pow.h
+++ b/arch/mips/include/asm/octeon/cvmx-pow.h
@@ -1283,7 +1283,7 @@ static inline cvmx_pow_tag_req_t cvmx_pow_get_current_tag(void)
*
* Returns WQE pointer
*/
-static inline cvmx_wqe_t *cvmx_pow_get_current_wqp(void)
+static inline struct cvmx_wqe *cvmx_pow_get_current_wqp(void)
{
cvmx_pow_load_addr_t load_addr;
cvmx_pow_tag_load_resp_t load_resp;
@@ -1296,7 +1296,7 @@ static inline cvmx_wqe_t *cvmx_pow_get_current_wqp(void)
load_addr.sstatus.get_cur = 1;
load_addr.sstatus.get_wqp = 1;
load_resp.u64 = cvmx_read_csr(load_addr.u64);
- return (cvmx_wqe_t *) cvmx_phys_to_ptr(load_resp.s_sstatus4.wqp);
+ return (struct cvmx_wqe *) cvmx_phys_to_ptr(load_resp.s_sstatus4.wqp);
}
#ifndef CVMX_MF_CHORD
@@ -1348,7 +1348,7 @@ static inline void cvmx_pow_tag_sw_wait(void)
* Returns Returns the WQE pointer from POW. Returns NULL if no work
* was available.
*/
-static inline cvmx_wqe_t *cvmx_pow_work_request_sync_nocheck(cvmx_pow_wait_t
+static inline struct cvmx_wqe *cvmx_pow_work_request_sync_nocheck(cvmx_pow_wait_t
wait)
{
cvmx_pow_load_addr_t ptr;
@@ -1368,7 +1368,7 @@ static inline cvmx_wqe_t *cvmx_pow_work_request_sync_nocheck(cvmx_pow_wait_t
if (result.s_work.no_work)
return NULL;
else
- return (cvmx_wqe_t *) cvmx_phys_to_ptr(result.s_work.addr);
+ return (struct cvmx_wqe *) cvmx_phys_to_ptr(result.s_work.addr);
}
/**
@@ -1382,7 +1382,7 @@ static inline cvmx_wqe_t *cvmx_pow_work_request_sync_nocheck(cvmx_pow_wait_t
* Returns Returns the WQE pointer from POW. Returns NULL if no work
* was available.
*/
-static inline cvmx_wqe_t *cvmx_pow_work_request_sync(cvmx_pow_wait_t wait)
+static inline struct cvmx_wqe *cvmx_pow_work_request_sync(cvmx_pow_wait_t wait)
{
if (CVMX_ENABLE_POW_CHECKS)
__cvmx_pow_warn_if_pending_switch(__func__);
@@ -1485,7 +1485,7 @@ static inline void cvmx_pow_work_request_async(int scr_addr,
* Returns Returns the WQE from the scratch register, or NULL if no
* work was available.
*/
-static inline cvmx_wqe_t *cvmx_pow_work_response_async(int scr_addr)
+static inline struct cvmx_wqe *cvmx_pow_work_response_async(int scr_addr)
{
cvmx_pow_tag_load_resp_t result;
@@ -1495,7 +1495,7 @@ static inline cvmx_wqe_t *cvmx_pow_work_response_async(int scr_addr)
if (result.s_work.no_work)
return NULL;
else
- return (cvmx_wqe_t *) cvmx_phys_to_ptr(result.s_work.addr);
+ return (struct cvmx_wqe *) cvmx_phys_to_ptr(result.s_work.addr);
}
/**
@@ -1508,7 +1508,7 @@ static inline cvmx_wqe_t *cvmx_pow_work_response_async(int scr_addr)
* Returns 0 if pointer is valid
* 1 if invalid (no work was returned)
*/
-static inline uint64_t cvmx_pow_work_invalid(cvmx_wqe_t *wqe_ptr)
+static inline uint64_t cvmx_pow_work_invalid(struct cvmx_wqe *wqe_ptr)
{
return wqe_ptr == NULL;
}
@@ -1638,7 +1638,7 @@ static inline void cvmx_pow_tag_sw(uint32_t tag,
* @tag_type: type of tag
* @group: group value for the work queue entry.
*/
-static inline void cvmx_pow_tag_sw_full_nocheck(cvmx_wqe_t *wqp, uint32_t tag,
+static inline void cvmx_pow_tag_sw_full_nocheck(struct cvmx_wqe *wqp, uint32_t tag,
enum cvmx_pow_tag_type tag_type,
uint64_t group)
{
@@ -1712,7 +1712,7 @@ static inline void cvmx_pow_tag_sw_full_nocheck(cvmx_wqe_t *wqp, uint32_t tag,
* @tag_type: type of tag
* @group: group value for the work queue entry.
*/
-static inline void cvmx_pow_tag_sw_full(cvmx_wqe_t *wqp, uint32_t tag,
+static inline void cvmx_pow_tag_sw_full(struct cvmx_wqe *wqp, uint32_t tag,
enum cvmx_pow_tag_type tag_type,
uint64_t group)
{
@@ -1803,7 +1803,7 @@ static inline void cvmx_pow_tag_sw_null(void)
* @qos: Input queue to add to.
* @grp: group value for the work queue entry.
*/
-static inline void cvmx_pow_work_submit(cvmx_wqe_t *wqp, uint32_t tag,
+static inline void cvmx_pow_work_submit(struct cvmx_wqe *wqp, uint32_t tag,
enum cvmx_pow_tag_type tag_type,
uint64_t qos, uint64_t grp)
{
diff --git a/arch/mips/include/asm/octeon/cvmx-wqe.h b/arch/mips/include/asm/octeon/cvmx-wqe.h
index 0d697aa786d4..9cec2299b81b 100644
--- a/arch/mips/include/asm/octeon/cvmx-wqe.h
+++ b/arch/mips/include/asm/octeon/cvmx-wqe.h
@@ -547,7 +547,7 @@ union cvmx_wqe_word1 {
*
* must be 8-byte aligned
*/
-typedef struct {
+struct cvmx_wqe {
/*****************************************************************
* WORD 0
@@ -593,9 +593,9 @@ typedef struct {
*
*/
-} CVMX_CACHE_LINE_ALIGNED cvmx_wqe_t;
+} CVMX_CACHE_LINE_ALIGNED;
-static inline int cvmx_wqe_get_port(cvmx_wqe_t *work)
+static inline int cvmx_wqe_get_port(struct cvmx_wqe *work)
{
int port;
@@ -607,7 +607,7 @@ static inline int cvmx_wqe_get_port(cvmx_wqe_t *work)
return port;
}
-static inline void cvmx_wqe_set_port(cvmx_wqe_t *work, int port)
+static inline void cvmx_wqe_set_port(struct cvmx_wqe *work, int port)
{
if (octeon_has_feature(OCTEON_FEATURE_CN68XX_WQE))
work->word2.s_cn68xx.port = port;
@@ -615,7 +615,7 @@ static inline void cvmx_wqe_set_port(cvmx_wqe_t *work, int port)
work->word1.cn38xx.ipprt = port;
}
-static inline int cvmx_wqe_get_grp(cvmx_wqe_t *work)
+static inline int cvmx_wqe_get_grp(struct cvmx_wqe *work)
{
int grp;
@@ -627,7 +627,7 @@ static inline int cvmx_wqe_get_grp(cvmx_wqe_t *work)
return grp;
}
-static inline void cvmx_wqe_set_grp(cvmx_wqe_t *work, int grp)
+static inline void cvmx_wqe_set_grp(struct cvmx_wqe *work, int grp)
{
if (octeon_has_feature(OCTEON_FEATURE_CN68XX_WQE))
work->word1.cn68xx.grp = grp;
@@ -635,7 +635,7 @@ static inline void cvmx_wqe_set_grp(cvmx_wqe_t *work, int grp)
work->word1.cn38xx.grp = grp;
}
-static inline int cvmx_wqe_get_qos(cvmx_wqe_t *work)
+static inline int cvmx_wqe_get_qos(struct cvmx_wqe *work)
{
int qos;
@@ -647,7 +647,7 @@ static inline int cvmx_wqe_get_qos(cvmx_wqe_t *work)
return qos;
}
-static inline void cvmx_wqe_set_qos(cvmx_wqe_t *work, int qos)
+static inline void cvmx_wqe_set_qos(struct cvmx_wqe *work, int qos)
{
if (octeon_has_feature(OCTEON_FEATURE_CN68XX_WQE))
work->word1.cn68xx.qos = qos;
--
2.25.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 4/6] MIPS: octeon: remove typedef declaration for cvmx_helper_link_info
2020-02-05 0:11 [PATCH 0/6] Re-instate octeon staging drivers Chris Packham
2020-02-05 0:11 ` [PATCH 3/6] MIPS: octeon: remove typedef declaration for cvmx_wqe Chris Packham
@ 2020-02-05 0:11 ` Chris Packham
2020-02-05 0:11 ` [PATCH 5/6] MIPS: octeon: remove typedef declaration for cvmx_pko_command_word0 Chris Packham
` (2 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Chris Packham @ 2020-02-05 0:11 UTC (permalink / raw)
To: gregkh, ralf, paulburton, linux, dan.carpenter, willy
Cc: linux-mips, devel, linux-kernel, Chris Packham
Remove declaration of union cvmx_helper_link_info as typedef and update
uses to use the union.
Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
arch/mips/cavium-octeon/executive/cvmx-helper-board.c | 4 ++--
arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c | 6 +++---
arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c | 8 ++++----
arch/mips/cavium-octeon/executive/cvmx-helper-spi.c | 6 +++---
arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c | 6 +++---
arch/mips/cavium-octeon/executive/cvmx-helper.c | 6 +++---
arch/mips/include/asm/octeon/cvmx-helper-board.h | 2 +-
arch/mips/include/asm/octeon/cvmx-helper-rgmii.h | 4 ++--
arch/mips/include/asm/octeon/cvmx-helper-sgmii.h | 4 ++--
arch/mips/include/asm/octeon/cvmx-helper-spi.h | 4 ++--
arch/mips/include/asm/octeon/cvmx-helper-xaui.h | 4 ++--
arch/mips/include/asm/octeon/cvmx-helper.h | 8 ++++----
12 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
index 2e2d45bc850d..abd11b7af22f 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
@@ -207,9 +207,9 @@ int cvmx_helper_board_get_mii_address(int ipd_port)
* Returns The ports link status. If the link isn't fully resolved, this must
* return zero.
*/
-cvmx_helper_link_info_t __cvmx_helper_board_link_get(int ipd_port)
+union cvmx_helper_link_info __cvmx_helper_board_link_get(int ipd_port)
{
- cvmx_helper_link_info_t result;
+ union cvmx_helper_link_info result;
WARN(!octeon_is_simulation(),
"Using deprecated link status - please update your DT");
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c b/arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c
index e812ed9a03bb..c4b58598aa9d 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c
@@ -261,7 +261,7 @@ int __cvmx_helper_rgmii_enable(int interface)
*
* Returns Link state
*/
-cvmx_helper_link_info_t __cvmx_helper_rgmii_link_get(int ipd_port)
+union cvmx_helper_link_info __cvmx_helper_rgmii_link_get(int ipd_port)
{
int interface = cvmx_helper_get_interface_num(ipd_port);
int index = cvmx_helper_get_interface_index_num(ipd_port);
@@ -270,7 +270,7 @@ cvmx_helper_link_info_t __cvmx_helper_rgmii_link_get(int ipd_port)
asxx_prt_loop.u64 = cvmx_read_csr(CVMX_ASXX_PRT_LOOP(interface));
if (asxx_prt_loop.s.int_loop & (1 << index)) {
/* Force 1Gbps full duplex on internal loopback */
- cvmx_helper_link_info_t result;
+ union cvmx_helper_link_info result;
result.u64 = 0;
result.s.full_duplex = 1;
result.s.link_up = 1;
@@ -292,7 +292,7 @@ cvmx_helper_link_info_t __cvmx_helper_rgmii_link_get(int ipd_port)
* Returns Zero on success, negative on failure
*/
int __cvmx_helper_rgmii_link_set(int ipd_port,
- cvmx_helper_link_info_t link_info)
+ union cvmx_helper_link_info link_info)
{
int result = 0;
int interface = cvmx_helper_get_interface_num(ipd_port);
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c b/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c
index f6ebf63dc84c..e07d8f15efba 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c
@@ -200,7 +200,7 @@ static int __cvmx_helper_sgmii_hardware_init_link(int interface, int index)
*/
static int __cvmx_helper_sgmii_hardware_init_link_speed(int interface,
int index,
- cvmx_helper_link_info_t
+ union cvmx_helper_link_info
link_info)
{
int is_enabled;
@@ -394,9 +394,9 @@ int __cvmx_helper_sgmii_enable(int interface)
*
* Returns Link state
*/
-cvmx_helper_link_info_t __cvmx_helper_sgmii_link_get(int ipd_port)
+union cvmx_helper_link_info __cvmx_helper_sgmii_link_get(int ipd_port)
{
- cvmx_helper_link_info_t result;
+ union cvmx_helper_link_info result;
union cvmx_pcsx_miscx_ctl_reg pcs_misc_ctl_reg;
int interface = cvmx_helper_get_interface_num(ipd_port);
int index = cvmx_helper_get_interface_index_num(ipd_port);
@@ -505,7 +505,7 @@ cvmx_helper_link_info_t __cvmx_helper_sgmii_link_get(int ipd_port)
* Returns Zero on success, negative on failure
*/
int __cvmx_helper_sgmii_link_set(int ipd_port,
- cvmx_helper_link_info_t link_info)
+ union cvmx_helper_link_info link_info)
{
int interface = cvmx_helper_get_interface_num(ipd_port);
int index = cvmx_helper_get_interface_index_num(ipd_port);
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-spi.c b/arch/mips/cavium-octeon/executive/cvmx-helper-spi.c
index 2a574d272671..525914e9b22d 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-spi.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-spi.c
@@ -140,9 +140,9 @@ int __cvmx_helper_spi_enable(int interface)
*
* Returns Link state
*/
-cvmx_helper_link_info_t __cvmx_helper_spi_link_get(int ipd_port)
+union cvmx_helper_link_info __cvmx_helper_spi_link_get(int ipd_port)
{
- cvmx_helper_link_info_t result;
+ union cvmx_helper_link_info result;
int interface = cvmx_helper_get_interface_num(ipd_port);
int index = cvmx_helper_get_interface_index_num(ipd_port);
result.u64 = 0;
@@ -193,7 +193,7 @@ cvmx_helper_link_info_t __cvmx_helper_spi_link_get(int ipd_port)
*
* Returns Zero on success, negative on failure
*/
-int __cvmx_helper_spi_link_set(int ipd_port, cvmx_helper_link_info_t link_info)
+int __cvmx_helper_spi_link_set(int ipd_port, union cvmx_helper_link_info link_info)
{
/* Nothing to do. If we have a SPI4000 then the setup was already performed
by cvmx_spi4000_check_speed(). If not then there isn't any link
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c b/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c
index 93a498d05184..842990e8404f 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c
@@ -259,13 +259,13 @@ int __cvmx_helper_xaui_enable(int interface)
*
* Returns Link state
*/
-cvmx_helper_link_info_t __cvmx_helper_xaui_link_get(int ipd_port)
+union cvmx_helper_link_info __cvmx_helper_xaui_link_get(int ipd_port)
{
int interface = cvmx_helper_get_interface_num(ipd_port);
union cvmx_gmxx_tx_xaui_ctl gmxx_tx_xaui_ctl;
union cvmx_gmxx_rx_xaui_ctl gmxx_rx_xaui_ctl;
union cvmx_pcsxx_status1_reg pcsxx_status1_reg;
- cvmx_helper_link_info_t result;
+ union cvmx_helper_link_info result;
gmxx_tx_xaui_ctl.u64 = cvmx_read_csr(CVMX_GMXX_TX_XAUI_CTL(interface));
gmxx_rx_xaui_ctl.u64 = cvmx_read_csr(CVMX_GMXX_RX_XAUI_CTL(interface));
@@ -299,7 +299,7 @@ cvmx_helper_link_info_t __cvmx_helper_xaui_link_get(int ipd_port)
*
* Returns Zero on success, negative on failure
*/
-int __cvmx_helper_xaui_link_set(int ipd_port, cvmx_helper_link_info_t link_info)
+int __cvmx_helper_xaui_link_set(int ipd_port, union cvmx_helper_link_info link_info)
{
int interface = cvmx_helper_get_interface_num(ipd_port);
union cvmx_gmxx_tx_xaui_ctl gmxx_tx_xaui_ctl;
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper.c b/arch/mips/cavium-octeon/executive/cvmx-helper.c
index bb84ae33399a..8002f9d3039d 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper.c
@@ -1075,9 +1075,9 @@ int cvmx_helper_initialize_packet_io_local(void)
*
* Returns Link state
*/
-cvmx_helper_link_info_t cvmx_helper_link_get(int ipd_port)
+union cvmx_helper_link_info cvmx_helper_link_get(int ipd_port)
{
- cvmx_helper_link_info_t result;
+ union cvmx_helper_link_info result;
int interface = cvmx_helper_get_interface_num(ipd_port);
int index = cvmx_helper_get_interface_index_num(ipd_port);
@@ -1136,7 +1136,7 @@ EXPORT_SYMBOL_GPL(cvmx_helper_link_get);
*
* Returns Zero on success, negative on failure
*/
-int cvmx_helper_link_set(int ipd_port, cvmx_helper_link_info_t link_info)
+int cvmx_helper_link_set(int ipd_port, union cvmx_helper_link_info link_info)
{
int result = -1;
int interface = cvmx_helper_get_interface_num(ipd_port);
diff --git a/arch/mips/include/asm/octeon/cvmx-helper-board.h b/arch/mips/include/asm/octeon/cvmx-helper-board.h
index d7fdcf0a0088..ce52aafe7a8d 100644
--- a/arch/mips/include/asm/octeon/cvmx-helper-board.h
+++ b/arch/mips/include/asm/octeon/cvmx-helper-board.h
@@ -93,7 +93,7 @@ extern int cvmx_helper_board_get_mii_address(int ipd_port);
* Returns The ports link status. If the link isn't fully resolved, this must
* return zero.
*/
-extern cvmx_helper_link_info_t __cvmx_helper_board_link_get(int ipd_port);
+extern union cvmx_helper_link_info __cvmx_helper_board_link_get(int ipd_port);
/**
* This function is called by cvmx_helper_interface_probe() after it
diff --git a/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h b/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h
index ac42b5066bd9..3e79a7f898b6 100644
--- a/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h
+++ b/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h
@@ -74,7 +74,7 @@ extern int __cvmx_helper_rgmii_enable(int interface);
*
* Returns Link state
*/
-extern cvmx_helper_link_info_t __cvmx_helper_rgmii_link_get(int ipd_port);
+extern union cvmx_helper_link_info __cvmx_helper_rgmii_link_get(int ipd_port);
/**
* Configure an IPD/PKO port for the specified link state. This
@@ -88,6 +88,6 @@ extern cvmx_helper_link_info_t __cvmx_helper_rgmii_link_get(int ipd_port);
* Returns Zero on success, negative on failure
*/
extern int __cvmx_helper_rgmii_link_set(int ipd_port,
- cvmx_helper_link_info_t link_info);
+ union cvmx_helper_link_info link_info);
#endif
diff --git a/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h b/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h
index 3a54dea58c0a..8aac90f1871f 100644
--- a/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h
+++ b/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h
@@ -68,7 +68,7 @@ extern int __cvmx_helper_sgmii_enable(int interface);
*
* Returns Link state
*/
-extern cvmx_helper_link_info_t __cvmx_helper_sgmii_link_get(int ipd_port);
+extern union cvmx_helper_link_info __cvmx_helper_sgmii_link_get(int ipd_port);
/**
* Configure an IPD/PKO port for the specified link state. This
@@ -82,6 +82,6 @@ extern cvmx_helper_link_info_t __cvmx_helper_sgmii_link_get(int ipd_port);
* Returns Zero on success, negative on failure
*/
extern int __cvmx_helper_sgmii_link_set(int ipd_port,
- cvmx_helper_link_info_t link_info);
+ union cvmx_helper_link_info link_info);
#endif
diff --git a/arch/mips/include/asm/octeon/cvmx-helper-spi.h b/arch/mips/include/asm/octeon/cvmx-helper-spi.h
index d5adf8592773..bc8cab9367b8 100644
--- a/arch/mips/include/asm/octeon/cvmx-helper-spi.h
+++ b/arch/mips/include/asm/octeon/cvmx-helper-spi.h
@@ -65,7 +65,7 @@ extern int __cvmx_helper_spi_enable(int interface);
*
* Returns Link state
*/
-extern cvmx_helper_link_info_t __cvmx_helper_spi_link_get(int ipd_port);
+extern union cvmx_helper_link_info __cvmx_helper_spi_link_get(int ipd_port);
/**
* Configure an IPD/PKO port for the specified link state. This
@@ -79,6 +79,6 @@ extern cvmx_helper_link_info_t __cvmx_helper_spi_link_get(int ipd_port);
* Returns Zero on success, negative on failure
*/
extern int __cvmx_helper_spi_link_set(int ipd_port,
- cvmx_helper_link_info_t link_info);
+ union cvmx_helper_link_info link_info);
#endif
diff --git a/arch/mips/include/asm/octeon/cvmx-helper-xaui.h b/arch/mips/include/asm/octeon/cvmx-helper-xaui.h
index 51f45b495680..c18da2eba78e 100644
--- a/arch/mips/include/asm/octeon/cvmx-helper-xaui.h
+++ b/arch/mips/include/asm/octeon/cvmx-helper-xaui.h
@@ -68,7 +68,7 @@ extern int __cvmx_helper_xaui_enable(int interface);
*
* Returns Link state
*/
-extern cvmx_helper_link_info_t __cvmx_helper_xaui_link_get(int ipd_port);
+extern union cvmx_helper_link_info __cvmx_helper_xaui_link_get(int ipd_port);
/**
* Configure an IPD/PKO port for the specified link state. This
@@ -82,6 +82,6 @@ extern cvmx_helper_link_info_t __cvmx_helper_xaui_link_get(int ipd_port);
* Returns Zero on success, negative on failure
*/
extern int __cvmx_helper_xaui_link_set(int ipd_port,
- cvmx_helper_link_info_t link_info);
+ union cvmx_helper_link_info link_info);
#endif
diff --git a/arch/mips/include/asm/octeon/cvmx-helper.h b/arch/mips/include/asm/octeon/cvmx-helper.h
index ba0e76f578e0..c6c99e28eefb 100644
--- a/arch/mips/include/asm/octeon/cvmx-helper.h
+++ b/arch/mips/include/asm/octeon/cvmx-helper.h
@@ -51,7 +51,7 @@ typedef enum {
CVMX_HELPER_INTERFACE_MODE_LOOP,
} cvmx_helper_interface_mode_t;
-typedef union {
+union cvmx_helper_link_info {
uint64_t u64;
struct {
uint64_t reserved_20_63:44;
@@ -59,7 +59,7 @@ typedef union {
uint64_t full_duplex:1; /**< 1 if the link is full duplex */
uint64_t speed:18; /**< Speed of the link in Mbps */
} s;
-} cvmx_helper_link_info_t;
+};
#include <asm/octeon/cvmx-helper-errata.h>
#include <asm/octeon/cvmx-helper-loop.h>
@@ -145,7 +145,7 @@ extern cvmx_helper_interface_mode_t cvmx_helper_interface_get_mode(int
*
* Returns Link state
*/
-extern cvmx_helper_link_info_t cvmx_helper_link_get(int ipd_port);
+extern union cvmx_helper_link_info cvmx_helper_link_get(int ipd_port);
/**
* Configure an IPD/PKO port for the specified link state. This
@@ -159,7 +159,7 @@ extern cvmx_helper_link_info_t cvmx_helper_link_get(int ipd_port);
* Returns Zero on success, negative on failure
*/
extern int cvmx_helper_link_set(int ipd_port,
- cvmx_helper_link_info_t link_info);
+ union cvmx_helper_link_info link_info);
/**
* This function probes an interface to determine the actual
--
2.25.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 5/6] MIPS: octeon: remove typedef declaration for cvmx_pko_command_word0
2020-02-05 0:11 [PATCH 0/6] Re-instate octeon staging drivers Chris Packham
2020-02-05 0:11 ` [PATCH 3/6] MIPS: octeon: remove typedef declaration for cvmx_wqe Chris Packham
2020-02-05 0:11 ` [PATCH 4/6] MIPS: octeon: remove typedef declaration for cvmx_helper_link_info Chris Packham
@ 2020-02-05 0:11 ` Chris Packham
2020-02-05 0:11 ` [PATCH 6/6] Revert "staging/octeon: Mark Ethernet driver as BROKEN" Chris Packham
2020-02-12 21:52 ` [PATCH 0/6] Re-instate octeon staging drivers Greg KH
4 siblings, 0 replies; 11+ messages in thread
From: Chris Packham @ 2020-02-05 0:11 UTC (permalink / raw)
To: gregkh, ralf, paulburton, linux, dan.carpenter, willy
Cc: linux-mips, devel, linux-kernel, Chris Packham
Remove the typedef and update usage to use the union.
Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
arch/mips/cavium-octeon/executive/cvmx-helper.c | 2 +-
arch/mips/include/asm/octeon/cvmx-pko.h | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper.c b/arch/mips/cavium-octeon/executive/cvmx-helper.c
index 8002f9d3039d..6044ff471002 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper.c
@@ -782,7 +782,7 @@ static int __cvmx_helper_errata_fix_ipd_ptr_alignment(void)
#define INTERFACE(port) (port >> 4)
#define INDEX(port) (port & 0xf)
uint64_t *p64;
- cvmx_pko_command_word0_t pko_command;
+ union cvmx_pko_command_word0 pko_command;
union cvmx_buf_ptr g_buffer, pkt_buffer;
struct cvmx_wqe *work;
int size, num_segs = 0, wqe_pcnt, pkt_pcnt;
diff --git a/arch/mips/include/asm/octeon/cvmx-pko.h b/arch/mips/include/asm/octeon/cvmx-pko.h
index f033523c19f8..5b0b982a36f7 100644
--- a/arch/mips/include/asm/octeon/cvmx-pko.h
+++ b/arch/mips/include/asm/octeon/cvmx-pko.h
@@ -169,7 +169,7 @@ typedef union {
/**
* Structure of the first packet output command word.
*/
-typedef union {
+union cvmx_pko_command_word0 {
uint64_t u64;
struct {
#ifdef __BIG_ENDIAN_BITFIELD
@@ -261,7 +261,7 @@ typedef union {
uint64_t size1:2;
#endif
} s;
-} cvmx_pko_command_word0_t;
+};
/* CSR typedefs have been moved to cvmx-csr-*.h */
@@ -419,7 +419,7 @@ static inline void cvmx_pko_send_packet_prepare(uint64_t port, uint64_t queue,
static inline cvmx_pko_status_t cvmx_pko_send_packet_finish(
uint64_t port,
uint64_t queue,
- cvmx_pko_command_word0_t pko_command,
+ union cvmx_pko_command_word0 pko_command,
union cvmx_buf_ptr packet,
cvmx_pko_lock_t use_locking)
{
@@ -462,7 +462,7 @@ static inline cvmx_pko_status_t cvmx_pko_send_packet_finish(
static inline cvmx_pko_status_t cvmx_pko_send_packet_finish3(
uint64_t port,
uint64_t queue,
- cvmx_pko_command_word0_t pko_command,
+ union cvmx_pko_command_word0 pko_command,
union cvmx_buf_ptr packet,
uint64_t addr,
cvmx_pko_lock_t use_locking)
--
2.25.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 6/6] Revert "staging/octeon: Mark Ethernet driver as BROKEN"
2020-02-05 0:11 [PATCH 0/6] Re-instate octeon staging drivers Chris Packham
` (2 preceding siblings ...)
2020-02-05 0:11 ` [PATCH 5/6] MIPS: octeon: remove typedef declaration for cvmx_pko_command_word0 Chris Packham
@ 2020-02-05 0:11 ` Chris Packham
2020-02-12 21:52 ` [PATCH 0/6] Re-instate octeon staging drivers Greg KH
4 siblings, 0 replies; 11+ messages in thread
From: Chris Packham @ 2020-02-05 0:11 UTC (permalink / raw)
To: gregkh, ralf, paulburton, linux, dan.carpenter, willy
Cc: linux-mips, devel, linux-kernel, Chris Packham
This reverts commit 075a1e87d1e2358d0b0301ac8f8e7f25051decf1. Now that
the build issues have been fixed we can resume build testing.
Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
drivers/staging/octeon/Kconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/octeon/Kconfig b/drivers/staging/octeon/Kconfig
index e7f4ddcc1361..5319909eb2f6 100644
--- a/drivers/staging/octeon/Kconfig
+++ b/drivers/staging/octeon/Kconfig
@@ -3,7 +3,6 @@ config OCTEON_ETHERNET
tristate "Cavium Networks Octeon Ethernet support"
depends on CAVIUM_OCTEON_SOC || COMPILE_TEST
depends on NETDEVICES
- depends on BROKEN
select PHYLIB
select MDIO_OCTEON
help
--
2.25.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 0/6] Re-instate octeon staging drivers
2020-02-05 0:11 [PATCH 0/6] Re-instate octeon staging drivers Chris Packham
` (3 preceding siblings ...)
2020-02-05 0:11 ` [PATCH 6/6] Revert "staging/octeon: Mark Ethernet driver as BROKEN" Chris Packham
@ 2020-02-12 21:52 ` Greg KH
2020-03-04 1:48 ` YunQiang Su
4 siblings, 1 reply; 11+ messages in thread
From: Greg KH @ 2020-02-12 21:52 UTC (permalink / raw)
To: Chris Packham
Cc: ralf, paulburton, linux, dan.carpenter, willy, devel, linux-mips,
linux-kernel
On Wed, Feb 05, 2020 at 01:11:10PM +1300, Chris Packham wrote:
> This series re-instates the octeon drivers that were recently removed and
> addresses the build issues that lead to that decision.
>
> I've approached Cavium/Marvell about taking a more active interest in getting
> the code out of staging and into their proper location. No reply on that (yet).
Good luck with talking to the companies, hopefully that will work.
Anyway, I've applied this series, thanks for this, let's see what breaks
now :)
greg k-h
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 0/6] Re-instate octeon staging drivers
2020-02-12 21:52 ` [PATCH 0/6] Re-instate octeon staging drivers Greg KH
@ 2020-03-04 1:48 ` YunQiang Su
2020-03-04 6:39 ` Greg KH
0 siblings, 1 reply; 11+ messages in thread
From: YunQiang Su @ 2020-03-04 1:48 UTC (permalink / raw)
To: Greg KH
Cc: Chris Packham, Ralf Baechle, Paul Burton, linux, dan.carpenter,
willy, devel, linux-mips, linux-kernel
Greg KH <gregkh@linuxfoundation.org> 于2020年2月13日周四 上午5:52写道：
>
> On Wed, Feb 05, 2020 at 01:11:10PM +1300, Chris Packham wrote:
> > This series re-instates the octeon drivers that were recently removed and
> > addresses the build issues that lead to that decision.
> >
> > I've approached Cavium/Marvell about taking a more active interest in getting
> > the code out of staging and into their proper location. No reply on that (yet).
>
> Good luck with talking to the companies, hopefully that will work.
>
> Anyway, I've applied this series, thanks for this, let's see what breaks
> now :)
Did you meet any problem to merge Chris's patchset?
>
> greg k-h
--
YunQiang Su
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/6] Re-instate octeon staging drivers
2020-03-04 1:48 ` YunQiang Su
@ 2020-03-04 6:39 ` Greg KH
2020-03-04 10:25 ` YunQiang Su
0 siblings, 1 reply; 11+ messages in thread
From: Greg KH @ 2020-03-04 6:39 UTC (permalink / raw)
To: YunQiang Su
Cc: devel, Paul Burton, linux, linux-mips, willy, linux-kernel,
Chris Packham, Ralf Baechle, dan.carpenter
On Wed, Mar 04, 2020 at 09:48:46AM +0800, YunQiang Su wrote:
> Greg KH <gregkh@linuxfoundation.org> 于2020年2月13日周四 上午5:52写道：
> >
> > On Wed, Feb 05, 2020 at 01:11:10PM +1300, Chris Packham wrote:
> > > This series re-instates the octeon drivers that were recently removed and
> > > addresses the build issues that lead to that decision.
> > >
> > > I've approached Cavium/Marvell about taking a more active interest in getting
> > > the code out of staging and into their proper location. No reply on that (yet).
> >
> > Good luck with talking to the companies, hopefully that will work.
> >
> > Anyway, I've applied this series, thanks for this, let's see what breaks
> > now :)
>
> Did you meet any problem to merge Chris's patchset?
They are all in linux-next, so you can see for yourself :)
greg k-h
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/6] Re-instate octeon staging drivers
2020-03-04 6:39 ` Greg KH
@ 2020-03-04 10:25 ` YunQiang Su
2020-03-04 11:50 ` Greg KH
0 siblings, 1 reply; 11+ messages in thread
From: YunQiang Su @ 2020-03-04 10:25 UTC (permalink / raw)
To: Greg KH
Cc: devel, Paul Burton, linux, linux-mips, willy, linux-kernel,
Chris Packham, Ralf Baechle, dan.carpenter
Greg KH <gregkh@linuxfoundation.org> 于2020年3月4日周三 下午2:39写道：
>
> On Wed, Mar 04, 2020 at 09:48:46AM +0800, YunQiang Su wrote:
> > Greg KH <gregkh@linuxfoundation.org> 于2020年2月13日周四 上午5:52写道：
> > >
> > > On Wed, Feb 05, 2020 at 01:11:10PM +1300, Chris Packham wrote:
> > > > This series re-instates the octeon drivers that were recently removed and
> > > > addresses the build issues that lead to that decision.
> > > >
> > > > I've approached Cavium/Marvell about taking a more active interest in getting
> > > > the code out of staging and into their proper location. No reply on that (yet).
> > >
> > > Good luck with talking to the companies, hopefully that will work.
> > >
> > > Anyway, I've applied this series, thanks for this, let's see what breaks
> > > now :)
> >
> > Did you meet any problem to merge Chris's patchset?
>
> They are all in linux-next, so you can see for yourself :)
Thank you so much. I found it.
It is very important for Debian MIPS Ports as we are using some of
Octeon machines.
>
> greg k-h
--
YunQiang Su
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/6] Re-instate octeon staging drivers
2020-03-04 10:25 ` YunQiang Su
@ 2020-03-04 11:50 ` Greg KH
2020-03-04 19:47 ` Chris Packham
0 siblings, 1 reply; 11+ messages in thread
From: Greg KH @ 2020-03-04 11:50 UTC (permalink / raw)
To: YunQiang Su
Cc: devel, Paul Burton, linux-kernel, willy, linux-mips,
Chris Packham, Ralf Baechle, dan.carpenter, linux
On Wed, Mar 04, 2020 at 06:25:34PM +0800, YunQiang Su wrote:
> Greg KH <gregkh@linuxfoundation.org> 于2020年3月4日周三 下午2:39写道：
> >
> > On Wed, Mar 04, 2020 at 09:48:46AM +0800, YunQiang Su wrote:
> > > Greg KH <gregkh@linuxfoundation.org> 于2020年2月13日周四 上午5:52写道：
> > > >
> > > > On Wed, Feb 05, 2020 at 01:11:10PM +1300, Chris Packham wrote:
> > > > > This series re-instates the octeon drivers that were recently removed and
> > > > > addresses the build issues that lead to that decision.
> > > > >
> > > > > I've approached Cavium/Marvell about taking a more active interest in getting
> > > > > the code out of staging and into their proper location. No reply on that (yet).
> > > >
> > > > Good luck with talking to the companies, hopefully that will work.
> > > >
> > > > Anyway, I've applied this series, thanks for this, let's see what breaks
> > > > now :)
> > >
> > > Did you meet any problem to merge Chris's patchset?
> >
> > They are all in linux-next, so you can see for yourself :)
>
> Thank you so much. I found it.
> It is very important for Debian MIPS Ports as we are using some of
> Octeon machines.
If it is so important, why is no one working on fixing these drivers up?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/6] Re-instate octeon staging drivers
2020-03-04 11:50 ` Greg KH
@ 2020-03-04 19:47 ` Chris Packham
0 siblings, 0 replies; 11+ messages in thread
From: Chris Packham @ 2020-03-04 19:47 UTC (permalink / raw)
To: gregkh, wzssyqa
Cc: linux-kernel, dan.carpenter, ralf, willy, linux-mips, linux,
devel, shomeek, paulburton
On Wed, 2020-03-04 at 12:50 +0100, Greg KH wrote:
> On Wed, Mar 04, 2020 at 06:25:34PM +0800, YunQiang Su wrote:
> > Greg KH <gregkh@linuxfoundation.org> 于2020年3月4日周三 下午2:39写道：
> > >
> > > On Wed, Mar 04, 2020 at 09:48:46AM +0800, YunQiang Su wrote:
> > > > Greg KH <gregkh@linuxfoundation.org> 于2020年2月13日周四 上午5:52写道：
> > > > >
> > > > > On Wed, Feb 05, 2020 at 01:11:10PM +1300, Chris Packham wrote:
> > > > > > This series re-instates the octeon drivers that were recently removed and
> > > > > > addresses the build issues that lead to that decision.
> > > > > >
> > > > > > I've approached Cavium/Marvell about taking a more active interest in getting
> > > > > > the code out of staging and into their proper location. No reply on that (yet).
> > > > >
> > > > > Good luck with talking to the companies, hopefully that will work.
> > > > >
> > > > > Anyway, I've applied this series, thanks for this, let's see what breaks
> > > > > now :)
> > > >
> > > > Did you meet any problem to merge Chris's patchset?
> > >
> > > They are all in linux-next, so you can see for yourself :)
> >
> > Thank you so much. I found it.
> > It is very important for Debian MIPS Ports as we are using some of
> > Octeon machines.
>
> If it is so important, why is no one working on fixing these drivers up?
>
I have had a reply from Marvell. They've contracted support for the old
Cavium Octeon designs out to an external company. I'm not sure that
means that we'll see some action on these drivers any time soon but at
least they're doing something.
^ permalink raw reply [flat|nested] 11+ messages in thread