From: Suman Tripathi <stripathi-qTEPVZfXA3Y@public.gmane.org> To: htejun-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Cc: olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org, arnd-r2nGTMty4D4@public.gmane.org, linux-ide-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, mlangsdo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, jcm-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, patches-qTEPVZfXA3Y@public.gmane.org, svtripathi-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, Suman Tripathi <stripathi-qTEPVZfXA3Y@public.gmane.org> Subject: [PATCH v2 2/3] libahci: Implement the capability to override the generic ahci interrupt handler. Date: Wed, 27 Jan 2016 15:19:56 +0530 [thread overview] Message-ID: <1453888197-11368-3-git-send-email-stripathi@apm.com> (raw) In-Reply-To: <1453888197-11368-1-git-send-email-stripathi-qTEPVZfXA3Y@public.gmane.org> This patch implements the capability to override the generic ahci interrupt handler so that LDD drivers can implement there own interrupt handler routines. Signed-off-by: Suman Tripathi <stripathi-qTEPVZfXA3Y@public.gmane.org> --- drivers/ata/ahci.h | 2 ++ drivers/ata/libahci.c | 13 ++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index e9b57e8..284ce3a 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -359,6 +359,7 @@ struct ahci_host_priv { * be overridden anytime before the host is activated. */ void (*start_engine)(struct ata_port *ap); + irqreturn_t (*ahci_irq_intr)(int irq, void *dev_instance); }; #ifdef CONFIG_PCI_MSI @@ -422,6 +423,7 @@ int ahci_reset_em(struct ata_host *host); void ahci_print_info(struct ata_host *host, const char *scc_s); int ahci_host_activate(struct ata_host *host, struct scsi_host_template *sht); void ahci_error_handler(struct ata_port *ap); +u32 ahci_handle_port_intr(struct ata_host *host, u32 irq_masked); static inline void __iomem *__ahci_port_base(struct ata_host *host, unsigned int port_no) diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 08be136..fa098c6 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -1816,7 +1816,7 @@ static irqreturn_t ahci_multi_irqs_intr_hard(int irq, void *dev_instance) return IRQ_HANDLED; } -static u32 ahci_handle_port_intr(struct ata_host *host, u32 irq_masked) +u32 ahci_handle_port_intr(struct ata_host *host, u32 irq_masked) { unsigned int i, handled = 0; @@ -1842,6 +1842,7 @@ static u32 ahci_handle_port_intr(struct ata_host *host, u32 irq_masked) return handled; } +EXPORT_SYMBOL_GPL(ahci_handle_port_intr); static irqreturn_t ahci_single_level_irq_intr(int irq, void *dev_instance) { @@ -2466,13 +2467,19 @@ int ahci_host_activate(struct ata_host *host, struct scsi_host_template *sht) { struct ahci_host_priv *hpriv = host->private_data; int irq = hpriv->irq; + irqreturn_t (*ahci_irq_handler)(int irq, void *dev_instance); int rc; if (hpriv->flags & (AHCI_HFLAG_MULTI_MSI | AHCI_HFLAG_MULTI_MSIX)) rc = ahci_host_activate_multi_irqs(host, sht); - else - rc = ata_host_activate(host, irq, ahci_single_level_irq_intr, + else { + ahci_irq_handler = hpriv->ahci_irq_intr ? hpriv->ahci_irq_intr : + ahci_single_level_irq_intr; + + rc = ata_host_activate(host, irq, ahci_irq_handler, IRQF_SHARED, sht); + } + return rc; } EXPORT_SYMBOL_GPL(ahci_host_activate); -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: stripathi@apm.com (Suman Tripathi) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 2/3] libahci: Implement the capability to override the generic ahci interrupt handler. Date: Wed, 27 Jan 2016 15:19:56 +0530 [thread overview] Message-ID: <1453888197-11368-3-git-send-email-stripathi@apm.com> (raw) In-Reply-To: <1453888197-11368-1-git-send-email-stripathi@apm.com> This patch implements the capability to override the generic ahci interrupt handler so that LDD drivers can implement there own interrupt handler routines. Signed-off-by: Suman Tripathi <stripathi@apm.com> --- drivers/ata/ahci.h | 2 ++ drivers/ata/libahci.c | 13 ++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index e9b57e8..284ce3a 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -359,6 +359,7 @@ struct ahci_host_priv { * be overridden anytime before the host is activated. */ void (*start_engine)(struct ata_port *ap); + irqreturn_t (*ahci_irq_intr)(int irq, void *dev_instance); }; #ifdef CONFIG_PCI_MSI @@ -422,6 +423,7 @@ int ahci_reset_em(struct ata_host *host); void ahci_print_info(struct ata_host *host, const char *scc_s); int ahci_host_activate(struct ata_host *host, struct scsi_host_template *sht); void ahci_error_handler(struct ata_port *ap); +u32 ahci_handle_port_intr(struct ata_host *host, u32 irq_masked); static inline void __iomem *__ahci_port_base(struct ata_host *host, unsigned int port_no) diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 08be136..fa098c6 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -1816,7 +1816,7 @@ static irqreturn_t ahci_multi_irqs_intr_hard(int irq, void *dev_instance) return IRQ_HANDLED; } -static u32 ahci_handle_port_intr(struct ata_host *host, u32 irq_masked) +u32 ahci_handle_port_intr(struct ata_host *host, u32 irq_masked) { unsigned int i, handled = 0; @@ -1842,6 +1842,7 @@ static u32 ahci_handle_port_intr(struct ata_host *host, u32 irq_masked) return handled; } +EXPORT_SYMBOL_GPL(ahci_handle_port_intr); static irqreturn_t ahci_single_level_irq_intr(int irq, void *dev_instance) { @@ -2466,13 +2467,19 @@ int ahci_host_activate(struct ata_host *host, struct scsi_host_template *sht) { struct ahci_host_priv *hpriv = host->private_data; int irq = hpriv->irq; + irqreturn_t (*ahci_irq_handler)(int irq, void *dev_instance); int rc; if (hpriv->flags & (AHCI_HFLAG_MULTI_MSI | AHCI_HFLAG_MULTI_MSIX)) rc = ahci_host_activate_multi_irqs(host, sht); - else - rc = ata_host_activate(host, irq, ahci_single_level_irq_intr, + else { + ahci_irq_handler = hpriv->ahci_irq_intr ? hpriv->ahci_irq_intr : + ahci_single_level_irq_intr; + + rc = ata_host_activate(host, irq, ahci_irq_handler, IRQF_SHARED, sht); + } + return rc; } EXPORT_SYMBOL_GPL(ahci_host_activate); -- 1.7.1
next prev parent reply other threads:[~2016-01-27 9:49 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-01-27 9:49 [PATCH v2 0/3] ata: Fixes related to edge trigger latch for ahci_xgene driver Suman Tripathi 2016-01-27 9:49 ` Suman Tripathi [not found] ` <1453888197-11368-1-git-send-email-stripathi-qTEPVZfXA3Y@public.gmane.org> 2016-01-27 9:49 ` [PATCH v2 1/3] ata: Remove the AHCI_HFLAG_EDGE_IRQ support from libahci Suman Tripathi 2016-01-27 9:49 ` Suman Tripathi 2016-01-31 11:32 ` Tejun Heo 2016-01-31 11:32 ` Tejun Heo 2016-02-01 19:45 ` Suman Tripathi 2016-02-01 19:45 ` Suman Tripathi 2016-01-27 9:49 ` Suman Tripathi [this message] 2016-01-27 9:49 ` [PATCH v2 2/3] libahci: Implement the capability to override the generic ahci interrupt handler Suman Tripathi [not found] ` <1453888197-11368-3-git-send-email-stripathi-qTEPVZfXA3Y@public.gmane.org> 2016-01-31 11:35 ` Tejun Heo 2016-01-31 11:35 ` Tejun Heo 2016-02-01 19:43 ` Suman Tripathi 2016-02-01 19:43 ` Suman Tripathi 2016-01-27 9:49 ` [PATCH v2 3/3] ahci_xgene: Implement the workaround to fix the missing of edge interrupt for HOST_IRQ_STAT Suman Tripathi 2016-01-27 9:49 ` Suman Tripathi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1453888197-11368-3-git-send-email-stripathi@apm.com \ --to=stripathi-qtepvzfxa3y@public.gmane.org \ --cc=arnd-r2nGTMty4D4@public.gmane.org \ --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=htejun-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=jcm-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-ide-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=mlangsdo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \ --cc=olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org \ --cc=patches-qTEPVZfXA3Y@public.gmane.org \ --cc=svtripathi-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.