From: Satyam Sharma <satyam@infradead.org>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Mel Gorman <mel@skynet.ie>,
Andrew Morton <akpm@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
jeff@garzik.org, linux-ide@vger.kernel.org,
linuxppc-dev@ozlabs.org, kamalesh@linux.vnet.ibm.com
Subject: Re: 2.6.23-rc6-mm1: Build failure on ppc64 drivers/ata/pata_scc.c
Date: Sat, 22 Sep 2007 08:20:09 +0530 (IST) [thread overview]
Message-ID: <alpine.LFD.0.999.0709220816170.14412@enigma.security.iitk.ac.in> (raw)
In-Reply-To: <20070920150925.0caf3aef@the-village.bc.nu>
Hi,
On Thu, 20 Sep 2007, Alan Cox wrote:
>
> On Thu, 20 Sep 2007 14:13:15 +0100
> mel@skynet.ie (Mel Gorman) wrote:
>
> > PPC64 building allmodconfig fails to compile drivers/ata/pata_scc.c . It
> > doesn't show up on other arches because this driver is specific to the
> > architecture.
> >
> > drivers/ata/pata_scc.c: In function `scc_bmdma_status'
>
> Its not been updated to match the libata core changes. Try something like
> this. Whoever is maintaining it should also remove the prereset cable handling
> code and use the proper cable detect method.
It appears you forgot to fix scc_std_softreset() and one of its callsites
in scc_bdma_stop(). A complete patch is attempted below -- please review.
[PATCH -mm] pata_scc: Keep up with libata core API changes
Little fixlets, that the build started erroring / warning about:
drivers/ata/pata_scc.c: In function 'scc_bmdma_status':
drivers/ata/pata_scc.c:734: error: structure has no member named 'active_tag'
drivers/ata/pata_scc.c: In function 'scc_pata_prereset':
drivers/ata/pata_scc.c:866: warning: passing arg 1 of 'ata_std_prereset' from incompatible pointer type
drivers/ata/pata_scc.c: In function 'scc_error_handler':
drivers/ata/pata_scc.c:908: warning: passing arg 2 of 'ata_bmdma_drive_eh' from incompatible pointer type
drivers/ata/pata_scc.c:908: warning: passing arg 3 of 'ata_bmdma_drive_eh' from incompatible pointer type
drivers/ata/pata_scc.c:908: warning: passing arg 5 of 'ata_bmdma_drive_eh' from incompatible pointer type
make[2]: *** [drivers/ata/pata_scc.o] Error 1
Signed-off-by: Satyam Sharma <satyam@infradead.org>
Cc: Alan Cox <alan@redhat.com>
Cc: Mel Gorman <mel@skynet.ie>
---
Andrew, this includes (supercedes) the previous two ones from Mel / Alan.
drivers/ata/pata_scc.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff -ruNp a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
--- a/drivers/ata/pata_scc.c 2007-09-22 06:26:37.000000000 +0530
+++ b/drivers/ata/pata_scc.c 2007-09-22 08:04:42.000000000 +0530
@@ -594,16 +594,17 @@ static unsigned int scc_bus_softreset(st
* Note: Original code is ata_std_softreset().
*/
-static int scc_std_softreset (struct ata_port *ap, unsigned int *classes,
- unsigned long deadline)
+static int scc_std_softreset(struct ata_link *link, unsigned int *classes,
+ unsigned long deadline)
{
+ struct ata_port *ap = link->ap;
unsigned int slave_possible = ap->flags & ATA_FLAG_SLAVE_POSS;
unsigned int devmask = 0, err_mask;
u8 err;
DPRINTK("ENTER\n");
- if (ata_link_offline(&ap->link)) {
+ if (ata_link_offline(link)) {
classes[0] = ATA_DEV_NONE;
goto out;
}
@@ -692,7 +693,7 @@ static void scc_bmdma_stop (struct ata_q
printk(KERN_WARNING "%s: Internal Bus Error\n", DRV_NAME);
out_be32(bmid_base + SCC_DMA_INTST, INTSTS_BMSINT);
/* TBD: SW reset */
- scc_std_softreset(ap, &classes, deadline);
+ scc_std_softreset(&ap->link, &classes, deadline);
continue;
}
@@ -731,7 +732,7 @@ static u8 scc_bmdma_status (struct ata_p
void __iomem *mmio = ap->ioaddr.bmdma_addr;
u8 host_stat = in_be32(mmio + SCC_DMA_STATUS);
u32 int_status = in_be32(mmio + SCC_DMA_INTST);
- struct ata_queued_cmd *qc = ata_qc_from_tag(ap, ap->active_tag);
+ struct ata_queued_cmd *qc = ata_qc_from_tag(ap, ap->link.active_tag);
static int retry = 0;
/* return if IOS_SS is cleared */
@@ -860,10 +861,10 @@ static void scc_bmdma_freeze (struct ata
* @deadline: deadline jiffies for the operation
*/
-static int scc_pata_prereset(struct ata_port *ap, unsigned long deadline)
+static int scc_pata_prereset(struct ata_link *link, unsigned long deadline)
{
- ap->cbl = ATA_CBL_PATA80;
- return ata_std_prereset(ap, deadline);
+ link->ap->cbl = ATA_CBL_PATA80;
+ return ata_std_prereset(link, deadline);
}
/**
@@ -874,8 +875,10 @@ static int scc_pata_prereset(struct ata_
* Note: Original code is ata_std_postreset().
*/
-static void scc_std_postreset (struct ata_port *ap, unsigned int *classes)
+static void scc_std_postreset(struct ata_link *link, unsigned int *classes)
{
+ struct ata_port *ap = link->ap;
+
DPRINTK("ENTER\n");
/* is double-select really necessary? */
next prev parent reply other threads:[~2007-09-22 2:47 UTC|newest]
Thread overview: 227+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-18 8:18 2.6.23-rc6-mm1 Andrew Morton
2007-09-18 8:24 ` 2.6.23-rc6-mm1 Andrew Morton
2007-09-18 9:13 ` 2.6.23-rc6-mm1 Kamalesh Babulal
2007-09-18 9:27 ` 2.6.23-rc6-mm1 Andrew Morton
2007-09-18 9:34 ` 2.6.23-rc6-mm1 Satyam Sharma
2007-09-18 19:17 ` 2.6.23-rc6-mm1 Greg KH
2007-09-22 9:21 ` 2.6.23-rc6-mm1 Satyam Sharma
2007-09-25 5:35 ` 2.6.23-rc6-mm1 Greg KH
2007-09-18 9:34 ` 2.6.23-rc6-mm1 Andy Whitcroft
2007-09-18 10:02 ` 2.6.23-rc6-mm1 Benjamin Herrenschmidt
2007-09-18 12:07 ` 2.6.23-rc6-mm1 Kamalesh Babulal
2007-09-18 16:53 ` 2.6.23-rc6-mm1 Andrew Morton
2007-09-18 19:16 ` 2.6.23-rc6-mm1 Greg KH
2007-09-18 21:35 ` 2.6.23-rc6-mm1 Benjamin Herrenschmidt
2007-09-18 15:07 ` 2.6.23-rc6-mm1 Valdis.Kletnieks
2007-09-18 15:50 ` 2.6.23-rc6-mm1 Sam Ravnborg
2007-09-18 15:27 ` 2.6.23-rc6-mm1 Miles Lane
2007-09-18 15:39 ` 2.6.23-rc6-mm1 Miles Lane
2007-09-18 15:52 ` 2.6.23-rc6-mm1 Sam Ravnborg
2007-09-18 19:17 ` 2.6.23-rc6-mm1 Sam Ravnborg
2007-09-18 19:42 ` 2.6.23-rc6-mm1 Miles Lane
2007-09-18 20:26 ` 2.6.23-rc6-mm1 Sam Ravnborg
2007-09-18 22:38 ` 2.6.23-rc6-mm1 Gabriel C
2007-09-18 22:48 ` 2.6.23-rc6-mm1 Gabriel C
2007-09-19 19:33 ` 2.6.23-rc6-mm1 Sam Ravnborg
2007-09-19 20:36 ` 2.6.23-rc6-mm1 Gabriel C
2007-09-19 20:43 ` 2.6.23-rc6-mm1 Sam Ravnborg
2007-09-19 18:48 ` 2.6.23-rc6-mm1 Sam Ravnborg
2007-09-18 15:43 ` modpost errors ( Re: 2.6.23-rc6-mm1) Gabriel C
2007-09-18 15:56 ` Sam Ravnborg
2007-09-18 16:37 ` [v4l-dvb-maintainer] " mkrufky
2007-09-18 22:06 ` Mauro Carvalho Chehab
2007-09-18 16:20 ` 2.6.23-rc6-mm1: Build failure on ppc64 drivers/net/ehea/ehea_main.c Mel Gorman
2007-09-18 16:41 ` Mel Gorman
2007-09-18 19:08 ` David Miller
2007-09-18 17:18 ` 2.6.23-rc6-mm1 (watchdog) Randy Dunlap
2007-09-18 17:41 ` Randy Dunlap
2007-09-18 17:20 ` 2.6.23-rc6-mm1 Miles Lane
2007-09-18 18:05 ` 2.6.23-rc6-mm1 Mel Gorman
2007-09-18 17:44 ` 2.6.23-rc6-mm1 Mel Gorman
2007-09-19 16:29 ` 2.6.23-rc6-mm1: kgdb support on ppc64 utterly broken Mel Gorman
2007-09-22 8:41 ` 2.6.23-rc6-mm1 Satyam Sharma
2007-09-24 11:14 ` 2.6.23-rc6-mm1 Mel Gorman
2007-09-18 19:32 ` 2.6.23-rc6-mm1 - Mostly working, with a kbuild oddity Valdis.Kletnieks
2007-09-18 20:32 ` Sam Ravnborg
2007-09-18 22:03 ` Valdis.Kletnieks
2007-09-19 7:34 ` Sam Ravnborg
2007-09-19 15:53 ` Valdis.Kletnieks
2007-09-19 17:39 ` Sam Ravnborg
2007-09-18 20:21 ` 2.6.23-rc6-mm1: failure to boot on HP nx6325 Rafael J. Wysocki
2007-09-18 20:54 ` Rafael J. Wysocki
2007-09-18 21:37 ` 2.6.23-rc6-mm1: failure to boot on HP nx6325, no sound when booted, USB-related WARNING Rafael J. Wysocki
2007-09-19 7:06 ` Thomas Gleixner
2007-09-19 17:44 ` Rafael J. Wysocki
2007-09-19 19:21 ` Thomas Gleixner
2007-09-20 0:06 ` Rafael J. Wysocki
2007-09-20 6:18 ` Thomas Gleixner
2007-09-20 13:29 ` Rafael J. Wysocki
2007-09-20 13:43 ` Thomas Gleixner
2007-09-20 14:12 ` Rafael J. Wysocki
2007-09-20 13:53 ` Thomas Gleixner
2007-09-20 14:47 ` Rafael J. Wysocki
2007-09-20 14:50 ` Thomas Gleixner
2007-09-20 15:49 ` Thomas Gleixner
2007-09-20 20:39 ` Rafael J. Wysocki
2007-09-20 21:08 ` Thomas Gleixner
2007-09-20 21:35 ` Linus Torvalds
2007-09-20 21:54 ` Rafael J. Wysocki
2007-09-20 22:01 ` Thomas Gleixner
2007-09-20 21:55 ` Linus Torvalds
2007-09-20 22:05 ` Thomas Gleixner
2007-09-20 22:30 ` Rafael J. Wysocki
2007-09-21 12:59 ` Thomas Gleixner
2007-09-21 14:20 ` Rafael J. Wysocki
2007-09-21 16:27 ` Thomas Gleixner
2007-09-21 19:20 ` Rafael J. Wysocki
2007-09-21 19:16 ` Thomas Gleixner
2007-09-21 19:37 ` Rafael J. Wysocki
2007-09-20 23:35 ` Len Brown
2007-09-21 7:56 ` Thomas Gleixner
2007-09-21 9:25 ` Rafael J. Wysocki
2007-09-21 4:51 ` Paul Mackerras
2007-09-21 8:06 ` Thomas Gleixner
2007-10-11 21:19 ` Pavel Machek
2007-09-20 21:45 ` Rafael J. Wysocki
2007-09-20 21:53 ` Thomas Gleixner
2007-09-20 22:35 ` Rafael J. Wysocki
2007-09-21 9:24 ` Rafael J. Wysocki
2007-09-20 20:42 ` Rafael J. Wysocki
2007-09-18 20:54 ` 2.6.23-rc6-mm1 sparc build error Mathieu Desnoyers
2007-09-18 21:05 ` Andrew Morton
2007-09-20 12:53 ` Guennadi Liakhovetski
2007-09-21 13:51 ` Mathieu Desnoyers
2007-09-18 21:45 ` 2.6.23-rc6-mm1: atomic counter underflow Mariusz Kozlowski
2007-09-19 8:27 ` Cornelia Huck
2007-09-19 16:43 ` Mariusz Kozlowski
2007-09-19 18:02 ` Cornelia Huck
2007-09-20 7:42 ` kobject: Temporarily save k_name on cleanup for debug message Cornelia Huck
2007-09-20 7:43 ` Cornelia Huck
2007-09-20 17:26 ` Mariusz Kozlowski
2007-09-20 13:35 ` 2.6.23-rc6-mm1: atomic counter underflow Cornelia Huck
2007-09-20 16:30 ` Pierre Ossman
2007-09-20 17:27 ` Mariusz Kozlowski
2007-09-19 9:28 ` 2.6.23-rc6-mm1 -- powerpc link failure Andy Whitcroft
2007-09-19 16:36 ` Segher Boessenkool
2007-09-19 16:52 ` Andy Whitcroft
2007-09-19 17:44 ` Sam Ravnborg
2007-09-25 13:40 ` Andy Whitcroft
2007-09-19 9:36 ` 2.6.23-rc6-mm1 -- powerpc pSeries_log_error panic in rtas_call/early_enable_eeh Andy Whitcroft
2007-09-19 11:43 ` X-freeze after clflush changes [Was: 2.6.23-rc6-mm1] Jiri Slaby
2007-09-19 11:53 ` Jiri Slaby
2007-09-19 14:59 ` Jiri Slaby
2007-09-19 19:10 ` Andrew Morton
2007-09-19 19:24 ` Andi Kleen
2007-09-19 19:46 ` Jiri Slaby
2007-09-19 19:54 ` Andi Kleen
2007-09-19 19:57 ` Jiri Slaby
2007-09-19 20:01 ` Jiri Slaby
2007-09-19 21:42 ` Andrew Morton
2007-09-19 20:32 ` Valdis.Kletnieks
2007-09-19 20:47 ` Jiri Slaby
2007-09-20 13:17 ` Valdis.Kletnieks
2007-09-20 22:24 ` Dave Airlie
2007-09-20 1:51 ` Dave Airlie
2007-09-20 7:24 ` Jiri Slaby
2007-09-20 7:33 ` Dave Airlie
2007-09-20 9:24 ` Zhenyu Wang
2007-09-20 22:10 ` Jiri Slaby
2007-09-21 1:27 ` Zhenyu Wang
2007-09-20 0:18 ` Dave Airlie
2007-09-20 1:42 ` Dave Airlie
2007-09-20 2:24 ` Andrew Morton
2007-09-20 7:19 ` Jiri Slaby
2007-09-20 22:06 ` Matt Mackall
2007-09-20 23:03 ` Andi Kleen
2007-09-20 23:31 ` Matt Mackall
2007-09-20 23:44 ` Andi Kleen
2007-09-21 17:18 ` Valdis.Kletnieks
2007-09-21 7:07 ` Jiri Slaby
2007-09-21 17:16 ` Valdis.Kletnieks
2007-09-21 17:30 ` Jiri Slaby
2007-09-21 17:54 ` Valdis.Kletnieks
2007-09-21 19:33 ` Valdis.Kletnieks
2007-09-21 19:38 ` Jiri Slaby
2007-09-21 19:43 ` Jiri Slaby
2007-09-24 3:25 ` Valdis.Kletnieks
2007-09-24 6:06 ` Jiri Slaby
2007-09-24 7:37 ` Valdis.Kletnieks
2007-09-24 8:10 ` Jiri Slaby
2007-09-19 16:43 ` 2.6.23-rc6-mm1 -- mkfs stuck in 'D' Andy Whitcroft
2007-09-19 20:03 ` Hugh Dickins
2007-09-19 20:44 ` Peter Zijlstra
2007-09-20 11:31 ` Hugh Dickins
2007-09-20 12:15 ` Peter Zijlstra
[not found] ` <20070922015509.GA5332@mail.ustc.edu.cn>
2007-09-22 1:55 ` Fengguang Wu
2007-09-22 13:16 ` Peter Zijlstra
[not found] ` <20070923012049.GA6010@mail.ustc.edu.cn>
2007-09-23 1:20 ` Fengguang Wu
2007-09-23 13:02 ` Peter Zijlstra
[not found] ` <20070924030109.GA5892@mail.ustc.edu.cn>
2007-09-24 3:01 ` Fengguang Wu
2007-09-24 7:35 ` Peter Zijlstra
[not found] ` <20070924081207.GA2266@mail.ustc.edu.cn>
2007-09-24 8:12 ` Fengguang Wu
2007-09-23 14:19 ` 2.6.23-rc6-mm1 -- ipg.c don't compile on i386 with CONFIG_HIGHMEM64G trem
2007-09-19 23:02 ` 2.6.23-rc6-mm1 Tilman Schmidt
2007-09-19 23:24 ` 2.6.23-rc6-mm1 Andrew Morton
2007-09-19 23:28 ` 2.6.23-rc6-mm1 Chuck Ebbert
2007-09-19 23:55 ` 2.6.23-rc6-mm1 Tilman Schmidt
2007-09-20 19:10 ` 2.6.23-rc6-mm1 Tilman Schmidt
2007-09-19 23:44 ` 2.6.23-rc6-mm1 David Brownell
2007-09-20 0:06 ` 2.6.23-rc6-mm1 Andrew Morton
2007-09-20 4:43 ` 2.6.23-rc6-mm1 David Brownell
2007-09-20 6:11 ` 2.6.23-rc6-mm1 Andrew Morton
2007-09-20 7:54 ` 2.6.23-rc6-mm1 Kay Sievers
2007-09-20 16:15 ` 2.6.23-rc6-mm1 David Brownell
2007-09-20 8:51 ` 2.6.23-rc6-mm1 Alessandro Zummo
2007-09-20 17:36 ` 2.6.23-rc6-mm1 David Brownell
2007-09-20 19:20 ` 2.6.23-rc6-mm1 Tilman Schmidt
2007-09-20 20:25 ` 2.6.23-rc6-mm1 Andrew Morton
2007-09-21 0:53 ` 2.6.23-rc6-mm1 Tilman Schmidt
2007-09-19 23:58 ` 2.6.23-rc6-mm1 Joseph Fannin
2007-09-20 0:09 ` 2.6.23-rc6-mm1 Andrew Morton
[not found] ` <f86d6cc00709200721h6e8f7cf8xa2264e9d1f88883b@mail.gmail.com>
[not found] ` <f86d6cc00709200912j37a3218boa882a044c0610779@mail.gmail.com>
2007-09-20 19:44 ` 2.6.23-rc6-mm1 Andrew Morton
2007-09-21 2:04 ` 2.6.23-rc6-mm1 Joseph Fannin
2007-09-21 2:04 ` [PATCH] make mv643xx_eth.c build again Joseph Fannin
2007-09-20 8:41 ` 2.6.23-rc6-mm1 - make access to tasks nsproxy ligther (fix) Cedric Le Goater
2007-09-20 8:59 ` Pavel Emelyanov
2007-09-20 9:12 ` Cedric Le Goater
2007-09-20 17:08 ` Cedric Le Goater
2007-09-24 4:00 ` Serge E. Hallyn
2007-09-20 13:13 ` 2.6.23-rc6-mm1: Build failure on ppc64 drivers/ata/pata_scc.c Mel Gorman
2007-09-20 14:09 ` Alan Cox
2007-09-20 15:14 ` Mel Gorman
2007-09-20 15:45 ` Kamalesh Babulal
2007-09-22 2:50 ` Satyam Sharma [this message]
2007-09-24 11:01 ` Mel Gorman
2007-09-26 3:39 ` Jeff Garzik
2007-09-20 13:25 ` Build failure on ppc64 drivers/block/ps3disk.c Mel Gorman
2007-09-20 13:32 ` Jens Axboe
2007-09-20 13:37 ` 2.6.23-rc6-mm1: Build failures on ppc64_defconfig Satyam Sharma
2007-09-22 6:50 ` Satyam Sharma
2007-09-22 6:51 ` Satyam Sharma
2007-09-22 6:54 ` Satyam Sharma
2007-09-24 11:12 ` Mel Gorman
2007-09-22 7:25 ` Satyam Sharma
2007-09-22 7:40 ` [PATCH -mm] pasemi_mac: Build fix after recent netdev stats changes Satyam Sharma
2007-09-21 2:05 ` [PATCH] Remove broken netfilter binary sysctls from bridging code Joseph Fannin
2007-09-21 4:21 ` Eric W. Biederman
2007-09-24 16:55 ` Patrick McHardy
2007-09-24 20:14 ` Stephen Hemminger
2007-09-25 4:07 ` Patrick McHardy
2007-09-25 16:12 ` Stephen Hemminger
2007-09-25 16:22 ` Patrick McHardy
2007-09-25 14:03 ` Eric W. Biederman
2007-09-25 14:26 ` Patrick McHardy
2007-09-25 16:38 ` Eric W. Biederman
2007-09-22 7:54 ` [PATCH -mm] mv643xx_eth: Remove redundant multiple initialization Satyam Sharma
2007-09-22 7:55 ` [PATCH -mm] iseries_veth: Kill unused variable Satyam Sharma
[not found] ` <20070923014214.GA16766@mail.ustc.edu.cn>
2007-09-23 1:42 ` [BUG 2.6.23-rc6-mm1] NMI Watchdog detected LOCKUP on CPU 0 Fengguang Wu
2007-09-23 4:22 ` Andrew Morton
[not found] ` <20070923053040.GA5820@mail.ustc.edu.cn>
2007-09-23 5:30 ` Fengguang Wu
2007-09-23 5:35 ` Andrew Morton
[not found] ` <20070923055303.GA14899@mail.ustc.edu.cn>
2007-09-23 5:53 ` Fengguang Wu
[not found] ` <20070923015217.GA5956@mail.ustc.edu.cn>
2007-09-23 1:52 ` Fengguang Wu
2007-09-23 3:01 ` [-mm Patch] net/bluetooth/hidp/core.c: Make hidp_setup_input() return int WANG Cong
2007-09-23 22:13 ` roel
2007-09-24 2:38 ` WANG Cong
2007-09-24 2:50 ` [Resend][-mm " WANG Cong
2007-09-24 7:09 ` [-mm " Marcel Holtmann
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=alpine.LFD.0.999.0709220816170.14412@enigma.security.iitk.ac.in \
--to=satyam@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=jeff@garzik.org \
--cc=kamalesh@linux.vnet.ibm.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=mel@skynet.ie \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).