From patchwork Fri Nov 8 22:30:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loc Ho X-Patchwork-Id: 3160231 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 96EFA9F243 for ; Fri, 8 Nov 2013 22:32:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8F4F220145 for ; Fri, 8 Nov 2013 22:32:00 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7E99620138 for ; Fri, 8 Nov 2013 22:31:59 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VeuaQ-0006z5-SO; Fri, 08 Nov 2013 22:31:31 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VeuaI-0007Pz-IQ; Fri, 08 Nov 2013 22:31:22 +0000 Received: from exprod5og116.obsmtp.com ([64.18.0.147]) by merlin.infradead.org with smtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VeuaC-0007Ow-5G for linux-arm-kernel@lists.infradead.org; Fri, 08 Nov 2013 22:31:17 +0000 Received: from mail-pd0-f179.google.com ([209.85.192.179]) (using TLSv1) by exprod5ob116.postini.com ([64.18.4.12]) with SMTP ID DSNKUn1mHih16s5sv6Xja9Aqwz/PNpW5utf4@postini.com; Fri, 08 Nov 2013 14:31:16 PST Received: by mail-pd0-f179.google.com with SMTP id y10so2751647pdj.10 for ; Fri, 08 Nov 2013 14:30:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mrnSQc8NWnnVqfNdVn69lk8ye5X1wPQGIIVKbLZet/s=; b=iB+uXaXwwU/B5WGBX9jUMFyXqIQKjHCTeXoTWSaP0TEGSYS4C5iQmNX7gRxaH+IEXe +T/xQdbvlkCkb1bH0TnpitvCVKiqFfu19s9b6DAoaLoe2fXYNQ7JT0HDHDIcTqvklsVA xruMrNJ35A0cxRSQ+GRH8JfJ8KGV3SiUvphRy3weZwmb9rX/qPOwv1WSdPuxEIVr5Tju kSx4EgcpF6QKB/BEX0mc6mI7ZZQaiIzjyCaStY3zI6lOS4owTHw2yPebGAtDOV2owmyG mAvNPr1DsNiT4qxq2suNPnm7Hjo/9WGnTR2JZp5gwImoApbmhbJpEzWTHof8GtNOtpMT sRTg== X-Gm-Message-State: ALoCoQmaw0x+9ozwRPIbjcOzJosXozIKVwxQ0snuKhjXF6fcAOpcZkGYASLFkYC0KHvv5GiuRzHqvL9JoNo2uGiHJAYbBq1pY+uBwaj8b3FMjIYNGMc3bvs4LKzIx5gg1OBdc5NnVS821wSu47JUMrF6cWFCU8ZJ2puQiZNpfDE/hck+Ui4vByg67d3IGrMxLcWzAhV5Su/P X-Received: by 10.66.66.133 with SMTP id f5mr17632279pat.176.1383949854399; Fri, 08 Nov 2013 14:30:54 -0800 (PST) X-Received: by 10.66.66.133 with SMTP id f5mr17632269pat.176.1383949854326; Fri, 08 Nov 2013 14:30:54 -0800 (PST) Received: from localhost ([198.137.200.11]) by mx.google.com with ESMTPSA id at4sm14389362pbc.30.2013.11.08.14.30.53 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 08 Nov 2013 14:30:53 -0800 (PST) From: Loc Ho To: tj@kernel.org, linux-scsi@vger.kernel.org Subject: [PATCH 1/5] ata: Export AHCI library functions required by APM X-Gene SATA driver Date: Fri, 8 Nov 2013 15:30:34 -0700 Message-Id: <1383949838-25106-2-git-send-email-lho@apm.com> X-Mailer: git-send-email 1.5.5 In-Reply-To: <1383949838-25106-1-git-send-email-lho@apm.com> References: <1383949838-25106-1-git-send-email-lho@apm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131108_173116_423241_F6CEF87F X-CRM114-Status: GOOD ( 10.67 ) X-Spam-Score: -4.2 (----) Cc: Suman Tripathi , jcm@redhat.com, devicetree-discuss@lists.ozlabs.org, patches@apm.com, Loc Ho , Tuan Phan , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Export required functions by APM X-Gene SATA driver to avoid duplicate code. Signed-off-by: Loc Ho Signed-off-by: Tuan Phan Signed-off-by: Suman Tripathi --- drivers/ata/ahci.h | 6 ++++++ drivers/ata/libahci.c | 13 ++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index 1145637..cf881e0 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -368,6 +368,12 @@ irqreturn_t ahci_hw_interrupt(int irq, void *dev_instance); irqreturn_t ahci_thread_fn(int irq, void *dev_instance); void ahci_print_info(struct ata_host *host, const char *scc_s); int ahci_host_activate(struct ata_host *host, int irq, unsigned int n_msis); +void ahci_sw_activity(struct ata_link *link); +int ahci_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val); +void ahci_error_intr(struct ata_port *ap, u32 irq_stat); +int ahci_exec_polled_cmd(struct ata_port *ap, int pmp, + struct ata_taskfile *tf, int is_cmd, u16 flags, + unsigned long timeout_msec); 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 aaac4fb..de7e074 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -68,7 +68,6 @@ static ssize_t ahci_transmit_led_message(struct ata_port *ap, u32 state, static int ahci_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val); -static int ahci_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val); static unsigned int ahci_qc_issue(struct ata_queued_cmd *qc); static bool ahci_qc_fill_rtf(struct ata_queued_cmd *qc); static int ahci_port_start(struct ata_port *ap); @@ -553,7 +552,7 @@ static int ahci_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val) return -EINVAL; } -static int ahci_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val) +int ahci_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val) { void __iomem *port_mmio = ahci_port_base(link->ap); int offset = ahci_scr_offset(link->ap, sc_reg); @@ -564,6 +563,7 @@ static int ahci_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val) } return -EINVAL; } +EXPORT_SYMBOL_GPL(ahci_scr_write); void ahci_start_engine(struct ata_port *ap) { @@ -869,7 +869,7 @@ int ahci_reset_controller(struct ata_host *host) } EXPORT_SYMBOL_GPL(ahci_reset_controller); -static void ahci_sw_activity(struct ata_link *link) +void ahci_sw_activity(struct ata_link *link) { struct ata_port *ap = link->ap; struct ahci_port_priv *pp = ap->private_data; @@ -882,6 +882,7 @@ static void ahci_sw_activity(struct ata_link *link) if (!timer_pending(&emp->timer)) mod_timer(&emp->timer, jiffies + msecs_to_jiffies(10)); } +EXPORT_SYMBOL_GPL(ahci_sw_activity); static void ahci_sw_activity_blink(unsigned long arg) { @@ -1239,7 +1240,7 @@ int ahci_kick_engine(struct ata_port *ap) } EXPORT_SYMBOL_GPL(ahci_kick_engine); -static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp, +int ahci_exec_polled_cmd(struct ata_port *ap, int pmp, struct ata_taskfile *tf, int is_cmd, u16 flags, unsigned long timeout_msec) { @@ -1268,6 +1269,7 @@ static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp, return 0; } +EXPORT_SYMBOL_GPL(ahci_exec_polled_cmd); int ahci_do_softreset(struct ata_link *link, unsigned int *class, int pmp, unsigned long deadline, @@ -1552,7 +1554,7 @@ static void ahci_fbs_dec_intr(struct ata_port *ap) dev_err(ap->host->dev, "failed to clear device error\n"); } -static void ahci_error_intr(struct ata_port *ap, u32 irq_stat) +void ahci_error_intr(struct ata_port *ap, u32 irq_stat) { struct ahci_host_priv *hpriv = ap->host->private_data; struct ahci_port_priv *pp = ap->private_data; @@ -1662,6 +1664,7 @@ static void ahci_error_intr(struct ata_port *ap, u32 irq_stat) } else ata_port_abort(ap); } +EXPORT_SYMBOL_GPL(ahci_error_intr); static void ahci_handle_port_interrupt(struct ata_port *ap, void __iomem *port_mmio, u32 status)