Message-ID: <21cc8585-9bad-2322-44c2-fc99c4dccda0@linux.intel.com>
Date:   Mon, 24 Jan 2022 16:51:53 +0200 (EET)
From:   Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>
To:     Ricardo Martinez <ricardo.martinez@...ux.intel.com>
cc:     Netdev <netdev@...r.kernel.org>, linux-wireless@...r.kernel.org,
        kuba@...nel.org, davem@...emloft.net, johannes@...solutions.net,
        ryazanov.s.a@...il.com, loic.poulain@...aro.org,
        m.chetan.kumar@...el.com, chandrashekar.devegowda@...el.com,
        linuxwwan@...el.com, chiranjeevi.rapolu@...ux.intel.com,
        haijun.liu@...iatek.com, amir.hanania@...el.com,
        Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
        dinesh.sharma@...el.com, eliot.lee@...el.com,
        moises.veleta@...el.com, pierre-louis.bossart@...el.com,
        muralidharan.sethuraman@...el.com, Soumya.Prakash.Mishra@...el.com,
        sreehari.kancharla@...el.com
Subject: Re: [PATCH net-next v4 03/13] net: wwan: t7xx: Add core components

On Thu, 13 Jan 2022, Ricardo Martinez wrote:

> From: Haijun Liu <haijun.liu@...iatek.com>
> 
> Registers the t7xx device driver with the kernel. Setup all the core
> components: PCIe layer, Modem Host Cross Core Interface (MHCCIF),
> modem control operations, modem state machine, and build
> infrastructure.
> 
> * PCIe layer code implements driver probe and removal.
> * MHCCIF provides interrupt channels to communicate events
>   such as handshake, PM and port enumeration.
> * Modem control implements the entry point for modem init,
>   reset and exit.
> * The modem status monitor is a state machine used by modem control
>   to complete initialization and stop. It is used also to propagate
>   exception events reported by other components.
> 
> Signed-off-by: Haijun Liu <haijun.liu@...iatek.com>
> Signed-off-by: Chandrashekar Devegowda <chandrashekar.devegowda@...el.com>
> Co-developed-by: Ricardo Martinez <ricardo.martinez@...ux.intel.com>
> Signed-off-by: Ricardo Martinez <ricardo.martinez@...ux.intel.com>
> ---

Some states in t7xx_common.h (MD_STATE_...) would logically belong to this 
patch instead of 02/. ...I think they were initally here but got moved 
with t7xx_skb_data_area_size(). And there was also things clearly related 
to 05/ in t7xx_common.h (at least CTL_ID_*).

> +static irqreturn_t t7xx_mhccif_isr_thread(int irq, void *data)
> +{
> +	struct t7xx_pci_dev *t7xx_dev = data;
> +	u32 int_sts, val;
> +
> +	val = L1_1_DISABLE_BIT(1) | L1_2_DISABLE_BIT(1);
> +	iowrite32(val, IREG_BASE(t7xx_dev) + DIS_ASPM_LOWPWR_SET_0);
> +
> +	int_sts = t7xx_mhccif_read_sw_int_sts(t7xx_dev);
> +	if (int_sts & t7xx_dev->mhccif_bitmask)

hccif_bitmask is set to a constant value and used only in this one place.
I'd also spell out sts to status.

> +static int t7xx_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> +{
> +	struct t7xx_pci_dev *t7xx_dev;
> +	int ret;
> +
> +	t7xx_dev = devm_kzalloc(&pdev->dev, sizeof(*t7xx_dev), GFP_KERNEL);
> +	if (!t7xx_dev)
> +		return -ENOMEM;
> +
> +	pci_set_drvdata(pdev, t7xx_dev);
> +	t7xx_dev->pdev = pdev;
> +
> +	ret = pcim_enable_device(pdev);
> +	if (ret)
> +		return ret;
> +
> +	pci_set_master(pdev);
> +
> +	ret = pcim_iomap_regions(pdev, BIT(PCI_IREG_BASE) | BIT(PCI_EREG_BASE), pci_name(pdev));
> +	if (ret) {
> +		dev_err(&pdev->dev, "Could not request BARs: %d\n", ret);
> +		return -ENOMEM;
> +	}
> +
> +	ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
> +	if (ret) {
> +		dev_err(&pdev->dev, "Could not set PCI DMA mask: %d\n", ret);
> +		return ret;
> +	}
> +
> +	ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
> +	if (ret) {
> +		dev_err(&pdev->dev, "Could not set consistent PCI DMA mask: %d\n", ret);
> +		return ret;
> +	}
> +
> +	IREG_BASE(t7xx_dev) = pcim_iomap_table(pdev)[PCI_IREG_BASE];
> +	t7xx_dev->base_addr.pcie_ext_reg_base = pcim_iomap_table(pdev)[PCI_EREG_BASE];
> +
> +	t7xx_pcie_mac_atr_init(t7xx_dev);
> +	t7xx_pci_infracfg_ao_calc(t7xx_dev);
> +	t7xx_mhccif_init(t7xx_dev);
> +
> +	ret = t7xx_md_init(t7xx_dev);
> +	if (ret)
> +		return ret;
> +
> +	t7xx_pcie_mac_interrupts_dis(t7xx_dev);
> +
> +	ret = t7xx_interrupt_init(t7xx_dev);
> +	if (ret)
> +		return ret;

Some leaks?

> +/**
> + * t7xx_pcie_mac_clear_set_int() - Clear/set interrupt by type.
> + * @t7xx_dev: MTK device.
> + * @int_type: Interrupt type.
> + * @clear: Clear/set.
> + *
> + * Clear or set device interrupt by type.
> + */
> +static void t7xx_pcie_mac_clear_set_int(struct t7xx_pci_dev *t7xx_dev,
> +					enum pcie_int int_type, bool clear)
> +{
> +	void __iomem *reg;
> +	u32 val;
> +
> +	if (t7xx_dev->pdev->msix_enabled) {
> +		if (clear)
> +			reg = IREG_BASE(t7xx_dev) + IMASK_HOST_MSIX_CLR_GRP0_0;
> +		else
> +			reg = IREG_BASE(t7xx_dev) + IMASK_HOST_MSIX_SET_GRP0_0;
> +	} else {
> +		if (clear)
> +			reg = IREG_BASE(t7xx_dev) + INT_EN_HST_CLR;
> +		else
> +			reg = IREG_BASE(t7xx_dev) + INT_EN_HST_SET;
> +	}
> +
> +	val = BIT(EXT_INT_START + int_type);
> +	iowrite32(val, reg);
> +}
> +
> +void t7xx_pcie_mac_clear_int(struct t7xx_pci_dev *t7xx_dev, enum pcie_int int_type)
> +{
> +	t7xx_pcie_mac_clear_set_int(t7xx_dev, int_type, true);
> +}
> +
> +void t7xx_pcie_mac_set_int(struct t7xx_pci_dev *t7xx_dev, enum pcie_int int_type)
> +{
> +	t7xx_pcie_mac_clear_set_int(t7xx_dev, int_type, false);
> +}

...

> +#define PCIE_MAC_MSIX_MSK_SET(t7xx_dev, ext_id)	\
> +	iowrite32(BIT(ext_id), IREG_BASE(t7xx_dev) + IMASK_HOST_MSIX_SET_GRP0_0)

A near duplicate of t7xx_pcie_mac_clear_set_int()/t7xx_pcie_mac_set_int()?

> +enum pcie_int {
> +	DPMAIF_INT = 0,
> +	CLDMA0_INT,
> +	CLDMA1_INT,
> +	CLDMA2_INT,
> +	MHCCIF_INT,
> +	DPMAIF2_INT,
> +	SAP_RGU_INT,
> +	CLDMA3_INT,
> +};

A bit too generic name for a driver specific enum?
There were also some PCIE_ starting defines you might want to take a look 
at.

> +static void fsm_wait_for_event(struct t7xx_fsm_ctl *ctl, enum t7xx_fsm_event_state event_id,
> +			       enum t7xx_fsm_event_state event_ignore, int timeout)
> +{
> +	struct t7xx_fsm_event *event;
> +	unsigned long flags;
> +	bool ackd = false;
> +	int cnt = 0;

int retries = timeout / FSM_EVENT_POLL_INTERVAL_MS;
(Or move that divide into caller which then gets optimized away by the 
compiler).

> +
> +	while (cnt++ < timeout / FSM_EVENT_POLL_INTERVAL_MS) {
> +		if (kthread_should_stop())
> +			return;
> +
> +		spin_lock_irqsave(&ctl->event_lock, flags);
> +		event = list_first_entry_or_null(&ctl->event_queue,
> +						 struct t7xx_fsm_event, entry);
> +		if (event) {
> +			if (event->event_id == event_ignore) {
> +				fsm_del_kf_event(event);
> +			} else if (event->event_id == event_id) {
> +				ackd = true;
> +				fsm_del_kf_event(event);
> +			}
> +		}
> +
> +		spin_unlock_irqrestore(&ctl->event_lock, flags);
> +		if (ackd)
> +			break;
> +
> +		msleep(FSM_EVENT_POLL_INTERVAL_MS);

I wonder if an event gets ignored, is msleep() useful also in that case?

> +	}
> +}
> +
> +static void fsm_routine_exception(struct t7xx_fsm_ctl *ctl, struct t7xx_fsm_command *cmd,
> +				  enum t7xx_ex_reason reason)
> +{
> +	struct device *dev = &ctl->md->t7xx_dev->pdev->dev;
> +
> +	dev_err(dev, "Exception %d, from %ps\n", reason, __builtin_return_address(0));

Is that address useful?

> +	if (ctl->curr_state != FSM_STATE_READY && ctl->curr_state != FSM_STATE_STARTING) {
> +		if (cmd)
> +			fsm_finish_command(ctl, cmd, -EINVAL);
> +
> +		return;
> +	}
> +
> +	ctl->curr_state = FSM_STATE_EXCEPTION;
> +
> +	switch (reason) {
> +	case EXCEPTION_HS_TIMEOUT:
> +		dev_err(dev, "BOOT_HS_FAIL\n");
> +		break;

...

> +	if (!md->core_md.ready) {
> +		dev_err(dev, "MD handshake timeout\n");
> +		fsm_routine_exception(ctl, NULL, EXCEPTION_HS_TIMEOUT);

Perhaps one dev_err() would suffice for this case :-). ...The another
one is inside fsm_routine_exception() (shown in the fragment above) 
although there's some non-trivial state-based logic in between which you 
want to check before removing either of them.


> +int t7xx_fsm_append_cmd(struct t7xx_fsm_ctl *ctl, enum t7xx_fsm_cmd_state cmd_id, unsigned int flag)

No callsite in this patch seems to care about the error code, is it ok?
E.g.:
> +int t7xx_md_init(struct t7xx_pci_dev *t7xx_dev)
> +{
...
> +       t7xx_fsm_append_cmd(md->fsm_ctl, FSM_CMD_START, 0);
If this returns an error, does it mean init/probe stalls? Or is there
some backup to restart?

> +int t7xx_fsm_append_event(struct t7xx_fsm_ctl *ctl, enum t7xx_fsm_event_state event_id,
> +			  unsigned char *data, unsigned int length)
Again, none of the callsites care?


-- 
 i.

Powered by blists - more mailing lists