From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anton Vorontsov Subject: [PATCH] alim15x3: Remove historical hacks, re-enable init_hwif for PowerPC Date: Mon, 27 Apr 2009 22:47:42 +0400 Message-ID: <20090427184742.GA6435@oksana.dev.rtsoft.ru> References: <20090417124014.GA8944@oksana.dev.rtsoft.ru> <1239986984.7210.9.camel@pasglop> <200904172017.18486.bzolnier@gmail.com> <20090417182332.GA18756@oksana.dev.rtsoft.ru> Reply-To: avorontsov@ru.mvista.com Mime-Version: 1.0 Content-Type: text/plain; charset="utf8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@ozlabs.org Errors-To: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@ozlabs.org To: Bartlomiej Zolnierkiewicz Cc: linuxppc-dev@ozlabs.org, Roderick Colenbrander , linux-ide@vger.kernel.org List-Id: linux-ide@vger.kernel.org U29tZSB0aW1lIGFnbyB3ZSBoYWQgdG8gZGlzYWJsZSBpbml0X2h3aWYgY2FsbGJhY2sgZm9yIFBv d2VyUEMgYnVpbGRzLgpUaGF0IHdhcyBiZWNhdXNlIG9mIGEgaGlzdG9yaWNhbCBJUlEgb3Zlcndy aXRlIGluIHRoZSBkcml2ZXIsIHdoaWNoCndhcyBjYXVzaW5nIElERSBtYWxmdW5jdGlvbiBvbiB0 aGUgTVBDODYxMEhQQ0QgUG93ZXJQQyBib2FyZHMuCgpJdCdzIHVuY2xlYXIgd2hldGhlciB0aGlz IG92ZXJ3cml0ZSBpcyBzdGlsbCB1c2VmdWwsIGJ1dCBpdCBpcyBwcm92ZW4KdG8gY2F1c2UgYSBi aXQgb2YgaGFybSwgYW5kIHRvZGF5IHNvbWUgUG93ZXJQQyB0YXJnZXRzIChYaWxpbnggTUw1MTAs CmFzIHJlcG9ydGVkIGJ5IFJvZGVyaWNrIENvbGVuYnJhbmRlcikgbmVlZCB0aGUgaW5pdF9od2lm LCBzbyB3ZSBoYXZlCnRvIHJlLWVuYWJsZSBpdCBhbmQgcmVtb3ZlIHRoZSBvdmVyd3JpdGUuCgpS ZXBvcnRlZC1ieTogUm9kZXJpY2sgQ29sZW5icmFuZGVyIDx0aHVuZGVyYmlyZDJrQGdtYWlsLmNv bT4KU3VnZ2VzdGVkLWJ5OiBCYXJ0bG9taWVqIFpvbG5pZXJraWV3aWN6IDxiem9sbmllckBnbWFp bC5jb20+ClNpZ25lZC1vZmYtYnk6IEFudG9uIFZvcm9udHNvdiA8YXZvcm9udHNvdkBydS5tdmlz dGEuY29tPgotLS0KCk9uIE1vbiwgQXByIDI3LCAyMDA5IGF0IDEwOjQ2OjI1QU0gKzAyMDAsIFJv ZGVyaWNrIENvbGVuYnJhbmRlciB3cm90ZToKPiA+PiBTZWVtcyBsaWtlIHRoaXMgc2hvdWxkIGFs bG93IE1QQzg2MTBIUENEIHRvIHdvcmsgd2l0aCBSb2RlcmljaydzIHBhdGNoCj4gPj4gaWYgdGhl IElERSBjb250cm9sbGVyIGlzIHNldCB0byBuYXRpdmUgbW9kZSBhbmQgQUxJIHNvdXRoLWJyaWRn ZSBTSVJRCj4gPj4gdGFibGVzIGFyZSBjb3JyZWN0bHkgc2V0IChvciBpZiB0aGlzIGlzIG5vdCBB TEkncyBzb3V0aC1icmlkZ2UpLiDCoEFudG9uPwo+ID4KPiA+IE9LLCBJJ2xsIHRlc3QgdGhpcyBh cHByb2FjaC4KPiA+Cj4gCj4gRGlkIHRoaXMgYXBwcm9hY2ggd29yayBmb3IgeW91PwoKSSdtIHNv cnJ5IGZvciB0aGUgZGVsYXkuIFllcywgaXQgc2VlbSB0byB3b3JrLgoKIGRyaXZlcnMvaWRlL2Fs aW0xNXgzLmMgfCAgIDEwICsrKy0tLS0tLS0KIDEgZmlsZXMgY2hhbmdlZCwgMyBpbnNlcnRpb25z KCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvaWRlL2FsaW0xNXgzLmMg Yi9kcml2ZXJzL2lkZS9hbGltMTV4My5jCmluZGV4IDUzN2RhMWMuLmU1OWI2ZGUgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvaWRlL2FsaW0xNXgzLmMKKysrIGIvZHJpdmVycy9pZGUvYWxpbTE1eDMuYwpA QCAtNDAyLDI3ICs0MDIsMjMgQEAgc3RhdGljIHU4IGFsaV9jYWJsZV9kZXRlY3QoaWRlX2h3aWZf dCAqaHdpZikKIAlyZXR1cm4gY2JsOwogfQogCi0jaWYgIWRlZmluZWQoQ09ORklHX1NQQVJDNjQp ICYmICFkZWZpbmVkKENPTkZJR19QUEMpCisjaWZuZGVmIENPTkZJR19TUEFSQzY0CiAvKioKICAq CWluaXRfaHdpZl9hbGkxNXgzCS0JSW5pdGlhbGl6ZSB0aGUgQUxJIElERSB4ODYgc3R1ZmYKICAq CUBod2lmOiBpbnRlcmZhY2UgdG8gY29uZmlndXJlCiAgKgogICoJT2J0YWluIHRoZSBJUlEgdGFi bGVzIGZvciBhbiBBTGkgYmFzZWQgSURFIHNvbHV0aW9uIG9uIHRoZSBQQwogICoJY2xhc3MgcGxh dGZvcm1zLiBUaGlzIHBhcnQgb2YgdGhlIGNvZGUgaXNuJ3QgYXBwbGljYWJsZSB0byB0aGUKLSAq CVNwYXJjIGFuZCBQb3dlclBDIHN5c3RlbXMuCisgKglTcGFyYyBzeXN0ZW1zLgogICovCiAKIHN0 YXRpYyB2b2lkIF9fZGV2aW5pdCBpbml0X2h3aWZfYWxpMTV4MyAoaWRlX2h3aWZfdCAqaHdpZikK IHsKLQlzdHJ1Y3QgcGNpX2RldiAqZGV2ID0gdG9fcGNpX2Rldihod2lmLT5kZXYpOwogCXU4IGlk ZWljLCBpbm1pcjsKIAlzOCBpcnFfcm91dGluZ190YWJsZVtdID0geyAtMSwgIDksIDMsIDEwLCA0 LCAgNSwgNywgIDYsCiAJCQkJICAgICAgMSwgMTEsIDAsIDEyLCAwLCAxNCwgMCwgMTUgfTsKIAlp bnQgaXJxID0gLTE7CiAKLQlpZiAoZGV2LT5kZXZpY2UgPT0gUENJX0RFVklDRV9JRF9BTF9NNTIy OSkKLQkJaHdpZi0+aXJxID0gaHdpZi0+Y2hhbm5lbCA/IDE1IDogMTQ7Ci0KIAlpZiAoaXNhX2Rl dikgewogCQkvKgogCQkgKiByZWFkIElERSBpbnRlcmZhY2UgY29udHJvbApAQCAtNDU1LDcgKzQ1 MSw3IEBAIHN0YXRpYyB2b2lkIF9fZGV2aW5pdCBpbml0X2h3aWZfYWxpMTV4MyAoaWRlX2h3aWZf dCAqaHdpZikKIH0KICNlbHNlCiAjZGVmaW5lIGluaXRfaHdpZl9hbGkxNXgzIE5VTEwKLSNlbmRp ZiAvKiAhZGVmaW5lZChDT05GSUdfU1BBUkM2NCkgJiYgIWRlZmluZWQoQ09ORklHX1BQQykgKi8K KyNlbmRpZiAvKiBDT05GSUdfU1BBUkM2NCAqLwogCiAvKioKICAqCWluaXRfZG1hX2FsaTE1eDMJ LQlzZXQgdXAgRE1BIG9uIEFMaTE1eDMKLS0gCjEuNi4yLjIKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkxpbnV4cHBjLWRldiBtYWlsaW5nIGxpc3QKTGlu dXhwcGMtZGV2QG96bGFicy5vcmcKaHR0cHM6Ly9vemxhYnMub3JnL21haWxtYW4vbGlzdGluZm8v bGludXhwcGMtZGV2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from buildserver.ru.mvista.com (unknown [213.79.90.228]) by ozlabs.org (Postfix) with ESMTP id B70FADDFB9 for ; Tue, 28 Apr 2009 04:47:44 +1000 (EST) Date: Mon, 27 Apr 2009 22:47:42 +0400 From: Anton Vorontsov To: Bartlomiej Zolnierkiewicz Subject: [PATCH] alim15x3: Remove historical hacks, re-enable init_hwif for PowerPC Message-ID: <20090427184742.GA6435@oksana.dev.rtsoft.ru> References: <20090417124014.GA8944@oksana.dev.rtsoft.ru> <1239986984.7210.9.camel@pasglop> <200904172017.18486.bzolnier@gmail.com> <20090417182332.GA18756@oksana.dev.rtsoft.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 In-Reply-To: Cc: linuxppc-dev@ozlabs.org, Roderick Colenbrander , linux-ide@vger.kernel.org Reply-To: avorontsov@ru.mvista.com List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Some time ago we had to disable init_hwif callback for PowerPC builds. That was because of a historical IRQ overwrite in the driver, which was causing IDE malfunction on the MPC8610HPCD PowerPC boards. It's unclear whether this overwrite is still useful, but it is proven to cause a bit of harm, and today some PowerPC targets (Xilinx ML510, as reported by Roderick Colenbrander) need the init_hwif, so we have to re-enable it and remove the overwrite. Reported-by: Roderick Colenbrander Suggested-by: Bartlomiej Zolnierkiewicz Signed-off-by: Anton Vorontsov --- On Mon, Apr 27, 2009 at 10:46:25AM +0200, Roderick Colenbrander wrote: > >> Seems like this should allow MPC8610HPCD to work with Roderick's patch > >> if the IDE controller is set to native mode and ALI south-bridge SIRQ > >> tables are correctly set (or if this is not ALI's south-bridge).  Anton? > > > > OK, I'll test this approach. > > > > Did this approach work for you? I'm sorry for the delay. Yes, it seem to work. drivers/ide/alim15x3.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c index 537da1c..e59b6de 100644 --- a/drivers/ide/alim15x3.c +++ b/drivers/ide/alim15x3.c @@ -402,27 +402,23 @@ static u8 ali_cable_detect(ide_hwif_t *hwif) return cbl; } -#if !defined(CONFIG_SPARC64) && !defined(CONFIG_PPC) +#ifndef CONFIG_SPARC64 /** * init_hwif_ali15x3 - Initialize the ALI IDE x86 stuff * @hwif: interface to configure * * Obtain the IRQ tables for an ALi based IDE solution on the PC * class platforms. This part of the code isn't applicable to the - * Sparc and PowerPC systems. + * Sparc systems. */ static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif) { - struct pci_dev *dev = to_pci_dev(hwif->dev); u8 ideic, inmir; s8 irq_routing_table[] = { -1, 9, 3, 10, 4, 5, 7, 6, 1, 11, 0, 12, 0, 14, 0, 15 }; int irq = -1; - if (dev->device == PCI_DEVICE_ID_AL_M5229) - hwif->irq = hwif->channel ? 15 : 14; - if (isa_dev) { /* * read IDE interface control @@ -455,7 +451,7 @@ static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif) } #else #define init_hwif_ali15x3 NULL -#endif /* !defined(CONFIG_SPARC64) && !defined(CONFIG_PPC) */ +#endif /* CONFIG_SPARC64 */ /** * init_dma_ali15x3 - set up DMA on ALi15x3 -- 1.6.2.2