Skip to content

Implement the dual external flash feature for stm32 qspi #4761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Implement the dual external flash feature for stm32 qspi #4761

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 96 additions & 16 deletions embassy-stm32/src/qspi/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ pub struct Config {
pub sample_shifting: SampleShifting,
/// GPIO Speed
pub gpio_speed: Speed,
/// Dual flash mode
pub dual_flash: bool,

}

impl Default for Config {
Expand All @@ -79,6 +82,7 @@ impl Default for Config {
cs_high_time: ChipSelectHighTime::_5Cycle,
sample_shifting: SampleShifting::None,
gpio_speed: Speed::VeryHigh,
dual_flash: false,
}
}
}
Expand All @@ -88,11 +92,16 @@ impl Default for Config {
pub struct Qspi<'d, T: Instance, M: PeriMode> {
_peri: Peri<'d, T>,
sck: Option<Peri<'d, AnyPin>>,
d0: Option<Peri<'d, AnyPin>>,
d1: Option<Peri<'d, AnyPin>>,
d2: Option<Peri<'d, AnyPin>>,
d3: Option<Peri<'d, AnyPin>>,
nss: Option<Peri<'d, AnyPin>>,
bk1d0: Option<Peri<'d, AnyPin>>,
bk1d1: Option<Peri<'d, AnyPin>>,
bk1d2: Option<Peri<'d, AnyPin>>,
bk1d3: Option<Peri<'d, AnyPin>>,
bk2d0: Option<Peri<'d, AnyPin>>,
bk2d1: Option<Peri<'d, AnyPin>>,
bk2d2: Option<Peri<'d, AnyPin>>,
bk2d3: Option<Peri<'d, AnyPin>>,
bk1nss: Option<Peri<'d, AnyPin>>,
bk2nss: Option<Peri<'d, AnyPin>>,
dma: Option<ChannelAndRequest<'d>>,
_phantom: PhantomData<M>,
config: Config,
Expand All @@ -101,12 +110,17 @@ pub struct Qspi<'d, T: Instance, M: PeriMode> {
impl<'d, T: Instance, M: PeriMode> Qspi<'d, T, M> {
fn new_inner(
peri: Peri<'d, T>,
d0: Option<Peri<'d, AnyPin>>,
d1: Option<Peri<'d, AnyPin>>,
d2: Option<Peri<'d, AnyPin>>,
d3: Option<Peri<'d, AnyPin>>,
bk1d0: Option<Peri<'d, AnyPin>>,
bk1d1: Option<Peri<'d, AnyPin>>,
bk1d2: Option<Peri<'d, AnyPin>>,
bk1d3: Option<Peri<'d, AnyPin>>,
bk2d0: Option<Peri<'d, AnyPin>>,
bk2d1: Option<Peri<'d, AnyPin>>,
bk2d2: Option<Peri<'d, AnyPin>>,
bk2d3: Option<Peri<'d, AnyPin>>,
sck: Option<Peri<'d, AnyPin>>,
nss: Option<Peri<'d, AnyPin>>,
bk1nss: Option<Peri<'d, AnyPin>>,
bk2nss: Option<Peri<'d, AnyPin>>,
dma: Option<ChannelAndRequest<'d>>,
config: Config,
fsel: FlashSelection,
Expand Down Expand Up @@ -135,6 +149,7 @@ impl<'d, T: Instance, M: PeriMode> Qspi<'d, T, M> {
w.set_fthres(config.fifo_threshold.into());
w.set_prescaler(config.prescaler);
w.set_fsel(fsel.into());
w.set_dfm(config.dual_flash.into());
});
T::REGS.dcr().modify(|w| {
w.set_fsize(config.memory_size.into());
Expand All @@ -145,11 +160,16 @@ impl<'d, T: Instance, M: PeriMode> Qspi<'d, T, M> {
Self {
_peri: peri,
sck,
d0,
d1,
d2,
d3,
nss,
bk1d0,
bk1d1,
bk1d2,
bk1d3,
bk2d0,
bk2d1,
bk2d2,
bk2d3,
bk1nss,
bk2nss,
dma,
_phantom: PhantomData,
config,
Expand Down Expand Up @@ -296,12 +316,19 @@ impl<'d, T: Instance> Qspi<'d, T, Blocking> {
new_pin!(d1, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(d2, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(d3, AfType::output(OutputType::PushPull, config.gpio_speed)),
None,
None,
None,
None,


new_pin!(sck, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(
nss,
AfType::output_pull(OutputType::PushPull, config.gpio_speed, Pull::Up)
),
None,
None,
config,
FlashSelection::Flash1,
)
Expand All @@ -320,20 +347,63 @@ impl<'d, T: Instance> Qspi<'d, T, Blocking> {
) -> Self {
Self::new_inner(
peri,
None,
None,
None,
None,
new_pin!(d0, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(d1, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(d2, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(d3, AfType::output(OutputType::PushPull, config.gpio_speed)),

new_pin!(sck, AfType::output(OutputType::PushPull, config.gpio_speed)),
None,
new_pin!(
nss,
AfType::output_pull(OutputType::PushPull, config.gpio_speed, Pull::Up)
),

None,
config,
FlashSelection::Flash2,
)
}
/// Create a new QSPI driver for a dual bank, in blocking mode.
/// NOTE: Both nss pins are optional, there are 3 mods of operation: (1)boths flashes share nss 1, (2)boths flashes share nss 2,(3)each flash have its own nss pin.
pub fn new_blocking_dual_bank(
peri: Peri<'d, T>,
bk1d0: Peri<'d, impl BK1D0Pin<T>>,
bk1d1: Peri<'d, impl BK1D1Pin<T>>,
bk1d2: Peri<'d, impl BK1D2Pin<T>>,
bk1d3: Peri<'d, impl BK1D3Pin<T>>,
bk2d0: Peri<'d, impl BK2D0Pin<T>>,
bk2d1: Peri<'d, impl BK2D1Pin<T>>,
bk2d2: Peri<'d, impl BK2D2Pin<T>>,
bk2d3: Peri<'d, impl BK2D3Pin<T>>,
sck: Peri<'d, impl SckPin<T>>,
bk1nss: Peri<'d, impl BK1NSSPin<T>>,
bk2nss: Peri<'d, impl BK2NSSPin<T>>,
config: Config,
) -> Self {
Self::new_inner(
peri,
new_pin!(bk1d0, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(bk1d1, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(bk1d2, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(bk1d3, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(bk2d0, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(bk2d1, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(bk2d2, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(bk2d3, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(sck, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(bk1nss, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(bk2nss, AfType::output(OutputType::PushPull, config.gpio_speed)),
None,
config,
FlashSelection::Flash2, // Dual bank mode, so DFM is set and both banks are used
)
}

}

impl<'d, T: Instance> Qspi<'d, T, Async> {
Expand All @@ -355,12 +425,17 @@ impl<'d, T: Instance> Qspi<'d, T, Async> {
new_pin!(d1, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(d2, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(d3, AfType::output(OutputType::PushPull, config.gpio_speed)),
None,
None,
None,
None,
new_pin!(sck, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(
nss,
AfType::output_pull(OutputType::PushPull, config.gpio_speed, Pull::Up)
),
new_dma!(dma),
None,
new_dma!(dma),
config,
FlashSelection::Flash1,
)
Expand All @@ -380,6 +455,10 @@ impl<'d, T: Instance> Qspi<'d, T, Async> {
) -> Self {
Self::new_inner(
peri,
None,
None,
None,
None,
new_pin!(d0, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(d1, AfType::output(OutputType::PushPull, config.gpio_speed)),
new_pin!(d2, AfType::output(OutputType::PushPull, config.gpio_speed)),
Expand All @@ -389,6 +468,7 @@ impl<'d, T: Instance> Qspi<'d, T, Async> {
nss,
AfType::output_pull(OutputType::PushPull, config.gpio_speed, Pull::Up)
),
None,
new_dma!(dma),
config,
FlashSelection::Flash2,
Expand Down
Loading