From patchwork Thu Feb 8 12:09:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 198408 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp165826dyd; Thu, 8 Feb 2024 05:30:20 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVpKNvxuG2YxFD04JrKCCgkx+1G697RyB1Mhbzq2CS5WtNPKHFOKaQLztp/M9P+Z2YxqsWI9RJJ8pR9u9RmxSikq1M30g== X-Google-Smtp-Source: AGHT+IE33x9ncTElTLBT94Atc1plt3hEw1GWwTj5uaI2rF+UNQEzKGbg0kAHG67elH2kEnweJmJ0 X-Received: by 2002:a05:620a:1a89:b0:784:2f2c:7b47 with SMTP id bl9-20020a05620a1a8900b007842f2c7b47mr4017863qkb.17.1707399020047; Thu, 08 Feb 2024 05:30:20 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707399020; cv=pass; d=google.com; s=arc-20160816; b=jh85gCVDSYSl4kvpe1jiI//MfmOZrpquVlpKvaAmO5m3VMjUl+SMWSnjD9nxowhF/2 ceNpeH/2x8joWcTPCA4w0vLn5cXvlyA8FTZ72RX2qnNRy8U0GU7zLM3auHgygEkE+Hsp 9XzaGFcnCKIJpVyqcUI7ddGSuWDgKdqZkxAllwL89uRzAOkMydVxAEbYBzCAQVuwSCC7 vuixoerVO2ePqV3XaYn9awYy5KxAAVeibXvzLptNTyoXeoNfoaSwQJQSb86yCFEA6e4V mpwGrrQyGHamdLfvYhwjeaCIZpR7BTDIwxEf8pZt9+WufS0xEcmx/l2XdcZH3zqC9GND 2mSw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=LD+OEtoNsnejtTiB6lpMqVzZBITAkyW93NiNWadethA=; fh=E7/rBIbRAdeYEecyT0zehZrWA6xbYBFy+QBsE6QzzSI=; b=JpZiwFg3Vs/nMseXE3qV2abj8FazcXaSYdGBnRTBPjoAewTdkRgSfdaToWbHd4UXTW ttMLjczf8y6ovyLYIRcHR39vYxwfLO+vMqIx8oo9Ty0FrApBmiZ0s+bXzIDY0lBacq97 0m6pu6XDfT4a7gD3FsvtSjRWvMiGNz1KA1w+R7JJW5+RrnJr/6UXCdG+uUIlCorU1f7G Ts9YE8Ym9YNd8mToGZd9ab2Sl37sIe/eDbhyS1/4ZoFCHCwihcEZHs89pDzmXgpb5Aov j8Jrg2CItJ32lmg6JXYnTPhsDThaHSg+EtXPy1zkFdHGfJ2RdvI2Y72RtVa3F3WN5sN8 1sjQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HGk9B80S; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-58029-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-58029-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Forwarded-Encrypted: i=2; AJvYcCVC5zcljZMtnZXAViKpxFo/iTzQA6hM+uEiZmFyJja+naFMrdhbgjttARXx91spTsVbjAdUn6ujjXgrc8HWgXdiy6Lg1g== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id j10-20020a37ef0a000000b007859fde04cdsi2498848qkk.769.2024.02.08.05.30.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Feb 2024 05:30:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-58029-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HGk9B80S; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-58029-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-58029-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 208A31C28145 for ; Thu, 8 Feb 2024 12:11:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CD2747602C; Thu, 8 Feb 2024 12:10:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="HGk9B80S" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9DBC274E31; Thu, 8 Feb 2024 12:10:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707394231; cv=none; b=X0Gaqj83R+XR1HQpUHbigBAA26CawlpvzWLwvAGSAclLa2m0v3lfIxyYIjVWTPXYM0PH6oTfsvCXdFEZnOnOFtluR4gQIoWPbNt/3dC2wB4aT11Wo+TZfIMbNvn9Y4MXWXknFn0Bov811XC1WPQz45S+ojoFZzk6YxjGh5qnUUY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707394231; c=relaxed/simple; bh=ivHn9eMnqjSo1Ck3bYq1BD7aGM0SlKEDNFiHnIfMXAA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=N0VoSOCDejFg7twqSQsVA/e4Wow6qQLzLfJ3S5Ofn2kqfZAui8QMTfLeanINpDJ9oYl8EcxZtkXE4aEAb1q49pwIfMl7Q7XVOOBJJf4k8dG/1DT9Gi+HFpVHpEP20gJEApcroLqS0xjVGOkY8C1RStQL/r0LJka+Q2Ud0QcoHw4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=HGk9B80S; arc=none smtp.client-ip=198.175.65.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707394230; x=1738930230; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ivHn9eMnqjSo1Ck3bYq1BD7aGM0SlKEDNFiHnIfMXAA=; b=HGk9B80SwqoBiAWLwhqYRXOeRbh3ANwta7SzF/DrX5q9YQtqO4bApgo5 7TYOYjSdpoz/jfId87Ru+0avKbHkhdvUN7zRfpzoIIRlJQndUWAJSqVOM 5wDe4McS0KvZHys8rQM9kUbV2T87LggUENIQ3MRHHZukWPYKKUti9XwRJ bUqbJR3/gPWR9y2Sv94zTzP97r7npQgK1+IvooKqwQJJEGKFR78kn/4Ey a3InvSsZJy3JZIwkMskkMsHhGDJ6KEpy5YaXgA8goPQ+A7Gmh+QIrsLIj Bm3UbLjzF03UqP+3UuDANuKxPAL1M2lcptV7qVPzWvuIL2GLpuBccr/Dc A==; X-IronPort-AV: E=McAfee;i="6600,9927,10977"; a="1341344" X-IronPort-AV: E=Sophos;i="6.05,253,1701158400"; d="scan'208";a="1341344" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2024 04:10:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,253,1701158400"; d="scan'208";a="1625955" Received: from ijarvine-desk1.ger.corp.intel.com (HELO localhost) ([10.246.52.95]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2024 04:10:27 -0800 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Thomas Bogendoerfer , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, Sergio Paracuellos Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH v2 3/4] MIPS: PCI: Return PCIBIOS_* from tx4927_pci_config_read/write() Date: Thu, 8 Feb 2024 14:09:58 +0200 Message-Id: <20240208120959.2513-4-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240208120959.2513-1-ilpo.jarvinen@linux.intel.com> References: <20240208120959.2513-1-ilpo.jarvinen@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790337634469860496 X-GMAIL-MSGID: 1790337634469860496 pci_ops .read/.write must return PCIBIOS_* codes but tx4927_pci_config_read/write() return -1 when mkaddr() cannot find devfn from the root bus. Return PCIBIOS_DEVICE_NOT_FOUND instead and pass that onward in the call chain instead of overwriting the return value. Also converts 0 -> PCIBIOS_SUCCESSFUL which has only cosmetic impact. Signed-off-by: Ilpo Järvinen Reviewed-by: Sergio Paracuellos --- arch/mips/pci/ops-tx4927.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/mips/pci/ops-tx4927.c b/arch/mips/pci/ops-tx4927.c index f7802f100401..670efbc5c585 100644 --- a/arch/mips/pci/ops-tx4927.c +++ b/arch/mips/pci/ops-tx4927.c @@ -60,7 +60,7 @@ static int mkaddr(struct pci_bus *bus, unsigned int devfn, int where, { if (bus->parent == NULL && devfn >= PCI_DEVFN(TX4927_PCIC_MAX_DEVNU, 0)) - return -1; + return PCIBIOS_DEVICE_NOT_FOUND; __raw_writel(((bus->number & 0xff) << 0x10) | ((devfn & 0xff) << 0x08) | (where & 0xfc) | (bus->parent ? 1 : 0), @@ -69,7 +69,7 @@ static int mkaddr(struct pci_bus *bus, unsigned int devfn, int where, __raw_writel((__raw_readl(&pcicptr->pcistatus) & 0x0000ffff) | (PCI_STATUS_REC_MASTER_ABORT << 16), &pcicptr->pcistatus); - return 0; + return PCIBIOS_SUCCESSFUL; } static int check_abort(struct tx4927_pcic_reg __iomem *pcicptr) @@ -140,10 +140,12 @@ static int tx4927_pci_config_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *val) { struct tx4927_pcic_reg __iomem *pcicptr = pci_bus_to_pcicptr(bus); + int ret; - if (mkaddr(bus, devfn, where, pcicptr)) { + ret = mkaddr(bus, devfn, where, pcicptr); + if (ret != PCIBIOS_SUCCESSFUL) { *val = 0xffffffff; - return -1; + return ret; } switch (size) { case 1: @@ -162,9 +164,11 @@ static int tx4927_pci_config_write(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 val) { struct tx4927_pcic_reg __iomem *pcicptr = pci_bus_to_pcicptr(bus); + int ret; - if (mkaddr(bus, devfn, where, pcicptr)) - return -1; + ret = mkaddr(bus, devfn, where, pcicptr); + if (ret != PCIBIOS_SUCCESSFUL) + return ret; switch (size) { case 1: icd_writeb(val, where & 3, pcicptr);