You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by an...@apache.org on 2019/11/22 18:22:57 UTC
[mynewt-core] branch master updated (a99cd66 -> 7adc06d)
This is an automated email from the ASF dual-hosted git repository.
andk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git.
from a99cd66 Merge pull request #2110 from vrahane/hal_uart_typo_fix
new c91e6a7 hw/mcu/dialog: Remove CMAC driver
new 7adc06d hw/mcu/dialog: Provide generic names for CMAC sections
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
hw/mcu/dialog/da1469x/da1469x.ld | 13 +-
hw/mcu/dialog/da1469x/include/mcu/da1469x_cmac.h | 37 ---
hw/mcu/dialog/da1469x/src/da1469x_cmac.c | 303 -----------------------
3 files changed, 3 insertions(+), 350 deletions(-)
delete mode 100644 hw/mcu/dialog/da1469x/include/mcu/da1469x_cmac.h
delete mode 100644 hw/mcu/dialog/da1469x/src/da1469x_cmac.c
[mynewt-core] 02/02: hw/mcu/dialog: Provide generic names for CMAC
sections
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 7adc06d38fe33296ff926c81c7632702049e19d1
Author: Andrzej Kaczmarek <an...@codecoup.pl>
AuthorDate: Wed Oct 16 15:24:13 2019 +0200
hw/mcu/dialog: Provide generic names for CMAC sections
We do not want to rely on section names used in Dialog's libraries.
Instead, we provide generic "placeholders" for firmware image and CMAC
RAM and it's up to CMAC driver to load proper symbols into these
sections.
---
hw/mcu/dialog/da1469x/da1469x.ld | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/hw/mcu/dialog/da1469x/da1469x.ld b/hw/mcu/dialog/da1469x/da1469x.ld
index df7088c..d76ef05 100644
--- a/hw/mcu/dialog/da1469x/da1469x.ld
+++ b/hw/mcu/dialog/da1469x/da1469x.ld
@@ -66,10 +66,7 @@ SECTIONS
*(.text)
*(.text.*)
- __cmac_fw_area_start = .;
- KEEP(*(.cmi_fw_area*))
- __cmac_fw_area_end = .;
- . = ALIGN(4);
+ *(.libcmac.rom)
KEEP(*(.init))
KEEP(*(.fini))
@@ -195,14 +192,10 @@ SECTIONS
__bss_end__ = .;
} > RAM
- .cmac_ram (NOLOAD) :
+ .cmac (NOLOAD) :
{
. = ALIGN(0x400);
- __cmac_ram_section_start__ = .;
- cmac_fw_addr = .;
- . += (__cmac_fw_area_end - __cmac_fw_area_start);
- . = ALIGN(0x400);
- __cmac_ram_section_end__ = . - 1;
+ *(.libcmac.ram)
} > RAM
/* Heap starts after BSS */
[mynewt-core] 01/02: hw/mcu/dialog: Remove CMAC driver
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit c91e6a7eee2ac9c2b31a50f9224f025d78162ccf
Author: Andrzej Kaczmarek <an...@codecoup.pl>
AuthorDate: Tue Nov 19 16:53:46 2019 +0100
hw/mcu/dialog: Remove CMAC driver
Driver is move to NimBLE repository as a sub-package of transport.
---
hw/mcu/dialog/da1469x/include/mcu/da1469x_cmac.h | 37 ---
hw/mcu/dialog/da1469x/src/da1469x_cmac.c | 303 -----------------------
2 files changed, 340 deletions(-)
diff --git a/hw/mcu/dialog/da1469x/include/mcu/da1469x_cmac.h b/hw/mcu/dialog/da1469x/include/mcu/da1469x_cmac.h
deleted file mode 100644
index d3ad94b..0000000
--- a/hw/mcu/dialog/da1469x/include/mcu/da1469x_cmac.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef __MCU_DA1469X_CMAC_H_
-#define __MCU_DA1469X_CMAC_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef int (* da1469x_cmac_mbox_read_cb)(const uint8_t *, uint16_t len);
-
-void da1469x_cmac_init(void);
-void da1469x_cmac_mbox_write(const uint8_t *buf, size_t len);
-void da1469x_cmac_mbox_set_read_cb(da1469x_cmac_mbox_read_cb cb);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __MCU_DA1469X_CMAC_H_ */
diff --git a/hw/mcu/dialog/da1469x/src/da1469x_cmac.c b/hw/mcu/dialog/da1469x/src/da1469x_cmac.c
deleted file mode 100644
index 961d5ae..0000000
--- a/hw/mcu/dialog/da1469x/src/da1469x_cmac.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <assert.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <string.h>
-#include "os/os.h"
-#include "mcu/cmsis_nvic.h"
-#include "mcu/da1469x_lpclk.h"
-#include "mcu/da1469x_cmac.h"
-#include "mcu/da1469x_hal.h"
-#include "mcu/da1469x_pdc.h"
-#include "mcu/mcu.h"
-
-#define CMAC_SYM_CONFIG ((void *)(0x00818f20 + MEMCTRL->CMI_CODE_BASE_REG))
-#define CMAC_SYM_CONFIG_DYN ((void *)(0x00821af8 + MEMCTRL->CMI_CODE_BASE_REG))
-#define CMAC_SYM_MBOX_RX ((void *)(0x008216b0 + MEMCTRL->CMI_CODE_BASE_REG))
-#define CMAC_SYM_MBOX_TX ((void *)(0x008218b0 + MEMCTRL->CMI_CODE_BASE_REG))
-
-#define CMAC_MBOX_SIZE 504
-#define CMAC_MBOX_F_RESET 0x0008
-#define CMAC_MBOX_F_WRITEPENDING 0x0010
-
-struct cmac_config {
- uint8_t bdaddr[6]; /* Device address */
-
- uint8_t rf_calibration_delay;
-
- uint8_t lp_clock_freq; /* Sleep clock frequency (0 = 32768Hz, 1 = 32000Hz) */
- uint16_t lp_clock_sca; /* Sleep clock accuracy [ppm] */
-
- uint16_t rx_buf_len; /* RX buffer size */
- uint16_t tx_buf_len; /* TX buffer size */
- bool initial_length_req;
-
- /* Channel assessment algorithm settings */
- uint16_t chan_assess_itvl;
- uint8_t chan_assess_itvl_mult;
- int8_t chan_assess_min_rssi;
- uint16_t chan_assess_pkt_num;
- uint16_t chan_assess_bad_pkt_num;
-
- /* Calibration settings */
- uint8_t system_tcs_length;
- uint8_t synth_tcs_length;
- uint8_t rfcu_tcs_length;
-
- uint8_t default_tx_power; /* Default TX power for connection/advertising */
- bool filter_dup_ov_discard; /* Discard unknown devices when filter buffer is full */
- bool use_hp_1m;
- bool use_hp_2m;
-};
-
-struct cmac_config_dynamic {
- bool enable_sleep; /* Enable sleep */
-
- /* More options here, don't care now */
-};
-
-struct cmac_mbox {
- volatile uint16_t magic;
- volatile uint16_t flags;
- volatile uint16_t wr_off;
- volatile uint16_t rd_off;
- uint8_t data[CMAC_MBOX_SIZE];
-};
-
-/* CMAC data */
-extern uint32_t cmac_fw_addr;
-extern uint32_t __cmac_ram_section_end__;
-extern uint32_t __cmac_fw_area_start[];
-
-/* Mailboxes for SYS<->CMAC communication */
-static struct cmac_mbox *cmac_mbox_rx;
-static struct cmac_mbox *cmac_mbox_tx;
-
-/* PDC entry for waking up CMAC */
-static int8_t g_da1469x_pdc_sys2cmac;
-/* PDC entry for waking up M33 */
-static int8_t g_da1469x_pdc_cmac2sys;
-/* Callback for data ready from CMAC */
-static da1469x_cmac_mbox_read_cb g_da1469x_cmac_mbox_read_cb;
-
-static inline void
-da1469x_cmac_pdc_signal(void)
-{
- da1469x_pdc_set(g_da1469x_pdc_sys2cmac);
-}
-
-static void
-cmac2sys_isr(void)
-{
- uint16_t wr_off;
- uint16_t rd_off;
- uint16_t chunk;
- uint16_t len;
-
- os_trace_isr_enter();
-
- /* Clear CMAC2SYS interrupt */
- *(volatile uint32_t *)0x40002000 = 2;
-
- if (*(volatile uint32_t *)0x40002000 & 0x1c00) {
- /* XXX CMAC is in error state, need to recover */
- assert(0);
- }
-
- if (cmac_mbox_rx->flags & CMAC_MBOX_F_RESET) {
- cmac_mbox_rx->flags &= ~CMAC_MBOX_F_RESET;
- goto done;
- }
-
- if (!g_da1469x_cmac_mbox_read_cb) {
- cmac_mbox_rx->rd_off = cmac_mbox_rx->wr_off;
- goto done;
- }
-
- do {
- rd_off = cmac_mbox_rx->rd_off;
- wr_off = cmac_mbox_rx->wr_off;
-
- if (rd_off <= wr_off) {
- chunk = wr_off - rd_off;
- } else {
- chunk = CMAC_MBOX_SIZE - rd_off;
- }
-
- while (chunk) {
- len = g_da1469x_cmac_mbox_read_cb(&cmac_mbox_rx->data[rd_off], chunk);
-
- rd_off += len;
- chunk -= len;
- };
-
- cmac_mbox_rx->rd_off = rd_off % CMAC_MBOX_SIZE;
- } while (cmac_mbox_rx->rd_off != cmac_mbox_rx->wr_off);
-
-done:
-
- if (cmac_mbox_rx->flags & CMAC_MBOX_F_WRITEPENDING) {
- da1469x_cmac_pdc_signal();
- }
-
- os_trace_isr_exit();
-}
-
-static void
-da1469x_cmac_lpclk_cb(uint32_t freq)
-{
- struct cmac_config_dynamic *cmac_config_dyn;
-
- cmac_config_dyn = CMAC_SYM_CONFIG_DYN;
- cmac_config_dyn->enable_sleep = freq == 32768;
-}
-
-void
-da1469x_cmac_mbox_write(const uint8_t *buf, size_t len)
-{
- uint16_t wr_off;
- uint16_t rd_off;
- uint16_t chunk;
- uint32_t primask;
-
- __HAL_DISABLE_INTERRUPTS(primask);
-
- while (len) {
- rd_off = cmac_mbox_tx->rd_off;
- wr_off = cmac_mbox_tx->wr_off;
-
- if (rd_off > wr_off) {
- chunk = min(len, rd_off - wr_off);
- } else {
- chunk = min(len, CMAC_MBOX_SIZE - wr_off);
- }
-
- if (chunk == 0) {
- continue;
- }
-
- memcpy(&cmac_mbox_tx->data[wr_off], buf, chunk);
-
- wr_off += chunk;
- cmac_mbox_tx->wr_off = wr_off % CMAC_MBOX_SIZE;
-
- da1469x_cmac_pdc_signal();
-
- len -= chunk;
- buf += chunk;
- }
-
- __HAL_ENABLE_INTERRUPTS(primask);
-}
-
-void
-da1469x_cmac_mbox_set_read_cb(da1469x_cmac_mbox_read_cb cb)
-{
- g_da1469x_cmac_mbox_read_cb = cb;
-}
-
-void
-da1469x_cmac_init(void)
-{
- uint32_t cmac_addr_code = (uint32_t)&cmac_fw_addr;
- uint32_t cmac_addr_data = cmac_addr_code & 0x0007fffc;
- uint32_t cmac_addr_end = (uint32_t)&__cmac_ram_section_end__;
- uint32_t *cmac_fw_area = __cmac_fw_area_start;
- struct cmac_config *cmac_config;
- struct cmac_config_dynamic *cmac_config_dyn;
-
- /* Add PDC entry to wake up CMAC from M33 */
- g_da1469x_pdc_sys2cmac = da1469x_pdc_add(MCU_PDC_TRIGGER_MAC_TIMER,
- MCU_PDC_MASTER_CMAC,
- MCU_PDC_EN_XTAL);
- da1469x_pdc_set(g_da1469x_pdc_sys2cmac);
- da1469x_pdc_ack(g_da1469x_pdc_sys2cmac);
-
- /* Add PDC entry to wake up M33 from CMAC, if does not exist yet */
- g_da1469x_pdc_cmac2sys = da1469x_pdc_find(MCU_PDC_TRIGGER_COMBO,
- MCU_PDC_MASTER_M33, 0);
- if (g_da1469x_pdc_cmac2sys < 0) {
- g_da1469x_pdc_cmac2sys = da1469x_pdc_add(MCU_PDC_TRIGGER_COMBO,
- MCU_PDC_MASTER_M33,
- MCU_PDC_EN_XTAL);
- da1469x_pdc_set(g_da1469x_pdc_cmac2sys);
- da1469x_pdc_ack(g_da1469x_pdc_cmac2sys);
- }
-
- /* Enable Radio LDO */
- CRG_TOP->POWER_CTRL_REG |= CRG_TOP_POWER_CTRL_REG_LDO_RADIO_ENABLE_Msk;
-
- /* Enable CMAC, but keep it in reset */
- CRG_TOP->CLK_RADIO_REG = (1 << CRG_TOP_CLK_RADIO_REG_RFCU_ENABLE_Pos) |
- (1 << CRG_TOP_CLK_RADIO_REG_CMAC_SYNCH_RESET_Pos) |
- (0 << CRG_TOP_CLK_RADIO_REG_CMAC_CLK_SEL_Pos) |
- (1 << CRG_TOP_CLK_RADIO_REG_CMAC_CLK_ENABLE_Pos) |
- (0 << CRG_TOP_CLK_RADIO_REG_CMAC_DIV_Pos);
-
- /* Setup CMAC memory base addresses */
- MEMCTRL->CMI_CODE_BASE_REG = cmac_addr_code;
- MEMCTRL->CMI_DATA_BASE_REG = cmac_addr_data;
- MEMCTRL->CMI_SHARED_BASE_REG = 0;
- MEMCTRL->CMI_END_REG = cmac_addr_end;
-
- /* Copy CMAC firmware to RAM (9 words of header data, 2nd word has FW size) */
- memcpy((void *)cmac_addr_code, &cmac_fw_area[9], cmac_fw_area[1]);
-
- /* Symbols below are in shared memory, can update them now */
- cmac_config = CMAC_SYM_CONFIG;
- cmac_config_dyn = CMAC_SYM_CONFIG_DYN;
- cmac_mbox_rx = CMAC_SYM_MBOX_RX;
- cmac_mbox_tx = CMAC_SYM_MBOX_TX;
-
- /* Update CMAC configuration */
- cmac_config->lp_clock_freq = 0;
- cmac_config->lp_clock_sca = 50;
- cmac_config->rx_buf_len = 251 + 11;
- cmac_config->tx_buf_len = 251 + 11;
- cmac_config->initial_length_req = 0;
- cmac_config->system_tcs_length = 0;
- cmac_config->synth_tcs_length = 0;
- cmac_config->rfcu_tcs_length = 0;
- cmac_config->default_tx_power = 4;
- cmac_config_dyn->enable_sleep = false;
-
- /* Release CMAC from reset */
- CRG_TOP->CLK_RADIO_REG &= ~CRG_TOP_CLK_RADIO_REG_CMAC_SYNCH_RESET_Msk;
-
- /* Wait for CMAC to update registers */
- while (MEMCTRL->CMI_DATA_BASE_REG == cmac_addr_data);
- while (MEMCTRL->CMI_SHARED_BASE_REG != (MEMCTRL->CMI_END_REG & 0xfffffc00));
-
- /* Initialize mailboxes and sync with CMAC */
- cmac_mbox_tx->flags = CMAC_MBOX_F_RESET;
- cmac_mbox_tx->wr_off = 0;
- cmac_mbox_tx->rd_off = 0;
- cmac_mbox_tx->magic = 0xa55a;
- while (cmac_mbox_rx->magic != 0xa55a);
-
- NVIC_SetVector(CMAC2SYS_IRQn, (uint32_t)cmac2sys_isr);
- NVIC_SetPriority(CMAC2SYS_IRQn, 0);
- NVIC_EnableIRQ(CMAC2SYS_IRQn);
-
- da1469x_cmac_pdc_signal();
-
- da1469x_lpclk_register_cmac_cb(da1469x_cmac_lpclk_cb);
-}