Re: [PATCH v3 07/11] PCI: microchip: Rename IRQ init function

[Minda Chen]

On 2023/8/14 21:55, Conor Dooley wrote:
> On Mon, Aug 14, 2023 at 04:20:12PM +0800, Minda Chen wrote:
>> Rename IRQ init function and prepare for re-use
>> IRQ init function.
>> 
>> rename list:
>> mc_init_interrupts -> plda_init_interrupts
>> mc_pcie_init_irq_domain-> plda_pcie_init_irq_domains
>> 
>> Signed-off-by: Minda Chen <minda.chen@xxxxxxxxxxxxxxxx>
>> ---
>>  .../pci/controller/plda/pcie-microchip-host.c | 37 +++++++++++++------
>>  drivers/pci/controller/plda/pcie-plda.h       |  7 ++++
>>  2 files changed, 33 insertions(+), 11 deletions(-)
>> 
>> diff --git a/drivers/pci/controller/plda/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c
>> index b42f1aac3ec3..140e7ca1a5cb 100644
>> --- a/drivers/pci/controller/plda/pcie-microchip-host.c
>> +++ b/drivers/pci/controller/plda/pcie-microchip-host.c
>> @@ -559,7 +559,7 @@ static int mc_pcie_init_clks(struct device *dev)
>>  	return 0;
>>  }
>>  
>> -static int mc_pcie_init_irq_domains(struct plda_pcie_rp *port)
>> +static int plda_pcie_init_irq_domains(struct plda_pcie_rp *port, struct plda_evt *evt)
>>  {
>>  	struct device *dev = port->dev;
>>  	struct device_node *node = dev->of_node;
>> @@ -572,8 +572,8 @@ static int mc_pcie_init_irq_domains(struct plda_pcie_rp *port)
>>  		return -EINVAL;
>>  	}
>>  
>> -	port->event_domain = irq_domain_add_linear(pcie_intc_node, NUM_EVENTS,
>> -						   &event_domain_ops, port);
>> +	port->event_domain = irq_domain_add_linear(pcie_intc_node, port->num_events,
>> +						   evt->domain_ops, port);
>>  	if (!port->event_domain) {
>>  		dev_err(dev, "failed to get event domain\n");
>>  		of_node_put(pcie_intc_node);
>> @@ -658,14 +658,15 @@ static void mc_disable_interrupts(struct mc_pcie *port)
>>  	writel_relaxed(GENMASK(31, 0), bridge_base_addr + ISTATUS_HOST);
>>  }
>>  
>> -static int mc_init_interrupts(struct platform_device *pdev, struct plda_pcie_rp *port)
>> +static int plda_init_interrupts(struct platform_device *pdev,
>> +				struct plda_pcie_rp *port, struct plda_evt *evt)
>>  {
>>  	struct device *dev = &pdev->dev;
>>  	int irq;
>>  	int i, intx_irq, msi_irq, event_irq;
>>  	int ret;
>>  
>> -	ret = mc_pcie_init_irq_domains(port);
>> +	ret = plda_pcie_init_irq_domains(port, evt);
>>  	if (ret) {
>>  		dev_err(dev, "failed creating IRQ domains\n");
>>  		return ret;
>> @@ -675,15 +676,18 @@ static int mc_init_interrupts(struct platform_device *pdev, struct plda_pcie_rp
>>  	if (irq < 0)
>>  		return -ENODEV;
>>  
>> -	for (i = 0; i < NUM_EVENTS; i++) {
>> +	for (i = 0; i < port->num_events; i++) {
>>  		event_irq = irq_create_mapping(port->event_domain, i);
>>  		if (!event_irq) {
>>  			dev_err(dev, "failed to map hwirq %d\n", i);
>>  			return -ENXIO;
>>  		}
>>  
>> -		ret = devm_request_irq(dev, event_irq, mc_event_handler,
>> -				       0, event_cause[i].sym, port);
>> +		if (evt->request_evt_irq)
>> +			ret = evt->request_evt_irq(port, event_irq, i);
>> +		else
>> +			ret = devm_request_irq(dev, event_irq, plda_event_handler,
>> +					       0, NULL, port);
> 
> Is there a particular reason this if/else addition ended up in this
> patch, but the if/else addition in plda_handle_event() ended up in the
> next one?
> 
> Otherwise, this looks fine to me.
I forget to modify mc_handle_event()， So leave it to next patch.  
But I will ended up them in this patches. This patch is to modify, next patch is to move.