Skip to content
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

Jump to bottom

Add octospim support for octospi #3102

Merged
merged 17 commits into from
Oct 13, 2024
Merged

Add octospim support for octospi #3102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c02050c
feat: add octospim to ospi
HaoboGu Jun 20, 2024
30ca374
Merge branch 'embassy-rs:main' into main
HaoboGu Jun 21, 2024
23066ef
feat: make octospim behind feature gate
HaoboGu Jun 21, 2024
08b092a
Merge remote-tracking branch 'refs/remotes/origin/main'
HaoboGu Jun 21, 2024
e2c050f
refactor: fix fmt issue
HaoboGu Jun 21, 2024
ada4914
refactor: fix ci failure
HaoboGu Jun 21, 2024
a5d8356
feat: add octospim reg writing code
HaoboGu Jun 22, 2024
89170c5
feat(octospi): enable rcc for octospim at the initialization
HaoboGu Jun 22, 2024
7bd23f5
fix: add octospim feature gate
HaoboGu Jun 23, 2024
6279799
fix: fix cfg flag
HaoboGu Jun 23, 2024
c068944
fix: fix rcc register on stm32l4 and stm32u5
HaoboGu Jun 23, 2024
4d5023e
feat(ospi): support OCTOSPI2 in build.rs
HaoboGu Jul 4, 2024
23baf62
feat(ospi): add OCTOSPI2 pin impls
HaoboGu Jul 23, 2024
c352bc3
Merge branch 'embassy-rs:main' into main
HaoboGu Aug 1, 2024
31fad52
Merge branch 'embassy-rs:main' into main
HaoboGu Aug 15, 2024
6383978
Merge branch 'embassy-rs:main' into main
HaoboGu Oct 12, 2024
4a05114
feat(ospi): support both ospi instances in stm32 OCTOSPIM
HaoboGu Oct 12, 2024
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
33 changes: 33 additions & 0 deletions embassy-stm32/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1054,6 +1054,30 @@ fn main() {
(("octospi", "NCS"), quote!(crate::ospi::NSSPin)),
(("octospi", "CLK"), quote!(crate::ospi::SckPin)),
(("octospi", "NCLK"), quote!(crate::ospi::NckPin)),
(("octospim", "P1_IO0"), quote!(crate::ospi::D0Pin)),
(("octospim", "P1_IO1"), quote!(crate::ospi::D1Pin)),
(("octospim", "P1_IO2"), quote!(crate::ospi::D2Pin)),
(("octospim", "P1_IO3"), quote!(crate::ospi::D3Pin)),
(("octospim", "P1_IO4"), quote!(crate::ospi::D4Pin)),
(("octospim", "P1_IO5"), quote!(crate::ospi::D5Pin)),
(("octospim", "P1_IO6"), quote!(crate::ospi::D6Pin)),
(("octospim", "P1_IO7"), quote!(crate::ospi::D7Pin)),
(("octospim", "P1_DQS"), quote!(crate::ospi::DQSPin)),
(("octospim", "P1_NCS"), quote!(crate::ospi::NSSPin)),
(("octospim", "P1_CLK"), quote!(crate::ospi::SckPin)),
(("octospim", "P1_NCLK"), quote!(crate::ospi::NckPin)),
(("octospim", "P2_IO0"), quote!(crate::ospi::D0Pin)),
(("octospim", "P2_IO1"), quote!(crate::ospi::D1Pin)),
(("octospim", "P2_IO2"), quote!(crate::ospi::D2Pin)),
(("octospim", "P2_IO3"), quote!(crate::ospi::D3Pin)),
(("octospim", "P2_IO4"), quote!(crate::ospi::D4Pin)),
(("octospim", "P2_IO5"), quote!(crate::ospi::D5Pin)),
(("octospim", "P2_IO6"), quote!(crate::ospi::D6Pin)),
(("octospim", "P2_IO7"), quote!(crate::ospi::D7Pin)),
(("octospim", "P2_DQS"), quote!(crate::ospi::DQSPin)),
(("octospim", "P2_NCS"), quote!(crate::ospi::NSSPin)),
(("octospim", "P2_CLK"), quote!(crate::ospi::SckPin)),
(("octospim", "P2_NCLK"), quote!(crate::ospi::NckPin)),
(("tsc", "G1_IO1"), quote!(crate::tsc::G1IO1Pin)),
HaoboGu marked this conversation as resolved.
Show resolved Hide resolved
(("tsc", "G1_IO2"), quote!(crate::tsc::G1IO2Pin)),
(("tsc", "G1_IO3"), quote!(crate::tsc::G1IO3Pin)),
Expand Down Expand Up @@ -1111,6 +1135,15 @@ fn main() {
peri = format_ident!("{}", pin.signal.replace('_', ""));
}

// OCTOSPIM is special
if p.name == "OCTOSPIM" {
peri = format_ident!("{}", "OCTOSPI1");
g.extend(quote! {
pin_trait_impl!(#tr, #peri, #pin_name, #af);
});
peri = format_ident!("{}", "OCTOSPI2");
}

g.extend(quote! {
pin_trait_impl!(#tr, #peri, #pin_name, #af);
})
Expand Down
118 changes: 118 additions & 0 deletions embassy-stm32/src/ospi/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ use crate::dma::{word, ChannelAndRequest};
use crate::gpio::{AfType, AnyPin, OutputType, Pull, SealedPin as _, Speed};
use crate::mode::{Async, Blocking, Mode as PeriMode};
use crate::pac::octospi::{vals, Octospi as Regs};
#[cfg(octospim_v1)]
use crate::pac::octospim::Octospim;
use crate::rcc::{self, RccPeripheral};
use crate::{peripherals, Peripheral};

Expand Down Expand Up @@ -197,6 +199,83 @@ impl<'d, T: Instance, M: PeriMode> Ospi<'d, T, M> {
) -> Self {
into_ref!(peri);

#[cfg(octospim_v1)]
{
// RCC for octospim should be enabled before writing register
#[cfg(stm32l4)]
crate::pac::RCC.ahb2smenr().modify(|w| w.set_octospimsmen(true));
#[cfg(stm32u5)]
crate::pac::RCC.ahb2enr1().modify(|w| w.set_octospimen(true));
#[cfg(not(any(stm32l4, stm32u5)))]
crate::pac::RCC.ahb3enr().modify(|w| w.set_iomngren(true));

// Disable OctoSPI peripheral first
T::REGS.cr().modify(|w| {
w.set_en(false);
});

// OctoSPI IO Manager has been enabled before
T::OCTOSPIM_REGS.cr().modify(|w| {
w.set_muxen(false);
w.set_req2ack_time(0xff);
});

// Clear config
T::OCTOSPIM_REGS.p1cr().modify(|w| {
w.set_clksrc(false);
w.set_dqssrc(false);
w.set_ncssrc(false);
w.set_clken(false);
w.set_dqsen(false);
w.set_ncsen(false);
w.set_iolsrc(0);
w.set_iohsrc(0);
});

T::OCTOSPIM_REGS.p1cr().modify(|w| {
let octospi_src = if T::OCTOSPI_IDX == 1 { false } else { true };
w.set_ncsen(true);
w.set_ncssrc(octospi_src);
w.set_clken(true);
w.set_clksrc(octospi_src);
if dqs.is_some() {
w.set_dqsen(true);
w.set_dqssrc(octospi_src);
}

// Set OCTOSPIM IOL and IOH according to the index of OCTOSPI instance
if T::OCTOSPI_IDX == 1 {
w.set_iolen(true);
w.set_iolsrc(0);
// Enable IOH in octo and dual quad mode
if let OspiWidth::OCTO = width {
w.set_iohen(true);
w.set_iohsrc(0b01);
} else if dual_quad {
w.set_iohen(true);
w.set_iohsrc(0b00);
} else {
w.set_iohen(false);
w.set_iohsrc(0b00);
}
} else {
w.set_iolen(true);
w.set_iolsrc(0b10);
// Enable IOH in octo and dual quad mode
if let OspiWidth::OCTO = width {
w.set_iohen(true);
w.set_iohsrc(0b11);
} else if dual_quad {
w.set_iohen(true);
w.set_iohsrc(0b10);
} else {
w.set_iohen(false);
w.set_iohsrc(0b00);
}
}
});
}

// System configuration
rcc::enable_and_reset::<T>();
while T::REGS.sr().read().busy() {}
Expand Down Expand Up @@ -1056,11 +1135,25 @@ fn finish_dma(regs: Regs) {
});
}

#[cfg(octospim_v1)]
/// OctoSPI I/O manager instance trait.
pub(crate) trait SealedOctospimInstance {
const OCTOSPIM_REGS: Octospim;
const OCTOSPI_IDX: u8;
}

/// OctoSPI instance trait.
pub(crate) trait SealedInstance {
const REGS: Regs;
}

/// OSPI instance trait.
#[cfg(octospim_v1)]
#[allow(private_bounds)]
pub trait Instance: Peripheral<P = Self> + SealedInstance + RccPeripheral + SealedOctospimInstance {}

/// OSPI instance trait.
#[cfg(not(octospim_v1))]
#[allow(private_bounds)]
pub trait Instance: Peripheral<P = Self> + SealedInstance + RccPeripheral {}

Expand All @@ -1078,6 +1171,31 @@ pin_trait!(DQSPin, Instance);
pin_trait!(NSSPin, Instance);
dma_trait!(OctoDma, Instance);

// Hard-coded the octospi index, for OCTOSPIM
#[cfg(octospim_v1)]
impl SealedOctospimInstance for peripherals::OCTOSPI1 {
const OCTOSPIM_REGS: Octospim = crate::pac::OCTOSPIM;
const OCTOSPI_IDX: u8 = 1;
}

#[cfg(octospim_v1)]
impl SealedOctospimInstance for peripherals::OCTOSPI2 {
const OCTOSPIM_REGS: Octospim = crate::pac::OCTOSPIM;
const OCTOSPI_IDX: u8 = 2;
}

#[cfg(octospim_v1)]
foreach_peripheral!(
(octospi, $inst:ident) => {
impl SealedInstance for peripherals::$inst {
const REGS: Regs = crate::pac::$inst;
}

impl Instance for peripherals::$inst {}
};
);

#[cfg(not(octospim_v1))]
foreach_peripheral!(
(octospi, $inst:ident) => {
impl SealedInstance for peripherals::$inst {
Expand Down