Add OSPI Mux selection API support to select the AXI interface to OSPI.
Signed-off-by: Sai Krishna Potthuri <[email protected]>
---
drivers/firmware/xilinx/zynqmp.c | 17 +++++++++++++++++
include/linux/firmware/xlnx-zynqmp.h | 12 ++++++++++++
2 files changed, 29 insertions(+)
diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index 15b138326ecc..43c3b5a9eef7 100644
--- a/drivers/firmware/xilinx/zynqmp.c
+++ b/drivers/firmware/xilinx/zynqmp.c
@@ -647,6 +647,23 @@ int zynqmp_pm_sd_dll_reset(u32 node_id, u32 type)
}
EXPORT_SYMBOL_GPL(zynqmp_pm_sd_dll_reset);
+/**
+ * zynqmp_pm_ospi_mux_select() - OSPI Mux selection
+ *
+ * @dev_id: Device Id of the OSPI device.
+ * @select: OSPI Mux select value.
+ *
+ * This function select the OSPI Mux.
+ *
+ * Return: Returns status, either success or error+reason
+ */
+int zynqmp_pm_ospi_mux_select(u32 dev_id, u32 select)
+{
+ return zynqmp_pm_invoke_fn(PM_IOCTL, dev_id, IOCTL_OSPI_MUX_SELECT,
+ select, 0, NULL);
+}
+EXPORT_SYMBOL_GPL(zynqmp_pm_ospi_mux_select);
+
/**
* zynqmp_pm_write_ggs() - PM API for writing global general storage (ggs)
* @index: GGS register index
diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
index 9d1a5c175065..6979a79f553a 100644
--- a/include/linux/firmware/xlnx-zynqmp.h
+++ b/include/linux/firmware/xlnx-zynqmp.h
@@ -119,6 +119,7 @@ enum pm_ioctl_id {
IOCTL_READ_PGGS = 15,
/* Set healthy bit value */
IOCTL_SET_BOOT_HEALTH_STATUS = 17,
+ IOCTL_OSPI_MUX_SELECT = 21,
};
enum pm_query_id {
@@ -347,6 +348,11 @@ enum zynqmp_pm_shutdown_subtype {
ZYNQMP_PM_SHUTDOWN_SUBTYPE_SYSTEM = 2,
};
+enum ospi_mux_select_type {
+ PM_OSPI_MUX_SEL_DMA = 0,
+ PM_OSPI_MUX_SEL_LINEAR = 1,
+};
+
/**
* struct zynqmp_pm_query_data - PM query data
* @qid: query ID
@@ -383,6 +389,7 @@ int zynqmp_pm_set_pll_frac_data(u32 clk_id, u32 data);
int zynqmp_pm_get_pll_frac_data(u32 clk_id, u32 *data);
int zynqmp_pm_set_sd_tapdelay(u32 node_id, u32 type, u32 value);
int zynqmp_pm_sd_dll_reset(u32 node_id, u32 type);
+int zynqmp_pm_ospi_mux_select(u32 dev_id, u32 select);
int zynqmp_pm_reset_assert(const enum zynqmp_pm_reset reset,
const enum zynqmp_pm_reset_action assert_flag);
int zynqmp_pm_reset_get_status(const enum zynqmp_pm_reset reset, u32 *status);
@@ -503,6 +510,11 @@ static inline int zynqmp_pm_sd_dll_reset(u32 node_id, u32 type)
return -ENODEV;
}
+static inline int zynqmp_pm_ospi_mux_select(u32 dev_id, u32 select)
+{
+ return -ENODEV;
+}
+
static inline int zynqmp_pm_reset_assert(const enum zynqmp_pm_reset reset,
const enum zynqmp_pm_reset_action assert_flag)
{
--
2.17.1
On 9/24/21 1:36 PM, Greg Kroah-Hartman wrote:
> On Fri, Sep 24, 2021 at 03:37:08PM +0530, Sai Krishna Potthuri wrote:
>> Add OSPI Mux selection API support to select the AXI interface to OSPI.
>>
>> Signed-off-by: Sai Krishna Potthuri <[email protected]>
>> ---
>> drivers/firmware/xilinx/zynqmp.c | 17 +++++++++++++++++
>> include/linux/firmware/xlnx-zynqmp.h | 12 ++++++++++++
>> 2 files changed, 29 insertions(+)
>>
>> diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
>> index 15b138326ecc..43c3b5a9eef7 100644
>> --- a/drivers/firmware/xilinx/zynqmp.c
>> +++ b/drivers/firmware/xilinx/zynqmp.c
>> @@ -647,6 +647,23 @@ int zynqmp_pm_sd_dll_reset(u32 node_id, u32 type)
>> }
>> EXPORT_SYMBOL_GPL(zynqmp_pm_sd_dll_reset);
>>
>> +/**
>> + * zynqmp_pm_ospi_mux_select() - OSPI Mux selection
>> + *
>> + * @dev_id: Device Id of the OSPI device.
>> + * @select: OSPI Mux select value.
>> + *
>> + * This function select the OSPI Mux.
>> + *
>> + * Return: Returns status, either success or error+reason
>> + */
>> +int zynqmp_pm_ospi_mux_select(u32 dev_id, u32 select)
>> +{
>> + return zynqmp_pm_invoke_fn(PM_IOCTL, dev_id, IOCTL_OSPI_MUX_SELECT,
>> + select, 0, NULL);
>> +}
>> +EXPORT_SYMBOL_GPL(zynqmp_pm_ospi_mux_select);
>> +
>> /**
>> * zynqmp_pm_write_ggs() - PM API for writing global general storage (ggs)
>> * @index: GGS register index
>> diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
>> index 9d1a5c175065..6979a79f553a 100644
>> --- a/include/linux/firmware/xlnx-zynqmp.h
>> +++ b/include/linux/firmware/xlnx-zynqmp.h
>> @@ -119,6 +119,7 @@ enum pm_ioctl_id {
>> IOCTL_READ_PGGS = 15,
>> /* Set healthy bit value */
>> IOCTL_SET_BOOT_HEALTH_STATUS = 17,
>> + IOCTL_OSPI_MUX_SELECT = 21,
>
> Why the gap? What are the commands in the middle for?
Below is the full list. Not everything has been upstream yet. There was
an attempt on AFI which one colleague is working on and should send new
version soon. I don't think anybody has started with upstreaming probe
counters.
Every part has different owner with unfortunately own upstreaming plan.
Thanks,
Michal
enum pm_ioctl_id {
IOCTL_GET_RPU_OPER_MODE = 0,
IOCTL_SET_RPU_OPER_MODE = 1,
IOCTL_RPU_BOOT_ADDR_CONFIG = 2,
IOCTL_TCM_COMB_CONFIG = 3,
IOCTL_SET_TAPDELAY_BYPASS = 4,
IOCTL_SET_SGMII_MODE = 5,
IOCTL_SD_DLL_RESET = 6,
IOCTL_SET_SD_TAPDELAY = 7,
IOCTL_SET_PLL_FRAC_MODE = 8,
IOCTL_GET_PLL_FRAC_MODE = 9,
IOCTL_SET_PLL_FRAC_DATA = 10,
IOCTL_GET_PLL_FRAC_DATA = 11,
IOCTL_WRITE_GGS = 12,
IOCTL_READ_GGS = 13,
IOCTL_WRITE_PGGS = 14,
IOCTL_READ_PGGS = 15,
/* IOCTL for ULPI reset */
IOCTL_ULPI_RESET = 16,
/* Set healthy bit value */
IOCTL_SET_BOOT_HEALTH_STATUS = 17,
IOCTL_AFI = 18,
/* Probe counter read/write */
IOCTL_PROBE_COUNTER_READ = 19,
IOCTL_PROBE_COUNTER_WRITE = 20,
IOCTL_OSPI_MUX_SELECT = 21,
/* IOCTL for USB power request */
IOCTL_USB_SET_STATE = 22,
/* IOCTL to get last reset reason */
IOCTL_GET_LAST_RESET_REASON = 23,
/* AI engine NPI ISR clear */
IOCTL_AIE_ISR_CLEAR = 24,
/* Register SGI to ATF */
IOCTL_REGISTER_SGI = 25,
/* Runtime feature configuration */
IOCTL_SET_FEATURE_CONFIG = 26,
IOCTL_GET_FEATURE_CONFIG = 27,
};
On Fri, Sep 24, 2021 at 02:12:55PM +0200, Michal Simek wrote:
>
>
> On 9/24/21 1:36 PM, Greg Kroah-Hartman wrote:
> > On Fri, Sep 24, 2021 at 03:37:08PM +0530, Sai Krishna Potthuri wrote:
> >> Add OSPI Mux selection API support to select the AXI interface to OSPI.
> >>
> >> Signed-off-by: Sai Krishna Potthuri <[email protected]>
> >> ---
> >> drivers/firmware/xilinx/zynqmp.c | 17 +++++++++++++++++
> >> include/linux/firmware/xlnx-zynqmp.h | 12 ++++++++++++
> >> 2 files changed, 29 insertions(+)
> >>
> >> diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
> >> index 15b138326ecc..43c3b5a9eef7 100644
> >> --- a/drivers/firmware/xilinx/zynqmp.c
> >> +++ b/drivers/firmware/xilinx/zynqmp.c
> >> @@ -647,6 +647,23 @@ int zynqmp_pm_sd_dll_reset(u32 node_id, u32 type)
> >> }
> >> EXPORT_SYMBOL_GPL(zynqmp_pm_sd_dll_reset);
> >>
> >> +/**
> >> + * zynqmp_pm_ospi_mux_select() - OSPI Mux selection
> >> + *
> >> + * @dev_id: Device Id of the OSPI device.
> >> + * @select: OSPI Mux select value.
> >> + *
> >> + * This function select the OSPI Mux.
> >> + *
> >> + * Return: Returns status, either success or error+reason
> >> + */
> >> +int zynqmp_pm_ospi_mux_select(u32 dev_id, u32 select)
> >> +{
> >> + return zynqmp_pm_invoke_fn(PM_IOCTL, dev_id, IOCTL_OSPI_MUX_SELECT,
> >> + select, 0, NULL);
> >> +}
> >> +EXPORT_SYMBOL_GPL(zynqmp_pm_ospi_mux_select);
> >> +
> >> /**
> >> * zynqmp_pm_write_ggs() - PM API for writing global general storage (ggs)
> >> * @index: GGS register index
> >> diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
> >> index 9d1a5c175065..6979a79f553a 100644
> >> --- a/include/linux/firmware/xlnx-zynqmp.h
> >> +++ b/include/linux/firmware/xlnx-zynqmp.h
> >> @@ -119,6 +119,7 @@ enum pm_ioctl_id {
> >> IOCTL_READ_PGGS = 15,
> >> /* Set healthy bit value */
> >> IOCTL_SET_BOOT_HEALTH_STATUS = 17,
> >> + IOCTL_OSPI_MUX_SELECT = 21,
> >
> > Why the gap? What are the commands in the middle for?
>
> Below is the full list. Not everything has been upstream yet. There was
> an attempt on AFI which one colleague is working on and should send new
> version soon. I don't think anybody has started with upstreaming probe
> counters.
> Every part has different owner with unfortunately own upstreaming plan.
>
> Thanks,
> Michal
>
> enum pm_ioctl_id {
> IOCTL_GET_RPU_OPER_MODE = 0,
> IOCTL_SET_RPU_OPER_MODE = 1,
> IOCTL_RPU_BOOT_ADDR_CONFIG = 2,
> IOCTL_TCM_COMB_CONFIG = 3,
> IOCTL_SET_TAPDELAY_BYPASS = 4,
> IOCTL_SET_SGMII_MODE = 5,
> IOCTL_SD_DLL_RESET = 6,
> IOCTL_SET_SD_TAPDELAY = 7,
> IOCTL_SET_PLL_FRAC_MODE = 8,
> IOCTL_GET_PLL_FRAC_MODE = 9,
> IOCTL_SET_PLL_FRAC_DATA = 10,
> IOCTL_GET_PLL_FRAC_DATA = 11,
> IOCTL_WRITE_GGS = 12,
> IOCTL_READ_GGS = 13,
> IOCTL_WRITE_PGGS = 14,
> IOCTL_READ_PGGS = 15,
> /* IOCTL for ULPI reset */
> IOCTL_ULPI_RESET = 16,
> /* Set healthy bit value */
> IOCTL_SET_BOOT_HEALTH_STATUS = 17,
> IOCTL_AFI = 18,
> /* Probe counter read/write */
> IOCTL_PROBE_COUNTER_READ = 19,
> IOCTL_PROBE_COUNTER_WRITE = 20,
> IOCTL_OSPI_MUX_SELECT = 21,
> /* IOCTL for USB power request */
> IOCTL_USB_SET_STATE = 22,
> /* IOCTL to get last reset reason */
> IOCTL_GET_LAST_RESET_REASON = 23,
> /* AI engine NPI ISR clear */
> IOCTL_AIE_ISR_CLEAR = 24,
> /* Register SGI to ATF */
> IOCTL_REGISTER_SGI = 25,
> /* Runtime feature configuration */
> IOCTL_SET_FEATURE_CONFIG = 26,
> IOCTL_GET_FEATURE_CONFIG = 27,
> };
Odd mix of comments and no comments...
Anyway, that's fine, just curious as to why there was a gap. No real
reason why you can't just add them all now right?
thanks,
greg k-h
On 9/24/21 2:22 PM, Greg Kroah-Hartman wrote:
> On Fri, Sep 24, 2021 at 02:12:55PM +0200, Michal Simek wrote:
>>
>>
>> On 9/24/21 1:36 PM, Greg Kroah-Hartman wrote:
>>> On Fri, Sep 24, 2021 at 03:37:08PM +0530, Sai Krishna Potthuri wrote:
>>>> Add OSPI Mux selection API support to select the AXI interface to OSPI.
>>>>
>>>> Signed-off-by: Sai Krishna Potthuri <[email protected]>
>>>> ---
>>>> drivers/firmware/xilinx/zynqmp.c | 17 +++++++++++++++++
>>>> include/linux/firmware/xlnx-zynqmp.h | 12 ++++++++++++
>>>> 2 files changed, 29 insertions(+)
>>>>
>>>> diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
>>>> index 15b138326ecc..43c3b5a9eef7 100644
>>>> --- a/drivers/firmware/xilinx/zynqmp.c
>>>> +++ b/drivers/firmware/xilinx/zynqmp.c
>>>> @@ -647,6 +647,23 @@ int zynqmp_pm_sd_dll_reset(u32 node_id, u32 type)
>>>> }
>>>> EXPORT_SYMBOL_GPL(zynqmp_pm_sd_dll_reset);
>>>>
>>>> +/**
>>>> + * zynqmp_pm_ospi_mux_select() - OSPI Mux selection
>>>> + *
>>>> + * @dev_id: Device Id of the OSPI device.
>>>> + * @select: OSPI Mux select value.
>>>> + *
>>>> + * This function select the OSPI Mux.
>>>> + *
>>>> + * Return: Returns status, either success or error+reason
>>>> + */
>>>> +int zynqmp_pm_ospi_mux_select(u32 dev_id, u32 select)
>>>> +{
>>>> + return zynqmp_pm_invoke_fn(PM_IOCTL, dev_id, IOCTL_OSPI_MUX_SELECT,
>>>> + select, 0, NULL);
>>>> +}
>>>> +EXPORT_SYMBOL_GPL(zynqmp_pm_ospi_mux_select);
>>>> +
>>>> /**
>>>> * zynqmp_pm_write_ggs() - PM API for writing global general storage (ggs)
>>>> * @index: GGS register index
>>>> diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
>>>> index 9d1a5c175065..6979a79f553a 100644
>>>> --- a/include/linux/firmware/xlnx-zynqmp.h
>>>> +++ b/include/linux/firmware/xlnx-zynqmp.h
>>>> @@ -119,6 +119,7 @@ enum pm_ioctl_id {
>>>> IOCTL_READ_PGGS = 15,
>>>> /* Set healthy bit value */
>>>> IOCTL_SET_BOOT_HEALTH_STATUS = 17,
>>>> + IOCTL_OSPI_MUX_SELECT = 21,
>>>
>>> Why the gap? What are the commands in the middle for?
>>
>> Below is the full list. Not everything has been upstream yet. There was
>> an attempt on AFI which one colleague is working on and should send new
>> version soon. I don't think anybody has started with upstreaming probe
>> counters.
>> Every part has different owner with unfortunately own upstreaming plan.
>>
>> Thanks,
>> Michal
>>
>> enum pm_ioctl_id {
>> IOCTL_GET_RPU_OPER_MODE = 0,
>> IOCTL_SET_RPU_OPER_MODE = 1,
>> IOCTL_RPU_BOOT_ADDR_CONFIG = 2,
>> IOCTL_TCM_COMB_CONFIG = 3,
>> IOCTL_SET_TAPDELAY_BYPASS = 4,
>> IOCTL_SET_SGMII_MODE = 5,
>> IOCTL_SD_DLL_RESET = 6,
>> IOCTL_SET_SD_TAPDELAY = 7,
>> IOCTL_SET_PLL_FRAC_MODE = 8,
>> IOCTL_GET_PLL_FRAC_MODE = 9,
>> IOCTL_SET_PLL_FRAC_DATA = 10,
>> IOCTL_GET_PLL_FRAC_DATA = 11,
>> IOCTL_WRITE_GGS = 12,
>> IOCTL_READ_GGS = 13,
>> IOCTL_WRITE_PGGS = 14,
>> IOCTL_READ_PGGS = 15,
>> /* IOCTL for ULPI reset */
>> IOCTL_ULPI_RESET = 16,
>> /* Set healthy bit value */
>> IOCTL_SET_BOOT_HEALTH_STATUS = 17,
>> IOCTL_AFI = 18,
>> /* Probe counter read/write */
>> IOCTL_PROBE_COUNTER_READ = 19,
>> IOCTL_PROBE_COUNTER_WRITE = 20,
>> IOCTL_OSPI_MUX_SELECT = 21,
>> /* IOCTL for USB power request */
>> IOCTL_USB_SET_STATE = 22,
>> /* IOCTL to get last reset reason */
>> IOCTL_GET_LAST_RESET_REASON = 23,
>> /* AI engine NPI ISR clear */
>> IOCTL_AIE_ISR_CLEAR = 24,
>> /* Register SGI to ATF */
>> IOCTL_REGISTER_SGI = 25,
>> /* Runtime feature configuration */
>> IOCTL_SET_FEATURE_CONFIG = 26,
>> IOCTL_GET_FEATURE_CONFIG = 27,
>> };
>
> Odd mix of comments and no comments...
>
> Anyway, that's fine, just curious as to why there was a gap. No real
> reason why you can't just add them all now right?
Code is firstly integrated to soc tree and then upstream. I would love
to see this happen vise versa but still marketing wants to deliver
features first to customers. On the other hand customers care about
getting features on the first place and they are fine with not having
upstream solution first.
Back to your comment. It can also happen while upstreaming that some
numbers are simply not used because design is changed. That's why that
numbers can be skipped because it was just temporary solution or not
proper design.
It doesn't mean that these numbers can't be listed but on the other hand
why they should be listed if they shouldn't/can't be used.
That's why over time we are just adding number which are used by that
patchset.
I can't see any problem to send all of them if that's fine for you.
Thanks,
Michal
On Fri, Sep 24, 2021 at 03:37:08PM +0530, Sai Krishna Potthuri wrote:
> Add OSPI Mux selection API support to select the AXI interface to OSPI.
>
> Signed-off-by: Sai Krishna Potthuri <[email protected]>
> ---
> drivers/firmware/xilinx/zynqmp.c | 17 +++++++++++++++++
> include/linux/firmware/xlnx-zynqmp.h | 12 ++++++++++++
> 2 files changed, 29 insertions(+)
>
> diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
> index 15b138326ecc..43c3b5a9eef7 100644
> --- a/drivers/firmware/xilinx/zynqmp.c
> +++ b/drivers/firmware/xilinx/zynqmp.c
> @@ -647,6 +647,23 @@ int zynqmp_pm_sd_dll_reset(u32 node_id, u32 type)
> }
> EXPORT_SYMBOL_GPL(zynqmp_pm_sd_dll_reset);
>
> +/**
> + * zynqmp_pm_ospi_mux_select() - OSPI Mux selection
> + *
> + * @dev_id: Device Id of the OSPI device.
> + * @select: OSPI Mux select value.
> + *
> + * This function select the OSPI Mux.
> + *
> + * Return: Returns status, either success or error+reason
> + */
> +int zynqmp_pm_ospi_mux_select(u32 dev_id, u32 select)
> +{
> + return zynqmp_pm_invoke_fn(PM_IOCTL, dev_id, IOCTL_OSPI_MUX_SELECT,
> + select, 0, NULL);
> +}
> +EXPORT_SYMBOL_GPL(zynqmp_pm_ospi_mux_select);
> +
> /**
> * zynqmp_pm_write_ggs() - PM API for writing global general storage (ggs)
> * @index: GGS register index
> diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
> index 9d1a5c175065..6979a79f553a 100644
> --- a/include/linux/firmware/xlnx-zynqmp.h
> +++ b/include/linux/firmware/xlnx-zynqmp.h
> @@ -119,6 +119,7 @@ enum pm_ioctl_id {
> IOCTL_READ_PGGS = 15,
> /* Set healthy bit value */
> IOCTL_SET_BOOT_HEALTH_STATUS = 17,
> + IOCTL_OSPI_MUX_SELECT = 21,
Why the gap? What are the commands in the middle for?
thanks,
greg k-h
On Fri, Sep 24, 2021 at 02:49:09PM +0200, Michal Simek wrote:
>
>
> On 9/24/21 2:22 PM, Greg Kroah-Hartman wrote:
> > On Fri, Sep 24, 2021 at 02:12:55PM +0200, Michal Simek wrote:
> >>
> >>
> >> On 9/24/21 1:36 PM, Greg Kroah-Hartman wrote:
> >>> On Fri, Sep 24, 2021 at 03:37:08PM +0530, Sai Krishna Potthuri wrote:
> >>>> Add OSPI Mux selection API support to select the AXI interface to OSPI.
> >>>>
> >>>> Signed-off-by: Sai Krishna Potthuri <[email protected]>
> >>>> ---
> >>>> drivers/firmware/xilinx/zynqmp.c | 17 +++++++++++++++++
> >>>> include/linux/firmware/xlnx-zynqmp.h | 12 ++++++++++++
> >>>> 2 files changed, 29 insertions(+)
> >>>>
> >>>> diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
> >>>> index 15b138326ecc..43c3b5a9eef7 100644
> >>>> --- a/drivers/firmware/xilinx/zynqmp.c
> >>>> +++ b/drivers/firmware/xilinx/zynqmp.c
> >>>> @@ -647,6 +647,23 @@ int zynqmp_pm_sd_dll_reset(u32 node_id, u32 type)
> >>>> }
> >>>> EXPORT_SYMBOL_GPL(zynqmp_pm_sd_dll_reset);
> >>>>
> >>>> +/**
> >>>> + * zynqmp_pm_ospi_mux_select() - OSPI Mux selection
> >>>> + *
> >>>> + * @dev_id: Device Id of the OSPI device.
> >>>> + * @select: OSPI Mux select value.
> >>>> + *
> >>>> + * This function select the OSPI Mux.
> >>>> + *
> >>>> + * Return: Returns status, either success or error+reason
> >>>> + */
> >>>> +int zynqmp_pm_ospi_mux_select(u32 dev_id, u32 select)
> >>>> +{
> >>>> + return zynqmp_pm_invoke_fn(PM_IOCTL, dev_id, IOCTL_OSPI_MUX_SELECT,
> >>>> + select, 0, NULL);
> >>>> +}
> >>>> +EXPORT_SYMBOL_GPL(zynqmp_pm_ospi_mux_select);
> >>>> +
> >>>> /**
> >>>> * zynqmp_pm_write_ggs() - PM API for writing global general storage (ggs)
> >>>> * @index: GGS register index
> >>>> diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
> >>>> index 9d1a5c175065..6979a79f553a 100644
> >>>> --- a/include/linux/firmware/xlnx-zynqmp.h
> >>>> +++ b/include/linux/firmware/xlnx-zynqmp.h
> >>>> @@ -119,6 +119,7 @@ enum pm_ioctl_id {
> >>>> IOCTL_READ_PGGS = 15,
> >>>> /* Set healthy bit value */
> >>>> IOCTL_SET_BOOT_HEALTH_STATUS = 17,
> >>>> + IOCTL_OSPI_MUX_SELECT = 21,
> >>>
> >>> Why the gap? What are the commands in the middle for?
> >>
> >> Below is the full list. Not everything has been upstream yet. There was
> >> an attempt on AFI which one colleague is working on and should send new
> >> version soon. I don't think anybody has started with upstreaming probe
> >> counters.
> >> Every part has different owner with unfortunately own upstreaming plan.
> >>
> >> Thanks,
> >> Michal
> >>
> >> enum pm_ioctl_id {
> >> IOCTL_GET_RPU_OPER_MODE = 0,
> >> IOCTL_SET_RPU_OPER_MODE = 1,
> >> IOCTL_RPU_BOOT_ADDR_CONFIG = 2,
> >> IOCTL_TCM_COMB_CONFIG = 3,
> >> IOCTL_SET_TAPDELAY_BYPASS = 4,
> >> IOCTL_SET_SGMII_MODE = 5,
> >> IOCTL_SD_DLL_RESET = 6,
> >> IOCTL_SET_SD_TAPDELAY = 7,
> >> IOCTL_SET_PLL_FRAC_MODE = 8,
> >> IOCTL_GET_PLL_FRAC_MODE = 9,
> >> IOCTL_SET_PLL_FRAC_DATA = 10,
> >> IOCTL_GET_PLL_FRAC_DATA = 11,
> >> IOCTL_WRITE_GGS = 12,
> >> IOCTL_READ_GGS = 13,
> >> IOCTL_WRITE_PGGS = 14,
> >> IOCTL_READ_PGGS = 15,
> >> /* IOCTL for ULPI reset */
> >> IOCTL_ULPI_RESET = 16,
> >> /* Set healthy bit value */
> >> IOCTL_SET_BOOT_HEALTH_STATUS = 17,
> >> IOCTL_AFI = 18,
> >> /* Probe counter read/write */
> >> IOCTL_PROBE_COUNTER_READ = 19,
> >> IOCTL_PROBE_COUNTER_WRITE = 20,
> >> IOCTL_OSPI_MUX_SELECT = 21,
> >> /* IOCTL for USB power request */
> >> IOCTL_USB_SET_STATE = 22,
> >> /* IOCTL to get last reset reason */
> >> IOCTL_GET_LAST_RESET_REASON = 23,
> >> /* AI engine NPI ISR clear */
> >> IOCTL_AIE_ISR_CLEAR = 24,
> >> /* Register SGI to ATF */
> >> IOCTL_REGISTER_SGI = 25,
> >> /* Runtime feature configuration */
> >> IOCTL_SET_FEATURE_CONFIG = 26,
> >> IOCTL_GET_FEATURE_CONFIG = 27,
> >> };
> >
> > Odd mix of comments and no comments...
> >
> > Anyway, that's fine, just curious as to why there was a gap. No real
> > reason why you can't just add them all now right?
>
> Code is firstly integrated to soc tree and then upstream. I would love
> to see this happen vise versa but still marketing wants to deliver
> features first to customers. On the other hand customers care about
> getting features on the first place and they are fine with not having
> upstream solution first.
> Back to your comment. It can also happen while upstreaming that some
> numbers are simply not used because design is changed. That's why that
> numbers can be skipped because it was just temporary solution or not
> proper design.
> It doesn't mean that these numbers can't be listed but on the other hand
> why they should be listed if they shouldn't/can't be used.
> That's why over time we are just adding number which are used by that
> patchset.
Ok, that makes sense to keep this in sync with the newly added features,
that way you don't have the "temporary number" problem.
thanks,
greg k-h