From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bartlomiej Zolnierkiewicz Subject: [git pull] IDE fixes Date: Mon, 8 Dec 2008 17:55:12 +0100 Message-ID: <200812081755.13024.bzolnier@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: base64 Return-path: Received: from yw-out-2324.google.com ([74.125.46.30]:23918 "EHLO yw-out-2324.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753416AbYLHQ4o (ORCPT ); Mon, 8 Dec 2008 11:56:44 -0500 Received: by yw-out-2324.google.com with SMTP id 9so485257ywe.1 for ; Mon, 08 Dec 2008 08:56:42 -0800 (PST) Content-Disposition: inline Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: Linus Torvalds Cc: Andrew Morton , Stephen Rothwell , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org CkxpbnVzLCBwbGVhc2UgcHVsbCBmcm9tOgoKbWFzdGVyLmtlcm5lbC5vcmc6L3B1Yi9zY20vbGlu dXgva2VybmVsL2dpdC9iYXJ0L2lkZS0yLjYuZ2l0LwoKdG8gcmVjZWl2ZSB0aGUgZm9sbG93aW5n IHVwZGF0ZXM6CgogZHJpdmVycy9pZGUvS2NvbmZpZyAgfCAgIDE0ICsrKy0tLS0tLS0tLS0tCiBk cml2ZXJzL2lkZS9pZGUtaW8uYyB8ICAgIDYgKysrKy0tCiBkcml2ZXJzL2lkZS9wbWFjLmMgICB8 ICAgMzAgKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDEw IGluc2VydGlvbnMoKyksIDQwIGRlbGV0aW9ucygtKQoKCkJhcnRsb21pZWogWm9sbmllcmtpZXdp Y3ogKDIpOgogICAgICBSZXZlcnQgImlkZTogcmVzcGVjdCBjdXJyZW50IERNQSBzZXR0aW5nIGR1 cmluZyByZXN1bWUiCiAgICAgIGlkZTogYnVpbGQtZml4IGZvciBDT05GSUdfQkxLX0RFVl9JREVE TUFfUE1BQz1uCgoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvaWRlL0tjb25maWcgYi9kcml2ZXJzL2lk ZS9LY29uZmlnCmluZGV4IDZkNzQwMTcuLmU2ODU3ZTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvaWRl L0tjb25maWcKKysrIGIvZHJpdmVycy9pZGUvS2NvbmZpZwpAQCAtNjY5LDEwICs2NjksMTIgQEAg Y29uZmlnIEJMS19ERVZfQ0VMTEVCCiAKIGVuZGlmCiAKKyMgVE9ETzogQkxLX0RFVl9JREVETUFf UENJIC0+IEJMS19ERVZfSURFRE1BX1NGRgogY29uZmlnIEJMS19ERVZfSURFX1BNQUMKIAl0cmlz dGF0ZSAiUG93ZXJNYWMgb24tYm9hcmQgSURFIHN1cHBvcnQiCiAJZGVwZW5kcyBvbiBQUENfUE1B QyAmJiBJREU9eQogCXNlbGVjdCBJREVfVElNSU5HUworCXNlbGVjdCBCTEtfREVWX0lERURNQV9Q Q0kKIAloZWxwCiAJICBUaGlzIGRyaXZlciBwcm92aWRlcyBzdXBwb3J0IGZvciB0aGUgb24tYm9h cmQgSURFIGNvbnRyb2xsZXIgb24KIAkgIG1vc3Qgb2YgdGhlIHJlY2VudCBBcHBsZSBQb3dlciBN YWNpbnRvc2hlcyBhbmQgUG93ZXJCb29rcy4KQEAgLTY4OSwxNiArNjkxLDYgQEAgY29uZmlnIEJM S19ERVZfSURFX1BNQUNfQVRBMTAwRklSU1QKIAkgIENELVJPTSBvbiBoZGEuIFRoaXMgb3B0aW9u IGNoYW5nZXMgdGhpcyB0byBtb3JlIG5hdHVyYWwgaGRhIGZvcgogCSAgaGFyZCBkaXNrIGFuZCBo ZGMgZm9yIENELVJPTS4KIAotY29uZmlnIEJMS19ERVZfSURFRE1BX1BNQUMKLQlib29sICJQb3dl ck1hYyBJREUgRE1BIHN1cHBvcnQiCi0JZGVwZW5kcyBvbiBCTEtfREVWX0lERV9QTUFDCi0Jc2Vs ZWN0IEJMS19ERVZfSURFRE1BX1BDSQotCWhlbHAKLQkgIFRoaXMgb3B0aW9uIGFsbG93cyB0aGUg ZHJpdmVyIGZvciB0aGUgb24tYm9hcmQgSURFIGNvbnRyb2xsZXIgb24KLQkgIFBvd2VyIE1hY2lu dG9zaGVzIGFuZCBQb3dlckJvb2tzIHRvIHVzZSBETUEgKGRpcmVjdCBtZW1vcnkgYWNjZXNzKQot CSAgdG8gdHJhbnNmZXIgZGF0YSB0byBhbmQgZnJvbSBtZW1vcnkuICBTYXlpbmcgWSBpcyBzYWZl IGFuZCBpbXByb3ZlcwotCSAgcGVyZm9ybWFuY2UuCi0KIGNvbmZpZyBCTEtfREVWX0lERV9BVTFY WFgKICAgICAgICBib29sICJJREUgZm9yIEFNRCBBbGNoZW15IEF1MTIwMCIKICAgICAgICBkZXBl bmRzIG9uIFNPQ19BVTEyMDAKQEAgLTkxMiw3ICs5MDQsNyBAQCBjb25maWcgQkxLX0RFVl9VTUM4 NjcyCiBlbmRpZgogCiBjb25maWcgQkxLX0RFVl9JREVETUEKLQlkZWZfYm9vbCBCTEtfREVWX0lE RURNQV9TRkYgfHwgQkxLX0RFVl9JREVETUFfUE1BQyB8fCBcCisJZGVmX2Jvb2wgQkxLX0RFVl9J REVETUFfU0ZGIHx8IFwKIAkJIEJMS19ERVZfSURFRE1BX0lDUyB8fCBCTEtfREVWX0lERV9BVTFY WFhfTURNQTJfREJETUEKIAogZW5kaWYgIyBJREUKZGlmZiAtLWdpdCBhL2RyaXZlcnMvaWRlL2lk ZS1pby5jIGIvZHJpdmVycy9pZGUvaWRlLWlvLmMKaW5kZXggN2QyNzViMi4uY2MzNWQ2ZCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9pZGUvaWRlLWlvLmMKKysrIGIvZHJpdmVycy9pZGUvaWRlLWlvLmMK QEAgLTIwOCw4ICsyMDgsMTAgQEAgc3RhdGljIGlkZV9zdGFydHN0b3BfdCBpZGVfc3RhcnRfcG93 ZXJfc3RlcChpZGVfZHJpdmVfdCAqZHJpdmUsIHN0cnVjdCByZXF1ZXN0ICoKIAkJICovCiAJCWlm IChkcml2ZS0+aHdpZi0+ZG1hX29wcyA9PSBOVUxMKQogCQkJYnJlYWs7Ci0JCWlmIChkcml2ZS0+ ZGV2X2ZsYWdzICYgSURFX0RGTEFHX1VTSU5HX0RNQSkKLQkJCWlkZV9zZXRfZG1hKGRyaXZlKTsK KwkJLyoKKwkJICogVE9ETzogcmVzcGVjdCBJREVfREZMQUdfVVNJTkdfRE1BCisJCSAqLworCQlp ZGVfc2V0X2RtYShkcml2ZSk7CiAJCWJyZWFrOwogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9p ZGUvcG1hYy5jIGIvZHJpdmVycy9pZGUvcG1hYy5jCmluZGV4IDJlMTlkNjIuLjdjNDgxYmIgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvaWRlL3BtYWMuYworKysgYi9kcml2ZXJzL2lkZS9wbWFjLmMKQEAg LTY2LDcgKzY2LDYgQEAgdHlwZWRlZiBzdHJ1Y3QgcG1hY19pZGVfaHdpZiB7CiAJc3RydWN0IG1h Y2lvX2RldgkJKm1kZXY7CiAJdTMyCQkJCXRpbWluZ3NbNF07CiAJdm9sYXRpbGUgdTMyIF9faW9t ZW0gKgkJKmthdWFpX2ZjcjsKLSNpZmRlZiBDT05GSUdfQkxLX0RFVl9JREVETUFfUE1BQwogCS8q IFRob3NlIGZpZWxkcyBhcmUgZHVwbGljYXRpbmcgd2hhdCBpcyBpbiBod2lmLiBXZSBjdXJyZW50 bHkKIAkgKiBjYW4ndCB1c2UgdGhlIGh3aWYgb25lcyBiZWNhdXNlIG9mIHNvbWUgYXNzdW1wdGlv bnMgdGhhdCBhcmUKIAkgKiBiZWVpbmcgZG9uZSBieSB0aGUgZ2VuZXJpYyBjb2RlIGFib3V0IHRo ZSBraW5kIG9mIGRtYSBjb250cm9sbGVyCkBAIC03NCw4ICs3Myw2IEBAIHR5cGVkZWYgc3RydWN0 IHBtYWNfaWRlX2h3aWYgewogCSAqLwogCXZvbGF0aWxlIHN0cnVjdCBkYmRtYV9yZWdzIF9faW9t ZW0gKglkbWFfcmVnczsKIAlzdHJ1Y3QgZGJkbWFfY21kKgkJZG1hX3RhYmxlX2NwdTsKLSNlbmRp ZgotCQogfSBwbWFjX2lkZV9od2lmX3Q7CiAKIGVudW0gewpAQCAtMjIyLDggKzIxOSw2IEBAIHN0 YXRpYyBjb25zdCBjaGFyKiBtb2RlbF9uYW1lW10gPSB7CiAjZGVmaW5lIEtBVUFJX0ZDUl9VQVRB X1JFU0VUX04JCTB4MDAwMDAwMDIKICNkZWZpbmUgS0FVQUlfRkNSX1VBVEFfRU5BQkxFCQkweDAw MDAwMDAxCiAKLSNpZmRlZiBDT05GSUdfQkxLX0RFVl9JREVETUFfUE1BQwotCiAvKiBSb3VuZGVk IE11bHRpd29yZCBETUEgdGltaW5ncwogICogCiAgKiBJIGdhdmUgdXAgZmluZGluZyBhIGdlbmVy aWMgZm9ybXVsYSBmb3IgYWxsIGNvbnRyb2xsZXIKQEAgLTQxMyw4ICs0MDgsNiBAQCBzdGF0aWMg aW50IHBtYWNfaWRlX2J1aWxkX2RtYXRhYmxlKGlkZV9kcml2ZV90ICpkcml2ZSwgc3RydWN0IHJl cXVlc3QgKnJxKTsKIHN0YXRpYyB2b2lkIHBtYWNfaWRlX3NlbGVjdHByb2MoaWRlX2RyaXZlX3Qg KmRyaXZlKTsKIHN0YXRpYyB2b2lkIHBtYWNfaWRlX2thdWFpX3NlbGVjdHByb2MoaWRlX2RyaXZl X3QgKmRyaXZlKTsKIAotI2VuZGlmIC8qIENPTkZJR19CTEtfREVWX0lERURNQV9QTUFDICovCi0K ICNkZWZpbmUgUE1BQ19JREVfUkVHKHgpIFwKIAkoKHZvaWQgX19pb21lbSAqKSgoZHJpdmUpLT5o d2lmLT5pb19wb3J0cy5kYXRhX2FkZHIgKyAoeCkpKQogCkBAIC01ODQsOCArNTc3LDYgQEAgcG1h Y19pZGVfc2V0X3Bpb19tb2RlKGlkZV9kcml2ZV90ICpkcml2ZSwgY29uc3QgdTggcGlvKQogCXBt YWNfaWRlX2RvX3VwZGF0ZV90aW1pbmdzKGRyaXZlKTsKIH0KIAotI2lmZGVmIENPTkZJR19CTEtf REVWX0lERURNQV9QTUFDCi0KIC8qCiAgKiBDYWxjdWxhdGUgS2V5TGFyZ28gQVRBLzY2IFVETUEg dGltaW5ncwogICovCkBAIC03ODYsNyArNzc3LDYgQEAgc2V0X3RpbWluZ3NfbWRtYShpZGVfZHJp dmVfdCAqZHJpdmUsIGludCBpbnRmX3R5cGUsIHUzMiAqdGltaW5ncywgdTMyICp0aW1pbmdzMiwK IAkJZHJpdmUtPm5hbWUsIHNwZWVkICYgMHhmLCAgKnRpbWluZ3MpOwogI2VuZGlmCQogfQotI2Vu ZGlmIC8qICNpZmRlZiBDT05GSUdfQkxLX0RFVl9JREVETUFfUE1BQyAqLwogCiBzdGF0aWMgdm9p ZCBwbWFjX2lkZV9zZXRfZG1hX21vZGUoaWRlX2RyaXZlX3QgKmRyaXZlLCBjb25zdCB1OCBzcGVl ZCkKIHsKQEAgLTgwNCw3ICs3OTQsNiBAQCBzdGF0aWMgdm9pZCBwbWFjX2lkZV9zZXRfZG1hX21v ZGUoaWRlX2RyaXZlX3QgKmRyaXZlLCBjb25zdCB1OCBzcGVlZCkKIAl0bFswXSA9ICp0aW1pbmdz OwogCXRsWzFdID0gKnRpbWluZ3MyOwogCi0jaWZkZWYgQ09ORklHX0JMS19ERVZfSURFRE1BX1BN QUMKIAlpZiAoc3BlZWQgPj0gWEZFUl9VRE1BXzApIHsKIAkJaWYgKHBtaWYtPmtpbmQgPT0gY29u dHJvbGxlcl9rbF9hdGE0KQogCQkJcmV0ID0gc2V0X3RpbWluZ3NfdWRtYV9hdGE0KCZ0bFswXSwg c3BlZWQpOwpAQCAtODE3LDcgKzgwNiw3IEBAIHN0YXRpYyB2b2lkIHBtYWNfaWRlX3NldF9kbWFf bW9kZShpZGVfZHJpdmVfdCAqZHJpdmUsIGNvbnN0IHU4IHNwZWVkKQogCQkJcmV0ID0gLTE7CiAJ fSBlbHNlCiAJCXNldF90aW1pbmdzX21kbWEoZHJpdmUsIHBtaWYtPmtpbmQsICZ0bFswXSwgJnRs WzFdLCBzcGVlZCk7Ci0jZW5kaWYgLyogQ09ORklHX0JMS19ERVZfSURFRE1BX1BNQUMgKi8KKwog CWlmIChyZXQpCiAJCXJldHVybjsKIApAQCAtMTAwOCw5ICs5OTcsNyBAQCBzdGF0aWMgY29uc3Qg c3RydWN0IGlkZV9wb3J0X2luZm8gcG1hY19wb3J0X2luZm8gPSB7CiAJLmNoaXBzZXQJCT0gaWRl X3BtYWMsCiAJLnRwX29wcwkJCT0gJnBtYWNfdHBfb3BzLAogCS5wb3J0X29wcwkJPSAmcG1hY19p ZGVfcG9ydF9vcHMsCi0jaWZkZWYgQ09ORklHX0JMS19ERVZfSURFRE1BX1BNQUMKIAkuZG1hX29w cwkJPSAmcG1hY19kbWFfb3BzLAotI2VuZGlmCiAJLmhvc3RfZmxhZ3MJCT0gSURFX0hGTEFHX1NF VF9QSU9fTU9ERV9LRUVQX0RNQSB8CiAJCQkJICBJREVfSEZMQUdfUE9TVF9TRVRfTU9ERSB8CiAJ CQkJICBJREVfSEZMQUdfTU1JTyB8CkBAIC0xMTgyLDcgKzExNjksNyBAQCBwbWFjX2lkZV9tYWNp b19hdHRhY2goc3RydWN0IG1hY2lvX2RldiAqbWRldiwgY29uc3Qgc3RydWN0IG9mX2RldmljZV9p ZCAqbWF0Y2gpCiAJcG1pZi0+cmVnYmFzZSA9IHJlZ2Jhc2U7CiAJcG1pZi0+aXJxID0gaXJxOwog CXBtaWYtPmthdWFpX2ZjciA9IE5VTEw7Ci0jaWZkZWYgQ09ORklHX0JMS19ERVZfSURFRE1BX1BN QUMKKwogCWlmIChtYWNpb19yZXNvdXJjZV9jb3VudChtZGV2KSA+PSAyKSB7CiAJCWlmIChtYWNp b19yZXF1ZXN0X3Jlc291cmNlKG1kZXYsIDEsICJpZGUtcG1hYyAoZG1hKSIpKQogCQkJcHJpbnRr KEtFUk5fV0FSTklORyAiaWRlLXBtYWM6IGNhbid0IHJlcXVlc3QgRE1BICIKQEAgLTExOTIsNyAr MTE3OSw3IEBAIHBtYWNfaWRlX21hY2lvX2F0dGFjaChzdHJ1Y3QgbWFjaW9fZGV2ICptZGV2LCBj b25zdCBzdHJ1Y3Qgb2ZfZGV2aWNlX2lkICptYXRjaCkKIAkJCXBtaWYtPmRtYV9yZWdzID0gaW9y ZW1hcChtYWNpb19yZXNvdXJjZV9zdGFydChtZGV2LCAxKSwgMHgxMDAwKTsKIAl9IGVsc2UKIAkJ cG1pZi0+ZG1hX3JlZ3MgPSBOVUxMOwotI2VuZGlmIC8qIENPTkZJR19CTEtfREVWX0lERURNQV9Q TUFDICovCisKIAlkZXZfc2V0X2RydmRhdGEoJm1kZXYtPm9mZGV2LmRldiwgcG1pZik7CiAKIAlt ZW1zZXQoJmh3LCAwLCBzaXplb2YoaHcpKTsKQEAgLTEzMDAsOSArMTI4Nyw3IEBAIHBtYWNfaWRl X3BjaV9hdHRhY2goc3RydWN0IHBjaV9kZXYgKnBkZXYsIGNvbnN0IHN0cnVjdCBwY2lfZGV2aWNl X2lkICppZCkKIAogCWJhc2UgPSBpb3JlbWFwKHJiYXNlLCBybGVuKTsKIAlwbWlmLT5yZWdiYXNl ID0gKHVuc2lnbmVkIGxvbmcpIGJhc2UgKyAweDIwMDA7Ci0jaWZkZWYgQ09ORklHX0JMS19ERVZf SURFRE1BX1BNQUMKIAlwbWlmLT5kbWFfcmVncyA9IGJhc2UgKyAweDEwMDA7Ci0jZW5kaWYgLyog Q09ORklHX0JMS19ERVZfSURFRE1BX1BNQUMgKi8KIAlwbWlmLT5rYXVhaV9mY3IgPSBiYXNlOwog CXBtaWYtPmlycSA9IHBkZXYtPmlycTsKIApAQCAtMTQzNCw4ICsxNDE5LDYgQEAgb3V0OgogCXJl dHVybiBlcnJvcjsKIH0KIAotI2lmZGVmIENPTkZJR19CTEtfREVWX0lERURNQV9QTUFDCi0KIC8q CiAgKiBwbWFjX2lkZV9idWlsZF9kbWF0YWJsZSBidWlsZHMgdGhlIERCRE1BIGNvbW1hbmQgbGlz dAogICogZm9yIGEgdHJhbnNmZXIgYW5kIHNldHMgdGhlIERCRE1BIGNoYW5uZWwgdG8gcG9pbnQg dG8gaXQuCkBAIC0xNzIzLDEzICsxNzA2LDYgQEAgc3RhdGljIGludCBfX2RldmluaXQgcG1hY19p ZGVfaW5pdF9kbWEoaWRlX2h3aWZfdCAqaHdpZiwKIAogCXJldHVybiAwOwogfQotI2Vsc2UKLXN0 YXRpYyBpbnQgX19kZXZpbml0IHBtYWNfaWRlX2luaXRfZG1hKGlkZV9od2lmX3QgKmh3aWYsCi0J CQkJICAgICAgIGNvbnN0IHN0cnVjdCBpZGVfcG9ydF9pbmZvICpkKQotewotCXJldHVybiAtRU9Q Tk9UU1VQUDsKLX0KLSNlbmRpZiAvKiBDT05GSUdfQkxLX0RFVl9JREVETUFfUE1BQyAqLwogCiBt b2R1bGVfaW5pdChwbWFjX2lkZV9wcm9iZSk7CiAKAAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754145AbYLHQ44 (ORCPT ); Mon, 8 Dec 2008 11:56:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753453AbYLHQ4p (ORCPT ); Mon, 8 Dec 2008 11:56:45 -0500 Received: from gv-out-0910.google.com ([216.239.58.186]:40177 "EHLO gv-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753258AbYLHQ4o (ORCPT ); Mon, 8 Dec 2008 11:56:44 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:user-agent:cc:mime-version:content-disposition:date :message-id:content-type:content-transfer-encoding; b=CkM4riLRlFIbQu2Swje1R6a+4VnG6d9mLMEBAcYoNkPYuUNZ4n4J8xHGh6pZJ08fns sljIfSbJm7oeL3ac46dJIuCjKcPtk5ctTrxCa/ZWnDzgzluXIn4lOwEBApbT/WGB6zYb gwUdUeYyotCoK5dQ27w7zQBQFkWWNoKm5EnCg= From: Bartlomiej Zolnierkiewicz To: Linus Torvalds Subject: [git pull] IDE fixes User-Agent: KMail/1.9.9 Cc: Andrew Morton , Stephen Rothwell , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Disposition: inline Date: Mon, 8 Dec 2008 17:55:12 +0100 Message-Id: <200812081755.13024.bzolnier@gmail.com> Content-Type: text/plain; charset="iso-8859-1" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by alpha id mB8Gv0dq014594 Linus, please pull from: master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/ to receive the following updates: drivers/ide/Kconfig | 14 +++----------- drivers/ide/ide-io.c | 6 ++++-- drivers/ide/pmac.c | 30 +++--------------------------- 3 files changed, 10 insertions(+), 40 deletions(-) Bartlomiej Zolnierkiewicz (2): Revert "ide: respect current DMA setting during resume" ide: build-fix for CONFIG_BLK_DEV_IDEDMA_PMAC=n diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfigindex 6d74017..e6857e0 100644--- a/drivers/ide/Kconfig+++ b/drivers/ide/Kconfig@@ -669,10 +669,12 @@ config BLK_DEV_CELLEB endif +# TODO: BLK_DEV_IDEDMA_PCI -> BLK_DEV_IDEDMA_SFF config BLK_DEV_IDE_PMAC tristate "PowerMac on-board IDE support" depends on PPC_PMAC && IDE=y select IDE_TIMINGS+ select BLK_DEV_IDEDMA_PCI help This driver provides support for the on-board IDE controller on most of the recent Apple Power Macintoshes and PowerBooks.@@ -689,16 +691,6 @@ config BLK_DEV_IDE_PMAC_ATA100FIRST CD-ROM on hda. This option changes this to more natural hda for hard disk and hdc for CD-ROM. -config BLK_DEV_IDEDMA_PMAC- bool "PowerMac IDE DMA support"- depends on BLK_DEV_IDE_PMAC- select BLK_DEV_IDEDMA_PCI- help- This option allows the driver for the on-board IDE controller on- Power Macintoshes and PowerBooks to use DMA (direct memory access)- to transfer data to and from memory. Saying Y is safe and improves- performance.- config BLK_DEV_IDE_AU1XXX bool "IDE for AMD Alchemy Au1200" depends on SOC_AU1200@@ -912,7 +904,7 @@ config BLK_DEV_UMC8672 endif config BLK_DEV_IDEDMA- def_bool BLK_DEV_IDEDMA_SFF || BLK_DEV_IDEDMA_PMAC || \+ def_bool BLK_DEV_IDEDMA_SFF || \ BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA endif # IDEdiff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.cindex 7d275b2..cc35d6d 100644--- a/drivers/ide/ide-io.c+++ b/drivers/ide/ide-io.c@@ -208,8 +208,10 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request * */ if (drive->hwif->dma_ops == NULL) break;- if (drive->dev_flags & IDE_DFLAG_USING_DMA)- ide_set_dma(drive);+ /*+ * TODO: respect IDE_DFLAG_USING_DMA+ */+ ide_set_dma(drive); break; } diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.cindex 2e19d62..7c481bb 100644--- a/drivers/ide/pmac.c+++ b/drivers/ide/pmac.c@@ -66,7 +66,6 @@ typedef struct pmac_ide_hwif { struct macio_dev *mdev; u32 timings[4]; volatile u32 __iomem * *kauai_fcr;-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC /* Those fields are duplicating what is in hwif. We currently * can't use the hwif ones because of some assumptions that are * beeing done by the generic code about the kind of dma controller@@ -74,8 +73,6 @@ typedef struct pmac_ide_hwif { */ volatile struct dbdma_regs __iomem * dma_regs; struct dbdma_cmd* dma_table_cpu;-#endif- } pmac_ide_hwif_t; enum {@@ -222,8 +219,6 @@ static const char* model_name[] = { #define KAUAI_FCR_UATA_RESET_N 0x00000002 #define KAUAI_FCR_UATA_ENABLE 0x00000001 -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC- /* Rounded Multiword DMA timings * * I gave up finding a generic formula for all controller@@ -413,8 +408,6 @@ static int pmac_ide_build_dmatable(ide_drive_t *drive, struct request *rq); static void pmac_ide_selectproc(ide_drive_t *drive); static void pmac_ide_kauai_selectproc(ide_drive_t *drive); -#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */- #define PMAC_IDE_REG(x) \ ((void __iomem *)((drive)->hwif->io_ports.data_addr + (x))) @@ -584,8 +577,6 @@ pmac_ide_set_pio_mode(ide_drive_t *drive, const u8 pio) pmac_ide_do_update_timings(drive); } -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC- /* * Calculate KeyLargo ATA/66 UDMA timings */@@ -786,7 +777,6 @@ set_timings_mdma(ide_drive_t *drive, int intf_type, u32 *timings, u32 *timings2, drive->name, speed & 0xf, *timings); #endif }-#endif /* #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC */ static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed) {@@ -804,7 +794,6 @@ static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed) tl[0] = *timings; tl[1] = *timings2; -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC if (speed >= XFER_UDMA_0) { if (pmif->kind == controller_kl_ata4) ret = set_timings_udma_ata4(&tl[0], speed);@@ -817,7 +806,7 @@ static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed) ret = -1; } else set_timings_mdma(drive, pmif->kind, &tl[0], &tl[1], speed);-#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */+ if (ret) return; @@ -1008,9 +997,7 @@ static const struct ide_port_info pmac_port_info = { .chipset = ide_pmac, .tp_ops = &pmac_tp_ops, .port_ops = &pmac_ide_port_ops,-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC .dma_ops = &pmac_dma_ops,-#endif .host_flags = IDE_HFLAG_SET_PIO_MODE_KEEP_DMA | IDE_HFLAG_POST_SET_MODE | IDE_HFLAG_MMIO |@@ -1182,7 +1169,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) pmif->regbase = regbase; pmif->irq = irq; pmif->kauai_fcr = NULL;-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC+ if (macio_resource_count(mdev) >= 2) { if (macio_request_resource(mdev, 1, "ide-pmac (dma)")) printk(KERN_WARNING "ide-pmac: can't request DMA "@@ -1192,7 +1179,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) pmif->dma_regs = ioremap(macio_resource_start(mdev, 1), 0x1000); } else pmif->dma_regs = NULL;-#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */+ dev_set_drvdata(&mdev->ofdev.dev, pmif); memset(&hw, 0, sizeof(hw));@@ -1300,9 +1287,7 @@ pmac_ide_pci_attach(struct pci_dev *pdev, const struct pci_device_id *id) base = ioremap(rbase, rlen); pmif->regbase = (unsigned long) base + 0x2000;-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC pmif->dma_regs = base + 0x1000;-#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */ pmif->kauai_fcr = base; pmif->irq = pdev->irq; @@ -1434,8 +1419,6 @@ out: return error; } -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC- /* * pmac_ide_build_dmatable builds the DBDMA command list * for a transfer and sets the DBDMA channel to point to it.@@ -1723,13 +1706,6 @@ static int __devinit pmac_ide_init_dma(ide_hwif_t *hwif, return 0; }-#else-static int __devinit pmac_ide_init_dma(ide_hwif_t *hwif,- const struct ide_port_info *d)-{- return -EOPNOTSUPP;-}-#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */ module_init(pmac_ide_probe); {.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I