From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1609AC4320A for ; Wed, 28 Jul 2021 09:04:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E8DC360FC0 for ; Wed, 28 Jul 2021 09:04:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229574AbhG1JEy (ORCPT ); Wed, 28 Jul 2021 05:04:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230520AbhG1JEx (ORCPT ); Wed, 28 Jul 2021 05:04:53 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8064DC061757 for ; Wed, 28 Jul 2021 02:04:52 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id d18so2592535lfb.6 for ; Wed, 28 Jul 2021 02:04:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v8Kf3bJVsFxGxcNbJs16/QeLrm2c8RvjSq7a7W3W4Mc=; b=EoXHY5nQlqlMIQMFDFRIm4xHWHDS1wm6yGyxYKQ8BGxVEja9SqIozH6dgoN1xjtIn3 uBF365hkjOLkpJgXbhCEjw3DrbMVgNj/D03H6dAh6ShyAwNC11WsEj9Sy39uVGJ3l8VI ojDoE018vEaHJtx9/3M1Q5wKJo4ejmWtDEnt4MKGlHWute1HONRR4NvL0rEo3/YP9cCk HtKR5CfaUX6BeE2XUJt6jVPOwmVOi4bkPVtKt08UFxUUsWOHgZLSnIKiUAamqsmldPZN xDa5CdDF1auZWUXjpkRqAftI2enQhbRLnKfOP4n3DXJqcT+CNvApjWH+Je8DgsAfKCmB YV/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v8Kf3bJVsFxGxcNbJs16/QeLrm2c8RvjSq7a7W3W4Mc=; b=sX0GjRpl/NRqFeT4aFFRJ91zUrQLQ86cujRQOz8o68h0Rqy0WxzXQxCd/1TQLrwX+W 5TfFzKahW//2VAwTnsoGODTqheH7ISnCHvz3zhbFr7oQ9NKt06SQKwZ/ExG8SU/iOGe+ TjNTEauLeoamrUOotMUj+9Yn/oH+Z3SwkFFZVsDtr9/2Zq5Xw/6LnxBwBb/kBDFM8YYW aDpwNfc2MlyH/uqeb6OVfBsWVZpmJBPC0dnZM68w17sKjPFvKus30WSIH9X5TmCUL7vY SW1DrYSlvgVzNUqv7RAmuq/oCHKvfT1k9GG7HHdxExLpWDPA7u6HJ/IPSkpdvCvAvKEi lRBA== X-Gm-Message-State: AOAM530izg2e1rEAYaF4wLGNhCCxYTo48BWtPJRmpFmzqOSK7glGtwQ4 PqW+5Eiwg2K0mcHShh8ta3IWzg== X-Google-Smtp-Source: ABdhPJwegtpEsG+OHXuMzO5YOXtSQOCaHq51mVY7by3SUgcUBlK1y1VSZMmjGZrBtQkSp/TZBypwHA== X-Received: by 2002:a05:6512:3d8b:: with SMTP id k11mr8170335lfv.599.1627463090867; Wed, 28 Jul 2021 02:04:50 -0700 (PDT) Received: from localhost.localdomain (c-fdcc225c.014-348-6c756e10.bbcust.telenor.se. [92.34.204.253]) by smtp.gmail.com with ESMTPSA id d9sm505495ljq.54.2021.07.28.02.04.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jul 2021 02:04:50 -0700 (PDT) From: Linus Walleij To: Jens Axboe , linux-ide@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Imre Kaloz , Krzysztof Halasa , Linus Walleij Subject: [PATCH 2/5] pata: ixp4xx: Use IS_ENABLED() to determine endianness Date: Wed, 28 Jul 2021 11:02:39 +0200 Message-Id: <20210728090242.2758812-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210728090242.2758812-1-linus.walleij@linaro.org> References: <20210728090242.2758812-1-linus.walleij@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Instead of an ARM-specific ifdef, use the global CPU config and if (IS_ENABLED()). Signed-off-by: Linus Walleij --- drivers/ata/pata_ixp4xx_cf.c | 45 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c index 23f0f7cacd52..bc5029d6525d 100644 --- a/drivers/ata/pata_ixp4xx_cf.c +++ b/drivers/ata/pata_ixp4xx_cf.c @@ -107,29 +107,28 @@ static void ixp4xx_setup_port(struct ata_port *ap, ata_sff_std_ports(ioaddr); -#ifndef __ARMEB__ - - /* adjust the addresses to handle the address swizzling of the - * ixp4xx in little endian mode. - */ - - *(unsigned long *)&ioaddr->data_addr ^= 0x02; - *(unsigned long *)&ioaddr->cmd_addr ^= 0x03; - *(unsigned long *)&ioaddr->altstatus_addr ^= 0x03; - *(unsigned long *)&ioaddr->ctl_addr ^= 0x03; - *(unsigned long *)&ioaddr->error_addr ^= 0x03; - *(unsigned long *)&ioaddr->feature_addr ^= 0x03; - *(unsigned long *)&ioaddr->nsect_addr ^= 0x03; - *(unsigned long *)&ioaddr->lbal_addr ^= 0x03; - *(unsigned long *)&ioaddr->lbam_addr ^= 0x03; - *(unsigned long *)&ioaddr->lbah_addr ^= 0x03; - *(unsigned long *)&ioaddr->device_addr ^= 0x03; - *(unsigned long *)&ioaddr->status_addr ^= 0x03; - *(unsigned long *)&ioaddr->command_addr ^= 0x03; - - raw_cmd ^= 0x03; - raw_ctl ^= 0x03; -#endif + if (!IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) { + /* adjust the addresses to handle the address swizzling of the + * ixp4xx in little endian mode. + */ + + *(unsigned long *)&ioaddr->data_addr ^= 0x02; + *(unsigned long *)&ioaddr->cmd_addr ^= 0x03; + *(unsigned long *)&ioaddr->altstatus_addr ^= 0x03; + *(unsigned long *)&ioaddr->ctl_addr ^= 0x03; + *(unsigned long *)&ioaddr->error_addr ^= 0x03; + *(unsigned long *)&ioaddr->feature_addr ^= 0x03; + *(unsigned long *)&ioaddr->nsect_addr ^= 0x03; + *(unsigned long *)&ioaddr->lbal_addr ^= 0x03; + *(unsigned long *)&ioaddr->lbam_addr ^= 0x03; + *(unsigned long *)&ioaddr->lbah_addr ^= 0x03; + *(unsigned long *)&ioaddr->device_addr ^= 0x03; + *(unsigned long *)&ioaddr->status_addr ^= 0x03; + *(unsigned long *)&ioaddr->command_addr ^= 0x03; + + raw_cmd ^= 0x03; + raw_ctl ^= 0x03; + } ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx", raw_cmd, raw_ctl); } -- 2.31.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFD7FC432BE for ; Wed, 28 Jul 2021 09:07:29 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9303260F9C for ; Wed, 28 Jul 2021 09:07:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9303260F9C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5UVjJOFEuzxbk+9Q/VgGuTFtVMp16ENY9rDDpmbWz3Y=; b=LYbzvBh0+ficYO UbVuFzPLj0E063UVZAHIqMEgzeC9X3ud5amF5l/t/Du4x1VewY3u+jyiP8ovjwaq/m7H4eY6JFD7s qxcyOtrvlYo1MJEdZpkv/6Xv5/L944TuHTsS7P/j7DZvbte7pZ86SSEUD5el7dPKGrYnnOxlwFG/O mjkuEgwJo43TxCIE///8bS3YmVxZfxvs4/MrXe5wc8L1onDgwdw4U0mSYzAGE3llnE0BHXEEIt7D5 SSsiK8VJO9asFfpfOVbtvWJPW9nEWulMMOA3zNIjE/QMU2xpVJzympwjiJ10HypBOsBV+J1ZC0YIn GElejC0J7nVji+XB/quQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m8fV5-0004D7-T7; Wed, 28 Jul 2021 09:05:16 +0000 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m8fUj-00048m-Jj for linux-arm-kernel@lists.infradead.org; Wed, 28 Jul 2021 09:04:55 +0000 Received: by mail-lf1-x12f.google.com with SMTP id r17so2628093lfe.2 for ; Wed, 28 Jul 2021 02:04:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v8Kf3bJVsFxGxcNbJs16/QeLrm2c8RvjSq7a7W3W4Mc=; b=EoXHY5nQlqlMIQMFDFRIm4xHWHDS1wm6yGyxYKQ8BGxVEja9SqIozH6dgoN1xjtIn3 uBF365hkjOLkpJgXbhCEjw3DrbMVgNj/D03H6dAh6ShyAwNC11WsEj9Sy39uVGJ3l8VI ojDoE018vEaHJtx9/3M1Q5wKJo4ejmWtDEnt4MKGlHWute1HONRR4NvL0rEo3/YP9cCk HtKR5CfaUX6BeE2XUJt6jVPOwmVOi4bkPVtKt08UFxUUsWOHgZLSnIKiUAamqsmldPZN xDa5CdDF1auZWUXjpkRqAftI2enQhbRLnKfOP4n3DXJqcT+CNvApjWH+Je8DgsAfKCmB YV/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v8Kf3bJVsFxGxcNbJs16/QeLrm2c8RvjSq7a7W3W4Mc=; b=AoSScXR2qnRHR2+lFCW2MwZozz4hQEhX+ZWAMoQmLNNkbRte/2NDNv6SkNhDAFqJLK eNE+Ud34fN77oz6L0xtyYWuMArl7+mXbPcPXmynnf1t5vHx/+pZG4MiQHnA2s4J+iXxG Wa6EF0FyQuer0DTASEH/7GZAd3avcIIbTFP3BcOX0jxNXDmPd4GiRiR71yTs1CEyME17 2dw2PZaO0KoScXuN4EbSzY6iM8xNeHgVONJmBMvTj6ohiGdEj4nkZamL2nQPbsYcFwou J6XR2iDKz/T9BuVjyHVFtanucr0T2y6U7v/3VVdHWP4PmgMfz3Dcds5hwtpJCeBeUdR5 9vYg== X-Gm-Message-State: AOAM531QKk2uiY+cdf4t1ng7O59/miR1y48zQre5UmGdrMySo26mtET5 UsV68zPSHAffXfHWawggKYBZRQ== X-Google-Smtp-Source: ABdhPJwegtpEsG+OHXuMzO5YOXtSQOCaHq51mVY7by3SUgcUBlK1y1VSZMmjGZrBtQkSp/TZBypwHA== X-Received: by 2002:a05:6512:3d8b:: with SMTP id k11mr8170335lfv.599.1627463090867; Wed, 28 Jul 2021 02:04:50 -0700 (PDT) Received: from localhost.localdomain (c-fdcc225c.014-348-6c756e10.bbcust.telenor.se. [92.34.204.253]) by smtp.gmail.com with ESMTPSA id d9sm505495ljq.54.2021.07.28.02.04.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jul 2021 02:04:50 -0700 (PDT) From: Linus Walleij To: Jens Axboe , linux-ide@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Imre Kaloz , Krzysztof Halasa , Linus Walleij Subject: [PATCH 2/5] pata: ixp4xx: Use IS_ENABLED() to determine endianness Date: Wed, 28 Jul 2021 11:02:39 +0200 Message-Id: <20210728090242.2758812-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210728090242.2758812-1-linus.walleij@linaro.org> References: <20210728090242.2758812-1-linus.walleij@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210728_020453_699148_955E84E4 X-CRM114-Status: GOOD ( 13.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Instead of an ARM-specific ifdef, use the global CPU config and if (IS_ENABLED()). Signed-off-by: Linus Walleij --- drivers/ata/pata_ixp4xx_cf.c | 45 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c index 23f0f7cacd52..bc5029d6525d 100644 --- a/drivers/ata/pata_ixp4xx_cf.c +++ b/drivers/ata/pata_ixp4xx_cf.c @@ -107,29 +107,28 @@ static void ixp4xx_setup_port(struct ata_port *ap, ata_sff_std_ports(ioaddr); -#ifndef __ARMEB__ - - /* adjust the addresses to handle the address swizzling of the - * ixp4xx in little endian mode. - */ - - *(unsigned long *)&ioaddr->data_addr ^= 0x02; - *(unsigned long *)&ioaddr->cmd_addr ^= 0x03; - *(unsigned long *)&ioaddr->altstatus_addr ^= 0x03; - *(unsigned long *)&ioaddr->ctl_addr ^= 0x03; - *(unsigned long *)&ioaddr->error_addr ^= 0x03; - *(unsigned long *)&ioaddr->feature_addr ^= 0x03; - *(unsigned long *)&ioaddr->nsect_addr ^= 0x03; - *(unsigned long *)&ioaddr->lbal_addr ^= 0x03; - *(unsigned long *)&ioaddr->lbam_addr ^= 0x03; - *(unsigned long *)&ioaddr->lbah_addr ^= 0x03; - *(unsigned long *)&ioaddr->device_addr ^= 0x03; - *(unsigned long *)&ioaddr->status_addr ^= 0x03; - *(unsigned long *)&ioaddr->command_addr ^= 0x03; - - raw_cmd ^= 0x03; - raw_ctl ^= 0x03; -#endif + if (!IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) { + /* adjust the addresses to handle the address swizzling of the + * ixp4xx in little endian mode. + */ + + *(unsigned long *)&ioaddr->data_addr ^= 0x02; + *(unsigned long *)&ioaddr->cmd_addr ^= 0x03; + *(unsigned long *)&ioaddr->altstatus_addr ^= 0x03; + *(unsigned long *)&ioaddr->ctl_addr ^= 0x03; + *(unsigned long *)&ioaddr->error_addr ^= 0x03; + *(unsigned long *)&ioaddr->feature_addr ^= 0x03; + *(unsigned long *)&ioaddr->nsect_addr ^= 0x03; + *(unsigned long *)&ioaddr->lbal_addr ^= 0x03; + *(unsigned long *)&ioaddr->lbam_addr ^= 0x03; + *(unsigned long *)&ioaddr->lbah_addr ^= 0x03; + *(unsigned long *)&ioaddr->device_addr ^= 0x03; + *(unsigned long *)&ioaddr->status_addr ^= 0x03; + *(unsigned long *)&ioaddr->command_addr ^= 0x03; + + raw_cmd ^= 0x03; + raw_ctl ^= 0x03; + } ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx", raw_cmd, raw_ctl); } -- 2.31.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel