From patchwork Mon Jun 24 14:35:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 167601 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp4312052ilk; Mon, 24 Jun 2019 07:37:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqxq7/qetzm0N1sOAdpW86pTMNISvGIr35iXR3XgI1J8R3MpEWZcsbwi1dDANCCc0LxnQUGS X-Received: by 2002:a17:90a:ac11:: with SMTP id o17mr25605991pjq.134.1561387024842; Mon, 24 Jun 2019 07:37:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561387024; cv=none; d=google.com; s=arc-20160816; b=P26njv9GSe1seAQSA7bNlJb3XZ9jiklRukR30d9A+qxNnp2pxtmhzdLT07vQdhPrVD /8rNeXSoiiu5dts0pU/hpIwX1OWiM6WSY4awuSMTNM7ssTLv66q88qtB9LfxcqtMyq5d 0TNxCi1rkrMTAoRJQ5FuLhQgiwjHd/x1s7urDmFW8q6cImxT86+0VWANr926tfU8SP1O DJES3m0RdAM1SipLfUMFF3FijPA1RGljoHQmjT4BuNcL5GR2H17TfubH5teQ4RhEbLES CKtoQtxOYvhrogdEdSmJAmGwxBBpIftqSqf9qKHPedx+UHQhrSoSdB4YBNozjbxIpK27 gkeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=c5Qb7+GCUQbMBVYb30khBcTVFmxUrPGSa5utdoQ5VA4=; b=h1XyQ86s+DN/qqKroV2kxYajnmsNNZHnVwbI5REh6vT3/afplHBQmpUSEKUq8XTtIO LhksXILq+2iI5VSjNw+LoBq0Qs8BiXasYKTgxOV4zurzP9cu+1P0FqVscIL/J2I6jZ9/ 1nA30uXMOuFDOwNtI1kckgXjtnTxr1Ta44AasNFw7FY1gLJx2OPGx7ufRX7Aj4c+om6Z rJ6Hn8kUPA3tDrGWI+BnNsml4f4jYbFVw0b+0NyP5iBe3LAJN8ENwe5aVQO7xDY3nw6C YoE2j2qRnY/MVXtHnvFe1ki0Il3tKXduN1gbCeoey3sxAKgpKDz0TkNAKoyAzXYr5G/p HiOQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g21si9758788plo.306.2019.06.24.07.37.04; Mon, 24 Jun 2019 07:37:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729315AbfFXOhC (ORCPT + 30 others); Mon, 24 Jun 2019 10:37:02 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:19070 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726887AbfFXOgk (ORCPT ); Mon, 24 Jun 2019 10:36:40 -0400 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 15FFA7B77114539C2EC5; Mon, 24 Jun 2019 22:36:37 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.439.0; Mon, 24 Jun 2019 22:36:29 +0800 From: John Garry To: CC: , , , , , , John Garry Subject: [PATCH v2 6/6] lib: logic_pio: Enforce LOGIC_PIO_INDIRECT region ops are set at registration Date: Mon, 24 Jun 2019 22:35:08 +0800 Message-ID: <1561386908-31884-7-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1561386908-31884-1-git-send-email-john.garry@huawei.com> References: <1561386908-31884-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since the only LOGIC_PIO_INDIRECT host (hisi-lpc) now sets the ops prior to registration, enforce this check at registration instead of in the IO port accessors to simplify and marginally optimise the code. A slight misalignment is also tidied. Suggested-by: Bjorn Helgaas Signed-off-by: John Garry --- lib/logic_pio.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) -- 2.17.1 diff --git a/lib/logic_pio.c b/lib/logic_pio.c index 905027574e5d..52831a85293a 100644 --- a/lib/logic_pio.c +++ b/lib/logic_pio.c @@ -39,7 +39,8 @@ int logic_pio_register_range(struct logic_pio_hwaddr *new_range) resource_size_t iio_sz = MMIO_UPPER_LIMIT; int ret = 0; - if (!new_range || !new_range->fwnode || !new_range->size) + if (!new_range || !new_range->fwnode || !new_range->size || + (new_range->flags == LOGIC_PIO_INDIRECT && !new_range->ops)) return -EINVAL; start = new_range->hw_start; @@ -237,7 +238,7 @@ type logic_in##bw(unsigned long addr) \ } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \ struct logic_pio_hwaddr *entry = find_io_range(addr); \ \ - if (entry && entry->ops) \ + if (entry) \ ret = entry->ops->in(entry->hostdata, \ addr, sizeof(type)); \ else \ @@ -253,7 +254,7 @@ void logic_out##bw(type value, unsigned long addr) \ } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \ struct logic_pio_hwaddr *entry = find_io_range(addr); \ \ - if (entry && entry->ops) \ + if (entry) \ entry->ops->out(entry->hostdata, \ addr, value, sizeof(type)); \ else \ @@ -261,7 +262,7 @@ void logic_out##bw(type value, unsigned long addr) \ } \ } \ \ -void logic_ins##bw(unsigned long addr, void *buffer, \ +void logic_ins##bw(unsigned long addr, void *buffer, \ unsigned int count) \ { \ if (addr < MMIO_UPPER_LIMIT) { \ @@ -269,7 +270,7 @@ void logic_ins##bw(unsigned long addr, void *buffer, \ } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \ struct logic_pio_hwaddr *entry = find_io_range(addr); \ \ - if (entry && entry->ops) \ + if (entry) \ entry->ops->ins(entry->hostdata, \ addr, buffer, sizeof(type), count); \ else \ @@ -286,7 +287,7 @@ void logic_outs##bw(unsigned long addr, const void *buffer, \ } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \ struct logic_pio_hwaddr *entry = find_io_range(addr); \ \ - if (entry && entry->ops) \ + if (entry) \ entry->ops->outs(entry->hostdata, \ addr, buffer, sizeof(type), count); \ else \