Check for device supported event rings and channels
Subsystems (2)
cover Check for device supported event rings and channels
This change is introduced to make sure device supported hardware event ring, hardware channels, total number of event rings and total number of channels match with MHI host controller. In case of a mismatch, driver bails out and does not move MHI device to M0 from Ready state.
Hemant Kumar (2):
bus: mhi: core: Count number of HW channels supported by controller
bus: mhi: core: Check for device supported event rings and channels
drivers/bus/mhi/core/init.c | 33 +++++++++++++++++++++++++++++++++ drivers/bus/mhi/core/internal.h | 5 +++++ include/linux/mhi.h | 1 + 3 files changed, 39 insertions(+)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 1/2 bus: mhi: core: Count number of HW channels supported by controller
Device provides the total number of HW channels it supports using MHI configuration register. Host supported HW channels shall not exceed that value. In order to make this check, a counter is needed to store total number of HW channels required by host.
--- drivers/bus/mhi/core/init.c | 2 ++ drivers/bus/mhi/core/internal.h | 1 + include/linux/mhi.h | 1 + 3 files changed, 4 insertions(+)
drivers/bus/mhi/core/init.c +2 -0
@@ -725,6 +725,8 @@ static int parse_ch_cfg(struct mhi_controller *mhi_cntrl, mhi_chan = &mhi_cntrl->mhi_chan[chan]; mhi_chan->name = ch_cfg->name; mhi_chan->chan = chan; +if (chan >=MHI_HW_CHAN_START_IDX ) + mhi_cntrl->hw_chan++; mhi_chan->tre_ring.elements = ch_cfg->num_elements;if (!mhi_chan->tre_ring.elements)
drivers/bus/mhi/core/internal.h +1 -0
@@ -454,6 +454,7 @@ enum mhi_pm_state {#define PRIMARY_CMD_RING 0#define MHI_DEV_WAKE_DB 127#define MHI_MAX_MTU 0xffff +#define MHI_HW_CHAN_START_IDX 100#define MHI_RANDOM_U32_NONZERO (bmsk) (prandom_u32_max(bmsk) + 1)enum mhi_er_type {
include/linux/mhi.h +1 -0
@@ -389,6 +389,7 @@ struct mhi_controller {struct list_head lpm_chans;int *irq;u32 max_chan; +u32 hw_chan;u32 total_ev_rings;u32 hw_ev_rings;u32 sw_ev_rings;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v1 1/2] bus: mhi: core: Count number of HW channels supported by controller
Quoted 42 lines · Hemant Kumar
Device provides the total number of HW channels it supports using MHI configuration register. Host supported HW channels shall not exceed that value. In order to make this check, a counter is needed to store total number of HW channels required by host.
Signed-off-by Hemant Kumar <[email protected]>--- drivers/bus/mhi/core/init.c | 2 ++ drivers/bus/mhi/core/internal.h | 1 + include/linux/mhi.h | 1 + 3 files changed, 4 insertions(+)drivers/bus/mhi/core/init.c +2
-0@@ -725,6 +725,8 @@ static int parse_ch_cfg(struct mhi_controller *mhi_cntrl, mhi_chan = &mhi_cntrl->mhi_chan[chan]; mhi_chan->name = ch_cfg->name; mhi_chan->chan = chan; +if (chan >=MHI_HW_CHAN_START_IDX ) + mhi_cntrl->hw_chan++; mhi_chan->tre_ring.elements = ch_cfg->num_elements;if (!mhi_chan->tre_ring.elements)drivers/bus/mhi/core/internal.h +1
-0@@ -454,6 +454,7 @@ enum mhi_pm_state {#define PRIMARY_CMD_RING 0#define MHI_DEV_WAKE_DB 127#define MHI_MAX_MTU 0xffff +#define MHI_HW_CHAN_START_IDX 100#define MHI_RANDOM_U32_NONZERO (bmsk) (prandom_u32_max(bmsk) + 1)enum mhi_er_type {include/linux/mhi.h +0
-0
include/linux/mhi.h struct mhi_controller { · line 392
Quoted 4 lines
include/linux/mhi.h +1
-0@@ -389,6 +389,7 @@ struct mhi_controller {struct list_head lpm_chans;int *irq;u32 max_chan; +u32 hw_chan;
Please add Kdoc for this member. With that,
Thanks,
Mani
Quoted 7 lines
include/linux/mhi.h +0
-0u32 total_ev_rings;u32 hw_ev_rings;u32 sw_ev_rings;Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 2/2 bus: mhi: core: Check for device supported event rings and channels
In reply to Hemant KumarIt is possible that the device does not support the number of event rings and channels that the controller would like to use. Read the MHICFG to determine device-side support and if the controller requests more than the device supports, bailout without configuring device MMIO registers.
--- drivers/bus/mhi/core/init.c | 31 +++++++++++++++++++++++++++++++ drivers/bus/mhi/core/internal.h | 4 ++++ 2 files changed, 35 insertions(+)
drivers/bus/mhi/core/init.c +31 -0
@@ -488,6 +488,37 @@ int mhi_init_mmio(struct mhi_controller *mhi_cntrl) { 0, 0, 0 } }; +/* range check b/w host and device supported ev rings and channels */ + ret =mhi_read_reg (mhi_cntrl, base,MHICFG , &val); +if (ret) { +dev_err (dev,"Unable to read MHICFG register\n" ); +return -EIO ; + } + +if (MHICFG_NHWER (val) < mhi_cntrl->hw_ev_rings) { +dev_err (dev,"#HWEV ring: host requires %d dev supports %d\n" , + mhi_cntrl->hw_ev_rings,MHICFG_NHWER (val)); +return -EIO ; + } + +if (MHICFG_NER (val) < mhi_cntrl->total_ev_rings) { +dev_err (dev,"#EV ring: host requires %d dev supports %d\n" , + mhi_cntrl->total_ev_rings,MHICFG_NER (val)); +return -EIO ; + } + +if (MHICFG_NHWCH (val) < mhi_cntrl->hw_chan) { +dev_err (dev,"#HWCH: host requires %d dev supports %d\n" , + mhi_cntrl->hw_chan,MHICFG_NHWCH (val)); +return -EIO ; + } + +if (MHICFG_NCH (val) < mhi_cntrl->max_chan) { +dev_err (dev,"#CH: host requires %d dev supports %d\n" , + mhi_cntrl->max_chan,MHICFG_NCH (val)); +return -EIO ; + } +dev_dbg (dev,"Initializing MHI registers\n" );/* Read channel db offset */
drivers/bus/mhi/core/internal.h +4 -0
@@ -28,6 +28,10 @@ extern struct bus_type mhi_bus_type;#define MHICFG_NHWCH_SHIFT (8)#define MHICFG_NCH_MASK (0xFF)#define MHICFG_NCH_SHIFT (0) +#define MHICFG_NHWER (n) (((n) & MHICFG_NHWER_MASK) >> MHICFG_NHWER_SHIFT) +#define MHICFG_NER (n) (((n) & MHICFG_NER_MASK) >> MHICFG_NER_SHIFT) +#define MHICFG_NHWCH (n) (((n) & MHICFG_NHWCH_MASK) >> MHICFG_NHWCH_SHIFT) +#define MHICFG_NCH (n) (((n) & MHICFG_NCH_MASK) >> MHICFG_NCH_SHIFT)#define CHDBOFF (0x18)#define CHDBOFF_CHDBOFF_MASK (0xFFFFFFFF)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v1 2/2] bus: mhi: core: Check for device supported event rings and channels
Quoted 20 lines · Hemant Kumar
It is possible that the device does not support the number of event rings and channels that the controller would like to use. Read the MHICFG to determine device-side support and if the controller requests more than the device supports, bailout without configuring device MMIO registers.
Signed-off-by Hemant Kumar <[email protected]>--- drivers/bus/mhi/core/init.c | 31 +++++++++++++++++++++++++++++++ drivers/bus/mhi/core/internal.h | 4 ++++ 2 files changed, 35 insertions(+)drivers/bus/mhi/core/init.c +0
-0@@ -488,6 +488,37 @@ int mhi_init_mmio(struct mhi_controller *mhi_cntrl) { 0, 0, 0 } };
drivers/bus/mhi/core/init.c int mhi_init_mmio(struct mhi_controller *mhi_cntrl) · line 500
Quoted 10 lines
drivers/bus/mhi/core/init.c +10
-0+/* range check b/w host and device supported ev rings and channels */ + ret =mhi_read_reg (mhi_cntrl, base,MHICFG , &val); +if (ret) { +dev_err (dev,"Unable to read MHICFG register\n" ); +return -EIO ; + } + +if (MHICFG_NHWER (val) < mhi_cntrl->hw_ev_rings) { +dev_err (dev,"#HWEV ring: host requires %d dev supports %d\n" , + mhi_cntrl->hw_ev_rings,MHICFG_NHWER (val));
Can you please improve this error message? Something like, "Host requires %d hw event rings but dev supports only %d".
Do this for below errors as well. With that,
Thanks,
Mani
Quoted 43 lines
drivers/bus/mhi/core/init.c +21
-0+return -EIO ; + } + +if (MHICFG_NER (val) < mhi_cntrl->total_ev_rings) { +dev_err (dev,"#EV ring: host requires %d dev supports %d\n" , + mhi_cntrl->total_ev_rings,MHICFG_NER (val)); +return -EIO ; + } + +if (MHICFG_NHWCH (val) < mhi_cntrl->hw_chan) { +dev_err (dev,"#HWCH: host requires %d dev supports %d\n" , + mhi_cntrl->hw_chan,MHICFG_NHWCH (val)); +return -EIO ; + } + +if (MHICFG_NCH (val) < mhi_cntrl->max_chan) { +dev_err (dev,"#CH: host requires %d dev supports %d\n" , + mhi_cntrl->max_chan,MHICFG_NCH (val)); +return -EIO ; + } +dev_dbg (dev,"Initializing MHI registers\n" );/* Read channel db offset */ drivers/bus/mhi/core/internal.h +4
-0@@ -28,6 +28,10 @@ extern struct bus_type mhi_bus_type;#define MHICFG_NHWCH_SHIFT (8)#define MHICFG_NCH_MASK (0xFF)#define MHICFG_NCH_SHIFT (0) +#define MHICFG_NHWER (n) (((n) & MHICFG_NHWER_MASK) >> MHICFG_NHWER_SHIFT) +#define MHICFG_NER (n) (((n) & MHICFG_NER_MASK) >> MHICFG_NER_SHIFT) +#define MHICFG_NHWCH (n) (((n) & MHICFG_NHWCH_MASK) >> MHICFG_NHWCH_SHIFT) +#define MHICFG_NCH (n) (((n) & MHICFG_NCH_MASK) >> MHICFG_NCH_SHIFT)#define CHDBOFF (0x18)#define CHDBOFF_CHDBOFF_MASK (0xFFFFFFFF)Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project